diff options
| -rw-r--r-- | apps/bookmarks/css/bookmarks.css | 18 | ||||
| -rw-r--r-- | apps/bookmarks/js/bookmarks.js | 10 |
2 files changed, 21 insertions, 7 deletions
diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css index ef0ec68fcce..48f0bede110 100644 --- a/apps/bookmarks/css/bookmarks.css +++ b/apps/bookmarks/css/bookmarks.css @@ -18,7 +18,7 @@ } .bookmarks_list { - margin-top: 2.8em; + margin-top: 36px; } .bookmarks_addBml { @@ -63,10 +63,22 @@ .bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; } .bookmark_url { display: none; color: #999; } .bookmark_single:hover .bookmark_url { display: inline; } - +.bookmark_tags { + position: absolute; + top: 0.5em; + right: 6em; + text-align: right; +} .bookmark_tag { - color: #ff3333; + display: inline-block; + color: white; + margin: 0 0.2em; + padding: 0 0.4em; + background-color: #1D2D44; + border-radius: 0.4em; + opacity: 0.2; } +.bookmark_tag:hover { opacity: 0.5; } .loading_meta { display: none; diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js index 86bb71ac725..b43c3deb59c 100644 --- a/apps/bookmarks/js/bookmarks.js +++ b/apps/bookmarks/js/bookmarks.js @@ -87,8 +87,8 @@ function addOrEditBookmark(event) { '<div class="bookmark_single" data-id="' + bookmark_id + '" >' + '<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span> <span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' + '<p class="bookmark_title"><a href="' + url + '" target="_blank" class="bookmark_link">' + title + '</a></p>' + - '<p class="bookmark_url">' + url + '</p>' + '<p class="bookmark_tags">' + tagshtml + '</p>' + + '<p class="bookmark_url">' + url + '</p>' + '</div>' ); } @@ -146,7 +146,8 @@ function updateBookmarksList(bookmark) { var tags = encodeEntities(bookmark.tags).split(' '); var taglist = ''; for ( var i=0, len=tags.length; i<len; ++i ){ - taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURI(tags[i]) + '">' + tags[i] + '</a> '; + if(tags[i] != '') + taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURI(tags[i]) + '">' + tags[i] + '</a> '; } if(!hasProtocol(bookmark.url)) { bookmark.url = 'http://' + bookmark.url; @@ -156,9 +157,11 @@ function updateBookmarksList(bookmark) { '<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span> <span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' + '<p class="bookmark_title"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a></p>' + '<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' + - '<p class="bookmark_tags">' + taglist + '</p>' + '</div>' ); + if(taglist != '') { + $('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>'); + } } function updateOnBottom() { @@ -178,7 +181,6 @@ function recordClick(event) { function encodeEntities(s){ try { return $('<div/>').text(s).html(); - } catch (ex) { return ""; } |