Improve connectors settings display

- Move settings templates to subfolder
- Add accordion display to "General Theme Settings" in frio
- Replace hand-written template with form field includes
- Simplify sprintf(t()) structures

view/theme/frio/templates/settings/connectors.tpl

@@ -0,0 +1,70 @@
+<div class="generic-page-wrapper">
+	{{* include the title template for the settings title *}}
+	{{include file="section_title.tpl" title=$title}}
+
+	<p class="connector_statusmsg">{{$diasp_enabled}}</p>
+	<p class="connector_statusmsg">{{$ostat_enabled}}</p>
+
+	<form action="settings/connectors" method="post" autocomplete="off">
+		<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">
+				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
+					<h4>
+						<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}}
+						</a>
+					</h4>
+				</div>
+				<div id="content-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="content-settings">
+					<div class="section-content-wrapper">
+
+						{{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
+						{{include file="field_checkbox.tpl" field=$ostatus_autofriend}}
+						{{$default_group}}
+						{{include file="field_input.tpl" field=$legacy_contact}}
+
+						<p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
+
+						<div class="form-group pull-right settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		{{$settings_connectors}}
+
+{{if $mail_disabled}}
+
+{{else}}
+		<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>
+		</span>
+		<div id="settings_mail_expanded" class="settings-block" style="display: none;">
+		<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>
+		</span>
+		<p>{{$imap_desc}}</p>
+		{{include file="field_custom.tpl" field=$imap_lastcheck}}
+		{{include file="field_input.tpl" field=$mail_server}}
+		{{include file="field_input.tpl" field=$mail_port}}
+		{{include file="field_select.tpl" field=$mail_ssl}}
+		{{include file="field_input.tpl" field=$mail_user}}
+		{{include file="field_password.tpl" field=$mail_pass}}
+		{{include file="field_input.tpl" field=$mail_replyto}}
+		{{include file="field_checkbox.tpl" field=$mail_pubmail}}
+		{{include file="field_select.tpl" field=$mail_action}}
+		{{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|escape:'html'}}" />
+		</div>
+		</div>
+{{/if}}
+
+	</form>
+</div>