liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整了一下卡片显示的日期

This commit is contained in:
luchenqun 2017-02-23 20:28:15 +08:00
parent b97162e5a1
commit 45b9f1eb16
6 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
database/db.js
View File

@ -421,7 +421,13 @@ db.getBookmarksTable = function(params) {
params.currentPage = params.currentPage || 1; params.currentPage = params.currentPage || 1;
params.perPageItems = params.perPageItems || 20; 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) { if (user_id) {
sql += " AND `user_id` = '" + user_id + "'"; sql += " AND `user_id` = '" + user_id + "'";
if (params.showStyle == 'card') { if (params.showStyle == 'card') {

3
public/scripts/controllers/bookmarks-controller.js
View File

@ -75,6 +75,9 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
id: bookmark.tag_id, id: bookmark.tag_id,
name: bookmark.tag_name 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); pubSubService.publish('TagCtr.showBookmarkInfo', bookmark);
bookmarkService.clickBookmark({ bookmarkService.clickBookmark({

10
public/views/bookmark-info.html
View File

@ -21,7 +21,7 @@
<i class="add to calendar icon"></i>创建日期：{{bookmark.created_at}} <i class="add to calendar icon"></i>创建日期：{{bookmark.created_at}}
</div> </div>
<div class="column"> <div class="column">
<i class="calendar icon"></i>最后使用：{{bookmark.last_click}} <i class="calendar icon"></i>最后点击：{{bookmark.last_click}}
</div> </div>
</div> </div>
<div class="two column row"> <div class="two column row">
@ -42,14 +42,18 @@
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="content" style="padding:0 0 0 20px"> <div class="content" style="padding:0 0 0 20px">
<div class="description"> <div class="description">
<div class="ui header"> 描述信息 </div> <div class="ui header">
描述信息
</div>
<p>{{ bookmark.description }}</p> <p>{{ bookmark.description }}</p>
</div> </div>
</div> </div>
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="content" style="padding:0 0 0 20px"> <div class="content" style="padding:0 0 0 20px">
<div class="description"> <div class="description">
<div class="ui header"> 内容摘抄 </div> <div class="ui header">
内容摘抄
</div>
<p ng-bind-html="content"></p> <p ng-bind-html="content"></p>
<img class="ui centered medium image" src="/images/loading.gif" ng-show="loading"> <img class="ui centered medium image" src="/images/loading.gif" ng-show="loading">
</div> </div>

28
public/views/bookmarks.html
View File

@ -19,8 +19,15 @@
</div> </div>
<div class="fourteen wide column" ng-if="tag.bookmarks.length"> <div class="fourteen wide column" ng-if="tag.bookmarks.length">
<div class="ui grid container"> <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)" <div
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}}"> 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" 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 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"> <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> </div>
</td> </td>
<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/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/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/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/copy.png" ng-click="copyBookmark(bookmark.url)" title="复制书签">
</td> </td>
</tr> </tr>
</tbody> </tbody>
@ -85,7 +92,7 @@
<div class="ui five link stackable cards" infinite-scroll='loadCardData()' infinite-scroll-immediate-check="false"> <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="card" ng-repeat="bookmark in bookmarks">
<div class="image" href="{{ bookmark.url }}" ng-click="jumpToUrl(bookmark.url, bookmark.id)"> <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>
<div class="content" ng-click="jumpToUrl(bookmark.url, bookmark.id)"> <div class="content" ng-click="jumpToUrl(bookmark.url, bookmark.id)">
<div class="description bookmarkTitle"> <div class="description bookmarkTitle">
@ -100,16 +107,15 @@
<div class="extra content" ng-click="jumpToUrl(bookmark.url, bookmark.id)"> <div class="extra content" ng-click="jumpToUrl(bookmark.url, bookmark.id)">
<span class="left floated like"> <span class="left floated like">
<i class="add to calendar icon"></i> <i class="add to calendar icon"></i>
{{ bookmark.created_at }} {{ bookmark.created_at.substr(5) }}
</span> </span>
<span class="left floated like"> <!-- <span class="left floated like">
<i class="pointing up icon"></i> <i class="pointing up icon"></i>
{{ bookmark.click_count }} {{ bookmark.click_count }}
</span> </span> -->
<span class="right floated"> <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="详情"> <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> </span>
</div> </div>
</div> </div>
</div> </div>

6
public/views/search.html
View File

@ -147,9 +147,9 @@
</div> </div>
</td> </td>
<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/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)"> <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)"> <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/copy.png" ng-click="copyBookmark(bookmark.url)" title="复制链接">
</td> </td>
</tr> </tr>

11
public/views/tags.html
View File

@ -10,7 +10,8 @@
</div> </div>
</div> </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"> <table class="ui celled table" ng-if="bookmarkCount > 0" style="margin-top:-14px;" ng-show="!loadBookmarks">
<thead> <thead>
<tr> <tr>
@ -43,10 +44,10 @@
</div> </div>
</td> </td>
<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/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)"> <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)"> <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/copy.png" ng-click="copyBookmark(bookmark.url)" title="复制书签">
</td> </td>
</tr> </tr>
</tbody> </tbody>