From 331bd527a7d130ec050018e971f1d42f9ea35a5b Mon Sep 17 00:00:00 2001
From: Joas Schilling
Date: Wed, 19 Feb 2014 17:42:05 +0100
Subject: [PATCH] Hide SMTP options based on selected send mode
Fix #7166
---
settings/js/admin.js | 22 ++++++++++++++++++++--
settings/templates/admin.php | 32 ++++++++++++++++----------------
2 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 923e267513..e2bc125b8f 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -37,9 +37,27 @@ $(document).ready(function(){
$('#mail_smtpauth').change(function() {
if (!this.checked) {
- $('#mail_credentials').toggle(false);
+ $('#mail_credentials').addClass('hidden');
} else {
- $('#mail_credentials').toggle(true);
+ $('#mail_credentials').removeClass('hidden');
+ }
+ });
+
+ $('#mail_smtpmode').change(function() {
+ if ($(this).val() != 'smtp') {
+ $('#setting_smtpauth').addClass('hidden');
+ $('#setting_smtphost').addClass('hidden');
+ $('#mail_smtpsecure_label').addClass('hidden');
+ $('#mail_smtpsecure').addClass('hidden');
+ $('#mail_credentials').addClass('hidden');
+ } else {
+ $('#setting_smtpauth').removeClass('hidden');
+ $('#setting_smtphost').removeClass('hidden');
+ $('#mail_smtpsecure_label').removeClass('hidden');
+ $('#mail_smtpsecure').removeClass('hidden');
+ if ($('#mail_smtpauth').attr('checked')) {
+ $('#mail_credentials').removeClass('hidden');
+ }
}
});
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d81840b5b6..377c05eb4b 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -288,8 +288,8 @@ if (!$_['internetconnectionworking']) {
-
-
-
+
+ ' />
+ @
+ ' />
+
+
+ >
+
$name):
$selected = '';
@@ -316,24 +323,17 @@ if (!$_['internetconnectionworking']) {
- >
-
- ' />
- ' />
-
-
-
-
+
>
+
' />
:
' />
-
-
- ' />
- @
- ' />
+
>
+
+ ' />
+ ' />