Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor connector settings page

Browse source 
- Fix header hierarchy
- [frio] Fix panel display
This commit is contained in:
Hypolite Petovan 2020-04-01 19:20:18 -04:00
parent 91fb396ec1
commit 76feae2203
2 changed files with 51 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
view/templates/settings/connectors.tpl
View file

@ -1,59 +1,60 @@
<h1>{{$title}}</h1> <h1>{{$title}}</h1>
<div class="connector_statusmsg">{{$diasp_enabled}}</div> <div class="connector_statusmsg">{{$diasp_enabled}}</div>
<div class="connector_statusmsg">{{$ostat_enabled}}</div> <div class="connector_statusmsg">{{$ostat_enabled}}</div>
<form action="settings/connectors" method="post" autocomplete="off"> <form action="settings/connectors" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
<h2 class="settings-heading">
<a onclick="openClose('settings_general_expanded'); openClose('settings_general_inflated');">{{$general_settings}}</a>
</h2>
<h3 class="settings-heading"><a onclick="openClose('settings_general_expanded'); openClose('settings_general_inflated');">{{$general_settings}}</a></h3> <div id="settings_general_expanded" class="settings-block" style="display: none;">
<div id="settings_general_expanded" class="settings-block" style="display: none;"> {{include file="field_checkbox.tpl" field=$accept_only_sharer}}
{{include file="field_checkbox.tpl" field=$disable_cw}}
{{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
{{include file="field_checkbox.tpl" field=$attach_link_title}}
{{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
{{$default_group nofilter}}
{{include file="field_input.tpl" field=$legacy_contact}}
{{include file="field_checkbox.tpl" field=$accept_only_sharer}} <p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
{{include file="field_checkbox.tpl" field=$disable_cw}}
{{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
{{include file="field_checkbox.tpl" field=$attach_link_title}}
{{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
{{$default_group nofilter}}
{{include file="field_input.tpl" field=$legacy_contact}}
<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p> <div class="settings-submit-wrapper">
<input type="submit" id="general-submit" name="general-submit" class="settings-submit" value="{{$submit}}"/>
</div>
</div>
<div class="clear"></div>
<div class="settings-submit-wrapper" ><input type="submit" id="general-submit" name="general-submit" class="settings-submit" value="{{$submit}}" /></div> {{$settings_connectors nofilter}}
</div>
<div class="clear"></div>
{{$settings_connectors nofilter}} {{if $mail_disabled}}
{{if $mail_disabled}} {{else}}
<span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;"
{{else}} onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
<span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');"> <img class="connector" src="images/mail.png"/><h3 class="settings-heading connector">{{$h_imap}}</h3>
<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
</span> </span>
<div id="settings_mail_expanded" class="settings-block" style="display: none;"> <div id="settings_mail_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');"> <span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3> <img class="connector" src="images/mail.png"/><h3 class="settings-heading connector">{{$h_imap}}</h3>
</span> </span>
<p>{{$imap_desc nofilter}}</p> <p>{{$imap_desc nofilter}}</p>
{{include file="field_custom.tpl" field=$imap_lastcheck}} {{include file="field_custom.tpl" field=$imap_lastcheck}}
{{include file="field_input.tpl" field=$mail_server}} {{include file="field_input.tpl" field=$mail_server}}
{{include file="field_input.tpl" field=$mail_port}} {{include file="field_input.tpl" field=$mail_port}}
{{include file="field_select.tpl" field=$mail_ssl}} {{include file="field_select.tpl" field=$mail_ssl}}
{{include file="field_input.tpl" field=$mail_user}} {{include file="field_input.tpl" field=$mail_user}}
{{include file="field_password.tpl" field=$mail_pass}} {{include file="field_password.tpl" field=$mail_pass}}
{{include file="field_input.tpl" field=$mail_replyto}} {{include file="field_input.tpl" field=$mail_replyto}}
{{include file="field_checkbox.tpl" field=$mail_pubmail}} {{include file="field_checkbox.tpl" field=$mail_pubmail}}
{{include file="field_select.tpl" field=$mail_action}} {{include file="field_select.tpl" field=$mail_action}}
{{include file="field_input.tpl" field=$mail_movetofolder}} {{include file="field_input.tpl" field=$mail_movetofolder}}
<div class="settings-submit-wrapper" >
<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>
{{/if}}
<div class="settings-submit-wrapper">
<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}"/>
</div>
</div>
{{/if}}
</form> </form>

22
view/theme/frio/templates/settings/connectors.tpl
View file

@ -1,25 +1,23 @@
<div class="generic-page-wrapper"> <div class="generic-page-wrapper">
{{* include the title template for the settings title *}} <h1>{{$title}}</h1>
{{include file="section_title.tpl" title=$title}}
<p class="connector_statusmsg">{{$diasp_enabled}}</p> <p class="connector_statusmsg">{{$diasp_enabled}}</p>
<p class="connector_statusmsg">{{$ostat_enabled}}</p> <p class="connector_statusmsg">{{$ostat_enabled}}</p>
<form action="settings/connectors" method="post" autocomplete="off"> <form action="settings/connectors" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true"> <div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
<div class="panel"> <div class="panel">
<div class="section-subtitle-wrapper" role="tab" id="content-settings-title"> <div class="section-subtitle-wrapper panel-heading" role="tab" id="content-settings-title">
<h4> <h2>
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="false" aria-controls="content-settings-content"> <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="false" aria-controls="content-settings-content">
{{$general_settings}} {{$general_settings}}
</a> </a>
</h4> </h2>
</div> </div>
<div id="content-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="content-settings"> <div id="content-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="content-settings">
<div class="section-content-wrapper"> <div class="panel-body">
{{include file="field_checkbox.tpl" field=$accept_only_sharer}} {{include file="field_checkbox.tpl" field=$accept_only_sharer}}
{{include file="field_checkbox.tpl" field=$disable_cw}} {{include file="field_checkbox.tpl" field=$disable_cw}}
@ -35,11 +33,9 @@
{{include file="field_input.tpl" field=$legacy_contact}} {{include file="field_input.tpl" field=$legacy_contact}}
<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p> <p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
</div>
<div class="form-group pull-right settings-submit-wrapper" > <div class="panel-footer">
<button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> <button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
</div>
<div class="clear"></div>
</div> </div>
</div> </div>
</div> </div>