diff options
| author | anaqreon <tamanning@zoho.com> | 2014-12-30 16:06:35 -0600 |
|---|---|---|
| committer | anaqreon <tamanning@zoho.com> | 2014-12-30 16:06:35 -0600 |
| commit | b78a545a1056e6db9f4b6b4f262182b0a5c56e67 (patch) | |
| tree | 515c2f742a5a39e18b00debf1849ee9703fa4a42 /view/tpl/photos_upload.tpl | |
| parent | d67c5a6ffd134602084a6dcb37b316bf768bf715 (diff) | |
| parent | 43671a0a323afa758df56c06822ce3c46da026df (diff) | |
| download | volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.tar.gz volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.tar.bz2 volse-hubzilla-b78a545a1056e6db9f4b6b4f262182b0a5c56e67.zip | |
Merge pull request #1 from friendica/master
Pull from upstream
Diffstat (limited to 'view/tpl/photos_upload.tpl')
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index a04038aa2..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> - {{/if}} - - <div id="photos-upload-new-end" class="clear"></div> + <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 class="checkbox pull-left"> - <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}} + <div class="clear"></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> |