Improve compose page template

- Update title and description of the limited/private panel
- Move CC email addresses outside of the visibility panels
This commit is contained in:
Hypolite Petovan 2019-07-19 22:20:14 -04:00
parent 3e6018b3f2
commit 9d20705700
2 changed files with 30 additions and 31 deletions

View file

@ -191,8 +191,8 @@ class Compose extends BaseModule
'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t('Categories (comma-separated list)') : ''), '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t('Categories (comma-separated list)') : ''),
'$public_title' => L10n::t('Public'), '$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.'), '$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_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 be visible in the community pages nor with its link, and can\'t be sent to connectors (Twitter, Pump.io, etc...).'), '$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'), '$emailcc' => L10n::t('CC: email addresses'),
'$title' => $title, '$title' => $title,
'$category' => $category, '$category' => $category,

View file

@ -92,36 +92,28 @@
<div id="visibility-public-panel" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="visibility-public-heading"> <div id="visibility-public-panel" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="visibility-public-heading">
<div class="panel-body"> <div class="panel-body">
<p>{{$public_desc}}</p> <p>{{$public_desc}}</p>
{{if $doesFederate}} {{if $doesFederate && $jotnets_fields}}
<div class="form-group"> {{if $jotnets_fields|count < 3}}
<label for="profile-jot-email" id="profile-jot-email-label">{{$emailcc}}</label> <div class="profile-jot-net">
<input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle}}" /> {{else}}
</div> <details class="profile-jot-net">
<div id="profile-jot-email-end"></div> <summary>{{$jotnets_summary}}</summary>
{{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}} {{/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> </div>
</div> </div>
@ -149,6 +141,13 @@
</div> </div>
</div> </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"> <div class="jotplugins">
{{$jotplugins nofilter}} {{$jotplugins nofilter}}
</div> </div>