diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-04 13:31:31 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-04 13:31:31 -0700 |
| commit | 3de40bdf04e4b774737804ab92b57004d5ee23bd (patch) | |
| tree | 7dba4dbe04ee53a6f82fa53851d102d786a8147e | |
| parent | ba6c346b46cd5cc438164ccba9cd36a2302c1ef5 (diff) | |
| parent | bba34a7a8e5b62017d917808d50165cfd9f3d2e7 (diff) | |
| download | volse-hubzilla-3de40bdf04e4b774737804ab92b57004d5ee23bd.tar.gz volse-hubzilla-3de40bdf04e4b774737804ab92b57004d5ee23bd.tar.bz2 volse-hubzilla-3de40bdf04e4b774737804ab92b57004d5ee23bd.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
| -rw-r--r-- | view/tpl/chatrooms.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 10 |
3 files changed, 10 insertions, 6 deletions
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index de8cdce7c..d35148f7c 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -21,7 +21,7 @@ <tr class="chatroom-index-row"> <td><a href="{{$baseurl}}/chat/{{$nickname}}/{{$room.cr_id}}">{{$room.cr_name}}</a></td> <td>{{$room.cr_expire}} min</td> - <td class="chatrooms-index-tool dropdown pull-right"> + <td class="chatrooms-index-tool{{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} dropdown pull-right{{/if}}"> {{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" onclick="lockview('chatroom',{{$room.cr_id}});"></i> <ul id="panel-{{$room.cr_id}}" class="lockview-panel dropdown-menu"></ul> 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> |