From: rabuzarus <>
Date: Fri, 26 Jun 2015 13:44:32 +0000 (+0200)
Subject: work on supported themes to use new acl
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d8c0c62331278fd7e73d02c060e01657c86cf4db;p=friendica.git

work on supported themes to use new acl
---

diff --git a/view/theme/frost-mobile/templates/acl_selector.tpl b/view/theme/frost-mobile/templates/acl_selector.tpl
index 7f459587ae..701caef3b9 100644
--- a/view/theme/frost-mobile/templates/acl_selector.tpl
+++ b/view/theme/frost-mobile/templates/acl_selector.tpl
@@ -15,6 +15,15 @@
 	<a href="#" class='acl-button-hide'>{{$hide}}</a>
 </div>
 
+{{if $networks}}
+<hr style="clear:both"/>
+<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle|escape:'html'}}" />
+<div id="profile-jot-email-end"></div>
+{{if $jotnets}}
+{{$jotnets}}
+<div id="profile-jot-networks-end"></div>
+{{/if}}{{/if}}
+
 <script>
 	window.allowCID = {{$allowcid}};
 	window.allowGID = {{$allowgid}};
diff --git a/view/theme/frost-mobile/templates/jot.tpl b/view/theme/frost-mobile/templates/jot.tpl
index a8bf4ea79c..eb326b1da2 100644
--- a/view/theme/frost-mobile/templates/jot.tpl
+++ b/view/theme/frost-mobile/templates/jot.tpl
@@ -18,6 +18,9 @@
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $notes_cid}}
+		<input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
+		{{/if}}
 		{{if $placeholdercategory}}
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
 		{{/if}}
@@ -74,10 +77,6 @@
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper">
 			{{$acl}}
-			<hr/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			{{$jotnets}}
-			<div id="profile-jot-networks-end"></div>
 		</div>
 	</div>
 
diff --git a/view/theme/frost/templates/acl_selector.tpl b/view/theme/frost/templates/acl_selector.tpl
index 7f459587ae..fbec3af629 100644
--- a/view/theme/frost/templates/acl_selector.tpl
+++ b/view/theme/frost/templates/acl_selector.tpl
@@ -15,6 +15,14 @@
 	<a href="#" class='acl-button-hide'>{{$hide}}</a>
 </div>
 
+{{if $networks}}
+<hr style="clear:both"/>
+<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle|escape:'html'}}" />
+<div id="profile-jot-email-end"></div>
+{{if $jotnets}}
+{{$jotnets}}
+{{/if}}{{/if}}
+
 <script>
 	window.allowCID = {{$allowcid}};
 	window.allowGID = {{$allowgid}};
diff --git a/view/theme/frost/templates/jot.tpl b/view/theme/frost/templates/jot.tpl
index 2ec1602312..08627b04d8 100644
--- a/view/theme/frost/templates/jot.tpl
+++ b/view/theme/frost/templates/jot.tpl
@@ -16,6 +16,9 @@
 		<input type="hidden" name="post_id" value="{{$post_id}}" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		{{if $notes_cid}}
+		<input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
+		{{/if}}
 		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
 		{{if $placeholdercategory}}
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
@@ -76,10 +79,6 @@
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
 			{{$acl}}
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
-			{{$jotnets}}
 		</div>
 	</div>
 
diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl
index 21df47dfa8..f72e3ccb4f 100644
--- a/view/theme/quattro/templates/jot.tpl
+++ b/view/theme/quattro/templates/jot.tpl
@@ -17,6 +17,9 @@
 		<input type="hidden" name="post_id" value="{{$post_id}}" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		{{if $notes_cid}}
+		<input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
+		{{/if}}
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
 
@@ -44,10 +47,6 @@
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
 			{{$acl}}
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
-			<div id="profile-jot-email-end"></div>
-			{{$jotnets}}
 		</div>
 	</div>