diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-15 21:49:48 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-15 21:49:48 -0800 |
| commit | 82306682c601688041ccfd9a7b259bc607301a37 (patch) | |
| tree | bd15059a020152b5dc59c265e22a27251efe0de4 /view | |
| parent | 03f692f24fe543c740e5443223d8084b9ca0c4de (diff) | |
| parent | 746ea5a3691a67ceb176352e8b6fcfe0f2dc99d6 (diff) | |
| download | volse-hubzilla-82306682c601688041ccfd9a7b259bc607301a37.tar.gz volse-hubzilla-82306682c601688041ccfd9a7b259bc607301a37.tar.bz2 volse-hubzilla-82306682c601688041ccfd9a7b259bc607301a37.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/mod_connedit.js | 4 | ||||
| -rw-r--r-- | view/js/mod_defperms.js | 4 | ||||
| -rw-r--r-- | view/js/mod_settings.js | 4 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/defperms.tpl | 1 |
6 files changed, 7 insertions, 8 deletions
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js index 7100e0d07..34e9a3b21 100644 --- a/view/js/mod_connedit.js +++ b/view/js/mod_connedit.js @@ -19,7 +19,7 @@ $(document).ready(function() { $('#id_permcat').change(function() { - $('.loading-role-rotator').spin(true); + $('.loading').toggleClass('invisible'); var permName = $('#id_permcat').val(); loadAbookRole(permName); }); @@ -128,7 +128,7 @@ function loadAbookRole(name) { if(this.value) $('#me_id_perms_' + this.name).attr('checked','checked'); }); - $('.loading-role-rotator').spin(false); + $('.loading').toggleClass('invisible'); }); } diff --git a/view/js/mod_defperms.js b/view/js/mod_defperms.js index c89142579..18ebe268e 100644 --- a/view/js/mod_defperms.js +++ b/view/js/mod_defperms.js @@ -1,7 +1,7 @@ $(document).ready(function() { $('#id_permcat').change(function() { - $('.loading-role-rotator').show(); + $('.loading').toggleClass('invisible'); var permName = $('#id_permcat').val(); loadConnectionRole(permName); }); @@ -25,7 +25,7 @@ function loadConnectionRole(name) { if(this.value) $('#id_perms_' + this.name).attr('checked','checked'); }); - $('.loading-role-rotator').hide(); + $('.loading').toggleClass('invisible'); }); } diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index f9faa3d5c..d3392c748 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -19,7 +19,7 @@ $(document).ready(function() { }); $('#id_permcat_list').change(function() { - $('.loading-role-rotator').spin(true); + $('.loading').toggleClass('invisible'); var permName = $('#id_permcat').val(); loadPermcat(permName); }); @@ -172,7 +172,7 @@ function loadPermcat(name) { if(this.value) $('#me_id_perms_' + this.name).attr('checked','checked'); }); - $('.loading-role-rotator').spin(false); + $('.loading').toggleClass('invisible'); }); } diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 13b94a560..81c182e1b 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -485,7 +485,6 @@ </div> {{if $permcat_enable}} - <div class="loading-role-rotator"></div> <a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> {{include file="field_select.tpl" field=$permcat}} {{/if}} diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 2b4e8c9f9..97c14b6e3 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -70,6 +70,7 @@ {{include file="field_input.tpl" field=$register_text}} {{include file="field_select.tpl" field=$register_policy}} {{include file="field_checkbox.tpl" field=$invite_only}} + {{include file="field_input.tpl" field=$minimum_age}} {{include file="field_select.tpl" field=$access_policy}} {{include file="field_input.tpl" field=$location}} {{include file="field_input.tpl" field=$sellpage}} diff --git a/view/tpl/defperms.tpl b/view/tpl/defperms.tpl index f4a711957..5273ee91b 100755 --- a/view/tpl/defperms.tpl +++ b/view/tpl/defperms.tpl @@ -17,7 +17,6 @@ <p>{{$permnote_self}}</p> </div> {{if $permcat_enable}} - <div class="loading-role-rotator spinner-wrapper"></div> <a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a> {{include file="field_select.tpl" field=$permcat}} {{/if}} |