diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
| commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
| tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /view/tpl/photos_upload.tpl | |
| parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
| parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
| download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'view/tpl/photos_upload.tpl')
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 5bb0092d6..2dd7de9b2 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -3,7 +3,6 @@ <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form"> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> - <div class="form-group"> <label for="photos-upload-album">{{$newalbum_label}}</label> <input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload"> @@ -19,37 +18,36 @@ {{$aclselect}} {{if $default}} - <div class="form-group pull-left"> + <div class="pull-left"> <input id="photos-upload-choose" type="file" name="userfile" /> </div> <div class="btn-group pull-right"> - <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> - <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" disabled="disabled" onclick="return false;"> + <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i> </button> - <button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-upload-submit">{{$submit}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" disabled="disabled">{{$submit}}</button> </div> {{/if}} - <div id="photos-upload-new-end"></div> + <div id="photos-upload-new-end" class="clear"></div> - <div class="form-group" id="photos-upload-noshare"> - <label id="photos-upload-noshare-text" for="photos-upload-noshare" > - <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" /> {{$nosharetext}} + <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 $uploader}} - <div id="photos-upload-noshare-end"></div> - <div id="photos-upload-perms" class="photos-upload-perms" > - <span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span> - <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + <div id="photos-upload-perms" class="pull-right"> + <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> + <div class="pull-right"> + {{$uploader}} + </div> </div> - <div id="photos-upload-perms-end"></div> - {{$uploader}} {{/if}} - - - <div class="photos-upload-end" ></div> </form> </div> + <div id="photos-upload-end" class="clear"></div> </div> |