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.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.tpl')
| -rwxr-xr-x | view/tpl/direntry.tpl | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index a6252bb9a..2da920ab1 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -3,12 +3,33 @@ <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > <div class="contact-photo" id="directory-photo-{{$entry.id}}" > <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a> +{{if $entry.connect}} +<div class="directory-connect btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div> +{{/if}} </div> </div> -<div class="contact-name" id="directory-name-{{$entry.id}}" ><span onclick="dirdetails('{{$entry.hash}}');" class="fakelink" >{{$entry.name}}</span></div> -{{if $entry.connect}} -<div class="directory-connect btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div> +<div class='contact-info'> +<div class="contact-name" id="directory-name-{{$entry.id}}" ><a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</div> + +{{if $entry.public_forum}} +<div class="contact-forum"> +{{$entry.forum_label}} @{{$entry.nickname}}+ +</div> {{/if}} + <div class="contact-details">{{$entry.details}}</div> +{{if $entry.hometown}} +<div class="directory-hometown">{{$entry.hometown}} </div> +{{/if}} +{{if $entry.about}} +<div class="directory-about">{{$entry.about}} </div> +{{/if}} +{{if $entry.homepage}} +<div class="directory-homepage">{{$entry.homepage}}{{$entry.homepageurl}} </div> +{{/if}} +{{if $entry.kw}} +<div class="directory-keywords">{{$entry.kw}} {{$entry.keywords}}</div> +{{/if}} +</div> </div> |