aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-25 13:46:55 -0700
committerredmatrix <git@macgirvin.com>2016-05-25 13:46:55 -0700
commit0d8dcdbbc9650583bc96272844401ef371dfd896 (patch)
treed848bf24d05f3ef2aaef3f214e6c824d6d946106 /view
parentda19ac98dd871216d23bef08b33dc4313446c883 (diff)
parent45568bf09701acadb6ebb268a7e110eccdadcc26 (diff)
downloadvolse-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
Diffstat (limited to 'view')
-rw-r--r--view/js/acl.js4
-rwxr-xr-xview/tpl/acl_selector.tpl4
2 files changed, 0 insertions, 8 deletions
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>&nbsp;{{$add_others}}</button>
- </div>
-
{{if $showallOrigin}}
<div id="acl-info" class="form-group">
<i class="fa fa-info-circle"></i>&nbsp;{{$showallOrigin}}