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 7f459587ae03e2a7de06253c5cf904cd5e2ba26c..701caef3b94b2632c3a9bf8b45e08cd96fcd2854 100644 (file)
--- 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 a8bf4ea79c9e21ef0c89aff3fff3ff30e572c17f..eb326b1da25953a9cd765e96510b9a9f8234eb52 100644 (file)
--- 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 7f459587ae03e2a7de06253c5cf904cd5e2ba26c..fbec3af629d55ba09039dc4a29dc8f6eb043008f 100644 (file)
--- 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 2ec16023129a26b4519707bdb751e1eb01a820d1..08627b04d80bad105c92b9e7868dee0ba67ccf51 100644 (file)
--- 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 21df47dfa87b1d2de008a7810cd59714e204f543..f72e3ccb4fa9d1538e52cb3378cdf84613acc0e2 100644 (file)
--- 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>