Merge branch 'master' into filesystem

3 files changed, 41 insertions, 32 deletions

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 233d4a02944..48f0bede110 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -18,7 +18,7 @@
 }
 
 .bookmarks_list {
-	margin-top: 45px;
+	margin-top: 36px;
 }
 
 .bookmarks_addBml {
@@ -36,42 +36,49 @@
 }
 
 .bookmark_actions {
+	position: absolute;
+	right: 1em;
+	top: 0.7em;
 	display: none;
-	font-size: smaller;
-	color: #666;
-	padding-left: 4em;
-}
-
-.bookmark_actions span:hover {
-	cursor: pointer;
-	text-decoration: underline;
 }
+.bookmark_actions span { margin: 0 0.4em; }
+.bookmark_actions img { opacity: 0.3; }
+.bookmark_actions img:hover { opacity: 1; cursor: pointer; }
 
 .bookmark_single {
+	position: relative;
 	padding: 0.5em 1em;
+	border-bottom: 1px solid #DDD;
+	-webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms;
 }
 
 .bookmark_single:hover {
-	background-color: #EAEAEA;
+	background-color:#f8f8f8
 }
 
 .bookmark_single:hover .bookmark_actions {
 	display: block;
 }
 
-.bookmark_title {
-	font-size: larger;
-	color: blue;
-	text-decoration: underline;
-}
-
-.bookmark_url {
-	color: green;
+.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 51646e5382b..b43c3deb59c 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -85,10 +85,10 @@ function addOrEditBookmark(event) {
 				$('.bookmarks_add').children('p').children('.bookmarks_input').val(''); 
 				$('.bookmarks_list').prepend(
 				'<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_actions"><span class="bookmark_delete">Delete</span>&nbsp;<span class="bookmark_edit">Edit</span></p>' +
+					'<p class="bookmark_url">' + url + '</p>' +
 				'</div>'
 				);
 			}
@@ -146,19 +146,22 @@ 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;
 	}
 	$('.bookmarks_list').append(
 		'<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="' + 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>' +
-			'<p class="bookmark_actions"><span class="bookmark_delete">Delete</span>&nbsp;<span class="bookmark_edit">Edit</span></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 "";
 	}
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 59efb5b5659..d2b4d858b55 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -46,14 +46,14 @@ Albums={
       var a = Albums.albums[i];
 	  var local=$(displayTemplate);
 	  local.attr('data-album',a.name);
-	  $(".gallery_album_decoration a.rename", local).click(function(name,event){
+	  $(".gallery_album_decoration a.rename", local).bind('click', {name: a.name},function(event){
 			event.preventDefault();
-			galleryRename(name);
-		}.bind(null,a.name));
-	  $(".gallery_album_decoration a.remove", local).click(function(name,event){
+			galleryRename(event.data.name);
+    });
+	  $(".gallery_album_decoration a.remove", local).bind('click', {name: a.name},function(event){
 		  event.preventDefault();
-		  galleryRemove(name);
-	  }.bind(null,a.name));
+		  galleryRemove(a.data.name);
+    });
 	  $("a.view", local).attr('href','?view='+a.name);
 	  $('h1',local).text(a.name);
 	  $(".gallery_album_cover", local).attr('title',a.name);