From e4faea8f9007667ee77ddd114440747539a0b843 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 1 Feb 2012 20:58:04 +0100
Subject: [PATCH 1/4] Fixed upload button display error

---
 files/css/files.css       | 3 ++-
 files/templates/index.php | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/files/css/files.css b/files/css/files.css
index 6c4d603b4a..13ed7fb33e 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -27,7 +27,8 @@
 
 .file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
 .file_upload_filename.active { border-bottom-right-radius:0 }
-.file_upload_filename { z-index:100; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; padding:.3em; }
+.file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
+.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; }
 
 
 .file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
diff --git a/files/templates/index.php b/files/templates/index.php
index 9ebfa41cef..38a3274ff3 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -3,13 +3,10 @@
 	<?php if (!isset($_['readonly']) || !$_['readonly']):?>
 		<div class="actions">
 			<div id='new' class='button'>
-				<a>
-					<?php echo $l->t('New');?>
-				</a>
+				<a><?php echo $l->t('New');?></a>
 				<ul class="popup popupTop">
 					<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
 					<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
-	<!-- 				<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
 				</ul>
 			</div>
 			<div class="file_upload_wrapper svg">
@@ -17,7 +14,7 @@
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-					<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
+					<button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
 					<input class="file_upload_start" type="file" name='files[]'/>
 						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
 					<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>

From bbd10a3c94fdd0f8ac41d6d60651c7468360e487 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 1 Feb 2012 21:19:31 +0100
Subject: [PATCH 2/4] Bookmark layout updated

---
 apps/bookmarks/css/bookmarks.css | 33 ++++++++++++++------------------
 apps/bookmarks/js/bookmarks.js   |  4 ++--
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 233d4a0294..ef0ec68fcc 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -18,7 +18,7 @@
 }
 
 .bookmarks_list {
-	margin-top: 45px;
+	margin-top: 2.8em;
 }
 
 .bookmarks_addBml {
@@ -36,38 +36,33 @@
 }
 
 .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_tag {
 	color: #ff3333;
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 51646e5382..86bb71ac72 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>' +
 				'</div>'
 				);
 			}
@@ -153,10 +153,10 @@ function updateBookmarksList(bookmark) {
 	}
 	$('.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>'
 	);
 }

From f999fbf81a142b2695bf3fffcf66e430efb71c44 Mon Sep 17 00:00:00 2001
From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Wed, 1 Feb 2012 22:02:06 +0100
Subject: [PATCH 3/4] Bookmark layout updated

---
 apps/bookmarks/css/bookmarks.css | 20 ++++++++++++++++----
 apps/bookmarks/js/bookmarks.js   | 10 ++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index ef0ec68fcc..48f0bede11 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_tag {
-	color: #ff3333;
+.bookmark_tags {
+	position: absolute;
+	top: 0.5em;
+	right: 6em;
+	text-align: right;
 }
+.bookmark_tag {
+	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 86bb71ac72..b43c3deb59 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>&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 "";
 	}

From f1982965769ac30f00bb36ab3c672815d1a0d09b Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 1 Feb 2012 22:15:01 +0100
Subject: [PATCH 4/4] gallery works in safari now

---
 apps/gallery/js/albums.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 59efb5b565..d2b4d858b5 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);