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/contact_template.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/contact_template.tpl')
-rw-r--r--[-rwxr-xr-x] | view/contact_template.tpl | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/view/contact_template.tpl b/view/contact_template.tpl index b826acc65..48930b48a 100755..100644 --- a/view/contact_template.tpl +++ b/view/contact_template.tpl @@ -1,26 +1,25 @@ -<div class="contact-wrapper" id="contact-entry-wrapper-$id" > - <div class="contact-photo-wrapper" > - <div class="contact-photo mframe" id="contact-entry-photo-$contact.id" +<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" > + <div class="contact-entry-photo-wrapper" > + <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id" onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" > <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a> {{ if $contact.photo_menu }} - <a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a> - <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id"> - $contact.photo_menu - </ul> + <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span> + <div class="contact-photo-menu" id="contact-photo-menu-$contact.id"> + <ul> + $contact.photo_menu + </ul> + </div> {{ endif }} </div> </div> - <div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div> - {{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }} - <div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div> - <div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div> - + <div class="contact-entry-photo-end" ></div> + <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div> + <div class="contact-entry-end" ></div> </div> - |