diff --git a/interface/lib/classes/cmstree.inc.php b/interface/lib/classes/cmstree.inc.php index 2a590008e2029b13f49fe13cdcf28d77cd7fd51c..d83fb297e50c81dbfce1826aa3a52b35881fc5b9 100644 --- a/interface/lib/classes/cmstree.inc.php +++ b/interface/lib/classes/cmstree.inc.php @@ -100,9 +100,9 @@ class cmstree */ $val_id = $val->id; if($_SESSION['s']['cat_open'][$val_id] == 1) { - $kategorie = "
  id."'\" style=\"text-decoration: none;\"> ".$val->btext."
"; + $kategorie = "
  id."'\" style=\"text-decoration: none;\"> ".$val->btext."
"; } else { - $kategorie = "
  id."'\" style=\"text-decoration: none;\"> ".$val->btext."
"; + $kategorie = "
  id."'\" style=\"text-decoration: none;\"> ".$val->btext."
"; } $optionlist[] = array( media_cat => $kategorie, diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php index 25505f7dedfba02899dfea45a6afdd3dc287aecc..ff4f3e7ef4a8080f98d20bcfd19e62fd5da80a50 100644 --- a/interface/lib/classes/listform_tpl_generator.inc.php +++ b/interface/lib/classes/listform_tpl_generator.inc.php @@ -44,7 +44,7 @@ class listform_tpl_generator {
{tmpl_var name="toolsarea_head_txt"}
-
@@ -79,7 +79,7 @@ class listform_tpl_generator { } } - $html .= '
+ $html .= '
@@ -89,7 +89,7 @@ class listform_tpl_generator { foreach($listDef["item"] as $field) { $key = $field["field"]; - $html .= " {tmpl_var name=\"".$key."\"}\n"; + $html .= " {tmpl_var name=\"".$key."\"}\n"; } $html .= " diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php index 5235da7c0bc8094dce1040662d92d5419b102b2e..d536f4b364d48c1041ba85ac6c9973d26ac753ad 100644 --- a/interface/lib/classes/tform_actions.inc.php +++ b/interface/lib/classes/tform_actions.inc.php @@ -486,7 +486,7 @@ class tform_actions { $navibar .= 'Drucken  '; } if($app->tform->formDef['template_mailsend'] != '') { - $navibar .= "tform->formDef['action'].'?id='.$this->id."&send_form_by_mail=1','send','width=370,height=240')\">\"Als"; + $navibar .= "tform->formDef['action'].'?id='.$this->id."&send_form_by_mail=1','send','width=370,height=240')\">\"Als"; } $app->tpl->setVar('form_navibar',$navibar); } diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php index 053e8dfbbf539511de906680d1201d21ae223f02..4767ad0b4b8b6e1ba133b36f7c2490b907e15a03 100644 --- a/interface/lib/classes/tform_tpl_generator.inc.php +++ b/interface/lib/classes/tform_tpl_generator.inc.php @@ -136,8 +136,8 @@ class tform_tpl_generator {
- - + +
diff --git a/interface/web/admin/lib/lang/en_iptables_list.lng b/interface/web/admin/lib/lang/en_iptables_list.lng index 0b9f68697bc14b22437de63e6f12cd2643990614..229374adf47cf5a75b1545213e65831876b5f5b0 100644 --- a/interface/web/admin/lib/lang/en_iptables_list.lng +++ b/interface/web/admin/lib/lang/en_iptables_list.lng @@ -13,7 +13,7 @@ templates/iptables_list.htm: templates/iptables_list.htm: templates/iptables_list.htm: -templates/iptables_list.htm: templates/iptables_list.htm: {tmpl_var name='delete_txt'} */ diff --git a/interface/web/admin/login_as.php b/interface/web/admin/login_as.php index 0f9c259346281e4edaf1a5c9691ad49ee2d5c2f1..807897763fab54f8102a6c8a91d04a75b3a01e69 100644 --- a/interface/web/admin/login_as.php +++ b/interface/web/admin/login_as.php @@ -78,8 +78,8 @@ echo '
- - + +
'; ?> diff --git a/interface/web/admin/software_package_install.php b/interface/web/admin/software_package_install.php index eb7a72ab167601abf3bce574cc2e79a028fb7830..9957c14de4a2ed334bf8fda3ebe106dc7697b8ee 100644 --- a/interface/web/admin/software_package_install.php +++ b/interface/web/admin/software_package_install.php @@ -129,7 +129,7 @@ if($install_server_id > 0 && $package_name != '' && ($package['package_installab //* Add the record to start the install process $insert_data = "(package_name, server_id, software_update_id, status) VALUES ('$package_name', '$install_server_id', '$software_update_id','installing')"; $app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id'); - $message_ok = 'Starting package installation '."".$app->lng('next').""; + $message_ok = 'Starting package installation '."".$app->lng('next').""; } diff --git a/interface/web/admin/software_package_list.php b/interface/web/admin/software_package_list.php index dd73c14083b7e5d3f37a27e460c7941b7be0c72c..c9380052c7757217ee07ce69f14b465335e196a5 100644 --- a/interface/web/admin/software_package_list.php +++ b/interface/web/admin/software_package_list.php @@ -165,7 +165,7 @@ if(is_array($packages)) { if($p['package_installable'] == 'no') { $installed_txt .= $s['server_name'].": ".$app->lng("Package can not be installed.")."
"; } else { - $installed_txt .= $s['server_name'].": Install now
"; + $installed_txt .= $s['server_name'].": Install now
"; } } } diff --git a/interface/web/admin/software_update_list.php b/interface/web/admin/software_update_list.php index 734f369343b78ba3429d880f466c2d46f7ac1977..226a5693a1198df69e790f7708f2cc63e884b4c9 100644 --- a/interface/web/admin/software_update_list.php +++ b/interface/web/admin/software_update_list.php @@ -175,7 +175,7 @@ if(is_array($installed_packages)) { foreach($updates as $key => $u) { $version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4']; - $installed_txt = "Install Update
"; + $installed_txt = "Install Update
"; $records_out[] = array('version' => $version, 'update_title' => $u["update_title"], 'installed' => $installed_txt); } @@ -199,7 +199,7 @@ if(is_array($updates)) { if($u['status'] == 'installed' || $u['status'] == 'installing' || $u['status'] == 'deleting') { $installed_txt .= "Installed version $version
"; } else { - $installed_txt .= "Install now
"; + $installed_txt .= "Install now
"; } $updates[$key]['installed'] = $installed_txt; diff --git a/interface/web/admin/templates/firewall_edit.htm b/interface/web/admin/templates/firewall_edit.htm index 827c1c8b9f29a18ff24d585f23e4b623f38dc468..b297f0a006d02a80ef9c484d0f95887567e0b56f 100644 --- a/interface/web/admin/templates/firewall_edit.htm +++ b/interface/web/admin/templates/firewall_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm index 53e2e4bc39dbec679eab20f3265379a3309f42cc..e9cb42527e973d6fc5283c369621655183adbba9 100644 --- a/interface/web/admin/templates/firewall_list.htm +++ b/interface/web/admin/templates/firewall_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="tcp_port"} - {tmpl_var name="udp_port"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="tcp_port"} + {tmpl_var name="udp_port"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/groups_edit.htm b/interface/web/admin/templates/groups_edit.htm index b5fe764944a33b13731b35b32e77b22682c9deee..c38317236a106bf9ed4bf14fbf3eff2dc807a030 100644 --- a/interface/web/admin/templates/groups_edit.htm +++ b/interface/web/admin/templates/groups_edit.htm @@ -18,8 +18,8 @@
- - + +
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm index 6cdbcc394ea863ad2c55904301e1d4f579acd3cd..2718d1f10e45f58c35d3ff7f4d400ae4ec6a21cf 100644 --- a/interface/web/admin/templates/groups_list.htm +++ b/interface/web/admin/templates/groups_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-

@@ -27,15 +27,15 @@ - + - {tmpl_var name="name"} - {tmpl_var name="description"} + {tmpl_var name="name"} + {tmpl_var name="description"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/iptables_edit.htm b/interface/web/admin/templates/iptables_edit.htm index 87033ab2c1ed2dda09589a353b0bf891ee4cdb36..283c5e78dbe169f1bca837b47109aa3f1439a127 100644 --- a/interface/web/admin/templates/iptables_edit.htm +++ b/interface/web/admin/templates/iptables_edit.htm @@ -57,9 +57,9 @@
- -
diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm index f1159f3292558eb8ffa59d00ad8f6f56bfcf3299..b570b97d2fb55d8114c5787b93b15479668b2410 100644 --- a/interface/web/admin/templates/iptables_list.htm +++ b/interface/web/admin/templates/iptables_list.htm @@ -5,7 +5,7 @@
Tools
-
@@ -37,21 +37,21 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="table"} - {tmpl_var name="protocol"} - {tmpl_var name="singleport"} - {tmpl_var name="multiport"} - {tmpl_var name="state"} - {tmpl_var name="target"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="table"} + {tmpl_var name="protocol"} + {tmpl_var name="singleport"} + {tmpl_var name="multiport"} + {tmpl_var name="state"} + {tmpl_var name="target"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm index 540fc97657fedc314ac9f3fa9c811fbee6ee17a8..0cab8abac7923f50aed9a17691c9bb47733b883a 100644 --- a/interface/web/admin/templates/language_add.htm +++ b/interface/web/admin/templates/language_add.htm @@ -21,8 +21,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm index 7416a7096c8eaa837dd687361e5bb6b9c0b350d7..86d3a44d454ac3ba77f8a322c6c5134d788790d9 100644 --- a/interface/web/admin/templates/language_complete.htm +++ b/interface/web/admin/templates/language_complete.htm @@ -21,8 +21,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_edit.htm b/interface/web/admin/templates/language_edit.htm index 3767a178ebf6c9df20ed0cb9d14911cb2b60d7c2..30bd927eb28459f80685f75026d35482378dc001 100644 --- a/interface/web/admin/templates/language_edit.htm +++ b/interface/web/admin/templates/language_edit.htm @@ -21,8 +21,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm index 40856220c9ca1698c25ef8b91ed815ab5ab87f2d..98be4b5f4aef9a2201d89d01e391c90997235a6f 100644 --- a/interface/web/admin/templates/language_export.htm +++ b/interface/web/admin/templates/language_export.htm @@ -20,8 +20,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm index 30289448f2c666f5ceca1567d75ef5f80bfc4c6b..85ea2a97d1f41b487664eb0684fda7a854856c95 100644 --- a/interface/web/admin/templates/language_import.htm +++ b/interface/web/admin/templates/language_import.htm @@ -33,8 +33,8 @@
- - + +
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm index c0718decdf75b947b9828c88c1b25cc0a4c95f82..ce1bf64b436f34c3f243dd9bb090ac71b9288939 100644 --- a/interface/web/admin/templates/language_list.htm +++ b/interface/web/admin/templates/language_list.htm @@ -29,9 +29,9 @@ - {tmpl_var name="module"} - {tmpl_var name="lang_file"} - {tmpl_var name="lang_file_date"} + {tmpl_var name="module"} + {tmpl_var name="lang_file"} + {tmpl_var name="lang_file_date"} diff --git a/interface/web/admin/templates/remote_action_ispcupdate.htm b/interface/web/admin/templates/remote_action_ispcupdate.htm index 6c903bad7c9eb4d6996128fc4683d06b1583cfe3..219c6fd84232e61eeee40e40bf7e07aa7aead87d 100644 --- a/interface/web/admin/templates/remote_action_ispcupdate.htm +++ b/interface/web/admin/templates/remote_action_ispcupdate.htm @@ -25,7 +25,7 @@
- +
--> diff --git a/interface/web/admin/templates/remote_action_osupdate.htm b/interface/web/admin/templates/remote_action_osupdate.htm index 034947355f307531eb0bf029d0458dc6019a8d30..05f2b296362fa8f5efd4cb2a163f6d1907561a4b 100644 --- a/interface/web/admin/templates/remote_action_osupdate.htm +++ b/interface/web/admin/templates/remote_action_osupdate.htm @@ -18,7 +18,7 @@
- +
diff --git a/interface/web/admin/templates/remote_user_edit.htm b/interface/web/admin/templates/remote_user_edit.htm index 1b7d22a5c4df14c1fe7a6a50f03d0240b3239b40..69dd61ccfec51315f93cd12d1b83907537d6dccb 100644 --- a/interface/web/admin/templates/remote_user_edit.htm +++ b/interface/web/admin/templates/remote_user_edit.htm @@ -13,7 +13,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -39,8 +39,8 @@
- - + +
diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm index 131c1aa3d2386a748a3199e5633ecadaf5ea9907..c7e86b44c925d2d434a4caf1f8d290cf359954ce 100644 --- a/interface/web/admin/templates/remote_user_list.htm +++ b/interface/web/admin/templates/remote_user_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -25,15 +25,15 @@   - + - {tmpl_var name="remote_userid"} - {tmpl_var name="remote_username"} + {tmpl_var name="remote_userid"} + {tmpl_var name="remote_username"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_config_cron_edit.htm b/interface/web/admin/templates/server_config_cron_edit.htm index 17c811ba27d27fa0905a03aeabd82911e26427dd..4f9d283e1a15f7f774b95c5f44e0081830ce9851 100644 --- a/interface/web/admin/templates/server_config_cron_edit.htm +++ b/interface/web/admin/templates/server_config_cron_edit.htm @@ -22,8 +22,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_dns_edit.htm b/interface/web/admin/templates/server_config_dns_edit.htm index c308ec495c1e97433bdf9934d260c7dbf6d2aff9..541c9d7f978a669db1ed451c28d59d463b4f1d88 100644 --- a/interface/web/admin/templates/server_config_dns_edit.htm +++ b/interface/web/admin/templates/server_config_dns_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm index ad9444060a562b34e3c11b6a4234a8573a437f78..88d06d7018cc063ab2cacf58ad8fc3c229979684 100644 --- a/interface/web/admin/templates/server_config_fastcgi_edit.htm +++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm @@ -44,8 +44,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_getmail_edit.htm b/interface/web/admin/templates/server_config_getmail_edit.htm index 21492e4c8983ad35b783078406aaf39239dc4fe7..8dc900de5116ccd67b964a6e0abe9a73a2ed2aed 100644 --- a/interface/web/admin/templates/server_config_getmail_edit.htm +++ b/interface/web/admin/templates/server_config_getmail_edit.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_jailkit_edit.htm b/interface/web/admin/templates/server_config_jailkit_edit.htm index 19e0416e616606688b5c01e9a5d710f72f06693c..9d7864b34244e335c6030b492b3a9a4dcd8caa18 100644 --- a/interface/web/admin/templates/server_config_jailkit_edit.htm +++ b/interface/web/admin/templates/server_config_jailkit_edit.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm index b2f0aa352d0778c9fbf2acc9a10f829d569cccd4..05efdcb226d9586dff561ca26432887033d08872 100644 --- a/interface/web/admin/templates/server_config_list.htm +++ b/interface/web/admin/templates/server_config_list.htm @@ -14,14 +14,14 @@ - + - {tmpl_var name="server_name"} + {tmpl_var name="server_name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm index 72292b32bf8c35987308ace171d16ab39c6b331e..4bfd430b941d9215dae19cbb54bb12ae033cecd5 100644 --- a/interface/web/admin/templates/server_config_mail_edit.htm +++ b/interface/web/admin/templates/server_config_mail_edit.htm @@ -86,8 +86,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm index 0310344013350332e44211cdfea7a8af2be6159c..778225b3e65087eee44762497db29bd265c9baf8 100644 --- a/interface/web/admin/templates/server_config_rescue_edit.htm +++ b/interface/web/admin/templates/server_config_rescue_edit.htm @@ -36,8 +36,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm index 3cb6848164e66c4cce70bebbfb38300f5b0e6abd..54fba4943d573ae9d472b22903dba618fbd3ca02 100644 --- a/interface/web/admin/templates/server_config_server_edit.htm +++ b/interface/web/admin/templates/server_config_server_edit.htm @@ -59,8 +59,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_ufw_edit.htm b/interface/web/admin/templates/server_config_ufw_edit.htm index e0a1ded29df3d054e9cbd9aeba2fc6a6957a3cdc..12a94aee18da578a70788e365bcb99cb819dc19b 100644 --- a/interface/web/admin/templates/server_config_ufw_edit.htm +++ b/interface/web/admin/templates/server_config_ufw_edit.htm @@ -58,8 +58,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_vlogger_edit.htm b/interface/web/admin/templates/server_config_vlogger_edit.htm index c960fb131aa620e97134721202eca1d4f8556587..9f6c02896f6b1a58a0ce5965a657985957bb6b2b 100644 --- a/interface/web/admin/templates/server_config_vlogger_edit.htm +++ b/interface/web/admin/templates/server_config_vlogger_edit.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index c0c9b3b963778968925170ad7f31669d2ef40795..7ff0c06112b026906166de100c6132c3f2981e04 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -217,8 +217,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_edit_config.htm b/interface/web/admin/templates/server_edit_config.htm index e5e23924112b6971b6f27609a3869e442e372d8a..d6ad468b5f293c07365612b4a328ef8fa2b36016 100644 --- a/interface/web/admin/templates/server_edit_config.htm +++ b/interface/web/admin/templates/server_edit_config.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm index f6e47323c29a8fedefa4e6b2b4077eb140638dad..595f16d5d2bffbf5271db39979a3a00fd728eb00 100644 --- a/interface/web/admin/templates/server_edit_services.htm +++ b/interface/web/admin/templates/server_edit_services.htm @@ -62,8 +62,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_ip_edit.htm b/interface/web/admin/templates/server_ip_edit.htm index 35718ceed855cfeae73f8a9da6e11b4e6e8feee6..09055c40d2c89527344d271ea372defe92229396 100644 --- a/interface/web/admin/templates/server_ip_edit.htm +++ b/interface/web/admin/templates/server_ip_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm index c82e9a334fc86770b3acdc830cc7e9108019f4e6..eef98aadd89e5c57be01dc5a31bc8a3e1aca3862 100644 --- a/interface/web/admin/templates/server_ip_list.htm +++ b/interface/web/admin/templates/server_ip_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -33,19 +33,19 @@ - + - {tmpl_var name="server_id"} - {tmpl_var name="client_id"} - {tmpl_var name="ip_type"} - {tmpl_var name="ip_address"} - {tmpl_var name="virtualhost"} - {tmpl_var name="virtualhost_port"} + {tmpl_var name="server_id"} + {tmpl_var name="client_id"} + {tmpl_var name="ip_type"} + {tmpl_var name="ip_address"} + {tmpl_var name="virtualhost"} + {tmpl_var name="virtualhost_port"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm index fd2da095cba386c222e2bb7c205a406e06902614..413ce4642b731309b179f2204dc28f8168ab9f02 100644 --- a/interface/web/admin/templates/server_list.htm +++ b/interface/web/admin/templates/server_list.htm @@ -26,14 +26,14 @@ - + - {tmpl_var name="server_name"} + {tmpl_var name="server_name"} {tmpl_var name="mail_server"} {tmpl_var name="web_server"} {tmpl_var name="dns_server"} diff --git a/interface/web/admin/templates/server_php_fastcgi_edit.htm b/interface/web/admin/templates/server_php_fastcgi_edit.htm index 21eba026782bec03873a441a04672db51577a813..bfc2978a3e5db5d6472145201d1506c4c1bbd56e 100644 --- a/interface/web/admin/templates/server_php_fastcgi_edit.htm +++ b/interface/web/admin/templates/server_php_fastcgi_edit.htm @@ -18,8 +18,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_php_fpm_edit.htm b/interface/web/admin/templates/server_php_fpm_edit.htm index 92cd4a88ba2c54b60b65d0a8725fe6ca33c157a3..869af3c481dcbf6342cc99bd13edd9e9dd5202bf 100644 --- a/interface/web/admin/templates/server_php_fpm_edit.htm +++ b/interface/web/admin/templates/server_php_fpm_edit.htm @@ -22,8 +22,8 @@
- - + +
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm index f41ff2635551bdbed578d91c8c79423defda22ac..f8c67558d21b2bb439ba3da2d8dd422968f279c9 100644 --- a/interface/web/admin/templates/server_php_list.htm +++ b/interface/web/admin/templates/server_php_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -27,16 +27,16 @@ - + - {tmpl_var name="server_id"} - {tmpl_var name="client_id"} - {tmpl_var name="name"} + {tmpl_var name="server_id"} + {tmpl_var name="client_id"} + {tmpl_var name="name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/server_php_name_edit.htm b/interface/web/admin/templates/server_php_name_edit.htm index d9e88ff1927e0b0224491e98eb8aab770c466826..c1e02a10ed65cd8ac4c35fcad07d02033cccdc31 100644 --- a/interface/web/admin/templates/server_php_name_edit.htm +++ b/interface/web/admin/templates/server_php_name_edit.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/admin/templates/software_package_install.htm b/interface/web/admin/templates/software_package_install.htm index 1d2d4de95b271483dce5bee91dc1dc4e098e5da4..3c2814439ae46f68d05c6834f2c773c1233cfc14 100644 --- a/interface/web/admin/templates/software_package_install.htm +++ b/interface/web/admin/templates/software_package_install.htm @@ -21,8 +21,8 @@

 

- - + +
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm index f9e1a25b09f3661f0f5ae9b531da1119f04e092f..8fc0973310beee7b4b56fb2a1878abc2eaba64a4 100644 --- a/interface/web/admin/templates/software_package_list.htm +++ b/interface/web/admin/templates/software_package_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
diff --git a/interface/web/admin/templates/software_repo_edit.htm b/interface/web/admin/templates/software_repo_edit.htm index bd8b2305222ad80a3118c2b94cb0760da9583fd8..fc5c38d9a45602e2fa3f15dd171a8f51d95aab60 100644 --- a/interface/web/admin/templates/software_repo_edit.htm +++ b/interface/web/admin/templates/software_repo_edit.htm @@ -32,8 +32,8 @@
- - + +
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm index 66aa396633e6290992d7fe99d8ae8d1304187301..466e8f8eda9b47004e2e3c6f9edff20646963d2e 100644 --- a/interface/web/admin/templates/software_repo_list.htm +++ b/interface/web/admin/templates/software_repo_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="repo_name"} - {tmpl_var name="repo_url"} + {tmpl_var name="active"} + {tmpl_var name="repo_name"} + {tmpl_var name="repo_url"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/system_config_domains_edit.htm b/interface/web/admin/templates/system_config_domains_edit.htm index 605587900df6f1c0a01a3a8e36219c5940d80b63..748729d91135b5e1963f0e8ee57d8ffa5a90df18 100644 --- a/interface/web/admin/templates/system_config_domains_edit.htm +++ b/interface/web/admin/templates/system_config_domains_edit.htm @@ -25,8 +25,8 @@
- - + +
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm index 013c39ae069be0130107f897894b8ea3fa7a310f..91fcc1f7c90e1b5476f9a276d2414e20be5e4ef3 100644 --- a/interface/web/admin/templates/system_config_mail_edit.htm +++ b/interface/web/admin/templates/system_config_mail_edit.htm @@ -72,8 +72,8 @@
- - + +
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm index dfb19eb5b7259444fc63a69cf024d3a975768a8a..3bdd72ee908f1c3a8c95cfbf7d765aab15dcfa29 100644 --- a/interface/web/admin/templates/system_config_misc_edit.htm +++ b/interface/web/admin/templates/system_config_misc_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index 121d607a38def87f3eafcb37df68596a22fdae93..ba1796fcdd5d4ddeb287c8a4395fca0e1274f268 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -50,8 +50,8 @@
- - + +
diff --git a/interface/web/admin/templates/tpl_default_basic.htm b/interface/web/admin/templates/tpl_default_basic.htm index f6a63716c3c8b03d796dc05013eb40e57fbd6936..a52533165d067444bd23318e2dccad24af2a92d0 100644 --- a/interface/web/admin/templates/tpl_default_basic.htm +++ b/interface/web/admin/templates/tpl_default_basic.htm @@ -15,8 +15,8 @@
- - + +
diff --git a/interface/web/admin/templates/users_groups_edit.htm b/interface/web/admin/templates/users_groups_edit.htm index cb52ae32b5207b18380d782fe0f2afe490093db5..3d3644dba2db9fa907bf14a22a85a3c0a79daa75 100644 --- a/interface/web/admin/templates/users_groups_edit.htm +++ b/interface/web/admin/templates/users_groups_edit.htm @@ -22,8 +22,8 @@
- - + +
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index 1b824866b7eb7444f80e57ff7fb0eeba08200a4d..e67050c857c9ec362a2bf2d62c66ac2a01022afb 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-

@@ -31,16 +31,16 @@ - + - {tmpl_var name="client_id"} - {tmpl_var name="active"} -
{tmpl_var name="typ"}
{tmpl_var name="username"}
+ {tmpl_var name="client_id"} + {tmpl_var name="active"} +
{tmpl_var name="typ"}
{tmpl_var name="username"}
{tmpl_var name="groups"} diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm index 4abe7935881e9deff47dc7ceff0ed47ed6ed6fcb..186322e43cc5e74ec66c9d14197c0bdfcadd6d97 100644 --- a/interface/web/admin/templates/users_user_edit.htm +++ b/interface/web/admin/templates/users_user_edit.htm @@ -11,7 +11,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -65,8 +65,8 @@
- - + +
diff --git a/interface/web/client/templates/client_circle_edit.htm b/interface/web/client/templates/client_circle_edit.htm index 1616dd4773bf235fe0eaf5761c5f4a6d6027f20b..95c5f32698af6d22eeb18508bc6501181ebcfee8 100644 --- a/interface/web/client/templates/client_circle_edit.htm +++ b/interface/web/client/templates/client_circle_edit.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm index 08a8148ef5c36a171209dcecbc8d731e9a9520c8..c7869d3b5f1f0fea4b8aa54f870f04a546c560b3 100644 --- a/interface/web/client/templates/client_circle_list.htm +++ b/interface/web/client/templates/client_circle_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="circle_id"} - {tmpl_var name="active"} - {tmpl_var name="circle_name"} - {tmpl_var name="description"} + {tmpl_var name="circle_id"} + {tmpl_var name="active"} + {tmpl_var name="circle_name"} + {tmpl_var name="description"} {tmpl_var name='delete_txt'} diff --git a/interface/web/client/templates/client_del.htm b/interface/web/client/templates/client_del.htm index aeb206f1078adad74843c522d08bd2fe04586210..ff254881c5e6ed614fb63793143dd114c8b1d86e 100644 --- a/interface/web/client/templates/client_del.htm +++ b/interface/web/client/templates/client_del.htm @@ -17,8 +17,8 @@
- - + +
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm index 076f4b021f86b97f2cc7eb5c14391fa3b8669ab3..c03827e9f15ebb778b18bc6c0f145d53a8a04917 100644 --- a/interface/web/client/templates/client_edit_address.htm +++ b/interface/web/client/templates/client_edit_address.htm @@ -23,7 +23,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -132,8 +132,8 @@
- - + +
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 83928dd7fac4838b3579e6cd8c6a41bcecdbc9d3..4aae4739c00b32d7e2a9223baaadbd0de34d3f84 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -7,8 +7,8 @@
{tmpl_var name="toolsarea_head_txt"}
- - + +
@@ -283,8 +283,8 @@
- - + +
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm index 20afdb111244204a5012252a7d3d0877141ae87c..6cff7105c4b8d0686a8b79ba739e8a294e41771b 100644 --- a/interface/web/client/templates/client_message.htm +++ b/interface/web/client/templates/client_message.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm index 91f9bd52d94c57dbf1a1be54d02f5dd008722138..e7b28f17dd8f81a746e0dcaf948244251d72a233 100644 --- a/interface/web/client/templates/client_template_edit_limits.htm +++ b/interface/web/client/templates/client_template_edit_limits.htm @@ -222,8 +222,8 @@
- - + +
diff --git a/interface/web/client/templates/client_template_edit_template.htm b/interface/web/client/templates/client_template_edit_template.htm index 232fa55fa7baa0d3e13e78a94de0bc4d8e1b80d5..79ea1094af020ba40993d6a3f417c61adb2a7826 100644 --- a/interface/web/client/templates/client_template_edit_template.htm +++ b/interface/web/client/templates/client_template_edit_template.htm @@ -20,8 +20,8 @@
- - + +
diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm index 81d93fd9b22c11591815833e7c8cbd4efebede9e..a760a17d3d62a752fff248eeaf9ed3c71b9368a8 100644 --- a/interface/web/client/templates/client_template_list.htm +++ b/interface/web/client/templates/client_template_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="template_id"} - {tmpl_var name="template_type"} - {tmpl_var name="template_name"} + {tmpl_var name="template_id"} + {tmpl_var name="template_type"} + {tmpl_var name="template_name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index cc948ce2f4c91271df2d0916df3a1c7b927fa395..718376559890b838e74b18fcd50a335397165ec8 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -34,18 +34,18 @@ - + - {tmpl_var name="client_id"} - {tmpl_var name="company_name"} - {tmpl_var name="contact_name"} - {tmpl_var name="username"} - {tmpl_var name="city"} + {tmpl_var name="client_id"} + {tmpl_var name="company_name"} + {tmpl_var name="contact_name"} + {tmpl_var name="username"} + {tmpl_var name="city"}
{tmpl_var name="country"}
diff --git a/interface/web/client/templates/domain_edit.htm b/interface/web/client/templates/domain_edit.htm index 5a6bef39654c95df1fd796d53769601f28b021ed..03f3aaf2ff81e637c7e07dc404b197e0620886d5 100644 --- a/interface/web/client/templates/domain_edit.htm +++ b/interface/web/client/templates/domain_edit.htm @@ -32,8 +32,8 @@
- - + +
diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm index 3f45632a555b4f2ada76856501a63bead775aa59..ef52ffc472c71c75a5f97c6ffffcfc6c34eb58b5 100644 --- a/interface/web/client/templates/domain_list.htm +++ b/interface/web/client/templates/domain_list.htm @@ -7,11 +7,11 @@
{tmpl_var name="toolsarea_head_txt"}
- - @@ -31,14 +31,14 @@ - + - {tmpl_var name="domain"} - {tmpl_var name="sys_groupid"} + {tmpl_var name="domain"} + {tmpl_var name="sys_groupid"} {tmpl_var name='delete_txt'} diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm index d58ee93b7ea03073bacc060ff6ca4d9a6cb006a2..ac6df07424f449d3b4a8376da8bbb53ef6f218e9 100644 --- a/interface/web/client/templates/reseller_edit_address.htm +++ b/interface/web/client/templates/reseller_edit_address.htm @@ -23,7 +23,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -108,8 +108,8 @@
- - + +
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm index 621dfa2b3b4abd5ba3db0558e490ab284e97d6a2..4c4b06f96212defc4047b86943eca813d9568d07 100644 --- a/interface/web/client/templates/reseller_edit_limits.htm +++ b/interface/web/client/templates/reseller_edit_limits.htm @@ -271,8 +271,8 @@
- - + +
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm index f5e1726d12aa6e852c9a4bec92c023c8433c7a3b..c1880577a8054505a3da43bc0bebd012e75fec8e 100644 --- a/interface/web/client/templates/resellers_list.htm +++ b/interface/web/client/templates/resellers_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,17 +32,17 @@ - + - {tmpl_var name="client_id"} - {tmpl_var name="company_name"} - {tmpl_var name="contact_name"} - {tmpl_var name="city"} + {tmpl_var name="client_id"} + {tmpl_var name="company_name"} + {tmpl_var name="contact_name"} + {tmpl_var name="city"}
{tmpl_var name="country"}
{tmpl_var name='login_as_txt'} diff --git a/interface/web/designer/form_show.php b/interface/web/designer/form_show.php index 77bb080a1ea894d514023477190c298ac010c5d6..4cb805668ee79192337476fe84ff3422632b20fb 100644 --- a/interface/web/designer/form_show.php +++ b/interface/web/designer/form_show.php @@ -72,11 +72,11 @@ foreach($tabs as $tab_id => $tab) { $tab[title] - - - - - + + + + + "; //$content .= "Bereich:\r\n"; @@ -87,10 +87,10 @@ foreach($tabs as $tab_id => $tab) { $content .= " $field_id - - - - + + + + "; $n2++; diff --git a/interface/web/designer/module_show.php b/interface/web/designer/module_show.php index 44548784d36d3d2588ebeba54a2e3fc6e87c782e..504d313d5b695a7a6ae51108ff45dbf3ffe186a9 100644 --- a/interface/web/designer/module_show.php +++ b/interface/web/designer/module_show.php @@ -66,11 +66,11 @@ foreach($navi as $nav_id => $section) { $section[title] -
-
-
-
-
+
+
+
+
+
"; //$content .= "Bereich:\r\n"; @@ -81,10 +81,10 @@ foreach($navi as $nav_id => $section) { $content .= " $item[title] -
-
-
-
+
+
+
+
"; $n2++; diff --git a/interface/web/designer/templates/form_edit.htm b/interface/web/designer/templates/form_edit.htm index 38a28c4aa3006220f7a8a90c37776142896b4555..72cb0a44294c1764d378859c6be645cd0e94926a 100644 --- a/interface/web/designer/templates/form_edit.htm +++ b/interface/web/designer/templates/form_edit.htm @@ -70,7 +70,7 @@   - + diff --git a/interface/web/designer/templates/form_show.htm b/interface/web/designer/templates/form_show.htm index 2a3eff4ea5b50b66b39a1974dee006518c847b49..e8db5efd88cff95c70e26aa9006d3f04a3b09c5c 100644 --- a/interface/web/designer/templates/form_show.htm +++ b/interface/web/designer/templates/form_show.htm @@ -43,9 +43,9 @@ function del_menuitem(link) { - - - + + +
diff --git a/interface/web/designer/templates/module_edit.htm b/interface/web/designer/templates/module_edit.htm index 2cd48a9ea7a495355c27b75e15ba13c5f168f23e..e6e5b113b22e759573eccefda60007c42787a774 100644 --- a/interface/web/designer/templates/module_edit.htm +++ b/interface/web/designer/templates/module_edit.htm @@ -29,8 +29,8 @@   -
-
+
+
diff --git a/interface/web/designer/templates/module_nav_edit.htm b/interface/web/designer/templates/module_nav_edit.htm index 3b2007af840ed1f52bb6e9b8cc415aaff854bdb0..fe925ddce4790a5a665bb1436abfbeb058104d0a 100644 --- a/interface/web/designer/templates/module_nav_edit.htm +++ b/interface/web/designer/templates/module_nav_edit.htm @@ -9,8 +9,8 @@   -
-
+
+
diff --git a/interface/web/designer/templates/module_nav_item_edit.htm b/interface/web/designer/templates/module_nav_item_edit.htm index 0aee2ca65fa7eb5e69831b48b535bd3248ca0041..3a52daeb253c7c6fe02d66bd63f985ba0c6ea268 100644 --- a/interface/web/designer/templates/module_nav_item_edit.htm +++ b/interface/web/designer/templates/module_nav_item_edit.htm @@ -17,8 +17,8 @@   -
-
+
+
diff --git a/interface/web/designer/templates/module_show.htm b/interface/web/designer/templates/module_show.htm index ffdfe9bb8abf28c70a79e20e85026b0e864c8ec6..24694b4b6049db807202dd09d351e774a250ea88 100644 --- a/interface/web/designer/templates/module_show.htm +++ b/interface/web/designer/templates/module_show.htm @@ -14,9 +14,9 @@ -
-
-
+
+
+
diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm index cce1af60521150bd3abc66659ad004b64d4adec4..410d0103a13057326e46ca681d687e1274d30cfa 100644 --- a/interface/web/dns/templates/dns_a_edit.htm +++ b/interface/web/dns/templates/dns_a_edit.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 4be690d5d64a5d175b333528e987ace53409f8ee..d1fcc5cc45a818b619ad556b9237730d533d628b 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -1,17 +1,17 @@ c
{tmpl_var name="toolsarea_head_txt"}
- - - - - - - - - - - + + + + + + + + + + +
@@ -44,12 +44,12 @@ c
- {tmpl_var name="active"} - {tmpl_var name="type"} - {tmpl_var name="name"} - {tmpl_var name="data"} - {tmpl_var name="aux"} - {tmpl_var name="ttl"} + {tmpl_var name="active"} + {tmpl_var name="type"} + {tmpl_var name="name"} + {tmpl_var name="data"} + {tmpl_var name="aux"} + {tmpl_var name="ttl"} {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_aaaa_edit.htm b/interface/web/dns/templates/dns_aaaa_edit.htm index fdea8270c78e6cfe671947992611fcc4c0b17204..44beefc909f7a7e4ac5a3c892872a7aab81d2fa1 100644 --- a/interface/web/dns/templates/dns_aaaa_edit.htm +++ b/interface/web/dns/templates/dns_aaaa_edit.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_alias_edit.htm b/interface/web/dns/templates/dns_alias_edit.htm index 2c859c7a059a9f6a90ed1cac4ab79b85327bc0bc..517df750e86ba523bfddfbef703f376b201ee18c 100644 --- a/interface/web/dns/templates/dns_alias_edit.htm +++ b/interface/web/dns/templates/dns_alias_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_cname_edit.htm b/interface/web/dns/templates/dns_cname_edit.htm index 5cf86c589fbbb5b843f05244249a9266a171671a..50212131f1dfa22adb88d2d2f3a0ee7d20209724 100644 --- a/interface/web/dns/templates/dns_cname_edit.htm +++ b/interface/web/dns/templates/dns_cname_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_hinfo_edit.htm b/interface/web/dns/templates/dns_hinfo_edit.htm index 1651bcc7d1bb8e4fe79f471f2831324447419b2b..0a9e0282f48ab37161373e82d6d4c019a394d628 100644 --- a/interface/web/dns/templates/dns_hinfo_edit.htm +++ b/interface/web/dns/templates/dns_hinfo_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm index 7f462ab62a9fe41fc2b3c4ee5507413f15c8a74f..af6a6e0a6ba497475bfe747c8832227ba7415f3b 100644 --- a/interface/web/dns/templates/dns_import.htm +++ b/interface/web/dns/templates/dns_import.htm @@ -38,8 +38,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_mx_edit.htm b/interface/web/dns/templates/dns_mx_edit.htm index e986efb777a4575ea1c761a5ca3910789aab6060..64b2c1291f8d6a28c4a3b5fb0467d71b679390f1 100644 --- a/interface/web/dns/templates/dns_mx_edit.htm +++ b/interface/web/dns/templates/dns_mx_edit.htm @@ -34,8 +34,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_ns_edit.htm b/interface/web/dns/templates/dns_ns_edit.htm index 9efd881a902e081126f87ae673ed05890785458b..3c5ee5904a0ab5bc507259c730489fe32a351e4c 100644 --- a/interface/web/dns/templates/dns_ns_edit.htm +++ b/interface/web/dns/templates/dns_ns_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_ptr_edit.htm b/interface/web/dns/templates/dns_ptr_edit.htm index 5d8cf1fdbe1814a3361b162df1bfe662b4e08457..86b96e9444d82c1cd4c63e5c8f76fcd2787beb3c 100644 --- a/interface/web/dns/templates/dns_ptr_edit.htm +++ b/interface/web/dns/templates/dns_ptr_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_rp_edit.htm b/interface/web/dns/templates/dns_rp_edit.htm index 86697cfed6f2ca7467768b47c3fb79a5312e3517..df9456fc0db4db332c13ca8ad8ac4a1c8565cd1f 100644 --- a/interface/web/dns/templates/dns_rp_edit.htm +++ b/interface/web/dns/templates/dns_rp_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm index b6dea70f9cdd873b2ca50c1f8bd63d58f95142cb..8aa9b03a5550091750cd0f579e537b96e19f6d10 100644 --- a/interface/web/dns/templates/dns_slave_edit.htm +++ b/interface/web/dns/templates/dns_slave_edit.htm @@ -61,8 +61,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm index 730b13ae3bef056f00d43d98dfc0346776c63424..1c7046b817138dd40d2e16d107f5f56e6b4cbc91 100644 --- a/interface/web/dns/templates/dns_slave_list.htm +++ b/interface/web/dns/templates/dns_slave_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="origin"} - {tmpl_var name="ns"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="origin"} + {tmpl_var name="ns"} {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm index 386a2ab6aee1909bd9ad1fb949d90af37535f3cc..20a97cf383425ebb706f664d90c642f2d984cca5 100644 --- a/interface/web/dns/templates/dns_soa_edit.htm +++ b/interface/web/dns/templates/dns_soa_edit.htm @@ -95,8 +95,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm index 980b002fdd3b39936e8b123b39fbb0511c577a3a..d70f76aa469b7a31659b2e6da024ea17b21e3e0b 100644 --- a/interface/web/dns/templates/dns_soa_list.htm +++ b/interface/web/dns/templates/dns_soa_list.htm @@ -6,9 +6,9 @@
{tmpl_var name="toolsarea_head_txt"}
- - - + + +
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="origin"} - {tmpl_var name="ns"} - {tmpl_var name="mbox"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="origin"} + {tmpl_var name="ns"} + {tmpl_var name="mbox"} {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_srv_edit.htm b/interface/web/dns/templates/dns_srv_edit.htm index fbcf10db9d4eccbedeb16f219d9dd3fc923c0754..b50abe6dcf4ff071e64cc00cdf2dfe4b41f15221 100644 --- a/interface/web/dns/templates/dns_srv_edit.htm +++ b/interface/web/dns/templates/dns_srv_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_template_edit.htm b/interface/web/dns/templates/dns_template_edit.htm index b18d84a691d1c52cba2a16dd18ba563c9bbef7d2..36ab9e05ba59ff1612c1fc1b9633595f7f09be6d 100644 --- a/interface/web/dns/templates/dns_template_edit.htm +++ b/interface/web/dns/templates/dns_template_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm index 87b28387e29ba4d29c4ba95523763de4bf2e5665..a7ecf410cdf6347b3eaab9f2a4899a21c9a94c60 100644 --- a/interface/web/dns/templates/dns_template_list.htm +++ b/interface/web/dns/templates/dns_template_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -26,15 +26,15 @@ - + - {tmpl_var name="visible"} - {tmpl_var name="name"} + {tmpl_var name="visible"} + {tmpl_var name="name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/dns/templates/dns_txt_edit.htm b/interface/web/dns/templates/dns_txt_edit.htm index 0450fc865f689c4d917b2b93c117946d028cdcdb..7884a86bd6b8174f039a5401d7c0a0b63b88ed8c 100644 --- a/interface/web/dns/templates/dns_txt_edit.htm +++ b/interface/web/dns/templates/dns_txt_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm index 51d9b76147c398f10a18112a50c414c1951c59b1..849c5b4e15fdf8a0306bd228bcb3f9374630092c 100644 --- a/interface/web/dns/templates/dns_wizard.htm +++ b/interface/web/dns/templates/dns_wizard.htm @@ -72,8 +72,8 @@
- - + +
diff --git a/interface/web/help/templates/faq_edit.htm b/interface/web/help/templates/faq_edit.htm index 6513f95508367fa274c7c3b203533ff375dd43ce..dc353589de5ccf9a0e1766d2d762f6524e051cd5 100644 --- a/interface/web/help/templates/faq_edit.htm +++ b/interface/web/help/templates/faq_edit.htm @@ -21,8 +21,8 @@
- - + +
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm index ad5d1f8faa5b8539e247227c2accef557383ab9a..809ce84a26f598b8ef996339e8fc4f0e456bd3bc 100644 --- a/interface/web/help/templates/faq_manage_questions_list.htm +++ b/interface/web/help/templates/faq_manage_questions_list.htm @@ -30,7 +30,7 @@ {tmpl_var name="faq_delete_txt"} - {tmpl_var name="faq_edit_txt"} + {tmpl_var name="faq_edit_txt"} diff --git a/interface/web/help/templates/faq_sections_edit.htm b/interface/web/help/templates/faq_sections_edit.htm index 181364bdc2478b15928ea53e9420c4a3a9153f49..0597c14b9318be6cc0e026e1bda4fefacb225674 100644 --- a/interface/web/help/templates/faq_sections_edit.htm +++ b/interface/web/help/templates/faq_sections_edit.htm @@ -11,8 +11,8 @@
- - + +
diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm index 436f515597190d7d66a5d35f83ae373ee977d618..298874654ba88d522c253cdb1018bc1a20e205e4 100644 --- a/interface/web/help/templates/help_faq_list.htm +++ b/interface/web/help/templates/help_faq_list.htm @@ -6,7 +6,7 @@

Delete - {tmpl_var name="edit_txt"} + {tmpl_var name="edit_txt"}


diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm index 8f1db6ea4991ade6bd2ffed8ba68604142d3d5a7..39b2b4000fd5497bb332cad2e14b336105fdaadd 100644 --- a/interface/web/help/templates/help_faq_sections_list.htm +++ b/interface/web/help/templates/help_faq_sections_list.htm @@ -30,7 +30,7 @@ {tmpl_var name="faq_delete_txt"} - {tmpl_var name="faq_edit_txt"} + {tmpl_var name="faq_edit_txt"} diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm index 06c17977fa4ec2ba1b43139fbf6ed75ce3ba9632..a7c26475749df7f233a7d352b59da3431693e796 100644 --- a/interface/web/help/templates/support_message_edit.htm +++ b/interface/web/help/templates/support_message_edit.htm @@ -25,8 +25,8 @@
- - + +
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm index 6a7d6d640e7a898c53cd7e99707aa0b0b5bc3889..1c111fc06d0c7824fefd775f9d2136b29d609aca 100644 --- a/interface/web/help/templates/support_message_list.htm +++ b/interface/web/help/templates/support_message_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -26,15 +26,15 @@ - + - {tmpl_var name="sender_id"} - {tmpl_var name="subject"} + {tmpl_var name="sender_id"} + {tmpl_var name="subject"} {tmpl_var name='delete_txt'} diff --git a/interface/web/help/templates/support_message_view.htm b/interface/web/help/templates/support_message_view.htm index 62f2736ec94d686e31defc7ac0191b647c30be8e..e671ef702fae03c8e9cdaba81e24dc8db1d7496f 100644 --- a/interface/web/help/templates/support_message_view.htm +++ b/interface/web/help/templates/support_message_view.htm @@ -15,7 +15,7 @@
- +
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 41461275b69b18dc760cc476f52f4327b3311f5f..6be0225d342142aa497fd86f62eadccad906228e 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -269,7 +269,7 @@ function loadInitContent() { function setFocus() { try { - document.pageForm.username.focus(); + jQuery('form#pageForm').find('input[name="username"]').focus(); } catch (e) { } } @@ -601,6 +601,8 @@ function generatePassword(passwordFieldID, repeatPasswordFieldID){ newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup'); } +var funcDisableClick = function(e) { e.preventDefault(); return false; }; + function checkPassMatch(pwField1,pwField2){ var rpass = jQuery('#'+pwField2).val(); var npass = jQuery('#'+pwField1).val(); @@ -608,13 +610,22 @@ function checkPassMatch(pwField1,pwField2){ jQuery('#confirmpasswordOK').hide(); jQuery('#confirmpasswordError').show(); jQuery('button.positive').attr('disabled','disabled'); - jQuery('.tabbox_tabs ul li a').attr('onclick','return false;'); + jQuery('.tabbox_tabs ul li a').each(function() { + var $this = $(this); + $this.data('saved_onclick', $this.attr('onclick')); + $this.removeAttr('onclick'); + $this.click(funcDisableClick); + }); return false; } else { jQuery('#confirmpasswordError').hide(); jQuery('#confirmpasswordOK').show(); jQuery('button.positive').removeAttr('disabled'); - jQuery('.tabbox_tabs ul li a').removeAttr('onclick'); + jQuery('.tabbox_tabs ul li a').each(function() { + var $this = $(this); + $this.unbind('click', funcDisableClick); + if($this.data('saved_onclick') && !$this.attr('onclick')) $this.attr('onclick', $this.data('saved_onclick')); + }); } } diff --git a/interface/web/login/logout.php b/interface/web/login/logout.php index 53dc933022c59bbf2b9677b96e26771f41e15896..c56b73dec66037ddc04ccaae0a77f408e3bb2551 100644 --- a/interface/web/login/logout.php +++ b/interface/web/login/logout.php @@ -52,8 +52,8 @@ if ((isset($_SESSION['s_old']) && ($_SESSION['s_old']['user']['typ'] == 'admin')
- - + +
'; exit; diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm index e977e058829af741a2cf94700ebeb1f880338c50..dff5b41e98a92d8fb002f24de99ea3fdd25cd390 100644 --- a/interface/web/login/templates/index.htm +++ b/interface/web/login/templates/index.htm @@ -26,7 +26,7 @@
- +
diff --git a/interface/web/login/templates/password_reset.htm b/interface/web/login/templates/password_reset.htm index d6007e67be0d1da048be4d6735be293149509447..a4ab3113e5be260c0f7b76e3294e058b862a9503 100644 --- a/interface/web/login/templates/password_reset.htm +++ b/interface/web/login/templates/password_reset.htm @@ -26,7 +26,7 @@
- +
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm index 0aa550f9aae3b474f8bcd7d184bb8604d37f0174..c2a6e95ab7aa142a1df4d3f3970b86a0c33d6e36 100644 --- a/interface/web/mail/templates/mail_alias_edit.htm +++ b/interface/web/mail/templates/mail_alias_edit.htm @@ -31,8 +31,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm index b6935a75a55362dc56f929d37c225489612e6119..5761b50e3e2986a9e80ab3be9f66019ce0e7457b 100644 --- a/interface/web/mail/templates/mail_alias_list.htm +++ b/interface/web/mail/templates/mail_alias_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="source"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="source"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_aliasdomain_edit.htm b/interface/web/mail/templates/mail_aliasdomain_edit.htm index c41121b7bd736d78c92af6e25b4a92e331de5964..21ca7c740862f8efe7642f58819daa7ce1b260db 100644 --- a/interface/web/mail/templates/mail_aliasdomain_edit.htm +++ b/interface/web/mail/templates/mail_aliasdomain_edit.htm @@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm index 5303a78b43dcc9a9527232365c28039774f7579a..8adc9f38af2fcdce2295fcfb6fd3b14bd9a22cab 100644 --- a/interface/web/mail/templates/mail_aliasdomain_list.htm +++ b/interface/web/mail/templates/mail_aliasdomain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="source"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="source"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_blacklist_edit.htm b/interface/web/mail/templates/mail_blacklist_edit.htm index 493e88b90aa6e610438aeae6bf678e524ab1ca43..fcd5bf6e52dea3f2d3311e3b50b58a1a72308060 100644 --- a/interface/web/mail/templates/mail_blacklist_edit.htm +++ b/interface/web/mail/templates/mail_blacklist_edit.htm @@ -33,8 +33,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm index cb410099a57aaf1cd17f76da57ac4e9278af5dcc..fc5f3ac0d4ec44277453c2cd9202bc3fae61e88e 100644 --- a/interface/web/mail/templates/mail_blacklist_list.htm +++ b/interface/web/mail/templates/mail_blacklist_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="source"} - {tmpl_var name="type"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="source"} + {tmpl_var name="type"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_content_filter_edit.htm b/interface/web/mail/templates/mail_content_filter_edit.htm index 8dc53e16ab8193713a4324f9dc920c6d1edcf28a..0caf697425877b056cf1a57d83ac04d5bb61d251 100644 --- a/interface/web/mail/templates/mail_content_filter_edit.htm +++ b/interface/web/mail/templates/mail_content_filter_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm index c55d9990abe12a5ca97c1baa824de81f6021d3f1..9109884f570e4e3fe0836c3cf468b8207561db29 100644 --- a/interface/web/mail/templates/mail_content_filter_list.htm +++ b/interface/web/mail/templates/mail_content_filter_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="pattern"} - {tmpl_var name="action"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="pattern"} + {tmpl_var name="action"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm index 7fae59575e4dfdb405502596239267d6d9ee6ba3..88ef5326806baff74d7280b26d41603e11030b53 100644 --- a/interface/web/mail/templates/mail_domain_admin_list.htm +++ b/interface/web/mail/templates/mail_domain_admin_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -29,17 +29,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="sys_groupid"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="sys_groupid"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm index b6b9223fcf5d5994811a15fd34a14ca8af4433bb..fc64b66f4253c0f2dcc4f201ba243559bae666b3 100644 --- a/interface/web/mail/templates/mail_domain_catchall_edit.htm +++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm @@ -28,8 +28,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm index 1800917bc30385399cbb4f87bcb5562b5aa1eeff..e9732f56cd73187ccf496819f3bbdbf8fb699491 100644 --- a/interface/web/mail/templates/mail_domain_catchall_list.htm +++ b/interface/web/mail/templates/mail_domain_catchall_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="source"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="source"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm index b84e2d61cba0e79ad73d44a012f28571a7df83b3..5a1b61379237567ab0a18e278bc0b5e0dc25c535 100644 --- a/interface/web/mail/templates/mail_domain_edit.htm +++ b/interface/web/mail/templates/mail_domain_edit.htm @@ -65,8 +65,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index 0b888bd85179656ea7dd67b182a3de92bc1cf21c..e1dc4bfa61a3bf85d61599ca449319f92e4267c2 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm index d0a85033f645f9bb712df76a6d68422ae3cafdea..5e076dc55937b1fc42279223cb8fb0231afd5654 100644 --- a/interface/web/mail/templates/mail_forward_edit.htm +++ b/interface/web/mail/templates/mail_forward_edit.htm @@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm index 83d1be39790637cec76162270e534c8353024fbf..230880204a17a3a8caa7f0504b40d75347d5d220 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -28,16 +28,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="source"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="source"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm index 1ba3f9e8f1c137a6c19ed839e819b78b23cadc6c..e1cba902696428b75c38446d48eec8343fa6eda5 100644 --- a/interface/web/mail/templates/mail_get_edit.htm +++ b/interface/web/mail/templates/mail_get_edit.htm @@ -52,8 +52,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm index 34b731849eb346ed08dca57eba8bd9ad107fe34a..05f8bbd1009671faa544a3a03d41b11e16102814 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="source_server"} - {tmpl_var name="source_username"} - {tmpl_var name="destination"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="source_server"} + {tmpl_var name="source_username"} + {tmpl_var name="destination"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm index 04964c70e2d080d5a47b3c58bbebb7682af05cb9..6a37951b8362dc563aba28f45dea02125ef9336f 100644 --- a/interface/web/mail/templates/mail_mailinglist_edit.htm +++ b/interface/web/mail/templates/mail_mailinglist_edit.htm @@ -60,7 +60,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -78,8 +78,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm index 0b9e6b9b68ffca8ad9b3d630f8e6f06d42145fe7..05c48d4de6fec78769adb7e798d3a09d348e9c63 100644 --- a/interface/web/mail/templates/mail_mailinglist_list.htm +++ b/interface/web/mail/templates/mail_mailinglist_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -25,15 +25,15 @@ - + - {tmpl_var name="listname"} - {tmpl_var name="domain"} + {tmpl_var name="listname"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_relay_recipient_edit.htm b/interface/web/mail/templates/mail_relay_recipient_edit.htm index 60ac345134b5f351c4495628b8ecee1146ef21d4..0e5999c089533f833db7368e61eb769ce452cfc6 100644 --- a/interface/web/mail/templates/mail_relay_recipient_edit.htm +++ b/interface/web/mail/templates/mail_relay_recipient_edit.htm @@ -27,8 +27,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm index c86e68f2b7810df982ea32f5cbc9cab14e0904da..e5b614b124753f082728acde8d69cac4cdfa7f21 100644 --- a/interface/web/mail/templates/mail_relay_recipient_list.htm +++ b/interface/web/mail/templates/mail_relay_recipient_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -27,16 +27,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="source"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="source"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm index 0bb8dfaf371378f67494296869f536925a55e415..cd1e8c99beb19f8a3818d7405409bf8c9c0d3434 100644 --- a/interface/web/mail/templates/mail_transport_edit.htm +++ b/interface/web/mail/templates/mail_transport_edit.htm @@ -48,8 +48,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm index 70bd71745fa56556ec021430a05aaafd4bbdc029..d7d7e0906478a5c9c3e02b60debb1f96fafcda24 100644 --- a/interface/web/mail/templates/mail_transport_list.htm +++ b/interface/web/mail/templates/mail_transport_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"} - {tmpl_var name="transport"} - {tmpl_var name="sort_order"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"} + {tmpl_var name="transport"} + {tmpl_var name="sort_order"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm index da6edd48df565fc34be9327e5f811dcb7b02291b..4ff8c813e7ba409f3f3880290bb373952ef60a05 100644 --- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm @@ -31,11 +31,11 @@
diff --git a/interface/web/mail/templates/mail_user_custom_rules_edit.htm b/interface/web/mail/templates/mail_user_custom_rules_edit.htm index 78c87ebc046682efa3788644c5818647e596a813..31549df0d73ebb9979e50e9dfe6c91c814ea2bdb 100644 --- a/interface/web/mail/templates/mail_user_custom_rules_edit.htm +++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm index 694b61876562675c14c9a24f649f96349c9bf28e..16ea6fa3cce84aa04f83c54dfa42c8f90707b903 100644 --- a/interface/web/mail/templates/mail_user_filter_edit.htm +++ b/interface/web/mail/templates/mail_user_filter_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm index 8bb8d211115e658591af22c7abd0ee41295cc868..cd10e4dc87707229e149c9747ad6f2e1e49ace8a 100644 --- a/interface/web/mail/templates/mail_user_filter_list.htm +++ b/interface/web/mail/templates/mail_user_filter_list.htm @@ -2,7 +2,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -27,7 +27,7 @@ - {tmpl_var name="rulename"} + {tmpl_var name="rulename"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index 66ff0b0fb01a7eeeee927edcb951173561243b51..553cc816bcf18667859f6643e329b1ce072b200e 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,21 +30,21 @@ - + - {tmpl_var name="email"} + {tmpl_var name="email"} - {tmpl_var name="login"} + {tmpl_var name="login"} - {tmpl_var name="name"} - {tmpl_var name="autoresponder"} + {tmpl_var name="name"} + {tmpl_var name="autoresponder"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm index bb1dd37ba0de44d744a9c8afba2e0c5e4dfa6f9c..2647e249984d8f6e19ee83df0c0dd3f80bac7a5b 100644 --- a/interface/web/mail/templates/mail_user_mailbox_edit.htm +++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm @@ -23,7 +23,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -73,8 +73,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_mailfilter_edit.htm b/interface/web/mail/templates/mail_user_mailfilter_edit.htm index ef053c93677cb5447630e521d4781713f622b44f..3274685fe518ba8c8d6f6f0acb065aef057a4b8a 100644 --- a/interface/web/mail/templates/mail_user_mailfilter_edit.htm +++ b/interface/web/mail/templates/mail_user_mailfilter_edit.htm @@ -18,8 +18,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm index fac9fa9d1dd4610715f05b29059b38bca669d521..973300cc5e73ce640e293482eeddcba44d315b4e 100644 --- a/interface/web/mail/templates/mail_user_stats_list.htm +++ b/interface/web/mail/templates/mail_user_stats_list.htm @@ -22,18 +22,18 @@ - + - {tmpl_var name="email"} - {tmpl_var name="this_month"} MB - {tmpl_var name="last_month"} MB - {tmpl_var name="this_year"} MB - {tmpl_var name="last_year"} MB + {tmpl_var name="email"} + {tmpl_var name="this_month"} MB + {tmpl_var name="last_month"} MB + {tmpl_var name="this_year"} MB + {tmpl_var name="last_year"} MB diff --git a/interface/web/mail/templates/mail_whitelist_edit.htm b/interface/web/mail/templates/mail_whitelist_edit.htm index cf2aeb596b8c45049a07b84beb2e298b33505c15..d36434941ac859770a598c142ce589d08bf05fb8 100644 --- a/interface/web/mail/templates/mail_whitelist_edit.htm +++ b/interface/web/mail/templates/mail_whitelist_edit.htm @@ -33,8 +33,8 @@
- - + +
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm index 043875a0f5ba586fe71ba39c526630038500db02..631052c3023a63ffe1ea80b417c7493456f5195c 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="source"} - {tmpl_var name="type"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="source"} + {tmpl_var name="type"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm index 34c2249d4b78c6950eb2a463dbbacea462fb8228..ae5b3eecbd4981f032f51d336d3424282b37c985 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_edit.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm @@ -41,8 +41,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm index 181c68649866608197696db2630c629aa3798b44..2181b0d48f9068d3c5c7483e91aff2fc15a30174 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="priority"} - {tmpl_var name="rid"} - {tmpl_var name="email"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="priority"} + {tmpl_var name="rid"} + {tmpl_var name="email"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm index 2b3c85a513b4bf3ce74e324a5e66d9a8a3082ceb..4dd0710f400531f3548747784e2da0cf0befd98a 100644 --- a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm index 5f6a28f572e138fc972b92d4a240d471c8382631..cf46159ae300c529bc685b8b78985cb9b952776a 100644 --- a/interface/web/mail/templates/spamfilter_config_list.htm +++ b/interface/web/mail/templates/spamfilter_config_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -24,14 +24,14 @@ - + - {tmpl_var name="server_name"} + {tmpl_var name="server_name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_config_mail_edit.htm b/interface/web/mail/templates/spamfilter_config_mail_edit.htm index 524c9804b0a9dd45863d6c4eae2dd22b0aee66cc..22f5b9fb0aa40c28b2a989881f3a2847e221476a 100644 --- a/interface/web/mail/templates/spamfilter_config_mail_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm @@ -58,8 +58,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_config_server_edit.htm b/interface/web/mail/templates/spamfilter_config_server_edit.htm index 6cdca69f3c90bac069f8786d82d078d69ec11bcb..e91d4a0ead102d73d988d385e6438eaf42eb5645 100644 --- a/interface/web/mail/templates/spamfilter_config_server_edit.htm +++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm index 518be5f47717ff51ff2bfcbd4cd7b1624620f9d9..a25a2e70eb011aa547a271cb9355e83aaab689cd 100644 --- a/interface/web/mail/templates/spamfilter_other_edit.htm +++ b/interface/web/mail/templates/spamfilter_other_edit.htm @@ -72,8 +72,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm index 7279f0a68f87c0c52a971c8b62d5840dcaa6db72..3ed6b83712a02b368ddf87ddf7f94c961b1e29c3 100644 --- a/interface/web/mail/templates/spamfilter_policy_edit.htm +++ b/interface/web/mail/templates/spamfilter_policy_edit.htm @@ -56,8 +56,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm index 653c4bcaed874563fc3a6ea802b85b7b0da83e3c..9dffaa93a9558087ac4f632939fd095259287505 100644 --- a/interface/web/mail/templates/spamfilter_policy_list.htm +++ b/interface/web/mail/templates/spamfilter_policy_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="policy_name"} - {tmpl_var name="virus_lover"} - {tmpl_var name="spam_lover"} - {tmpl_var name="banned_files_lover"} - {tmpl_var name="bad_header_lover"} + {tmpl_var name="policy_name"} + {tmpl_var name="virus_lover"} + {tmpl_var name="spam_lover"} + {tmpl_var name="banned_files_lover"} + {tmpl_var name="bad_header_lover"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_quarantine_edit.htm b/interface/web/mail/templates/spamfilter_quarantine_edit.htm index 98e9c3e4b1f68a0902de121a58451d24a4e78f7e..4a38d7ffb80f810d2e97c73398c87f9aa1b684c8 100644 --- a/interface/web/mail/templates/spamfilter_quarantine_edit.htm +++ b/interface/web/mail/templates/spamfilter_quarantine_edit.htm @@ -36,8 +36,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_taglevel_edit.htm b/interface/web/mail/templates/spamfilter_taglevel_edit.htm index 34577c8794fadb291f9bfb2a60dc2974bec6115b..059ab155b3937e36b283dfc7489bbbdbfed06654 100644 --- a/interface/web/mail/templates/spamfilter_taglevel_edit.htm +++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm @@ -44,8 +44,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_users_edit.htm b/interface/web/mail/templates/spamfilter_users_edit.htm index 7c96208536a6e93790a0e812f71b8f0a52d0d171..52e5945f46a33add0dd8db87ded873fa6b0e6928 100644 --- a/interface/web/mail/templates/spamfilter_users_edit.htm +++ b/interface/web/mail/templates/spamfilter_users_edit.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm index 39c4ef8686346be57c07ba3efca5473d777c2985..92e8821591791e5258adc38e1d7ffa2ee00ff4bc 100644 --- a/interface/web/mail/templates/spamfilter_users_list.htm +++ b/interface/web/mail/templates/spamfilter_users_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="local"} - {tmpl_var name="server_id"} - {tmpl_var name="priority"} - {tmpl_var name="policy_id"} - {tmpl_var name="fullname"} + {tmpl_var name="local"} + {tmpl_var name="server_id"} + {tmpl_var name="priority"} + {tmpl_var name="policy_id"} + {tmpl_var name="fullname"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm index 0d31b7af5c10030f0ece308eda86a5d22ab6ddec..efb70186ff2ffff911b816d18d9638d12eada69d 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_edit.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm @@ -41,8 +41,8 @@
- - + +
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm index 9cb4ba6bbbb83cab53fe962dea51d4bae7433723..9bd30eefe2b9dea0526d8d34595aa59c6224efdf 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_list.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="priority"} - {tmpl_var name="rid"} - {tmpl_var name="email"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="priority"} + {tmpl_var name="rid"} + {tmpl_var name="email"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm index 1f8a9ecc8507f528a3e2c899e94e03ecc87b8044..e9485f0d554e2d0c63f3e26409f9587ef4667bcc 100644 --- a/interface/web/mail/templates/user_quota_stats_list.htm +++ b/interface/web/mail/templates/user_quota_stats_list.htm @@ -19,17 +19,17 @@     - + - {tmpl_var name="email"} - {tmpl_var name="name"} - {tmpl_var name="used"} - {tmpl_var name="quota"} + {tmpl_var name="email"} + {tmpl_var name="name"} + {tmpl_var name="used"} + {tmpl_var name="quota"} diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm index 271fca1035758bac6c97258d5e47c6202ed71ca8..34b7f0d238cf5f0cb5a59407cb9cdf638aff330d 100644 --- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm +++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm @@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/mailuser/templates/mail_user_cc_edit.htm b/interface/web/mailuser/templates/mail_user_cc_edit.htm index 089f82430118f643b6bbd063d27b2a51027a683a..ba715c89ae1569baa7cf0135124d0b186291a9ba 100644 --- a/interface/web/mailuser/templates/mail_user_cc_edit.htm +++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm @@ -18,8 +18,8 @@
- - + +
diff --git a/interface/web/mailuser/templates/mail_user_filter_edit.htm b/interface/web/mailuser/templates/mail_user_filter_edit.htm index a9113c2f65023ce72a958183795316dd32d6b08e..320567742ce9e74559d1a823c111867b24cb80ae 100644 --- a/interface/web/mailuser/templates/mail_user_filter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm @@ -30,8 +30,8 @@
- - + +
diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm index a303d03484106644bc601268d1aabcf457762627..5d252299cfbc5952d688f0254d2ae41370b5c681 100644 --- a/interface/web/mailuser/templates/mail_user_filter_list.htm +++ b/interface/web/mailuser/templates/mail_user_filter_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -23,14 +23,14 @@ - + - {tmpl_var name="rulename"} + {tmpl_var name="rulename"} {tmpl_var name='delete_txt'} diff --git a/interface/web/mailuser/templates/mail_user_password_edit.htm b/interface/web/mailuser/templates/mail_user_password_edit.htm index ed49c1654bd9c489d03f49706c893066f11ff90c..01d1227ce77a349e9d4ea92cc1a81fcfb3f9f636 100644 --- a/interface/web/mailuser/templates/mail_user_password_edit.htm +++ b/interface/web/mailuser/templates/mail_user_password_edit.htm @@ -11,7 +11,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm index eaa59e9503697b3c7b54fe011a8db724ad1134fc..4fdc5f86fd98a554a2dffeaee8fd3ae109dc73ee 100644 --- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm +++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm @@ -20,8 +20,8 @@
- - + +
diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm index e237e5aa1ac63eccd1cf6f33639950e2d44ba902..ac9a8c0077b9c949297203cb9b0898f1db18cfa5 100644 --- a/interface/web/monitor/templates/datalog_list.htm +++ b/interface/web/monitor/templates/datalog_list.htm @@ -20,7 +20,7 @@ - + diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm index 9b796f246f7b430c1b279e045a8f0b0597a023d1..fa0449b6af5217fd935514c52e5d516e1a8142ba 100644 --- a/interface/web/monitor/templates/syslog_list.htm +++ b/interface/web/monitor/templates/syslog_list.htm @@ -20,7 +20,7 @@ - + diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm index e6ce02a445cf01565835fddbbc0933b56bd227ed..4aba7ed4292f3ff7f888288b112a2865333e14be 100644 --- a/interface/web/sites/templates/aps_install_package.htm +++ b/interface/web/sites/templates/aps_install_package.htm @@ -48,8 +48,8 @@
- - + +
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm index 3007d40c7f99bff19cdf78e29322589c793c1620..46312889dc1f22b6601effe6bf74e15d6bd76a39 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -25,17 +25,17 @@   - + - {tmpl_var name='package_name'} + {tmpl_var name='package_name'} {tmpl_var name='package_version'}-{tmpl_var name='package_release'} - {tmpl_var name='customer_name'} + {tmpl_var name='customer_name'} {tmpl_var name='install_location_short'} {tmpl_var name='instance_status'} diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm index e7187ffaebd2da71a16f53aca9fd24c541e04f12..4a5b4359c20cdd9af6e593166fd4a8e45e121dd6 100644 --- a/interface/web/sites/templates/aps_packagedetails_show.htm +++ b/interface/web/sites/templates/aps_packagedetails_show.htm @@ -8,7 +8,7 @@

 

-

 

 

diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm index 454822d7d1cab9c68c4879dd30fd50c854a08802..bfd8c627f82c995174e18467bfc25d38134b2c92 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -22,13 +22,13 @@ - + - {tmpl_var name='name'} + {tmpl_var name='name'} {tmpl_var name='version'}-{tmpl_var name='release'} {tmpl_var name='category'} diff --git a/interface/web/sites/templates/cron_edit.htm b/interface/web/sites/templates/cron_edit.htm index 7d47b4e277f2269315896f2a587a01625ecb7411..1c0cd02ed59b0bbecabeca9388186ad3a80fba56 100644 --- a/interface/web/sites/templates/cron_edit.htm +++ b/interface/web/sites/templates/cron_edit.htm @@ -60,8 +60,8 @@
- - + +
diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm index 868469c5cf812adcb584844d23d99c2daa04d486..2759e225a487ce0171146348ef78e75e07a9057b 100644 --- a/interface/web/sites/templates/cron_list.htm +++ b/interface/web/sites/templates/cron_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -40,22 +40,22 @@ - + - - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="run_min"} - {tmpl_var name="run_hour"} - {tmpl_var name="run_mday"} - {tmpl_var name="run_month"} - {tmpl_var name="run_wday"} - {tmpl_var name="command"} + + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="run_min"} + {tmpl_var name="run_hour"} + {tmpl_var name="run_mday"} + {tmpl_var name="run_month"} + {tmpl_var name="run_wday"} + {tmpl_var name="command"}
{tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm index 8a169b65ddedb73f5fda2745c7fa60886a28359c..e66aa5139083731f21805e9cbdc5a7303df17b50 100644 --- a/interface/web/sites/templates/database_admin_list.htm +++ b/interface/web/sites/templates/database_admin_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -33,19 +33,19 @@ - + - {tmpl_var name="active"} - {tmpl_var name="remote_access"} - {tmpl_var name="sys_groupid"} - {tmpl_var name="server_id"} - {tmpl_var name="database_user_id"} - {tmpl_var name="database_name"} + {tmpl_var name="active"} + {tmpl_var name="remote_access"} + {tmpl_var name="sys_groupid"} + {tmpl_var name="server_id"} + {tmpl_var name="database_user_id"} + {tmpl_var name="database_name"} {tmpl_var name='admin_txt'} diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index 4207a789ff724b95cb3a71e82bf88ad768fb3349..de2899c1c3f82626e0f94bebfdd790da893e3f5a 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -90,8 +90,8 @@
- - + +
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm index 0412080e543eb44af5a3746d7c72b37919e8da5b..5fec212eec95152ac07b565846651c1267d663f5 100644 --- a/interface/web/sites/templates/database_list.htm +++ b/interface/web/sites/templates/database_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -32,18 +32,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="remote_access"} - {tmpl_var name="server_id"} - {tmpl_var name="database_user_id"} - {tmpl_var name="database_name"} + {tmpl_var name="active"} + {tmpl_var name="remote_access"} + {tmpl_var name="server_id"} + {tmpl_var name="database_user_id"} + {tmpl_var name="database_name"} {tmpl_var name='admin_txt'} diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm index 59a45104eb5d47901156f25f8186366dc219806c..0e33a887d3d21381f32e866e0a5403a3b311893f 100644 --- a/interface/web/sites/templates/database_user_admin_list.htm +++ b/interface/web/sites/templates/database_user_admin_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -22,13 +22,13 @@ - + - {tmpl_var name="database_user"} + {tmpl_var name="database_user"} {tmpl_var name='edit_txt'} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/database_user_edit.htm b/interface/web/sites/templates/database_user_edit.htm index 40e8c96e826fd64ed7ca414ad9da05724b8992c8..5bdf062fa527e516e81982aa0e87ff28259c4e8c 100644 --- a/interface/web/sites/templates/database_user_edit.htm +++ b/interface/web/sites/templates/database_user_edit.htm @@ -28,7 +28,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -46,8 +46,8 @@
- - + +
diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm index f20b26189c920595245bb2ffd6ebb87760b9eb2a..b3e1efed12198df58dc4c2b891203985d117e53b 100644 --- a/interface/web/sites/templates/database_user_list.htm +++ b/interface/web/sites/templates/database_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -23,13 +23,13 @@ - + - {tmpl_var name="database_user"} + {tmpl_var name="database_user"} {tmpl_var name='edit_txt'} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/ftp_user_advanced.htm b/interface/web/sites/templates/ftp_user_advanced.htm index 175b5fe5d9ee460adcf62825fcec162e45c3f1c7..b945033823a562cb1337f89a78f8208e8129fbd0 100644 --- a/interface/web/sites/templates/ftp_user_advanced.htm +++ b/interface/web/sites/templates/ftp_user_advanced.htm @@ -42,8 +42,8 @@
- - + +
diff --git a/interface/web/sites/templates/ftp_user_advanced_client.htm b/interface/web/sites/templates/ftp_user_advanced_client.htm index 5918c6d571cc568d04d89d4857fd51b3acc3c82c..8e2500d50121462ab7594ef8f739fa38b0309096 100644 --- a/interface/web/sites/templates/ftp_user_advanced_client.htm +++ b/interface/web/sites/templates/ftp_user_advanced_client.htm @@ -14,8 +14,8 @@
- - + +
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm index cf900015c9993a68f0dc772d84affadf4a020768..c33401103d9f7cb3e54fb2f1bbd3765acff12d10 100644 --- a/interface/web/sites/templates/ftp_user_edit.htm +++ b/interface/web/sites/templates/ftp_user_edit.htm @@ -18,7 +18,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -46,8 +46,8 @@
- - + +
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm index 8c07458ff2bdd3666f1bd583fc84603a741889ad..9621e96759cadac3a4e6e06b47ed5cdafee23977 100644 --- a/interface/web/sites/templates/ftp_user_list.htm +++ b/interface/web/sites/templates/ftp_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="username"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="username"} {tmpl_var name='admin_txt'} diff --git a/interface/web/sites/templates/shell_user_advanced.htm b/interface/web/sites/templates/shell_user_advanced.htm index bad78c81c641d7d05704dc5c6c63df6736809bad..a16b50cd03dbdc98036ad46fc72b405f97af7d66 100644 --- a/interface/web/sites/templates/shell_user_advanced.htm +++ b/interface/web/sites/templates/shell_user_advanced.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm index 3cb5d3842417936149ab877a0bc523815349fe76..1aa663b7bee5be5b2feab2f079fbe2367ef40734 100644 --- a/interface/web/sites/templates/shell_user_edit.htm +++ b/interface/web/sites/templates/shell_user_edit.htm @@ -26,7 +26,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -64,8 +64,8 @@
- - + +
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm index d98c959754033a0c8dbb61c31e4e0a94ffe58d76..2ed2c5e3556de2427dfb10420e716df7a78abfbe 100644 --- a/interface/web/sites/templates/shell_user_list.htm +++ b/interface/web/sites/templates/shell_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="username"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="username"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm index 43b6a00b7868b3c2edcc8d0a34bcc2c872b27872..ad303c1d07d244f911a4689173e266b30871e4fc 100644 --- a/interface/web/sites/templates/user_quota_stats_list.htm +++ b/interface/web/sites/templates/user_quota_stats_list.htm @@ -23,19 +23,19 @@     - + - {tmpl_var name="domain"} - {tmpl_var name="system_user"} - {tmpl_var name="used"} - {tmpl_var name="soft"} - {tmpl_var name="hard"} - {tmpl_var name="files"} + {tmpl_var name="domain"} + {tmpl_var name="system_user"} + {tmpl_var name="used"} + {tmpl_var name="soft"} + {tmpl_var name="hard"} + {tmpl_var name="files"} diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm index 0ccaa5edf1e0a8006efb538404f69437dd464232..3f800596f68bf11e841bbfa4f61b53c921cfe58d 100644 --- a/interface/web/sites/templates/web_aliasdomain_edit.htm +++ b/interface/web/sites/templates/web_aliasdomain_edit.htm @@ -48,8 +48,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm index 126a972d95a7a8afb5ccee33c8e512195df5dbac..1de97c4020fdfb8d2bbf3a42e92a1ad5fb7d2553 100644 --- a/interface/web/sites/templates/web_aliasdomain_list.htm +++ b/interface/web/sites/templates/web_aliasdomain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm index 0347072e5952f1e37dff65094660165ff1e01524..51c3c3356645e26301ea006a6ab8916217b819e4 100644 --- a/interface/web/sites/templates/web_backup_list.htm +++ b/interface/web/sites/templates/web_backup_list.htm @@ -27,8 +27,8 @@ {tmpl_var name="filename"}
- - + +
diff --git a/interface/web/sites/templates/web_domain_admin_list.htm b/interface/web/sites/templates/web_domain_admin_list.htm index b286e5040772e25ab8244c28804281785cfa6301..bf2cc659a5849872042203efbe172d4d53ae5343 100644 --- a/interface/web/sites/templates/web_domain_admin_list.htm +++ b/interface/web/sites/templates/web_domain_admin_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -31,18 +31,18 @@ - + - {tmpl_var name="domain_id"} - {tmpl_var name="active"} - {tmpl_var name="sys_groupid"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"}Link + {tmpl_var name="domain_id"} + {tmpl_var name="active"} + {tmpl_var name="sys_groupid"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"}Link {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_domain_advanced.htm b/interface/web/sites/templates/web_domain_advanced.htm index 87107400af24704f79644aa7ac3cc83dac2373cf..f61cf500c7dfdb72e298686a33df400795b7f696 100644 --- a/interface/web/sites/templates/web_domain_advanced.htm +++ b/interface/web/sites/templates/web_domain_advanced.htm @@ -82,8 +82,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_domain_backup.htm b/interface/web/sites/templates/web_domain_backup.htm index c46d4e2d4ef9a3fd0aae5921d68d194f959bfb86..3c78fe73de2fcf8bb3e9c83ea5c9cb265855c85d 100644 --- a/interface/web/sites/templates/web_domain_backup.htm +++ b/interface/web/sites/templates/web_domain_backup.htm @@ -24,8 +24,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm index edf1836d29a0ab48a764a21844efce438b4cbfee..145104e0e96623d7a1df2e74829aa897f326c6a2 100644 --- a/interface/web/sites/templates/web_domain_edit.htm +++ b/interface/web/sites/templates/web_domain_edit.htm @@ -146,7 +146,7 @@
- +
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm index 52ec9e2b1ab462e57c4e4442fff06a51d495c3a0..362060dfe6e19bed2c8b7f804e6127fc04e0ae78 100644 --- a/interface/web/sites/templates/web_domain_list.htm +++ b/interface/web/sites/templates/web_domain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="domain_id"} - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="domain"}Link + {tmpl_var name="domain_id"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="domain"}Link {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm index 66a17034c9b27fec864671d69ddddf1024273511..ddbdc04bbd9926185d3f7e8fa01b7b4ad001e692 100644 --- a/interface/web/sites/templates/web_domain_redirect.htm +++ b/interface/web/sites/templates/web_domain_redirect.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_domain_ssl.htm b/interface/web/sites/templates/web_domain_ssl.htm index 4c27bb77298df546759290df5dfd967d1400d8e7..832d623f616f2bae612092726f25dcbfdc02ec15 100644 --- a/interface/web/sites/templates/web_domain_ssl.htm +++ b/interface/web/sites/templates/web_domain_ssl.htm @@ -60,8 +60,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_domain_stats.htm b/interface/web/sites/templates/web_domain_stats.htm index 26eee94772c6b8ea574a65495cf7fa43aad68377..d0f6f16a315d17a6fca891fc774a519fc4db26b6 100644 --- a/interface/web/sites/templates/web_domain_stats.htm +++ b/interface/web/sites/templates/web_domain_stats.htm @@ -10,7 +10,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}
@@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_folder_edit.htm b/interface/web/sites/templates/web_folder_edit.htm index 4165ab70b1688db02b541fd46ac0ad8c8e2e7253..a5dc3b9c60e10f1f0bff55b4e85ae7dd6bc8851d 100644 --- a/interface/web/sites/templates/web_folder_edit.htm +++ b/interface/web/sites/templates/web_folder_edit.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm index 6b7761c98f9d6a93ec527da2f0dcb271a26a4442..af362337f23cf76d2bba0e8eac2a96f240e3464b 100644 --- a/interface/web/sites/templates/web_folder_list.htm +++ b/interface/web/sites/templates/web_folder_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -29,17 +29,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="path"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="path"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_folder_user_edit.htm b/interface/web/sites/templates/web_folder_user_edit.htm index 63376d8ed8377a84b5029dcb94064c7227716ec4..bb6291375b9c649bd903a906e7a6b65b57cc1c4f 100644 --- a/interface/web/sites/templates/web_folder_user_edit.htm +++ b/interface/web/sites/templates/web_folder_user_edit.htm @@ -17,7 +17,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -41,8 +41,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm index ae00cccb28dc23903f54f8f55924d9f69498334a..c36281aab8644f78578d9f36095e7e75cc9440a1 100644 --- a/interface/web/sites/templates/web_folder_user_list.htm +++ b/interface/web/sites/templates/web_folder_user_list.htm @@ -5,7 +5,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -27,16 +27,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="web_folder_id"} - {tmpl_var name="username"} + {tmpl_var name="active"} + {tmpl_var name="web_folder_id"} + {tmpl_var name="username"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm index 3e0642489b82e7589457e0a69e610707426a9861..0a4da6432541a774f2f591979023bf75f8b2f068 100644 --- a/interface/web/sites/templates/web_sites_stats_list.htm +++ b/interface/web/sites/templates/web_sites_stats_list.htm @@ -22,27 +22,27 @@ - + - {tmpl_var name="domain"} - {tmpl_var name="this_month"} MB - {tmpl_var name="last_month"} MB - {tmpl_var name="this_year"} MB - {tmpl_var name="last_year"} MB + {tmpl_var name="domain"} + {tmpl_var name="this_month"} MB + {tmpl_var name="last_month"} MB + {tmpl_var name="this_year"} MB + {tmpl_var name="last_year"} MB - {tmpl_var name="sum_txt"} - {tmpl_var name="sum_this_month"} MB - {tmpl_var name="sum_last_month"} MB - {tmpl_var name="sum_this_year"} MB - {tmpl_var name="sum_last_year"} MB + {tmpl_var name="sum_txt"} + {tmpl_var name="sum_this_month"} MB + {tmpl_var name="sum_last_month"} MB + {tmpl_var name="sum_this_year"} MB + {tmpl_var name="sum_last_year"} MB
diff --git a/interface/web/sites/templates/web_subdomain_edit.htm b/interface/web/sites/templates/web_subdomain_edit.htm index a8b0fe9bd0ea7f871da26364c1c4bf3769d9eaba..4aaae6790f7f021ac42072f076d3d40ebcfa4cd0 100644 --- a/interface/web/sites/templates/web_subdomain_edit.htm +++ b/interface/web/sites/templates/web_subdomain_edit.htm @@ -34,8 +34,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm index 7d097ec48704631d6d82a0243e7d0ed14ecf0b2c..03ca2b3b83c28ce0987b5fcc3abfdf3f90749374 100644 --- a/interface/web/sites/templates/web_subdomain_list.htm +++ b/interface/web/sites/templates/web_subdomain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm index 87107400af24704f79644aa7ac3cc83dac2373cf..f61cf500c7dfdb72e298686a33df400795b7f696 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm @@ -82,8 +82,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_backup.htm b/interface/web/sites/templates/web_vhost_subdomain_backup.htm index c46d4e2d4ef9a3fd0aae5921d68d194f959bfb86..3c78fe73de2fcf8bb3e9c83ea5c9cb265855c85d 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_backup.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_backup.htm @@ -24,8 +24,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_edit.htm b/interface/web/sites/templates/web_vhost_subdomain_edit.htm index 159830c685c148b8fb52736b62eec6c276815eec..f6f84b07497766ae5401f119317e123cab3404dd 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_edit.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_edit.htm @@ -105,7 +105,7 @@
- +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_list.htm b/interface/web/sites/templates/web_vhost_subdomain_list.htm index 26eb3f1cc737b0d1d83cdc13586f1d67ea5e2650..6db8d059e0e2efd3770dc229ee33b4b6ad551194 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_list.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -29,16 +29,16 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="domain"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="domain"} {tmpl_var name='delete_txt'} diff --git a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm index 66a17034c9b27fec864671d69ddddf1024273511..ddbdc04bbd9926185d3f7e8fa01b7b4ad001e692 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_redirect.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm @@ -26,8 +26,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm b/interface/web/sites/templates/web_vhost_subdomain_ssl.htm index 4c27bb77298df546759290df5dfd967d1400d8e7..832d623f616f2bae612092726f25dcbfdc02ec15 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_ssl.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_ssl.htm @@ -60,8 +60,8 @@
- - + +
diff --git a/interface/web/sites/templates/web_vhost_subdomain_stats.htm b/interface/web/sites/templates/web_vhost_subdomain_stats.htm index 26eee94772c6b8ea574a65495cf7fa43aad68377..d0f6f16a315d17a6fca891fc774a519fc4db26b6 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_stats.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_stats.htm @@ -10,7 +10,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}
@@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/sites/templates/webdav_user_edit.htm b/interface/web/sites/templates/webdav_user_edit.htm index 8dd719dca16363d21d4e47ea339cef3df5f40575..9a75015f4c2aed9b17367cb47b0fb202195ece9a 100644 --- a/interface/web/sites/templates/webdav_user_edit.htm +++ b/interface/web/sites/templates/webdav_user_edit.htm @@ -26,7 +26,7 @@
-  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

{tmpl_var name='password_strength_txt'}

@@ -56,8 +56,8 @@
- - + +
diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm index e5b055a2ba1e3bc398a7f5ada37115779880fbba..82004d924ee19be006898f133cd05c6751b526f7 100644 --- a/interface/web/sites/templates/webdav_user_list.htm +++ b/interface/web/sites/templates/webdav_user_list.htm @@ -6,7 +6,7 @@
{tmpl_var name="toolsarea_head_txt"}
-
@@ -30,17 +30,17 @@ - + - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="parent_domain_id"} - {tmpl_var name="username"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="parent_domain_id"} + {tmpl_var name="username"} {tmpl_var name='delete_txt'} diff --git a/interface/web/themes/default/templates/sidenav.tpl.htm b/interface/web/themes/default/templates/sidenav.tpl.htm index a5051cf3a58b2bd74807b6e4799637907d8cebe1..8ec46aa867cf8f79ba1025cdf06195c1c7b8b5c3 100644 --- a/interface/web/themes/default/templates/sidenav.tpl.htm +++ b/interface/web/themes/default/templates/sidenav.tpl.htm @@ -2,7 +2,7 @@
  • - + @@ -12,7 +12,7 @@
  • id='' > - + diff --git a/interface/web/themes/default/templates/topnav.tpl.htm b/interface/web/themes/default/templates/topnav.tpl.htm index 4c681960c054eca047593fd472f899eb1b46273e..485fa23083e2fb75b5a014cf413d4268fce0e63b 100644 --- a/interface/web/themes/default/templates/topnav.tpl.htm +++ b/interface/web/themes/default/templates/topnav.tpl.htm @@ -3,7 +3,7 @@
    • -
    • +
    • diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm index b4fad7e6f2b1251d8290b8c12661d14368f48714..bf1ed65d2cfb9f7eb383224c88ff475865a628bf 100644 --- a/interface/web/tools/templates/dns_import_tupa.htm +++ b/interface/web/tools/templates/dns_import_tupa.htm @@ -48,8 +48,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm index 7d7b4c17bcad8e170b319b4ef3fcdc46df46e635..465c8c519d283c9108a70cf293b261c43ae601fd 100644 --- a/interface/web/tools/templates/import_ispconfig.htm +++ b/interface/web/tools/templates/import_ispconfig.htm @@ -91,13 +91,13 @@
    - - + +
    - - + +
    \ No newline at end of file diff --git a/interface/web/tools/templates/import_plesk.htm b/interface/web/tools/templates/import_plesk.htm index f72096c7003a5ee9bd32e728a1ef06626e128e89..10a73d7a689edde36796458a7f2d7ed8b563d7e6 100644 --- a/interface/web/tools/templates/import_plesk.htm +++ b/interface/web/tools/templates/import_plesk.htm @@ -66,8 +66,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/interface_settings.htm b/interface/web/tools/templates/interface_settings.htm index 640f187cd2916384ebaf58578fbf8a0fce48d70d..978355f0fc306fcb47bf666c80ee22156af7f981 100644 --- a/interface/web/tools/templates/interface_settings.htm +++ b/interface/web/tools/templates/interface_settings.htm @@ -23,8 +23,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm index c7611b804984aa544a75784e8e5fd2a890b99f07..62b3a1d01aca1a2d568b5fa5fc1aab3262ad057f 100644 --- a/interface/web/tools/templates/resync.htm +++ b/interface/web/tools/templates/resync.htm @@ -59,8 +59,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/tpl_default.htm b/interface/web/tools/templates/tpl_default.htm index e9e5ade713aff9f300994c61f23699d041686446..fadcd36f8015612c57cb52b2bb64f322b7719494 100644 --- a/interface/web/tools/templates/tpl_default.htm +++ b/interface/web/tools/templates/tpl_default.htm @@ -13,8 +13,8 @@
    - - + +
    diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm index 6155093aa3be1ebee42295a7e2519ca9350a0850..27be28c531cab502d88718f0d8e4a0f49340938e 100644 --- a/interface/web/tools/templates/user_settings.htm +++ b/interface/web/tools/templates/user_settings.htm @@ -7,7 +7,7 @@
    -  {tmpl_var name='generate_password_txt'} +  {tmpl_var name='generate_password_txt'}

    {tmpl_var name='password_strength_txt'}

    @@ -31,8 +31,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_action.htm b/interface/web/vm/templates/openvz_action.htm index 057c851dc3ccc731b7d822deef4b2897a70a6eac..00bb65e077dcd4a5584b778440c71faae5b141d6 100644 --- a/interface/web/vm/templates/openvz_action.htm +++ b/interface/web/vm/templates/openvz_action.htm @@ -45,8 +45,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_ip_edit.htm b/interface/web/vm/templates/openvz_ip_edit.htm index 8b8f34b62bc26eebccfb9dcf88b502d1ada6e33a..ef0537d9d9a5e18391bb03e488c3955b315da4d2 100644 --- a/interface/web/vm/templates/openvz_ip_edit.htm +++ b/interface/web/vm/templates/openvz_ip_edit.htm @@ -32,8 +32,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm index 12d50da03967af434a8f1284182ea8692bb40698..99e48e2720d6b80d326b952871be6313e6b62998 100644 --- a/interface/web/vm/templates/openvz_ip_list.htm +++ b/interface/web/vm/templates/openvz_ip_list.htm @@ -5,7 +5,7 @@
    {tmpl_var name="toolsarea_head_txt"}
    -
    @@ -29,17 +29,17 @@ - + - {tmpl_var name="server_id"} - {tmpl_var name="vm_id"} - {tmpl_var name="ip_address"} - {tmpl_var name="reserved"} + {tmpl_var name="server_id"} + {tmpl_var name="vm_id"} + {tmpl_var name="ip_address"} + {tmpl_var name="reserved"} {tmpl_var name='delete_txt'} diff --git a/interface/web/vm/templates/openvz_ostemplate_edit.htm b/interface/web/vm/templates/openvz_ostemplate_edit.htm index 6f08d1506468fd7a3aed5050a0d413e89f86da52..8bcba15b766d438d15f6e4bca7bb6b4142f4f249 100644 --- a/interface/web/vm/templates/openvz_ostemplate_edit.htm +++ b/interface/web/vm/templates/openvz_ostemplate_edit.htm @@ -40,8 +40,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm index f30f68affbd631ed6382841b8e43fb3a89edd32c..679c66599e2b2b226c7f3908b7b6ef8cb07f7c02 100644 --- a/interface/web/vm/templates/openvz_ostemplate_list.htm +++ b/interface/web/vm/templates/openvz_ostemplate_list.htm @@ -5,7 +5,7 @@
    {tmpl_var name="toolsarea_head_txt"}
    -
    @@ -31,18 +31,18 @@ - + - {tmpl_var name="active"} - {tmpl_var name="ostemplate_id"} - {tmpl_var name="template_name"} - {tmpl_var name="server_id"} - {tmpl_var name="allservers"} + {tmpl_var name="active"} + {tmpl_var name="ostemplate_id"} + {tmpl_var name="template_name"} + {tmpl_var name="server_id"} + {tmpl_var name="allservers"} {tmpl_var name='delete_txt'} diff --git a/interface/web/vm/templates/openvz_template_advanced_edit.htm b/interface/web/vm/templates/openvz_template_advanced_edit.htm index 6741ce9ab3e4e321af69579156930b7b7df3d7f9..86e2807d293412d8c9fb070da8bb94230aa3de10 100644 --- a/interface/web/vm/templates/openvz_template_advanced_edit.htm +++ b/interface/web/vm/templates/openvz_template_advanced_edit.htm @@ -102,8 +102,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_template_edit.htm b/interface/web/vm/templates/openvz_template_edit.htm index ce356afeec2e7427a0657d47fac413d5fe92529e..e26bdf9f6aac7f34bcd7f05055a6ef7685825311 100644 --- a/interface/web/vm/templates/openvz_template_edit.htm +++ b/interface/web/vm/templates/openvz_template_edit.htm @@ -66,8 +66,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm index d83eb31de2f00ae7303d7c3496376634f10531db..7f5ab7130e83eddf9787032da2110959309a0e0b 100644 --- a/interface/web/vm/templates/openvz_template_list.htm +++ b/interface/web/vm/templates/openvz_template_list.htm @@ -5,7 +5,7 @@
    {tmpl_var name="toolsarea_head_txt"}
    -
    @@ -25,15 +25,15 @@ - + - {tmpl_var name="active"} - {tmpl_var name="template_name"} + {tmpl_var name="active"} + {tmpl_var name="template_name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/vm/templates/openvz_vm_advanced_edit.htm b/interface/web/vm/templates/openvz_vm_advanced_edit.htm index a0bf42d3e4cd4380e7e8063f71b8148f0bff5e5b..0226eda767b8d420034d2539b44465ec492d84f1 100644 --- a/interface/web/vm/templates/openvz_vm_advanced_edit.htm +++ b/interface/web/vm/templates/openvz_vm_advanced_edit.htm @@ -56,8 +56,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_vm_edit.htm b/interface/web/vm/templates/openvz_vm_edit.htm index 402bad398c6e7c0af949f9c0c772e3929791da6b..446cd1e844b4090caa570e574236f4f34225eb37 100644 --- a/interface/web/vm/templates/openvz_vm_edit.htm +++ b/interface/web/vm/templates/openvz_vm_edit.htm @@ -96,8 +96,8 @@
    - - + +
    diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm index 66d65a1d749c89469bd5a22f0198bf370c946fc9..339c9851fa2ff89b6c45523664087b2ff54da0ba 100644 --- a/interface/web/vm/templates/openvz_vm_list.htm +++ b/interface/web/vm/templates/openvz_vm_list.htm @@ -5,7 +5,7 @@
    {tmpl_var name="toolsarea_head_txt"}
    -
    @@ -35,20 +35,20 @@ - + - {tmpl_var name="veid"} - {tmpl_var name="active"} - {tmpl_var name="server_id"} - {tmpl_var name="ostemplate_id"} - {tmpl_var name="template_id"} - {tmpl_var name="hostname"} - {tmpl_var name="ip_address"} + {tmpl_var name="veid"} + {tmpl_var name="active"} + {tmpl_var name="server_id"} + {tmpl_var name="ostemplate_id"} + {tmpl_var name="template_id"} + {tmpl_var name="hostname"} + {tmpl_var name="ip_address"} Action {tmpl_var name='delete_txt'}