From 4b7fd9ab1d9dda8f2b0999f975e01303fea27749 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 7 Nov 2012 02:16:56 +0530
Subject: [PATCH] Fixes https://github.com/owncloud/apps/issues/143

The edit button come besides title + url
---
 css/bookmarks.css    | 14 ++++++++++++--
 templates/js_tpl.php | 12 ++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/css/bookmarks.css b/css/bookmarks.css
index 851f052d..8d91f433 100644
--- a/css/bookmarks.css
+++ b/css/bookmarks.css
@@ -66,11 +66,13 @@ input.disabled, input.disabled:hover {
 .bookmark_actions span { margin: 0 0.4em; }
 .bookmark_actions img { opacity: 0.3; }
 .bookmark_actions img:hover { opacity: 1; cursor: pointer; }
+.bookmark_edit img {opacity:0.3;}
+.bookmark_edit img:hover {cursor: pointer; opacity: 1;}
 
 .bookmark_single {
 	position: relative;
-	min-height: 3em;
 	padding: 0.5em 1em;
+        min-height: 3em;
 	border-bottom: 1px solid #DDD;
 	-webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms;
 }
@@ -237,7 +239,7 @@ li:hover em { display : none; }
 }
 
 .bookmark_desc{
-/* 	height: 1.5em; */
+	height: 1.5em;
 	padding-left:1em;
 	white-space:nowrap;
   text-overflow:ellipsis;
@@ -253,6 +255,14 @@ li:hover em { display : none; }
 	margin-right: 0.2em;
 }
 
+/*
+.bm_view_img .bookmark_single:hover .bookmark_url{
+	display:block; 
+}
+.bm_view_img .bookmark_single .bookmark_url{
+ 	display:block; 
+}
+*/
 .bookmark_single:hover .bookmark_url { display: inline;  }
 .bookmark_single:hover .bookmark_url a[href]{ color:gray; }
 
diff --git a/templates/js_tpl.php b/templates/js_tpl.php
index 3f997015..6c0b5b62 100644
--- a/templates/js_tpl.php
+++ b/templates/js_tpl.php
@@ -1,10 +1,6 @@
 <script type="text/html" id="item_tmpl">
 		<div class="bookmark_single" data-id="<%= id %>">
 				<p class="bookmark_actions">
-					<span class="bookmark_edit">
-						<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>"
-							title="<?php echo $l->t('Edit');?>">
-					</span>
 					<span class="bookmark_delete">
 						<img class="svg" src="<?php echo OCP\image_path("", "actions/delete.svg");?>"
 							title="<?php echo $l->t('Delete');?>">
@@ -13,15 +9,19 @@
 				<p class="bookmark_title">
 					<a href="<%= encodeEntities(url) %>" target="_blank" class="bookmark_link">
 						<%= encodeEntities(title == '' ? url : title ) %>
-					</a>
+					</a>                                                                    
 				</p>
 				<p class="bookmark_url">
 					<a href="<%= encodeEntities(url) %>" target="_blank" class="bookmark_link">
 						<%= encodeEntities(title == '' ? '' : url) %>
 					</a>
+                                        <span class="bookmark_edit">
+						<img class="svg" src="<?php echo OCP\image_path("", "actions/rename.svg");?>"
+							title="<?php echo $l->t('Edit');?>">
+					</span>
 				</p>
-				<p class="bookmark_desc"><%= encodeEntities(description)%> </p>
 				<p class="bookmark_date"><%= formatDate(added_date) %></p>
+				<p class="bookmark_desc"><%= encodeEntities(description)%> </p>
 			</div>
 </script>