diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-04-04 10:13:30 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-04-04 10:13:30 +0200 |
| commit | dfa12b29190086c3976d7cab8dbf1721846dcf94 (patch) | |
| tree | f2b4e33ab62aa776707990481d8647bd010cf401 /view | |
| parent | 222ace377009d196e3ea0292b1ac332ef8e88d23 (diff) | |
| parent | 9b9f29a0b2182cd17596c7f1ca4f65204e077b3d (diff) | |
| download | volse-hubzilla-dfa12b29190086c3976d7cab8dbf1721846dcf94.tar.gz volse-hubzilla-dfa12b29190086c3976d7cab8dbf1721846dcf94.tar.bz2 volse-hubzilla-dfa12b29190086c3976d7cab8dbf1721846dcf94.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/photo_album.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 95169164a..3007c0bcc 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,6 +1,8 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> + <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button> + <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button> {{if $order}} <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> {{/if}} @@ -13,9 +15,7 @@ {{/if}} </div> </div> - <h2>{{$album}}</h2> - <div class="clear"></div> </div> {{$upload_form}} diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index f3131117c..3e296658f 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -1,8 +1,12 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - {{if $can_post}} - <button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> - {{/if}} + <div class="pull-right"> + <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button> + <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button> + {{if $can_post}} + <button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i> {{$upload.0}}</button> + {{/if}} + </div> <h2>{{$title}}</h2> <div class="clear"></div> </div> |