From 45b9f1eb168ad72ce7e94a529def5e6da6b71daa Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Thu, 23 Feb 2017 20:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=98=BE=E7=A4=BA=E7=9A=84=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/db.js                                |  8 +++++-
 .../controllers/bookmarks-controller.js       |  3 ++
 public/views/bookmark-info.html               | 10 +++++--
 public/views/bookmarks.html                   | 28 +++++++++++--------
 public/views/search.html                      |  6 ++--
 public/views/tags.html                        | 11 ++++----
 6 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/database/db.js b/database/db.js
index ab0d28e..683c417 100644
--- a/database/db.js
+++ b/database/db.js
@@ -421,7 +421,13 @@ db.getBookmarksTable = function(params) {
     params.currentPage = params.currentPage || 1;
     params.perPageItems = params.perPageItems || 20;
 
-    var sql = "SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d') as created_at,  DATE_FORMAT(last_click, '%Y-%m-%d') as last_click FROM `bookmarks` WHERE 1=1";
+    var sql = "SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, ";
+    if (params.showStyle == 'card') {
+        sql += "'%Y-%m-%d %H:%i:%s'";
+    } else {
+        sql += "'%Y-%m-%d'";
+    }
+    sql += ") as created_at,  DATE_FORMAT(last_click, '%Y-%m-%d') as last_click FROM `bookmarks` WHERE 1=1";
     if (user_id) {
         sql += " AND `user_id` = '" + user_id + "'";
         if (params.showStyle == 'card') {
diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index d4880a9..8e5b7e8 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -75,6 +75,9 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
                 id: bookmark.tag_id,
                 name: bookmark.tag_name
             }];
+        } else if ($scope.showStyle == 'card') {
+            bookmark.last_click = bookmark.last_click.substring(0, 10);
+            bookmark.created_at = bookmark.created_at.substring(0, 10);
         }
         pubSubService.publish('TagCtr.showBookmarkInfo', bookmark);
         bookmarkService.clickBookmark({
diff --git a/public/views/bookmark-info.html b/public/views/bookmark-info.html
index 2ab8697..1ec766d 100644
--- a/public/views/bookmark-info.html
+++ b/public/views/bookmark-info.html
@@ -21,7 +21,7 @@
                             <i class="add to calendar icon"></i>创建日期：{{bookmark.created_at}}
                         </div>
                         <div class="column">
-                            <i class="calendar icon"></i>最后使用：{{bookmark.last_click}}
+                            <i class="calendar icon"></i>最后点击：{{bookmark.last_click}}
                         </div>
                     </div>
                     <div class="two column row">
@@ -42,14 +42,18 @@
     <div class="ui divider"></div>
     <div class="content" style="padding:0 0 0 20px">
         <div class="description">
-            <div class="ui header"> 描述信息 </div>
+            <div class="ui header">
+                描述信息
+            </div>
             <p>{{ bookmark.description }}</p>
         </div>
     </div>
     <div class="ui divider"></div>
     <div class="content" style="padding:0 0 0 20px">
         <div class="description">
-            <div class="ui header"> 内容摘抄 </div>
+            <div class="ui header">
+                内容摘抄
+            </div>
             <p ng-bind-html="content"></p>
             <img class="ui centered medium image" src="/images/loading.gif" ng-show="loading">
         </div>
diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html
index 9ee0d2a..f3905dd 100644
--- a/public/views/bookmarks.html
+++ b/public/views/bookmarks.html
@@ -19,8 +19,15 @@
                 </div>
                 <div class="fourteen wide column" ng-if="tag.bookmarks.length">
                     <div class="ui grid container">
-                        <div class="four wide column js-navigate-bookmark" ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmarkEditHover:bookmarkEditHover, bookmark:(!bookmarkNormalHover && !bookmarkEditHover)}" ng-mouseover="edit ? (bookmarkEditHover=true) : (bookmarkNormalHover=true)"
-                            ng-mouseleave="edit ? (bookmarkEditHover=false) : (bookmarkNormalHover=false)" ng-repeat="bookmark in tag.bookmarks" ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{ bookmark.title }}" id="{{bookmark.id}}">
+                        <div
+                            class="four wide column js-navigate-bookmark"
+                            ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmarkEditHover:bookmarkEditHover, bookmark:(!bookmarkNormalHover && !bookmarkEditHover)}"
+                            ng-mouseover="edit ? (bookmarkEditHover=true) : (bookmarkNormalHover=true)"
+                            ng-mouseleave="edit ? (bookmarkEditHover=false) : (bookmarkNormalHover=false)"
+                            ng-repeat="bookmark in tag.bookmarks"
+                            ng-click="jumpToUrl(bookmark.url, bookmark.id)"
+                            title="{{ bookmark.title }}"
+                            id="{{bookmark.id}}">
                             <img class="ui ui middle aligned tiny image bookmarkOperaterHover" style="width:16px;height:16px" ng-src="./images/{{ bookmarkEditHover ? 'delete-hover' : 'delete'}}.png" ng-if="edit" ng-click="delBookmark(bookmark.id)">
                             <img class="ui ui middle aligned tiny image bookmarkOperaterHover" style="width:16px;height:16px;float:right;" ng-src="./images/{{ bookmarkEditHover ? 'edit-bookmark-hover' : 'edit-bookmark'}}.png" ng-if="edit" ng-click="editBookmark(bookmark.id)">
                             <img class="ui ui middle aligned tiny image" ng-src=" http://favicon.byi.pw/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:default;" ng-click="detailBookmark(bookmark);$event.stopPropagation()" ng-if="!edit">
@@ -66,10 +73,10 @@
                 </div>
             </td>
             <td>
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/delete.png" ng-click="delBookmark(bookmark.id)" title="删除">
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/edit-bookmark.png" ng-click="editBookmark(bookmark.id)" title="编辑">
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)" title="详情">
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/copy.png" ng-click="copyBookmark(bookmark.url)" title="复制链接">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/delete.png" ng-click="delBookmark(bookmark.id)" title="删除书签">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/edit-bookmark.png" ng-click="editBookmark(bookmark.id)" title="编辑书签">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)" title="书签详情">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/copy.png" ng-click="copyBookmark(bookmark.url)" title="复制书签">
             </td>
         </tr>
     </tbody>
@@ -85,7 +92,7 @@
     <div class="ui five link stackable cards" infinite-scroll='loadCardData()' infinite-scroll-immediate-check="false">
         <div class="card" ng-repeat="bookmark in bookmarks">
             <div class="image" href="{{ bookmark.url }}" ng-click="jumpToUrl(bookmark.url, bookmark.id)">
-                <img ng-src="./images/snap/{{bookmark.id}}.png" err-src="./images/snap/default.png" />
+                <img ng-src="./images/snap/{{bookmark.id}}.png" err-src="./images/snap/default.png"/>
             </div>
             <div class="content" ng-click="jumpToUrl(bookmark.url, bookmark.id)">
                 <div class="description bookmarkTitle">
@@ -100,16 +107,15 @@
             <div class="extra content" ng-click="jumpToUrl(bookmark.url, bookmark.id)">
                 <span class="left floated like">
                     <i class="add to calendar icon"></i>
-                    {{ bookmark.created_at }}
+                    {{ bookmark.created_at.substr(5) }}
                 </span>
-                <span class="left floated like">
+                <!-- <span class="left floated like">
                     <i class="pointing up icon"></i>
                     {{ bookmark.click_count }}
-                </span>
+                </span> -->
                 <span class="right floated">
                     <img class="ui mini spaced image" style="cursor:default;width:16px;height:16px;margin:0 1px" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark);$event.stopPropagation()" title="详情">
                 </span>
-
             </div>
         </div>
     </div>
diff --git a/public/views/search.html b/public/views/search.html
index bdb83c7..53ea162 100644
--- a/public/views/search.html
+++ b/public/views/search.html
@@ -147,9 +147,9 @@
                 </div>
             </td>
             <td>
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/delete.png" ng-click="delBookmark(bookmark.id)">
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/edit-bookmark.png" ng-click="editBookmark(bookmark.id)">
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/delete.png" ng-click="delBookmark(bookmark.id)" title="删除书签">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/edit-bookmark.png" ng-click="editBookmark(bookmark.id)" title="编辑书签">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)" title="书签详情">
                 <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/copy.png" ng-click="copyBookmark(bookmark.url)" title="复制链接">
             </td>
         </tr>
diff --git a/public/views/tags.html b/public/views/tags.html
index aa2508c..db29ee9 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -10,7 +10,8 @@
         </div>
     </div>
 </div>
-<div class="ui huge text centered inline loader" ng-class="{active:loadBookmarks, disabled: !loadBookmarks}"> 正在加载中...</div>
+<div class="ui huge text centered inline loader" ng-class="{active:loadBookmarks, disabled: !loadBookmarks}">
+    正在加载中...</div>
 <table class="ui celled table" ng-if="bookmarkCount > 0" style="margin-top:-14px;" ng-show="!loadBookmarks">
     <thead>
         <tr>
@@ -43,10 +44,10 @@
                 </div>
             </td>
             <td>
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/delete.png" ng-click="delBookmark(bookmark.id)">
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/edit-bookmark.png" ng-click="editBookmark(bookmark.id)">
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)">
-                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/copy.png" ng-click="copyBookmark(bookmark.url)" title="复制链接">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/delete.png" ng-click="delBookmark(bookmark.id)" title="删除书签">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/edit-bookmark.png" ng-click="editBookmark(bookmark.id)" title="编辑书签">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)" title="书签详情">
+                <img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/copy.png" ng-click="copyBookmark(bookmark.url)" title="复制书签">
             </td>
         </tr>
     </tbody>