harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
friendica 2014-10-03 04:54:27 -07:00
parent a177cd1bd4
commit e2f45a76b1
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
view/tpl/abook_edit.tpl
View File

@ -58,31 +58,10 @@
<h3>{{$permlbl}}</h3> <h3>{{$permlbl}}</h3>
<div id="perm-desc" class="descriptive-text">{{$permnote}}</div> <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 /> <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}}" /> <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" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
<div id="abook-advanced-panel" style="display: block;"> <div id="abook-advanced-panel" style="display: block;">

9
view/tpl/settings.tpl
View File

@ -24,15 +24,6 @@
{{include file="field_checkbox.tpl" field=$hide_presence}} {{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> <button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>