diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
| commit | f0c7612bcd49d32e408e67ac1829ee891c677f7e (patch) | |
| tree | d4cff4aa2d728524b631776ffffee71f42056421 /view/tpl/photos_upload.tpl | |
| parent | 43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff) | |
| parent | 10102ac2ac4d5b02012a9794e23656717ab05556 (diff) | |
| download | volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.gz volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.bz2 volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
Diffstat (limited to 'view/tpl/photos_upload.tpl')
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 10fc82648..6cd7e3eb9 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -18,30 +18,40 @@ {{$aclselect}} {{if $default}} - <div class="pull-left"> + <div class="form-group"> <input id="photos-upload-choose" type="file" name="userfile" /> </div> - <div class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> - </button> - <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + <div class="pull-right btn-group form-group"> + <div class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> + </label> + </div> + <div class="btn-group"> + {{if $lockstate}} + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> + </button> + {{/if}} + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button> + </div> + </div> {{/if}} - <div class="clear"></div> - <div class="checkbox"> - <label class="checkbox-inline" for="photos-upload-noshare" > - <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}} - </label> - </div> - {{if $uploader}} - <div id="photos-upload-perms" class="pull-right"> + <div id="photos-upload-perms" class="btn-group pull-right"> + <div class="btn-group" data-toggle="buttons"> + <label class="btn btn-default btn-sm" title="{{$nosharetext}}"> + <input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /><i class="icon-ban-circle"></i> + </label> + </div> + {{if $lockstate}} <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> </button> + {{/if}} <div class="pull-right"> {{$uploader}} </div> |