diff options
author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
---|---|---|
committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /view/tpl/direntry_large.tpl | |
parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'view/tpl/direntry_large.tpl')
-rwxr-xr-x | view/tpl/direntry_large.tpl | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl deleted file mode 100755 index da6ea1a44..000000000 --- a/view/tpl/direntry_large.tpl +++ /dev/null @@ -1,43 +0,0 @@ -<div class="directory-popup-item lframe" id="directory-item-{{$id}}" > -<div class="generic-content-wrapper"> - -<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > - <div class="contact-photo dirpopup" id="directory-photo-{{$id}}" > - <a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" style="height:175px; width:175px;" src="{{$photo}}" alt="{{$alttext}}" title="{{$alttext}}" /></a> - </div> - <div class="contact-photo dirpopup" id="directory-qr-{{$id}}" > - <img class="directory-photo-img" style="height:175px; width:175px;" src="photo/qr?f=&qr={{$qrlink}}" alt="QR" title="{{$qrlink}}" /> - </div> -</div> - -<div class="clear"></div> - - -<div class="contact-name" id="directory-name-{{$id}}" >{{$name}}{{if $online}} <i class="icon-asterisk online-now" title="{{$online}}"></i>{{/if}}</div> -{{if $connect}} -<div class="directory-connect btn btn-default"><a href="{{$connect}}"><i class="icon-plus connect-icon"></i> {{$conn_label}}</a></div> -{{/if}} - -<div class="contact-webbie">{{$address}}</div> - -<div class="contact-details">{{$details}}</div> -{{if $marital}} -<div class="directory-marital">{{$marital}} </div> -{{/if}} -{{if $sexual}} -<div class="directory-sexual">{{$sexual}} </div> -{{/if}} -{{if $homepage}} -<div class="directory-homepage">{{$homepage}} </div> -{{/if}} -{{if $hometown}} -<div class="directory-hometown">{{$hometown}} </div> -{{/if}} -{{if $about}} -<div class="directory-about">{{$about}} </div> -{{/if}} -{{if $kw}} -<div class="directory-keywords">{{$kw}} {{$keywords}}</div> -{{/if}} -</div> -</div> |