Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / view / theme / dispy-dark / profile_vcard.tpl

diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 6228e4f282aa5e4566b729737d55644c6a7f42f6..f14ea7915e1f75c48c89577e75fd3b59bfe7f89b 100644 (file)
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -1,24 +1,22 @@
 <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>
@@ -82,4 +80,3 @@
 
 $contact_block
 
-