diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/acl.js | 89 | ||||
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/js/mod_cloud.js | 14 | ||||
| -rw-r--r-- | view/js/mod_filestorage.js | 15 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/attach_edit.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/chatroom_new.tpl | 6 | ||||
| -rw-r--r-- | view/tpl/chatrooms.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/mitemedit.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/photos_recent.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/thing_edit.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/thing_input.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/webpagelist.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 16 |
20 files changed, 110 insertions, 103 deletions
diff --git a/view/js/acl.js b/view/js/acl.js index 79699c589..b36fa97a1 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -1,15 +1,17 @@ -function ACL(backend_url, preset) { +function ACL(backend_url) { that = this; that.url = backend_url; that.kp_timer = null; - if (preset === undefined) preset = []; - that.allow_cid = (preset[0] || []); - that.allow_gid = (preset[1] || []); - that.deny_cid = (preset[2] || []); - that.deny_gid = (preset[3] || []); + that.self = []; + + that.allow_cid = []; + that.allow_gid = []; + that.deny_cid = []; + that.deny_gid = []; + that.group_uids = []; that.info = $("#acl-info"); @@ -21,11 +23,8 @@ function ACL(backend_url, preset) { that.showlimited = $("#acl-showlimited"); that.acl_select = $("#acl-select"); - that.preset = preset; - that.self = []; - // set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes. - that.on_submit(); + //that.on_submit(); /*events*/ @@ -47,6 +46,10 @@ function ACL(backend_url, preset) { } }); + $(document).on('focus', '.acl-form', that.get_form_data); + $(document).on('click', '.acl-form', that.get_form_data); + $(document).on('click', '.acl-form-trigger', that.get_form_data); + $(document).on('click','.acl-button-show',that.on_button_show); $(document).on('click','.acl-button-hide',that.on_button_hide); @@ -54,29 +57,44 @@ function ACL(backend_url, preset) { /* startup! */ that.get(0,15000); - that.on_submit(); + //that.on_submit(); }); } -// no longer called only on submit - call to update whenever a change occurs to the acl list. +ACL.prototype.get_form_data = function(event) { + + form_id = $(this).data('form_id'); + that.form_id = $('#' + form_id); + + that.allow_cid = (that.form_id.data('allow_cid') || []); + that.allow_gid = (that.form_id.data('allow_gid') || []); + that.deny_cid = (that.form_id.data('deny_cid') || []); + that.deny_gid = (that.form_id.data('deny_gid') || []); + + that.update_view(); + that.on_submit(); + +} + +// no longer called only on submit - call to update whenever a change occurs to the acl list. ACL.prototype.on_submit = function() { - aclfields = $("#acl-fields").html(""); + + $('.acl-field').remove(); + $(that.allow_gid).each(function(i,v) { - aclfields.append("<input type='hidden' name='group_allow[]' value='"+v+"'>"); + that.form_id.append("<input class='acl-field' type='hidden' name='group_allow[]' value='"+v+"'>"); }); $(that.allow_cid).each(function(i,v) { - aclfields.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>"); + that.form_id.append("<input class='acl-field' type='hidden' name='contact_allow[]' value='"+v+"'>"); }); $(that.deny_gid).each(function(i,v) { - aclfields.append("<input type='hidden' name='group_deny[]' value='"+v+"'>"); + that.form_id.append("<input class='acl-field' type='hidden' name='group_deny[]' value='"+v+"'>"); }); $(that.deny_cid).each(function(i,v) { - aclfields.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>"); + that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>"); }); - //areYouSure jquery plugin: recheck the form here - $('form').trigger('checkform.areYouSure'); }; ACL.prototype.search = function() { @@ -101,6 +119,7 @@ ACL.prototype.on_onlyme = function(event) { that.deny_cid = []; that.deny_gid = []; + that.update_view(event.target.value); that.on_submit(); @@ -126,14 +145,14 @@ ACL.prototype.on_showlimited = function(event) { // preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton event.stopPropagation(); - if(that.preset[0].length === 0 && that.preset[1].length === 0 && that.preset[2].length === 0 && that.preset[3].length === 0) { - that.preset[0] = [that.self[0]]; + if(that.allow_cid.length === 0 && that.allow_gid.length === 0 && that.deny_cid.length === 0 && that.deny_gid.length === 0) { + that.allow_cid = [that.self[0]]; } - that.allow_cid = (that.preset[0] || []); - that.allow_gid = (that.preset[1] || []); - that.deny_cid = (that.preset[2] || []); - that.deny_gid = (that.preset[3] || []); + that.allow_cid = (that.allow_cid || []); + that.allow_gid = (that.allow_gid || []); + that.deny_cid = (that.deny_cid || []); + that.deny_gid = (that.deny_gid || []); that.update_view(event.target.value); that.on_submit(); @@ -239,13 +258,19 @@ ACL.prototype.set_deny = function(itemid) { that.update_view(); }; -ACL.prototype.update_select = function(preset) { - that.showall.prop('selected', preset === 'public'); - that.onlyme.prop('selected', preset === 'onlyme'); - that.showlimited.prop('selected', preset === 'limited'); +ACL.prototype.update_select = function(set) { + that.showall.prop('selected', set === 'public'); + that.onlyme.prop('selected', set === 'onlyme'); + that.showlimited.prop('selected', set === 'limited'); }; ACL.prototype.update_view = function(value) { + if(that.form_id) { + that.form_id.data('allow_cid', that.allow_cid); + that.form_id.data('allow_gid', that.allow_gid); + that.form_id.data('deny_cid', that.deny_cid); + that.form_id.data('deny_gid', that.deny_gid); + } if (that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0) { that.list.hide(); //hide acl-list @@ -259,8 +284,8 @@ ACL.prototype.update_view = function(value) { } // if value != 'onlyme' we should fall through this one - else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'onlyme') { - that.list.hide(); //hide acl-list if + else if (that.allow_gid.length === 0 && that.allow_cid.length === 1 && that.allow_cid[0] === that.self[0] && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value !== 'limited') { + that.list.hide(); //hide acl-list that.info.hide(); //show acl-info that.update_select('onlyme'); @@ -363,5 +388,5 @@ ACL.prototype.populate = function(data) { $(el).attr('src', $(el).data("src")); $(el).removeAttr("data-src"); }); - that.update_view(); + //that.update_view(); }; diff --git a/view/js/main.js b/view/js/main.js index a3fade0ea..21157bdfe 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1015,8 +1015,6 @@ function filestorage(event, nick, id) { $('#cloud-index-' + last_filestorage_id).removeClass('cloud-index-active'); $('#perms-panel-' + last_filestorage_id).hide().html(''); $('#file-edit-' + id).spin('tiny'); - // What for do we need this here? - delete acl; $.get('filestorage/' + nick + '/' + id + '/edit', function(data) { $('#cloud-index-' + id).addClass('cloud-index-active'); $('#perms-panel-' + id).html(data).show(); diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index e56ec2a81..5b3c78bed 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -100,13 +100,13 @@ function prepareHtml(f, i) { } function formatSizeUnits(bytes){ - if (bytes>=1000000000) {bytes=(bytes/1000000000).toFixed(2)+' GB';} - else if (bytes>=1000000) {bytes=(bytes/1000000).toFixed(2)+' MB';} - else if (bytes>=1000) {bytes=(bytes/1000).toFixed(2)+' KB';} - else if (bytes>1) {bytes=bytes+' bytes';} - else if (bytes==1) {bytes=bytes+' byte';} - else {bytes='0 byte';} - return bytes; + if (bytes>=1000000000) {bytes=(bytes/1000000000).toFixed(2)+' GB';} + else if (bytes>=1000000) {bytes=(bytes/1000000).toFixed(2)+' MB';} + else if (bytes>=1000) {bytes=(bytes/1000).toFixed(2)+' KB';} + else if (bytes>1) {bytes=bytes+' bytes';} + else if (bytes==1) {bytes=bytes+' byte';} + else {bytes='0 byte';} + return bytes; } // this is basically a js port of include/text.php getIconFromType() function diff --git a/view/js/mod_filestorage.js b/view/js/mod_filestorage.js index c0620c928..4f58af9d5 100644 --- a/view/js/mod_filestorage.js +++ b/view/js/mod_filestorage.js @@ -1,17 +1,4 @@ /** * JavaScript used by mod/filestorage */ -$(document).ready(function() { - $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { - var selstr; - $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { - selstr = $(this).text(); - $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock'); - $('#jot-public').hide(); - }); - if(selstr === null) { - $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock'); - $('#jot-public').show(); - } - }).trigger('change'); -});
\ No newline at end of file + diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 60fae0a29..ddeb25a39 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -1,3 +1,4 @@ +<form> <div class="modal" id="aclModal"> <div class="modal-dialog"> <div class="modal-content"> @@ -59,14 +60,13 @@ </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> - +</form> <script> $('[data-toggle="popover"]').popover(); // Init the popover, if present if(typeof acl=="undefined"){ acl = new ACL( - baseurl+"/acl", - [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ] + baseurl+"/acl" ); } </script> diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 965fb4819..1d58004e5 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -1,4 +1,4 @@ -<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" > +<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$file.id}}" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="channelnick" value="{{$channelnick}}" /> <input type="hidden" name="filehash" value="{{$file.hash}}" /> <input type="hidden" name="uid" value="{{$uid}}" /> @@ -16,15 +16,13 @@ </button> </div> <div id="attach-edit-perms" class="btn-group pull-right"> - <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i> </button> <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit"> {{$submit}} </button> </div> - {{$aclselect}} - <div id="link-code" class="form-group"> <label for="">{{$cpldesc}}</label> <input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/> diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index a40313934..1b7e0501a 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -1,12 +1,12 @@ <div id="chatroom-new" class="section-content-tools-wrapper"> - <form action="chat" method="post" > + <form id="chatroom-new-form" action="chat" method="post" class="acl-form" data-form_id="chatroom-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$chat_expire}} - {{$acl}} <div class="btn-group pull-right"> <button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> - <button id="dbtn-submit" class="btn btn-primary" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + <button id="dbtn-submit" class="acl-submit btn btn-primary" type="submit" name="submit" value="{{$submit}}" data-formid="chatroom-new-form">{{$submit}}</button> </div> <div class="clear"></div> </form> </div> +{{$acl}} diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index 04ebbcae4..64f6e8d0f 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> {{if $is_owner}} - <button type="button" class="btn btn-success btn-xs pull-right" onclick="openClose('chatroom-new');"><i class="fa fa-plus-circle"></i> {{$newroom}}</button> + <button type="button" class="btn btn-success btn-xs pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i> {{$newroom}}</button> {{/if}} <h2>{{$header}}</h2> </div> diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index eaa613dc4..0884cd0b4 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -9,12 +9,12 @@ </div> <div id="files-upload-tools" class="section-content-tools-wrapper"> {{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}} - <form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data"> + <form id="ajax-upload-files" method="post" action="" enctype="multipart/form-data" class="acl-form" data-form_id="ajax-upload-files" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="sabreAction" value="put"> <label for="files-upload">{{$upload_header}}</label> - <div class="clear"></div> <input class="form-group pull-left" id="files-upload" type="file" name="file"> <button id="upload-submit" class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button> </form> <div class="clear"></div> </div> +{{$aclselect}} diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index fbeec9aa3..a2bb1f112 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,4 +1,4 @@ -<form id="event-edit-form" action="{{$post}}" method="post" > +<form id="event-edit-form" action="{{$post}}" method="post" class="acl-form" data-form_id="event-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="event_id" value="{{$eid}}" /> <input type="hidden" name="event_hash" value="{{$event_hash}}" /> @@ -107,7 +107,6 @@ {{if ! $eid}} {{include file="field_checkbox.tpl" field=$share}} - {{$acl}} {{/if}} <div class="clear"></div> @@ -116,8 +115,12 @@ <div class="btn-group pull-right"> <button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> {{if ! $eid}} - <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}"><i id="jot-perms-icon" class="fa"></i></button> + <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa"></i></button> {{/if}} <button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button> </div> </form> + +{{if ! $eid}} + {{$acl}} +{{/if}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 490349a04..a91c81ea9 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,4 +1,4 @@ -<form id="profile-jot-form" action="{{$action}}" method="post"> +<form id="profile-jot-form" action="{{$action}}" method="post" class="acl-form" data-form_id="profile-jot-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{$mimeselect}} {{$layoutselect}} {{if $id_select}} @@ -23,7 +23,6 @@ <input type="hidden" name="webpage" value="{{$webpage}}" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" /> - {{if $showacl}}{{$acl}}{{/if}} {{if $webpage}} <div id="jot-pagetitle-wrap" class="jothidden"> @@ -166,11 +165,11 @@ </button> {{/if}} {{if $showacl}} - <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;"> + <button id="dbtn-acl" class="acl-select btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button" data-form_id="profile-jot-form"> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{if $bang}} <i class="fa fa-exclamation jot-icons"></i>{{/if}} </button> {{/if}} - <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit" >{{$share}}</button> + <button id="dbtn-submit" class="acl-submit btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit">{{$share}}</button> </div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-plugin-wrapper"> @@ -184,6 +183,8 @@ <div id="jot-preview-content" style="display:none;"></div> +{{if $showacl}}{{$acl}}{{/if}} + {{if $feature_expire}} <!-- Modal for item expiry--> <div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 865c587ec..a06203244 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -5,7 +5,7 @@ </div> {{/if}} <div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> - <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > + <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="menu_id" value="{{$menu_id}}" /> {{if $mitem_id}} <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> @@ -32,10 +32,10 @@ {{/if}} <button class="btn btn-primary btn-sm" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> </div> - {{$aclselect}} </div> <div class="clear"></div> </form> + {{$aclselect}} </div> {{if $header}} </div> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 76259a8be..ec827d990 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -23,7 +23,7 @@ {{/if}} {{if $edit}} <li class="nav-item"> - <a class="nav-link" href="#" title="" onclick="openClose('photo-edit'); return false;"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> + <a class="nav-link acl-form-trigger" href="#" title="" onclick="openClose('photo-edit'); return false;" data-form_id="photo_edit_form"><i class="fa fa-pencil"></i> {{$edit.edit}}</a> </li> {{/if}} </ul> @@ -53,7 +53,7 @@ {{$map}} </div> <div id="photo-edit" class="section-content-tools-wrapper"> - <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form"> + <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" class="acl-form" data-form_id="photo_edit_form" data-allow_cid='{{$edit.allow_cid}}' data-allow_gid='{{$edit.allow_gid}}' data-deny_cid='{{$edit.deny_cid}}' data-deny_gid='{{$edit.deny_gid}}'> <input type="hidden" name="item_id" value="{{$edit.item_id}}" /> {{* album renaming is not supported atm. <div class="form-group"> @@ -88,8 +88,6 @@ </div> {{/if}} - {{$edit.aclselect}} - <div class="form-group pull-left"> <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> @@ -102,6 +100,7 @@ <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button> </div> </form> + {{$edit.aclselect}} <div id="photo-edit-end" class="clear"></div> </div> <div id="photo-view-wrapper"> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 139f27a23..4cb1bc306 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> <div class="pull-right"> {{if $can_post}} - <button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> + <button class="btn btn-xs btn-success acl-form-trigger" title="{{$usage}}" onclick="openClose('photo-upload-form');" data-form_id="photos-upload-form"><i class="fa fa-arrow-circle-o-up"></i> {{$upload.0}}</button> {{/if}} <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 6b98a8ac4..90cd0e84a 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,6 +1,6 @@ <div id="photo-upload-form"> <div class="section-content-tools-wrapper"> - <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form"> + <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" class="acl-form" data-form_id="photos-upload-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" id="photos-upload-source" name="source" value="photos" /> <div class="form-group"> @@ -14,9 +14,6 @@ {{/foreach}} </datalist> </div> - - {{$aclselect}} - {{if $default}} <div class="form-group"> <input id="photos-upload-choose" type="file" name="userfile" /> @@ -59,5 +56,6 @@ {{/if}} </form> </div> + {{$aclselect}} <div id="photos-upload-end" class="clear"></div> </div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 8157196ac..0ec44e9ff 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -5,7 +5,7 @@ <div class="clear"></div> </div> {{$nickname_block}} - <form action="settings" id="settings-form" method="post" autocomplete="off" > + <form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}' /> <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> <div class="panel"> @@ -72,7 +72,6 @@ {{/if}} <div id="settings-default-perms" class="form-group" > <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i> {{$permissions}}</button> - {{$aclselect}} </div> {{$group_select}} {{include file="field_checkbox.tpl" field=$hide_presence}} @@ -174,4 +173,5 @@ </div> </div> </form> + {{$aclselect}} </div> diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl index 356693782..b23584fe1 100644 --- a/view/tpl/thing_edit.tpl +++ b/view/tpl/thing_edit.tpl @@ -1,5 +1,5 @@ <h2>{{$thing_hdr}}</h2> -<form action="thing" method="post" > +<form id="thing-edit-form" action="thing" method="post" class="acl-form" data-form_id="thing-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="term_hash" value="{{$thing_hash}}" /> {{if $multiprof }} @@ -29,8 +29,6 @@ <div class="thing-end"></div> -{{$aclselect}} - {{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="fa fa-{{$lockstate}}"></i> @@ -40,3 +38,4 @@ <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> </form> +{{$aclselect}} diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl index 75497e878..3e178925c 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -1,5 +1,5 @@ <h2>{{$thing_hdr}}</h2> -<form action="thing" method="post" > +<form id="thing-new-form" action="thing" method="post" class="acl-form" data-form_id="thing-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{if $multiprof }} <div class="thing-profile-label">{{$profile_lbl}}</div> @@ -29,8 +29,6 @@ <div class="thing-end"></div> -{{$aclselect}} - {{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="fa fa-{{$lockstate}}"></i> @@ -40,3 +38,4 @@ <input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> </form> +{{$aclselect}} diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index 524460408..4dec7518f 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> {{if $editor}} <div class="pull-right"> - <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('webpage-editor');"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> + <button id="webpage-create-btn" class="btn btn-xs btn-success acl-form-trigger" onclick="openClose('webpage-editor');" data-form_id="profile-jot-form"><i class="fa fa-pencil-square-o"></i> {{$create}}</button> </div> {{/if}} <h2>{{$listtitle}}</h2> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index d9a4f8be3..c05b33a61 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -15,7 +15,7 @@ <div class="section-title-wrapper"> <div class="pull-right"> {{if $showNewWikiButton}} - <button class="btn btn-primary btn-xs" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');">New Wiki</button> + <button class="btn btn-primary btn-xs acl-form-trigger" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form">New Wiki</button> {{/if}} {{if $showNewPageButton}} <button class="btn btn-success btn-xs" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper');">New Page</button> @@ -29,7 +29,7 @@ <div class="clear"></div> </div> <div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> - <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" > + <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <div class="clear"></div> {{include file="field_input.tpl" field=$wikiName}} @@ -45,17 +45,17 @@ </div> <div class="btn-group pull-right"> - <div id="profile-jot-submit-right" class="btn-group" style="margin-right: 20px;"> + <div id="profile-jot-submit-right" class="btn-group"> <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;"> - <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons">{{$bang}}</i> + <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{$bang}} </button> + <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button> </div> - <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button> </div> - <div>{{$acl}}</div> </form> - <div class="clear"></div> - <hr> + {{$acl}} + <div class="clear"></div> + <hr> </div> <div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> |