From 9d207057004538a9231d81121b9318d40ee598cb Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Fri, 19 Jul 2019 22:20:14 -0400
Subject: [PATCH] Improve compose page template

- Update title and description of the limited/private panel
- Move CC email addresses outside of the visibility panels
---
 src/Module/Item/Compose.php     |  4 +--
 view/templates/item/compose.tpl | 57 ++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 3fe6d9402..60e2c65dc 100644
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -191,8 +191,8 @@ class Compose extends BaseModule
 			'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t('Categories (comma-separated list)') : ''),
 			'$public_title'  => L10n::t('Public'),
 			'$public_desc'  => L10n::t('This post will be sent to all your followers and can be seen in the community pages and by anyone with its link.'),
-			'$custom_title' => L10n::t('Custom'),
-			'$custom_desc'  => L10n::t('This post will be sent only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t be visible in the community pages nor with its link, and can\'t be sent to connectors (Twitter, Pump.io, etc...).'),
+			'$custom_title' => L10n::t('Limited/Private'),
+			'$custom_desc'  => L10n::t('This post will be sent only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.'),
 			'$emailcc'      => L10n::t('CC: email addresses'),
 			'$title'        => $title,
 			'$category'     => $category,
diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl
index 8f31ac39d..b1aa73d33 100644
--- a/view/templates/item/compose.tpl
+++ b/view/templates/item/compose.tpl
@@ -92,36 +92,28 @@
 					<div id="visibility-public-panel" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="visibility-public-heading">
 						<div class="panel-body">
 							<p>{{$public_desc}}</p>
-                        {{if $doesFederate}}
-							<div class="form-group">
-								<label for="profile-jot-email" id="profile-jot-email-label">{{$emailcc}}</label>
-								<input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle}}" />
-							</div>
-							<div id="profile-jot-email-end"></div>
-
-                            {{if $jotnets_fields}}
-                                {{if $jotnets_fields|count < 3}}
-									<div class="profile-jot-net">
-                                {{else}}
-									<details class="profile-jot-net">
-									<summary>{{$jotnets_summary}}</summary>
-                                {{/if}}
-
-                                {{foreach $jotnets_fields as $jotnets_field}}
-                                    {{if $jotnets_field.type == 'checkbox'}}
-                                        {{include file="field_checkbox.tpl" field=$jotnets_field.field}}
-                                    {{elseif $jotnets_field.type == 'select'}}
-                                        {{include file="field_select.tpl" field=$jotnets_field.field}}
-                                    {{/if}}
-                                {{/foreach}}
-
-                                {{if $jotnets_fields|count >= 3}}
-									</details>
-                                {{else}}
-									</div>
-                                {{/if}}
-                            {{/if}}
+                    {{if $doesFederate && $jotnets_fields}}
+                        {{if $jotnets_fields|count < 3}}
+							<div class="profile-jot-net">
+                        {{else}}
+							<details class="profile-jot-net">
+							<summary>{{$jotnets_summary}}</summary>
                         {{/if}}
+
+                        {{foreach $jotnets_fields as $jotnets_field}}
+                            {{if $jotnets_field.type == 'checkbox'}}
+                                {{include file="field_checkbox.tpl" field=$jotnets_field.field}}
+                            {{elseif $jotnets_field.type == 'select'}}
+                                {{include file="field_select.tpl" field=$jotnets_field.field}}
+                            {{/if}}
+                        {{/foreach}}
+
+                        {{if $jotnets_fields|count >= 3}}
+							</details>
+                        {{else}}
+							</div>
+                        {{/if}}
+                    {{/if}}
 						</div>
 					</div>
 				</div>
@@ -149,6 +141,13 @@
 					</div>
 				</div>
 			</div>
+        {{if $doesFederate}}
+			<div class="form-group">
+				<label for="profile-jot-email" id="profile-jot-email-label">{{$emailcc}}</label>
+				<input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle}}" />
+			</div>
+			<div id="profile-jot-email-end"></div>
+		{{/if}}
 			<div class="jotplugins">
 				{{$jotplugins nofilter}}
 			</div>