diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-25 13:46:55 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-25 13:46:55 -0700 |
| commit | 0d8dcdbbc9650583bc96272844401ef371dfd896 (patch) | |
| tree | d848bf24d05f3ef2aaef3f214e6c824d6d946106 | |
| parent | da19ac98dd871216d23bef08b33dc4313446c883 (diff) | |
| parent | 45568bf09701acadb6ebb268a7e110eccdadcc26 (diff) | |
| download | volse-hubzilla-0d8dcdbbc9650583bc96272844401ef371dfd896.tar.gz volse-hubzilla-0d8dcdbbc9650583bc96272844401ef371dfd896.tar.bz2 volse-hubzilla-0d8dcdbbc9650583bc96272844401ef371dfd896.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
| -rw-r--r-- | include/acl_selectors.php | 1 | ||||
| -rw-r--r-- | view/js/acl.js | 4 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 4 |
3 files changed, 0 insertions, 9 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 1f97a7a7b..54ea0304b 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -266,7 +266,6 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti $o = replace_macros($tpl, array( '$showall' => $showall_caption, '$onlyme' => t('Only me'), - '$add_others' => t('Add others'), '$showallOrigin' => $showall_origin, '$showallIcon' => $showall_icon, '$select_label' => t('Who can see this?'), diff --git a/view/js/acl.js b/view/js/acl.js index 92a80e3d1..79699c589 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -20,7 +20,6 @@ function ACL(backend_url, preset) { that.onlyme = $("#acl-onlyme"); that.showlimited = $("#acl-showlimited"); that.acl_select = $("#acl-select"); - that.showacl = $("#show-acl"); that.preset = preset; that.self = []; @@ -250,7 +249,6 @@ ACL.prototype.update_view = function(value) { 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 - that.showacl.hide(); //hide showacl button that.info.show(); //show acl-info that.update_select('public'); @@ -263,7 +261,6 @@ 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 - that.showacl.show(); //show showacl button that.info.hide(); //show acl-info that.update_select('onlyme'); @@ -274,7 +271,6 @@ ACL.prototype.update_view = function(value) { else { that.list.show(); //show acl-list - that.showacl.hide(); //hide showacl button that.info.hide(); //hide acl-info that.update_select('limited'); diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 1711cee8a..60fae0a29 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -19,10 +19,6 @@ <option id="acl-showlimited" value="limited">{{$showlimited}}</option> </select> - <div id="show-acl" class="form-group"> - <button type="button" class="btn btn-success form-group" onclick="openClose('acl-list'); closeOpen('show-acl');"><i class="fa fa-user-plus"></i> {{$add_others}}</button> - </div> - {{if $showallOrigin}} <div id="acl-info" class="form-group"> <i class="fa fa-info-circle"></i> {{$showallOrigin}} |