From 5df6059f4153845f2d7db0bff426c4ad70c299cd Mon Sep 17 00:00:00 2001 From: cfoe Date: Tue, 4 Sep 2012 12:47:19 +0000 Subject: [PATCH] a lot of minor template fixes --- .../web/admin/form/system_config.tform.php | 24 +++++ .../templates/server_config_web_edit.htm | 12 +++ .../web/admin/templates/server_php_list.htm | 12 +-- .../admin/templates/software_package_list.htm | 4 +- interface/web/client/lib/module.conf.php | 101 ++++++++++-------- interface/web/dns/lib/lang/de_dns_wizard.lng | 2 + interface/web/dns/lib/lang/en_dns_wizard.lng | 2 + interface/web/dns/templates/dns_a_list.htm | 2 +- .../templates/faq_manage_questions_list.htm | 12 +-- .../help/templates/help_faq_sections_list.htm | 16 +-- .../mail/templates/spamfilter_config_list.htm | 1 - .../web/monitor/templates/show_sys_state.htm | 2 +- interface/web/sites/lib/lang/de_aps.lng | 4 +- interface/web/sites/lib/lang/en_aps.lng | 4 +- .../sites/templates/aps_install_package.htm | 4 +- .../sites/templates/aps_instances_list.htm | 2 +- .../web/sites/templates/aps_packages_list.htm | 4 +- .../templates/database_user_admin_list.htm | 7 +- .../sites/templates/database_user_list.htm | 4 +- .../web/sites/templates/web_backup_list.htm | 2 +- .../web/sites/templates/web_domain_stats.htm | 7 +- .../sites/templates/web_sites_stats_list.htm | 11 -- .../web_vhost_subdomain_advanced.htm | 4 +- .../templates/web_vhost_subdomain_backup.htm | 4 +- .../web_vhost_subdomain_redirect.htm | 4 +- .../templates/web_vhost_subdomain_ssl.htm | 4 +- .../templates/web_vhost_subdomain_stats.htm | 4 +- .../web/tools/templates/dns_import_tupa.htm | 11 +- .../web/tools/templates/import_ispconfig.htm | 10 +- .../web/tools/templates/import_plesk.htm | 6 +- .../tools/templates/interface_settings.htm | 1 + interface/web/tools/templates/resync.htm | 6 +- 32 files changed, 167 insertions(+), 126 deletions(-) diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index 1317bf77c..370e57f60 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -302,6 +302,30 @@ $form["tabs"]['domains'] = array ( ) ); +/* TODO_ BEGIN: Branding + +$form["tabs"]['domains'] = array ( + 'title' => "Branding", + 'width' => 70, + 'template' => "templates/system_config_branding_edit.htm", + 'fields' => array ( + ################################## + # Begin Datatable fields + ################################## + 'allow_themechange' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'N', + 'value' => array(0 => 'n',1 => 'y') + ), + ################################## + # ENDE Datatable fields + ################################## + ) +); + + + END: Branding */ $form["tabs"]['misc'] = array ( 'title' => "Misc", 'width' => 70, diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 7ff0c0611..5a9591792 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -95,6 +95,18 @@ {tmpl_var name='enable_ip_wildcard'} +
+

{tmpl_var name='overtraffic_notify_admin_txt'}

+
+ {tmpl_var name='overtraffic_notify_admin'} +
+
+
+

{tmpl_var name='overtraffic_notify_client_txt'}

+
+ {tmpl_var name='overtraffic_notify_client'} +
+
{tmpl_var name='ssl_settings_txt'}
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm index f8c67558d..92aa0801c 100644 --- a/interface/web/admin/templates/server_php_list.htm +++ b/interface/web/admin/templates/server_php_list.htm @@ -18,14 +18,14 @@ - - + + {tmpl_var name='search_limit'} - - + + @@ -35,8 +35,8 @@ {tmpl_var name="server_id"} - {tmpl_var name="client_id"} - {tmpl_var name="name"} + {tmpl_var name="client_id"} + {tmpl_var name="name"} {tmpl_var name='delete_txt'} diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm index 8fc097331..d030e5e5c 100644 --- a/interface/web/admin/templates/software_package_list.htm +++ b/interface/web/admin/templates/software_package_list.htm @@ -22,7 +22,7 @@ -   + {tmpl_var name='search_limit'} @@ -32,7 +32,7 @@ {tmpl_var name="package_title"} {tmpl_var name="package_description"} ispapp{tmpl_var name="package_id"} - + {tmpl_var name='delete_txt'} diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php index 2575ba266..233d4f673 100644 --- a/interface/web/client/lib/module.conf.php +++ b/interface/web/client/lib/module.conf.php @@ -1,74 +1,68 @@ "Edit Client", + 'target' => 'content', + 'link' => 'client/client_list.php', + 'html_id' => 'client_list'); - - -$items[] = array( 'title' => "Edit Client", - 'target' => 'content', - 'link' => 'client/client_list.php', - 'html_id' => 'client_list'); - -$items[] = array( 'title' => "Add Client", - 'target' => 'content', - 'link' => 'client/client_edit.php', - 'html_id' => 'client_add'); +$items[] = array( 'title' => "Add Client", + 'target' => 'content', + 'link' => 'client/client_edit.php', + 'html_id' => 'client_add'); - if($_SESSION["s"]["user"]["typ"] == 'admin'){ - $items[] = array( 'title' => "Edit Client-Templates", - 'target' => 'content', - 'link' => 'client/client_template_list.php', - 'html_id' => 'client_template_list'); +if($_SESSION["s"]["user"]["typ"] == 'admin'){ +$items[] = array( 'title' => "Edit Client-Templates", + 'target' => 'content', + 'link' => 'client/client_template_list.php', + 'html_id' => 'client_template_list'); } -$module["nav"][] = array( 'title' => 'Clients', - 'open' => 1, - 'items' => $items); +$module["nav"][] = array( 'title' => 'Clients', + 'open' => 1, + 'items' => $items); unset($items); if($_SESSION["s"]["user"]["typ"] == 'admin'){ -$items[] = array( 'title' => "Edit Reseller", - 'target' => 'content', - 'link' => 'client/reseller_list.php', - 'html_id' => 'reseller_list'); +$items[] = array( 'title' => "Edit Reseller", + 'target' => 'content', + 'link' => 'client/reseller_list.php', + 'html_id' => 'reseller_list'); -$items[] = array( 'title' => "Add Reseller", - 'target' => 'content', - 'link' => 'client/reseller_edit.php', - 'html_id' => 'reseller_add'); +$items[] = array( 'title' => "Add Reseller", + 'target' => 'content', + 'link' => 'client/reseller_edit.php', + 'html_id' => 'reseller_add'); -$module["nav"][] = array( 'title' => 'Resellers', - 'open' => 1, - 'items' => $items); +$module["nav"][] = array( 'title' => 'Resellers', + 'open' => 1, + 'items' => $items); unset($items); } -$items[] = array( 'title' => "Edit Client Circle", - 'target' => 'content', - 'link' => 'client/client_circle_list.php', - 'html_id' => 'client_circle_list'); +$items[] = array( 'title' => "Edit Client Circle", + 'target' => 'content', + 'link' => 'client/client_circle_list.php', + 'html_id' => 'client_circle_list'); -$items[] = array( 'title' => "Send email", - 'target' => 'content', - 'link' => 'client/client_message.php', - 'html_id' => 'reseller_add'); +$items[] = array( 'title' => "Send email", + 'target' => 'content', + 'link' => 'client/client_message.php', + 'html_id' => 'reseller_add'); -$module["nav"][] = array( 'title' => 'Messaging', - 'open' => 1, - 'items' => $items); +$module["nav"][] = array( 'title' => 'Messaging', + 'open' => 1, + 'items' => $items); unset($items); @@ -87,5 +81,18 @@ if ($settings['use_domain_module'] == 'y') { unset($items); } - + +if($_SESSION["s"]["user"]["typ"] == 'admin'){ +$items[] = array( 'title' => "Interface Settings", + 'target' => 'content', + 'link' => 'client/reseller_admin_interface.php', + 'html_id' => 'reseller_admin_interface'); + + +$module["nav"][] = array( 'title' => 'Reseller Panel', + 'open' => 1, + 'items' => $items); + +unset($items); +} ?> \ No newline at end of file diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng index 9bcaae1f4..e8c171569 100644 --- a/interface/web/dns/lib/lang/de_dns_wizard.lng +++ b/interface/web/dns/lib/lang/de_dns_wizard.lng @@ -1,4 +1,6 @@ +
{tmpl_var name="toolsarea_head_txt"}
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm index 809ce84a2..4907b73d7 100644 --- a/interface/web/help/templates/faq_manage_questions_list.htm +++ b/interface/web/help/templates/faq_manage_questions_list.htm @@ -17,20 +17,20 @@ {tmpl_var name="faq_question_txt"} - {tmpl_var name="faq_section_name_txt"} - {tmpl_var name="faq_delete_txt"} - {tmpl_var name="faq_edit_txt"} + {tmpl_var name="faq_section_name_txt"} + {tmpl_var name="faq_delete_txt"} + {tmpl_var name="faq_edit_txt"} - + {tmpl_var name='hf_question'} {tmpl_var name='hf_section'} {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/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm index 39b2b4000..9166f1314 100644 --- a/interface/web/help/templates/help_faq_sections_list.htm +++ b/interface/web/help/templates/help_faq_sections_list.htm @@ -18,19 +18,19 @@ - - - + + + - - - + - diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm index cf46159ae..d2e936924 100644 --- a/interface/web/mail/templates/spamfilter_config_list.htm +++ b/interface/web/mail/templates/spamfilter_config_list.htm @@ -38,7 +38,6 @@ - diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm index 740141b26..55aeeb28a 100644 --- a/interface/web/monitor/templates/show_sys_state.htm +++ b/interface/web/monitor/templates/show_sys_state.htm @@ -7,7 +7,7 @@
- + diff --git a/interface/web/sites/lib/lang/de_aps.lng b/interface/web/sites/lib/lang/de_aps.lng index ad29227ff..f5684556e 100644 --- a/interface/web/sites/lib/lang/de_aps.lng +++ b/interface/web/sites/lib/lang/de_aps.lng @@ -26,8 +26,8 @@ $wb['settings_txt'] = 'Einstellungen'; $wb['install_package_txt'] = 'Dieses Paket installieren'; $wb['installation_txt'] = 'Installation'; $wb['install_location_txt'] = 'Installationsort'; -$wb['btn_install'] = 'Installieren'; -$wb['btn_cancel'] = 'Abbrechen'; +$wb['btn_install_txt'] = 'Installieren'; +$wb['btn_cancel_txt'] = 'Abbrechen'; $wb['acceptance_txt'] = 'Lizenzvereinbarung'; $wb['acceptance_text_txt'] = 'Ja, ich habe die Lizenzvereinbarung gelesen und akzeptiere sie.'; $wb['install_language_txt'] = 'Sprache der Oberfläche'; diff --git a/interface/web/sites/lib/lang/en_aps.lng b/interface/web/sites/lib/lang/en_aps.lng index d0ecb771f..2ab54024b 100644 --- a/interface/web/sites/lib/lang/en_aps.lng +++ b/interface/web/sites/lib/lang/en_aps.lng @@ -26,8 +26,8 @@ $wb['settings_txt'] = 'Settings'; $wb['install_package_txt'] = 'Install this package'; $wb['installation_txt'] = 'Installation'; $wb['install_location_txt'] = 'Install location'; -$wb['btn_install'] = 'Install'; -$wb['btn_cancel'] = 'Cancel'; +$wb['btn_install_txt'] = 'Install'; +$wb['btn_cancel_txt'] = 'Cancel'; $wb['acceptance_txt'] = 'Acceptance'; $wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.'; $wb['install_language_txt'] = 'Interface language'; diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm index 4aba7ed42..4468475ff 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 46312889d..11de54fdd 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -14,7 +14,7 @@
- + diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm index bfd8c627f..819bba099 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -13,7 +13,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm index 0e33a887d..93df0b174 100644 --- a/interface/web/sites/templates/database_user_admin_list.htm +++ b/interface/web/sites/templates/database_user_admin_list.htm @@ -1,4 +1,5 @@

+

@@ -16,12 +17,12 @@
{tmpl_var name="faq_section_name_txt"}{tmpl_var name="faq_delete_txt"}{tmpl_var name="faq_edit_txt"}{tmpl_var name="faq_section_name_txt"}{tmpl_var name="faq_delete_txt"}{tmpl_var name="faq_edit_txt"}
{tmpl_var name='hfs_name'} +
{tmpl_var name='hfs_name'} + {tmpl_var name="faq_delete_txt"} - {tmpl_var name="faq_edit_txt"} + + {tmpl_var name="faq_edit_txt"}
{tmpl_var name='install_location_txt'} {tmpl_var name='status_txt'}  
{tmpl_var name='status_txt'}   
{tmpl_var name='package_status'}   
- + - - + + diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm index b3e1efed1..f1d80af89 100644 --- a/interface/web/sites/templates/database_user_list.htm +++ b/interface/web/sites/templates/database_user_list.htm @@ -17,11 +17,11 @@
{tmpl_var name='search_limit'}
- + - + diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm index 51c3c3356..46db0adf9 100644 --- a/interface/web/sites/templates/web_backup_list.htm +++ b/interface/web/sites/templates/web_backup_list.htm @@ -16,7 +16,7 @@ - + diff --git a/interface/web/sites/templates/web_domain_stats.htm b/interface/web/sites/templates/web_domain_stats.htm index d0f6f16a3..f497f1bb9 100644 --- a/interface/web/sites/templates/web_domain_stats.htm +++ b/interface/web/sites/templates/web_domain_stats.htm @@ -12,9 +12,14 @@  {tmpl_var name='generate_password_txt'} +
+

{tmpl_var name='password_strength_txt'}

+
+

 

+
- +
diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm index 0a4da6432..5c40a7952 100644 --- a/interface/web/sites/templates/web_sites_stats_list.htm +++ b/interface/web/sites/templates/web_sites_stats_list.htm @@ -37,17 +37,6 @@ - - - - - - - - diff --git a/interface/web/sites/templates/web_vhost_subdomain_advanced.htm b/interface/web/sites/templates/web_vhost_subdomain_advanced.htm index f61cf500c..d71e30b1b 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 3c78fe73d..6c55e50a5 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_redirect.htm b/interface/web/sites/templates/web_vhost_subdomain_redirect.htm index ddbdc04bb..ac504f124 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 832d623f6..e5b13c1d0 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 d0f6f16a3..aa1605e43 100644 --- a/interface/web/sites/templates/web_vhost_subdomain_stats.htm +++ b/interface/web/sites/templates/web_vhost_subdomain_stats.htm @@ -29,8 +29,8 @@
- - + +
diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm index bf1ed65d2..9bd7ba37f 100644 --- a/interface/web/tools/templates/dns_import_tupa.htm +++ b/interface/web/tools/templates/dns_import_tupa.htm @@ -1,7 +1,7 @@ -

Import DNS recods from Tupa PowerDNS controlpanel

+

Import DNS recods from Tupa PowerDNS controlpanel

-
+
PowerDNS Tupa import @@ -28,8 +28,7 @@
-
- +

Import DNS Records

@@ -48,8 +47,8 @@
- - + +
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm index 465c8c519..f7b97e8e6 100644 --- a/interface/web/tools/templates/import_ispconfig.htm +++ b/interface/web/tools/templates/import_ispconfig.htm @@ -1,4 +1,4 @@ -

{tmpl_var name="head_txt"}

+

@@ -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 10a73d7a6..363d72860 100644 --- a/interface/web/tools/templates/import_plesk.htm +++ b/interface/web/tools/templates/import_plesk.htm @@ -1,4 +1,4 @@ -

Import plesk panel data

+

Import plesk panel data

@@ -66,8 +66,8 @@
- - + +
diff --git a/interface/web/tools/templates/interface_settings.htm b/interface/web/tools/templates/interface_settings.htm index 978355f0f..a9057c874 100644 --- a/interface/web/tools/templates/interface_settings.htm +++ b/interface/web/tools/templates/interface_settings.htm @@ -12,6 +12,7 @@ {tmpl_var name='app_theme'}
+
- - + +
-- GitLab
{tmpl_var name='search_limit'}
 {tmpl_var name='search_limit'}
{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 -
-
-