diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm
index 30dc4d153c95a0a18bd2f08615fa5590935a0773..285f884ee39e7b39c035def843dd3698c30d7ec7 100644
--- a/interface/web/admin/templates/language_add.htm
+++ b/interface/web/admin/templates/language_add.htm
@@ -1,24 +1,32 @@
<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
+ <h1>
+ <tmpl_var name="list_head_txt">
+ </h1>
</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<p>
+ <tmpl_var name="list_desc_txt">
+</p>
+<div class="panel" style="padding:20px;">
+ <div class="pnl_formsarea">
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
+ <div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags">
+ {tmpl_var name='language_option'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label for="lng_new" class="col-sm-3 control-label">{tmpl_var name='language_new_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="lng_new" id="lng_new" value="" class="form-control" /></div>
+ <p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
+ </div>
- <div class="form-group">
- <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
- <div class="col-sm-9"><select name="lng_select" id="language" class="form-control flags">
- {tmpl_var name='language_option'}
- </select></div>
- </div>
- <div class="form-group">
- <label for="lng_new" class="col-sm-3 control-label">{tmpl_var name='language_new_txt'}</label>
- <div class="col-sm-9"><input type="text" name="lng_new" id="lng_new" value="" class="form-control" /></div><p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
- </div>
-
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_add.php">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
+ <div class="clear">
+ <div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_add.php">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div>
+ </div>
+ </div>
diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm
index 53f42fc8fe39734c7190a1349b0d0cf5e7a0a0c6..0da59e11776ec422217e2432d3e8aa538b2fd016 100644
--- a/interface/web/admin/templates/language_complete.htm
+++ b/interface/web/admin/templates/language_complete.htm
@@ -1,30 +1,39 @@
<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
+ <h1>
+ <tmpl_var name="list_head_txt">
+ </h1>
</div>
-<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_complete">
+ <div class="alert alert-info">
+ <p>
+ <tmpl_var name="list_desc_txt">
+ </p>
+ </div>
+ <tmpl_if name="msg">
+ <div id="OKMsg">
+ <tmpl_var name="msg">
+ </div>
+ </tmpl_if>
+ <tmpl_if name="error">
+ <div id="errorMsg">
+ <tmpl_var name="error">
+ </div>
+ </tmpl_if>
- <tmpl_if name="msg">
- <div id="OKMsg"><tmpl_var name="msg"></div>
- </tmpl_if>
- <tmpl_if name="error">
- <div id="errorMsg"><tmpl_var name="error"></div>
- </tmpl_if>
-
- <div class="pnl_formsarea">
- <div class="form-group">
- <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
- <div class="col-sm-9">
- <select name="lng_select" id="language" class="form-control flags">{tmpl_var name='language_option'}</select>
- </div>
- </div>
+ <div class="pnl_formsarea">
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
+ <div class="col-sm-9">
+ <select name="lng_select" id="language" class="form-control flags">{tmpl_var name='language_option'}</select>
+ </div>
+ </div>
<div class="clear">
- <div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_complete.php">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ <div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_complete.php">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div>
- </div>
- </div>
+ </div>
+ </div>
</div>
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm
index a115e6493a7863228e341d58619e6737a6362ce1..bb9eb49164dc609533cf55ed6b3dedda562343c3 100644
--- a/interface/web/admin/templates/language_export.htm
+++ b/interface/web/admin/templates/language_export.htm
@@ -1,24 +1,35 @@
<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
+ <h1>
+ <tmpl_var name="list_head_txt">
+ </h1>
</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<p>
+ <tmpl_var name="list_desc_txt">
+</p>
+<div class="panel panel_language_import" style="padding:20px;">
+ <div class="pnl_formsarea">
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
+ <div class="col-sm-9"><select name="lng_select" id="lng_select" class="form-control flags">
+ {tmpl_var name='language_option'}
+ </select></div>
+ </div>
+ <tmpl_if name="msg">
+ <div id="OKMsg">
+ <p>
+ <tmpl_var name="msg">
+ </p>
+ </div>
+ </tmpl_if>
- <div class="form-group">
- <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
- <div class="col-sm-9"><select name="lng_select" id="lng_select" class="form-control flags">
- {tmpl_var name='language_option'}
- </select></div>
- </div>
-
-
- <tmpl_if name="msg">
- <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
- </tmpl_if>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_export.php">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="clear">
+ <div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_export.php">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm
index 0761cc87ed863f948e889112a4529cd2f9134b64..963da26a4667b63ac87b4991f32397c6a3e83bcd 100644
--- a/interface/web/admin/templates/language_import.htm
+++ b/interface/web/admin/templates/language_import.htm
@@ -1,33 +1,54 @@
<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
+ <h1>
+ <tmpl_var name="list_head_txt">
+ </h1>
</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<div class="panel" style="padding:20px;">
+ <div class="pnl_formsarea">
+ <div class="alert alert-warning">
+ <p>
+ <tmpl_var name="list_desc_txt">
+ </p>
+ </div>
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_import_txt'}</label>
+ <input name="file" id="file" size="30" type="file" class="fileUpload" />
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite" /></div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version" /></div>
+ </div>
- <div class="form-group">
- <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_import_txt'}</label>
- <input name="file" id="file" size="30" type="file" class="fileUpload" />
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
- <div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/></div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
- <div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/></div>
- </div>
-
-
- <tmpl_if name="msg">
- <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
- </tmpl_if>
- <tmpl_if name="error">
- <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
- </tmpl_if>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
+ <tmpl_if name="msg">
+ <div id="OKMsg">
+ <p>
+ <tmpl_var name="msg">
+ </p>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="error">
+ <div id="errorMsg">
+ <h3>
+ <tmpl_var name="error_txt">
+ </h3>
+ <ol>
+ <tmpl_var name="error">
+ </ol>
+ </div>
+ </tmpl_if>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="clear">
+ <div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/language_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/interface/web/admin/templates/remote_action_ispcupdate.htm b/interface/web/admin/templates/remote_action_ispcupdate.htm
index cbd2899bea9c1668dff1bbde4a60fef4205e2fd6..944ccb3ce14f3dfb98675aedca8e42d71dfbabf1 100644
--- a/interface/web/admin/templates/remote_action_ispcupdate.htm
+++ b/interface/web/admin/templates/remote_action_ispcupdate.htm
@@ -6,14 +6,18 @@
-->
<div class='page-header'>
- <h1><tmpl_var name="ispconfig_update_title"></h1>
+ <h1>
+ <tmpl_var name="ispconfig_update_title">
+ </h1>
</div>
-<p style="margin-top:50px; font-size:14px;"><tmpl_var name="ispconfig_update_text"></p>
-
-<div class="panel panel_language_add">
-
- <div class="pnl_formsarea">
- <!--
+<div class="panel" style="padding:20px;">
+ <div class="pnl_formsarea">
+ <p style="font-size:14px;">
+ <tmpl_var name="ispconfig_update_text">
+ </p>
+ </div>
+</div>
+<!--
<legend>{tmpl_var name='do_ispcupdate_caption'}</legend>
<div class="form-group">
<label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
@@ -21,17 +25,17 @@
{tmpl_var name='server_option'}
</select></div>
</div>
-
-
+
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
-
-
+
+
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_do_txt'}" data-submit-form="pageForm" data-form-action="admin/remote_action_ispcupdate.php">{tmpl_var name='btn_do_txt'}</button>
</div></div>
-->
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+</div>
diff --git a/interface/web/admin/templates/remote_action_osupdate.htm b/interface/web/admin/templates/remote_action_osupdate.htm
index 55629fc1e9adfd21c39dc384a85200e39f3e42b8..e32ae2c652e211d0270772af493206b6ddccc3a7 100644
--- a/interface/web/admin/templates/remote_action_osupdate.htm
+++ b/interface/web/admin/templates/remote_action_osupdate.htm
@@ -1,21 +1,34 @@
<div class='page-header'>
- <h1><tmpl_var name="do_osupdate_caption"></h1>
+ <h1>
+ <tmpl_var name="do_osupdate_caption">
+ </h1>
</div>
-<p><tmpl_var name="do_osupdate_desc"></p>
+<div class="panel" style="padding:20px;">
+ <div class="pnl_formsarea">
+ <div class="alert alert-warning">
+ <p>
+ <tmpl_var name="do_osupdate_desc">
+ </p>
+ </div>
+ <div class="form-group">
+ <label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
+ <div class="col-sm-9"><select name="server_select" id="server" class="form-control" onchange="$('#OKMsg').hide(); ">
+ {tmpl_var name='server_option'}
+ </select></div>
+ </div>
+ <tmpl_if name="msg">
+ <div id="OKMsg">
+ <p>
+ <tmpl_var name="msg">
+ </p>
+ </div>
+ </tmpl_if>
- <div class="form-group">
- <label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
- <div class="col-sm-9"><select name="server_select" id="server" class="form-control" onchange="$('#OKMsg').hide(); ">
- {tmpl_var name='server_option'}
- </select></div>
- </div>
-
-
- <tmpl_if name="msg">
- <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
- </tmpl_if>
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_do_txt'}" data-submit-form="pageForm" data-form-action="admin/remote_action_osupdate.php">{tmpl_var name='btn_do_txt'}</button>
- </div></div>
+ <div class="clear">
+ <div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_do_txt'}" data-submit-form="pageForm" data-form-action="admin/remote_action_osupdate.php">{tmpl_var name='btn_do_txt'}</button>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm
index c461e01ed6d06e3c0ac37e8e4cb9e2da54f0c912..9d40107c89c7ee6f74435a05bf1697f34c0f2724 100644
--- a/interface/web/dns/templates/dns_import.htm
+++ b/interface/web/dns/templates/dns_import.htm
@@ -1,74 +1,92 @@
<div class='page-header'>
- <h1><tmpl_var name="zone_file_import_txt"></h1>
+ <h1>
+ <tmpl_var name="zone_file_import_txt">
+ </h1>
</div>
-<p><tmpl_var name="list_desc_txt"></p>
+<p>
+ <tmpl_var name="list_desc_txt">
+</p>
+<div class="panel panel_language_import" style="padding:20px;">
+ <div class="pnl_formsarea">
+ <tmpl_if name="is_admin">
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
+ {tmpl_var name='server_id'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
+ {tmpl_var name='client_group_id'}
+ </select></div>
+ </div>
+ <tmpl_else>
+ <tmpl_if name="only_one_server">
+ <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ <tmpl_else>
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
+ {tmpl_var name='server_id'}
+ </select></div>
+ </div>
+ </tmpl_if>
+ </tmpl_if>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <tmpl_if name="domain_option">
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
+ {tmpl_var name='domain_option'}
+ </select></div>
+ <tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" onkeydown="keydown(event.which);" /></div>
+ </tmpl_if>
+ <div class="col-sm-3 col-text"></div>
+ <div class="col-sm-9 col-text">
+ <tmpl_var name='domain_field_desc_txt' }</div>
+ </div>
+ <div class="form-group">
+ <label for="file" class="col-sm-3 control-label">{tmpl_var name='zonefile_to_import_txt'}</label>
+ <div class="col-sm-9 col-text"><input name="file" id="file" size="30" type="file" class="fileUpload" /></div>
+ </div>
- <tmpl_if name="is_admin">
- <div class="form-group">
- <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
- <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
- {tmpl_var name='server_id'}
- </select></div>
- </div>
- <div class="form-group">
- <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
- <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
- {tmpl_var name='client_group_id'}
- </select></div>
- </div>
- <tmpl_else>
- <tmpl_if name="only_one_server">
- <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
- <tmpl_else>
- <div class="form-group">
- <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
- <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
- {tmpl_var name='server_id'}
- </select></div>
- </div>
- </tmpl_if>
- </tmpl_if>
- <div class="form-group">
- <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
- <tmpl_if name="domain_option">
- <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
- {tmpl_var name='domain_option'}
- </select></div>
- <tmpl_else>
- <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" onkeydown="keydown(event.which);" /></div></tmpl_if>
- <div class="col-sm-3 col-text"></div><div class="col-sm-9 col-text"><tmpl_var name='domain_field_desc_txt'}</div>
- </div>
- <div class="form-group">
- <label for="file" class="col-sm-3 control-label">{tmpl_var name='zonefile_to_import_txt'}</label>
- <div class="col-sm-9 col-text"><input name="file" id="file" size="30" type="file" class="fileUpload" /></div>
- </div>
+ <tmpl_if name="msg">
+ <div id="OKMsg">
+ <p>
+ <tmpl_var name="msg">
+ </p>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="error">
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'>
+ <strong>
+ <tmpl_var name="error_txt">
+ </strong>
+ </div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
+ </tmpl_if>
- <tmpl_if name="msg">
- <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
- </tmpl_if>
- <tmpl_if name="error">
- <div class='alert alert-danger clear'>
- <div class='alert-label'>
- <strong><tmpl_var name="error_txt"></strong>
- </div>
- <div class='alert-content'>
- <ul style="list-style-type:none">
- <tmpl_var name="error">
- </ul>
- </div>
- </div>
- </tmpl_if>
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
-<script language="JavaScript" type="text/javascript">
- function keydown(keynum){
- if(keynum == 13){
- jQuery('.positive').trigger('click');
- }
- }
-</script>
+ <div class="clear">
+ <div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_import.php" data-form-upload="true">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script language="JavaScript" type="text/javascript">
+ function keydown(keynum) {
+ if (keynum == 13) {
+ jQuery('.positive').trigger('click');
+ }
+ }
+ </script>
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index daaac277eba8a85811e291e9c04e6289f168fd6f..07d064c1619ff850d9328dc748e8307237b38e39 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -1,146 +1,159 @@
<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
+ <h1>
+ <tmpl_var name="list_head_txt">
+ </h1>
</div>
-<tmpl_if name="error">
- <div class='alert alert-danger clear'>
- <div class='alert-label'><strong>
- <tmpl_var name="error_txt">
- </strong></div>
- <div class='alert-content'>
- <ul style="list-style-type:none">
- <tmpl_var name="error">
- </ul>
+<div class="panel panel_language_import" style="padding:20px;">
+ <div class="pnl_formsarea">
+ <tmpl_if name="error">
+ <div class='alert alert-danger clear'>
+ <div class='alert-label'><strong>
+ <tmpl_var name="error_txt">
+ </strong></div>
+ <div class='alert-content'>
+ <ul style="list-style-type:none">
+ <tmpl_var name="error">
+ </ul>
+ </div>
+ </div>
+ </tmpl_if>
+ <div class="form-group">
+ <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
+ <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control" onChange="ISPConfig.submitForm('pageForm','dns/dns_wizard.php')">
+ {tmpl_var name='template_id_option'}
+ </select></div>
</div>
- </div>
-</tmpl_if>
-
-
- <div class="form-group">
- <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
- <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control" onChange="ISPConfig.submitForm('pageForm','dns/dns_wizard.php')">
- {tmpl_var name='template_id_option'}
- </select></div>
- </div>
- <tmpl_if name="is_admin">
- <div class="form-group">
- <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
- <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
- {tmpl_var name='server_id'}
- </select></div>
- </div>
- <tmpl_unless name="domain_option">
- <div class="form-group">
- <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
- <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
- {tmpl_var name='client_group_id'}
- </select></div>
- </div>
- </tmpl_unless>
- <tmpl_else>
- <tmpl_if name="only_one_server">
- <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
- <tmpl_else>
- <div class="form-group">
- <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
- <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
- {tmpl_var name='server_id'}
- </select></div>
- </div>
- </tmpl_if>
- </tmpl_if>
- <tmpl_if name="is_reseller">
- <tmpl_unless name="domain_option">
- <div class="form-group">
- <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
- <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
- {tmpl_var name='client_group_id'}
- </select></div>
- </div>
- </tmpl_unless>
- </tmpl_if>
- <tmpl_if name="DOMAIN_VISIBLE">
- <div class="form-group">
- <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
- <tmpl_if name="domain_option">
- <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
- {tmpl_var name='domain_option'}
- </select></div>
- <tmpl_else>
- <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
- </div>
- </tmpl_if>
- <tmpl_if name="IP_VISIBLE">
- <div class="form-group">
- <label for="ip" class="col-sm-3 control-label">{tmpl_var name='ip_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ip" id="ip" value="{tmpl_var name='ip'}" class="form-control" /></div></div>
- </tmpl_if>
- <tmpl_if name="IPV6_VISIBLE">
- <div class="form-group">
- <label for="ipv6" class="col-sm-3 control-label">{tmpl_var name='ipv6_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" class="form-control" /></div></div>
- </tmpl_if>
- <tmpl_if name="NS1_VISIBLE">
- <div class="form-group">
- <label for="ns1" class="col-sm-3 control-label">{tmpl_var name='ns1_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ns1" id="ns1" value="{tmpl_var name='ns1'}" class="form-control" /></div></div>
- </tmpl_if>
- <tmpl_if name="NS2_VISIBLE">
- <div class="form-group">
- <label for="ns2" class="col-sm-3 control-label">{tmpl_var name='ns2_txt'}</label>
- <div class="col-sm-9"><input type="text" name="ns2" id="ns2" value="{tmpl_var name='ns2'}" class="form-control" /></div></div>
- </tmpl_if>
- <tmpl_if name="EMAIL_VISIBLE">
- <div class="form-group">
- <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
- <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div></div>
- </tmpl_if>
- <tmpl_if name="DKIM_VISIBLE">
+ <tmpl_if name="is_admin">
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
+ {tmpl_var name='server_id'}
+ </select></div>
+ </div>
+ <tmpl_unless name="domain_option">
<div class="form-group">
- <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dkim_txt'}</label>
- <div class="col-sm-9"><input type="checkbox" disabled readonly checked><input name="dkim" type="hidden" maxlength="255" type="text"/></div></div>
- </tmpl_if>
- <tmpl_if name="DNSSEC_VISIBLE">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
+ {tmpl_var name='client_group_id'}
+ </select></div>
+ </div>
+ </tmpl_unless>
+ <tmpl_else>
+ <tmpl_if name="only_one_server">
+ <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ <tmpl_else>
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
+ {tmpl_var name='server_id'}
+ </select></div>
+ </div>
+ </tmpl_if>
+ </tmpl_if>
+ <tmpl_if name="is_reseller">
+ <tmpl_unless name="domain_option">
<div class="form-group">
- <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dnssec_txt'}</label>
- <div class="col-sm-9"><input type="checkbox" name="dnssec" value="Y"></div></div>
- </tmpl_if>
-
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
+ {tmpl_var name='client_group_id'}
+ </select></div>
+ </div>
+ </tmpl_unless>
+ </tmpl_if>
+ <tmpl_if name="DOMAIN_VISIBLE">
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <tmpl_if name="domain_option">
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
+ {tmpl_var name='domain_option'}
+ </select></div>
+ <tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div>
+ </tmpl_if>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="IP_VISIBLE">
+ <div class="form-group">
+ <label for="ip" class="col-sm-3 control-label">{tmpl_var name='ip_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ip" id="ip" value="{tmpl_var name='ip'}" class="form-control" /></div>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="IPV6_VISIBLE">
+ <div class="form-group">
+ <label for="ipv6" class="col-sm-3 control-label">{tmpl_var name='ipv6_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" class="form-control" /></div>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="NS1_VISIBLE">
+ <div class="form-group">
+ <label for="ns1" class="col-sm-3 control-label">{tmpl_var name='ns1_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ns1" id="ns1" value="{tmpl_var name='ns1'}" class="form-control" /></div>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="NS2_VISIBLE">
+ <div class="form-group">
+ <label for="ns2" class="col-sm-3 control-label">{tmpl_var name='ns2_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ns2" id="ns2" value="{tmpl_var name='ns2'}" class="form-control" /></div>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="EMAIL_VISIBLE">
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" /></div>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="DKIM_VISIBLE">
+ <div class="form-group">
+ <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dkim_txt'}</label>
+ <div class="col-sm-9"><input type="checkbox" disabled readonly checked><input name="dkim" type="hidden" maxlength="255" type="text" /></div>
+ </div>
+ </tmpl_if>
+ <tmpl_if name="DNSSEC_VISIBLE">
+ <div class="form-group">
+ <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dnssec_txt'}</label>
+ <div class="col-sm-9"><input type="checkbox" name="dnssec" value="Y"></div>
+ </div>
+ </tmpl_if>
+ <input type="hidden" name="create" value="0" />
- <input type="hidden" name="create" value="0" />
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onclick="document.pageForm.create.value=1; ISPConfig.submitForm('pageForm','dns/dns_wizard.php');">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
+ <div class="clear">
+ <div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onclick="document.pageForm.create.value=1; ISPConfig.submitForm('pageForm','dns/dns_wizard.php');">{tmpl_var
+ name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div>
+ </div>
+ </div>
+</div>
<script language="JavaScript" type="text/javascript">
- jQuery('#ip').ispconfigSearch({
- dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
- resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
- ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
- noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
- noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
- minChars: 0,
- cssPrefix: 'df-',
- fillSearchField: true,
- fillSearchFieldWith: 'fill_text',
- searchFieldWatermark: '',
- resultBoxPosition: ''
- });
+ jQuery('#ip').ispconfigSearch({
+ dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
+ resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+ ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+ noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+ noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+ minChars: 0,
+ cssPrefix: 'df-',
+ fillSearchField: true,
+ fillSearchFieldWith: 'fill_text',
+ searchFieldWatermark: '',
+ resultBoxPosition: ''
+ });
</script>
<script language="JavaScript" type="text/javascript">
- jQuery('#ipv6').ispconfigSearch({
- dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
- resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
- ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
- noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
- noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
- minChars: 0,
- cssPrefix: 'df-',
- fillSearchField: true,
- fillSearchFieldWith: 'fill_text',
- searchFieldWatermark: '',
- resultBoxPosition: ''
- });
+ jQuery('#ipv6').ispconfigSearch({
+ dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
+ resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+ ResultsTextPrefix: '<tmpl_var name="globalsearch_suggestions_text_txt">',
+ noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+ noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+ minChars: 0,
+ cssPrefix: 'df-',
+ fillSearchField: true,
+ fillSearchFieldWith: 'fill_text',
+ searchFieldWatermark: '',
+ resultBoxPosition: ''
+ });
</script>
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm
index 278a6de5ea55df6e7c9b817ac2e11aaba51749c6..71640f7b7ddcbf2add8ff8801fc80716c98d62ff 100644
--- a/interface/web/tools/templates/import_ispconfig.htm
+++ b/interface/web/tools/templates/import_ispconfig.htm
@@ -4,7 +4,6 @@
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import" style="padding:20px;">
-
<div class="pnl_formsarea">
<legend>{tmpl_var name="legend_txt"}</legend>
<div class="form-group">