aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-03 04:54:27 -0700
committerfriendica <info@friendica.com>2014-10-03 04:54:27 -0700
commite2f45a76b1e63152c80601daeae9782fac858fcb (patch)
tree4b2d51f6434e80670750f340df9ab40129ac1326 /view/tpl
parenta177cd1bd489b1f5c74d28929cad63e0b7df0dcb (diff)
downloadvolse-hubzilla-e2f45a76b1e63152c80601daeae9782fac858fcb.tar.gz
volse-hubzilla-e2f45a76b1e63152c80601daeae9782fac858fcb.tar.bz2
volse-hubzilla-e2f45a76b1e63152c80601daeae9782fac858fcb.zip
remove the privacy macros in settings and connedit now that we have privacy roles attached to the channel. One can still use the advanced permission dialogues, but they shouldn't have a reason to if they created the channel with a suitable channel type - plus it's just a bunch of extra permissions settings to confuse people.
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/abook_edit.tpl21
-rwxr-xr-xview/tpl/settings.tpl9
2 files changed, 0 insertions, 30 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index f7bcb56c3..95285ac79 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -58,31 +58,10 @@
<h3>{{$permlbl}}</h3>
<div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
-
-{{* {{if $noperms}}
-<div id="noperm-msg" class="warning-text">{{$noperms}}</div>
-<div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div>
-{{/if}}
-*}}
-
-
-
<br />
-<h3>{{$quick}}</h3>
-<ul>
-{{if $self}}
-<li><span class="fakelink" onclick="connectClear();">{{$clear}}</span></li>
-<li><span class="fakelink" onclick="connectForum();">{{$forum}}</span></li>
-<li><span class="fakelink" onclick="connectSoapBox();">{{$soapbox}}</span></li>
-{{/if}}
-<li><span class="fakelink" onclick="connectFullShare();">{{$full}}</span></li>
-<li><span class="fakelink" onclick="connectCautiousShare();">{{$cautious}}</span></li>
-<li><span class="fakelink" onclick="connectFollowOnly();">{{$follow}}</span></li>
-</ul>
<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-
<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
<div id="abook-advanced-panel" style="display: block;">
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 4dba1f23e..1340a1653 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -24,15 +24,6 @@
{{include file="field_checkbox.tpl" field=$hide_presence}}
-<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3>
-<ul id="settings-privacy-macros">
-<li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li>
-<li><a href="#" onclick="channel_privacy_macro(1); return false" id="settings_pmacro1">{{$pmacro1}}</a></li>
-<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li>
-<li><a href="#" onclick="channel_privacy_macro(0); return false" id="settings_pmacro0">{{$pmacro0}}</a></li>
-</ul>
-
-
<button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>