diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /view/profile_vcard.tpl | |
parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'view/profile_vcard.tpl')
-rw-r--r--[-rwxr-xr-x] | view/profile_vcard.tpl | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index 7cd02f164..d1e684795 100755..100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -1,27 +1,11 @@ <div class="vcard"> - <div class="tool"> - <div class="fn label">$profile.name</div> - {{ if $profile.edit }} - <div class="action"> - <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></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> + <div class="fn label">$profile.name</div> + - </ul> - </div> - {{ endif }} - </div> - - + {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div> + <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div> @@ -54,6 +38,9 @@ {{ if $connect }} <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li> {{ endif }} + {{ if $wallmessage }} + <li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li> + {{ endif }} </ul> </div> </div> |