diff options
| author | friendica <info@friendica.com> | 2015-01-20 14:05:22 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-20 14:05:22 -0800 |
| commit | 70fb47248b6579beabc81287750bc18aab2a7ddd (patch) | |
| tree | a403865fe2760b73952d5fadf061d4b1d0c0c28d /view/tpl | |
| parent | 7875b79f2f87bef0fc2ebddd3cee0ef952def5d4 (diff) | |
| parent | 43326a26b742430674b92347eb1e4ad8e1a16538 (diff) | |
| download | volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.tar.gz volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.tar.bz2 volse-hubzilla-70fb47248b6579beabc81287750bc18aab2a7ddd.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/hdr.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index fdcc4521c..cfd22e607 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> + <li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li> </ul> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 6904c2fec..bff3148f3 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -6,7 +6,7 @@ <ul class="dropdown-menu" role="menu"> {{foreach $profile.menu.entries as $e}} <li> - <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a> + <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> </li> {{/foreach}} <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> |