diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-07 14:56:53 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-07 14:56:53 -0700 |
| commit | 2ebf76cd501d478cd36b9665b68730b8d58b266d (patch) | |
| tree | cb6569773ac4a26e58c4351b0edbd4c7477325d0 /view/tpl | |
| parent | 69ab6639b2b730e95da93e5049c2ca8c3b75c67b (diff) | |
| parent | 06b0c89aeedd60fc3e9a177e0060e8b393ed227c (diff) | |
| download | volse-hubzilla-2ebf76cd501d478cd36b9665b68730b8d58b266d.tar.gz volse-hubzilla-2ebf76cd501d478cd36b9665b68730b8d58b266d.tar.bz2 volse-hubzilla-2ebf76cd501d478cd36b9665b68730b8d58b266d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/photo_albums.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 20 |
2 files changed, 7 insertions, 15 deletions
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index c565ccaf1..a238e61bc 100755 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -1,7 +1,7 @@ <div id="side-bar-photos-albums" class="widget"> <h3>{{$title}}</h3> <ul class="nav nav-pills flex-column"> - <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li> + <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li> {{if $albums}} {{foreach $albums as $al}} {{if $al.shorttext}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index ed726d027..2431329ec 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -7,26 +7,18 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> <i class="fa fa-cog"></i> {{$tools_label}} </button> - <ul class="dropdown-menu dropdown-menu-right"> + <div class="dropdown-menu dropdown-menu-right flex-column"> {{if $tools}} - <li class="nav-item"> - <a class="nav-link" href="{{$tools.profile.0}}"><i class="fa fa-user"></i> {{$tools.profile.1}}</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i> {{$tools.cover.1}}</a> - </li> + <a class="dropdown-item" href="{{$tools.profile.0}}"><i class="fa fa-user"></i> {{$tools.profile.1}}</a> + <a class="dropdown-item" href="{{$tools.cover.0}}"><i class="fa fa-picture-o"></i> {{$tools.cover.1}}</a> {{/if}} {{if $map}} - <li class="nav-item"> - <a class="nav-link" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i> {{$map_text}}</a> - </li> + <a class="dropdown-item" href="#" onclick="var pos = $('#photo-map').css('position'); if(pos === 'absolute') { $('#photo-map').css( { position: 'relative', left: 'auto', top: 'auto' }); } else { $('#photo-map').css( { position: 'absolute', left: '-9999px', top: '-9999px' }); } return false; " ><i class="fa fa-globe"></i> {{$map_text}}</a> {{/if}} {{if $edit}} - <li class="nav-item"> - <a class="nav-link acl-form-trigger" href="#" title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> - </li> + <a class="dropdown-item acl-form-trigger" href="#" title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> {{/if}} - </ul> + </div> </div> {{/if}} {{if $lock}} |