diff options
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/js/acl.js | 1 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/chatroom_new.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/mitemedit.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 4 |
8 files changed, 13 insertions, 12 deletions
diff --git a/version.inc b/version.inc index b0f79cf5f..efaa3c1ee 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-07.852 +2014-11-08.853 diff --git a/view/js/acl.js b/view/js/acl.js index c129634a0..ec5e59962 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -269,5 +269,6 @@ ACL.prototype.populate = function(data){ $(el).removeAttr("data-src"); }); that.update_view(); + $('#dbtn-submit, #dbtn-acl').prop('disabled', false); } diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index e91b4c0c6..1254c713b 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -5,7 +5,7 @@ <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > <div id="attach-edit-perms" > -<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> +<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" disabled="disabled" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> </button> {{$aclselect}} {{$file.filename}} @@ -30,7 +30,7 @@ <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> <div class="clear"></div> -<input id="attach-edit-submit" type="submit" name="submit" value="{{$submit}}" /> +<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" disabled="disabled"/> </form> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index 287f95cc0..bb1121924 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -2,12 +2,12 @@ <form action="chat" method="post" > {{include file="field_input.tpl" field=$name}} -<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> +<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;" disabled="disabled">{{$permissions}}</button> {{$acl}} <div class="clear"></div> <br /> <br /> -<input type="submit" name="submit" value="{{$submit}}" /> +<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" disabled="disabled"/> </form> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 12da18ef1..29dc41525 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -76,7 +76,7 @@ </div> <div id="profile-jot-submit-right" class="btn-group pull-right"> {{if $showacl}} - <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" disabled="disabled" onclick="return false;"> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i> </button> {{/if}} @@ -85,7 +85,7 @@ <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} - <button class="btn btn-primary btn-sm" type="submit" name="button-submit">{{$share}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit"{{if $showacl}} disabled="disabled"{{/if}}>{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 482005e44..f398cf02c 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -26,7 +26,7 @@ <div class="mitemedit-submit-wrapper" > -<input type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" /> +<input id="dbtn-submit" type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" disabled="disabled" /> </div> </form> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 969f66f44..4652f33c6 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -68,10 +68,10 @@ <button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button> </div> <div class="form-group btn-group pull-right"> - <button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;"> + <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-{{$edit.lockstate}}"></i> </button> - <button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-edit-submit">{{$edit.submit}}</button> + <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" disabled="disabled">{{$edit.submit}}</button> </div> </form> <div id="photo-edit-end" class="clear"></div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 611068b6d..2dd7de9b2 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -22,10 +22,10 @@ <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;"> + <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}} |