Merge remote-tracking branch 'upstream/master'

[friendica.git] / view / settings.tpl

diff --git a/view/settings.tpl b/view/settings.tpl
index 50b59cc9181baa638f12721e48bbda93a127f7c8..b79fbfe43c3e8df72ae7bba903b95aa00d75d211 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -15,8 +15,9 @@ $nickname_block
 {{inc field_password.tpl with $field=$password1 }}{{endinc}}
 {{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
+{{ if $oid_enable }}
 {{inc field_input.tpl with $field=$openid }}{{endinc}}
-
+{{ endif }}
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
@@ -82,11 +83,11 @@ $hide_wall
 <div id="settings-notify-desc">$lbl_not </div>
 
 <div class="group">
-{{inc field_checkbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
 </div>
 
 
@@ -94,10 +95,10 @@ $hide_wall
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
-<h3 class="settings-heading">$h_imap</h3>
 {{ if $mail_disabled }}
-       <div class="info-message">$mail_disabled</div>
+
 {{ else }}
+       <h3 class="settings-heading">$h_imap</h3>
        <p>$imap_desc</p>
        {{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
        {{inc field_input.tpl with $field=$mail_server }}{{endinc}}