fixed the sidebar edit thingy. haven't synced dispy yet.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

2 files changed, 27 insertions, 24 deletions

diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 6228e4f28..350a6ce4a 100644
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -1,24 +1,23 @@
 <div class="vcard">
 
-	<div class="fn label">$profile.name</div>
-
-		{{ if $profile.edit }}
-			<div class="action">
-			<span class="icon-profile-edit"></span>
-			<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				
-			</ul>
-			</div>
-		{{ endif }}
+	{{ if $profile.edit }}
+	<div class="action">
+	<span class="icon-profile-edit"></span>
+	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+	<ul id="profiles-menu" class="menu-popup">
+		{{ for $profile.menu.entries as $e }}
+		<li>
+			<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+		</li>
+		{{ endfor }}
+		<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+		<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+		
+	</ul>
 	</div>
+	{{ endif }}
+
+	<div class="fn label">$profile.name</div>
 
 	{{ if $pdesc }}
     <div class="title">$profile.pdesc</div>
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 2dc21817a..6ab0c7921 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -694,7 +694,7 @@ aside #viewcontacts {
 	margin: 30px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 5px;
+	margin: 0px 0px 0px 0px;
 }
 
 /**
@@ -835,6 +835,7 @@ aside #viewcontacts {
     border: 0;
     text-decoration: none;
 	float: right;
+	cursor: pointer;
 }
 #profile-jot-perms { 
 	float: right;
@@ -1702,7 +1703,6 @@ div[id$="wrapper"] br {
 }
 
 
-
 /**
  * 	register, settings & profile forms
  */
@@ -1767,21 +1767,25 @@ div[id$="wrapper"] br {
 	/*margin: 3px 0px 0px 70px;*/
 /*}*/
 #profiles-menu-trigger {
-	width: 100px;
+	margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
     margin: 20px 20px 0px 0px;
 }
 .icon-profile-edit {
-    background: url("icons.png") no-repeat scroll -150px 0px transparent;
-    border: 0 none;
+    background: url("icons.png") -150px 0px no-repeat;
+    border: 0;
+	cursor: pointer;
     display: block;
     float: right;
+	width: 20px;
     height: 20px;
     margin: 0 0 -18px;
+	position: absolute;
     text-decoration: none;
-	cursor: pointer;
+	top: 18px;
+	right: 226px;
 }
 #profile-edit-links ul {
     margin: 20px 0;