From aa370627b211a51dc46891cfa4b6e3d2ef3e52db Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 16 Jul 2013 10:45:17 -0400
Subject: [PATCH] - Fixed FS#2924 - the month will not set automatically in the autoresponder by click now Along with this fixed some display problems with the combo boxes introduced in 3.0.5. Some fields were not correctly displayed with the predefined values if value and text of the underlying option element differ.
---
interface/web/tools/templates/import_ispconfig.htm | 196 ++++++++++++++++++++++++------------------------
1 files changed, 97 insertions(+), 99 deletions(-)
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm
index 4980dc4..f7b97e8 100644
--- a/interface/web/tools/templates/import_ispconfig.htm
+++ b/interface/web/tools/templates/import_ispconfig.htm
@@ -1,105 +1,103 @@
-<h2>{tmpl_var name="head_txt"}</h2>
+<h2><tmpl_var name="head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
- <div class="ctrlHolder">
- <p class="label">Remote API URL</p>
- <div class="multiField">
- <input id="remote_server" type="text" value="{tmpl_var name='remote_server'}" name="remote_server" /> (e.g. https://www.example.com:8080/remote/ )
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">Remote User</p>
- <div class="multiField">
- <input id="remote_user" type="text" value="{tmpl_var name='remote_user'}" name="remote_user" />
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">Remote password</p>
- <div class="multiField">
- <input id="remote_password" type="text" value="{tmpl_var name='remote_password'}" name="remote_password" />
- </div>
- </div>
- </fieldset>
- <tmpl_if name="connected">
-<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="legend2_txt"}</legend>
- <div class="ctrlHolder">
- <label for="mail_domain">{tmpl_var name='mail_domain_txt'}</label>
- <select name="mail_domain" id="mail_domain" class="selectInput">
- {tmpl_var name='mail_domain'}
- </select>
- </div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
- {tmpl_var name='client_group_id'}
- </select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_mailbox_txt"}</p>
- <div class="multiField">
- <input id="import_mailbox" type="checkbox" value="1" name="import_mailbox" checked="checked" />
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_user_filter_txt"}</p>
- <div class="multiField">
- <input id="import_user_filter" type="checkbox" value="1" name="import_user_filter" checked="checked" />
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_spamfilter_txt"}</p>
- <div class="multiField">
- <input id="import_spamfilter" type="checkbox" value="1" name="import_spamfilter" checked="checked" />
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_alias_txt"}</p>
- <div class="multiField">
- <input id="import_alias" type="checkbox" value="1" name="import_alias" checked="checked" />
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_forward_txt"}</p>
- <div class="multiField">
- <input id="import_forward" type="checkbox" value="1" name="import_forward" checked="checked" />
- </div>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_aliasdomain_txt"}</p>
- <div class="multiField">
- <input id="import_aliasdomain" type="checkbox" value="1" name="import_aliasdomain" checked="checked" />
- </div>
- </div>
- </fieldset>
- </tmpl_if>
-
-
-
- <tmpl_if name="msg">
- <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
- </tmpl_if>
- <tmpl_if name="error">
- <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
- </tmpl_if>
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
+ <div class="ctrlHolder">
+ <p class="label">Remote API URL</p>
+ <div class="multiField">
+ <input id="remote_server" type="text" value="{tmpl_var name='remote_server'}" name="remote_server" /> (e.g. https://www.example.com:8080/remote/ )
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">Remote User</p>
+ <div class="multiField">
+ <input id="remote_user" type="text" value="{tmpl_var name='remote_user'}" name="remote_user" />
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">Remote password</p>
+ <div class="multiField">
+ <input id="remote_password" type="text" value="{tmpl_var name='remote_password'}" name="remote_password" />
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <tmpl_if name="connected">
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels"><legend>{tmpl_var name="legend2_txt"}</legend>
+ <div class="ctrlHolder">
+ <label for="mail_domain">{tmpl_var name='mail_domain_txt'}</label>
+ <select name="mail_domain" id="mail_domain" class="selectInput">
+ {tmpl_var name='mail_domain'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
+ <select name="client_group_id" id="client_group_id" class="selectInput">
+ {tmpl_var name='client_group_id'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name="import_mailbox_txt"}</p>
+ <div class="multiField">
+ <input id="import_mailbox" type="checkbox" value="1" name="import_mailbox" checked="checked" />
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name="import_user_filter_txt"}</p>
+ <div class="multiField">
+ <input id="import_user_filter" type="checkbox" value="1" name="import_user_filter" checked="checked" />
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name="import_spamfilter_txt"}</p>
+ <div class="multiField">
+ <input id="import_spamfilter" type="checkbox" value="1" name="import_spamfilter" checked="checked" />
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name="import_alias_txt"}</p>
+ <div class="multiField">
+ <input id="import_alias" type="checkbox" value="1" name="import_alias" checked="checked" />
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name="import_forward_txt"}</p>
+ <div class="multiField">
+ <input id="import_forward" type="checkbox" value="1" name="import_forward" checked="checked" />
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name="import_aliasdomain_txt"}</p>
+ <div class="multiField">
+ <input id="import_aliasdomain" type="checkbox" value="1" name="import_aliasdomain" checked="checked" />
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ </tmpl_if>
+
+ <tmpl_if name="msg">
+ <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
+ </tmpl_if>
+ <tmpl_if name="error">
+ <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
+ </tmpl_if>
<input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
- <input type="hidden" name="connected" value="{tmpl_var name='connected'}">
-<tmpl_if name="connected">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
- </div>
-<tmpl_else>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
- </div>
-</tmpl_if>
- </div>
-
-</div>
+ <input type="hidden" name="connected" value="{tmpl_var name='connected'}">
+ <tmpl_if name="connected">
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ </div>
+ <tmpl_else>
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ </div>
+ </tmpl_if>
+ </div>
\ No newline at end of file
--
Gitblit v1.9.1