harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undo disabled submit buttons now that ACL is initialised when page loaded

Browse Source
This commit is contained in:
friendica 2014-11-18 00:24:32 -08:00
parent db3015e34e
commit 1d96e165e0
8 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
version.inc
View File

@ -1 +1 @@
2014-11-17.862 2014-11-18.863

1
view/js/acl.js
View File

@ -273,6 +273,5 @@ ACL.prototype.populate = function(data){
$(el).removeAttr("data-src"); $(el).removeAttr("data-src");
}); });
that.update_view(); that.update_view();
$('#dbtn-submit, #dbtn-acl').prop('disabled', false);
} }

4
view/tpl/attach_edit.tpl
View File

@ -5,7 +5,7 @@
<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > <form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
<div id="attach-edit-perms" > <div id="attach-edit-perms" >
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" disabled="disabled" onclick="return false;"> <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
</button> </button>
{{$aclselect}} {{$file.filename}} {{$aclselect}} {{$file.filename}}
@ -30,7 +30,7 @@
<input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br /> <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br />
<div class="clear"></div> <div class="clear"></div>
<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" disabled="disabled"/> <input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" />
</form> </form>

4
view/tpl/chatroom_new.tpl
View File

@ -2,12 +2,12 @@
<form action="chat" method="post" > <form action="chat" method="post" >
{{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$name}}
<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;" disabled="disabled">{{$permissions}}</button> <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button>
{{$acl}} {{$acl}}
<div class="clear"></div> <div class="clear"></div>
<br /> <br />
<br /> <br />
<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" disabled="disabled"/> <input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" />
</form> </form>

4
view/tpl/jot.tpl
View File

@ -76,7 +76,7 @@
</div> </div>
<div id="profile-jot-submit-right" class="btn-group pull-right"> <div id="profile-jot-submit-right" class="btn-group pull-right">
{{if $showacl}} {{if $showacl}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" disabled="disabled" onclick="return false;"> <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i> <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons">{{$bang}}</i>
</button> </button>
{{/if}} {{/if}}
@ -85,7 +85,7 @@
<i class="icon-eye-open jot-icons" ></i> <i class="icon-eye-open jot-icons" ></i>
</button> </button>
{{/if}} {{/if}}
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit"{{if $showacl}} disabled="disabled"{{/if}}>{{$share}}</button> <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="button-submit" >{{$share}}</button>
</div> </div>
<div id="profile-jot-perms-end"></div> <div id="profile-jot-perms-end"></div>
<div id="profile-jot-plugin-wrapper"> <div id="profile-jot-plugin-wrapper">

2
view/tpl/mitemedit.tpl
View File

@ -26,7 +26,7 @@
<div class="mitemedit-submit-wrapper" > <div class="mitemedit-submit-wrapper" >
<input id="dbtn-submit" type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" disabled="disabled" /> <input id="dbtn-submit" type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" />
</div> </div>
</form> </form>

4
view/tpl/photo_view.tpl
View File

@ -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> <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>
<div class="form-group btn-group pull-right"> <div class="form-group btn-group pull-right">
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" disabled="disabled" onclick="return false;"> <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-{{$edit.lockstate}}"></i> <i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i>
</button> </button>
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" disabled="disabled">{{$edit.submit}}</button> <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
</div> </div>
</form> </form>
<div id="photo-edit-end" class="clear"></div> <div id="photo-edit-end" class="clear"></div>

4
view/tpl/photos_upload.tpl
View File

@ -22,10 +22,10 @@
<input id="photos-upload-choose" type="file" name="userfile" /> <input id="photos-upload-choose" type="file" name="userfile" />
</div> </div>
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" disabled="disabled" onclick="return false;"> <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> <i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
</button> </button>
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" disabled="disabled">{{$submit}}</button> <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
</div> </div>
{{/if}} {{/if}}