Bookmark layout updated

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index ef0ec68fccecd71b28b60bdb94bfe2e05c569a61..48f0bede1103decaf7fed854506c681da6163324 100644 (file)
--- 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 86bb71ac7252da0bc2686924e9b8f47b7f74cd51..b43c3deb59c58d2addf4990a38d4c4590dd832c6 100644 (file)
--- 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>&nbsp;<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>&nbsp;<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 "";
        }