rebase and update themes

1 files changed, 18 insertions, 14 deletions

diff --git a/view/tpl/smarty3/profile_vcard.tpl b/view/tpl/smarty3/profile_vcard.tpl
index d9bbd177c..13460c2d9 100644
--- a/view/tpl/smarty3/profile_vcard.tpl
+++ b/view/tpl/smarty3/profile_vcard.tpl
@@ -1,9 +1,23 @@
 <div class="vcard">
 
-	<div class="fn label">{{$profile.name}}</div>
-	
+	{{if $profile.edit}}
+	<div class="action">
+	<a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><span>{{$profile.edit.1}}</span></a>
+	<ul id="profiles-menu" class="menu-popup">
+		{{foreach $profile.menu.entries as $e}}
+		<li>
+			<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+		</li>
+		{{/foreach}}
+		<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>
+	{{/if}}
+
+	<div class="fn label">{{$profile.name}}</div>
+		
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 
@@ -31,18 +45,8 @@
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}}
 
 	
-	<div id="profile-extra-links">
-		<ul>
-			{{if $connect}}
-				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-			{{/if}}
-			{{if $wallmessage}}
-				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
 </div>
-
+<div id="vcard-end"></div>
 {{$contact_block}}