Merge pull request #13128 from annando/owa

[friendica.git] / view / templates / settings / connectors.tpl

diff --git a/view/templates/settings/connectors.tpl b/view/templates/settings/connectors.tpl
index 8010cc982d137e17757e6f06c8fe71dd38d46b33..853c193b7130c42fb410c78268c9c75f575607f2 100644 (file)
--- a/view/templates/settings/connectors.tpl
+++ b/view/templates/settings/connectors.tpl
@@ -16,6 +16,8 @@
                {{include file="field_checkbox.tpl" field=$enable_smart_shortening}}
                {{include file="field_checkbox.tpl" field=$simple_shortening}}
                {{include file="field_checkbox.tpl" field=$attach_link_title}}
+               {{include file="field_checkbox.tpl" field=$api_spoiler_title}}
+               {{include file="field_checkbox.tpl" field=$api_auto_attach}}
                {{include file="field_input.tpl" field=$legacy_contact}}
 
                <p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
@@ -27,7 +29,6 @@
 </form>
 <div class="clear"></div>
 
-{{if !$mail_disabled}}
 <form action="settings/connectors" method="post" autocomplete="off">
        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
        <span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;"
@@ -38,6 +39,9 @@
                <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_mail}}</h3>
                </span>
+    {{if $mail_disabled}}
+               <p>{{$mail_disabled}}</p>
+       {{else}}
                <p>{{$mail_desc nofilter}}</p>
                {{include file="field_custom.tpl" field=$mail_lastcheck}}
                {{include file="field_input.tpl" field=$mail_server}}
@@ -53,9 +57,9 @@
                <div class="settings-submit-wrapper">
                        <input type="submit" id="mail-submit" name="mail-submit" class="settings-submit" value="{{$submit}}"/>
                </div>
+       {{/if}}
        </div>
 </form>
-{{/if}}
 
 {{foreach $connector_settings_forms as $addon => $connector_settings_form}}
 <form action="settings/connectors/{{$addon}}" method="post" autocomplete="off">