From dd0ddd19db32c2952b0c121df370ab143fbbeb5b Mon Sep 17 00:00:00 2001 From: ftimme Date: Wed, 25 Apr 2012 10:31:39 +0000 Subject: [PATCH] - Introduced subsections for forms. With subsections, you can split up large forms. Subsections can be slid into/out of view. --- .../web/admin/lib/lang/de_server_config.lng | 17 ++-- .../web/admin/lib/lang/en_server_config.lng | 5 ++ .../templates/server_config_web_edit.htm | 79 ++++++++++------- .../default/css/screen/content_ispc.css | 81 ++++++++++++++++++ .../web/themes/default/images/chevron.png | Bin 0 -> 183 bytes .../web/themes/default/templates/main.tpl.htm | 7 +- .../default_64_navimg/templates/main.tpl.htm | 6 +- .../default_combobox/templates/main.tpl.htm | 6 +- .../default_no_navimg/templates/main.tpl.htm | 6 +- 9 files changed, 165 insertions(+), 42 deletions(-) create mode 100644 interface/web/themes/default/images/chevron.png diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index fd78f1bce..63bbf1020 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -148,9 +148,16 @@ $wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring'; $wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring'; $wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere Email Monitoring'; $wb['rescue_description_txt'] = 'Information: Falls Sie MySQL stoppen möchten, wählen Sie die "Deaktiviere MySQL Monitoring" Checkbox und warten Sie 2-3 Minuten.
Falls Sie nicht 2-3 Minuten warten, wird Rescue versuchen, MySQL neu zu starten!'; -$wb['enable_sni_txt'] = 'Enable SNI'; -$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update'; -$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group'; -$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid'; -$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect'; +$wb['enable_sni_txt'] = 'Aktiviere SNI'; +$wb['set_folder_permissions_on_update_txt'] = 'Verzeichnisberechtigungen beim Update setzen'; +$wb['add_web_users_to_sshusers_group_txt'] = 'Webuser zur -sshusers- hinzufügen'; +$wb['connect_userid_to_webid_txt'] = 'Linux-Userid mit webid verknüpfen'; +$wb['connect_userid_to_webid_start_txt'] = 'Start-ID für userid/webid-Verknüpfung'; +$wb["realtime_blackhole_list_txt"] = 'Real-time Blackhole List'; +$wb["realtime_blackhole_list_note_txt"] = '(RBL\'s mit Kommas trennen)'; +$wb["ssl_settings_txt"] = 'SSL-Einstellungen'; +$wb["permissions_txt"] = 'Berechtigungen'; +$wb["php_settings_txt"] = 'PHP-Einstellungen'; +$wb["apps_vhost_settings_txt"] = 'Apps-Vhost-Einstellungen'; +$wb["awstats_settings_txt"] = 'AWStats-Einstellungen'; ?> diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 4cce27548..ac7546f8c 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -157,4 +157,9 @@ $wb["connect_userid_to_webid_txt"] = 'Connect Linux userid to webid'; $wb["connect_userid_to_webid_start_txt"] = 'Start ID for userid/webid connect'; $wb["realtime_blackhole_list_txt"] = 'Real-time Blackhole List'; $wb["realtime_blackhole_list_note_txt"] = '(Separate RBL\'s with commas)'; +$wb["ssl_settings_txt"] = 'SSL Settings'; +$wb["permissions_txt"] = 'Permissions'; +$wb["php_settings_txt"] = 'PHP Settings'; +$wb["apps_vhost_settings_txt"] = 'Apps Vhost Settings'; +$wb["awstats_settings_txt"] = 'AWStats Settings'; ?> \ No newline at end of file diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 7f150f2dc..f5710faf3 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -47,14 +47,6 @@ -
- - -
-
- - -

{tmpl_var name='security_level_txt'}

@@ -69,12 +61,49 @@ {tmpl_var name='check_apache_config'}
-
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
{tmpl_var name='ssl_settings_txt'}
+
+

{tmpl_var name='enable_sni_txt'}

{tmpl_var name='enable_sni'}
+
+ + +
+
+ + +
+
+
{tmpl_var name='permissions_txt'}
+

{tmpl_var name='set_folder_permissions_on_update_txt'}

@@ -97,22 +126,9 @@
-
- - -
-
- - -
-
- - -
-
- - -
+
+
{tmpl_var name='php_settings_txt'}
+
@@ -145,14 +161,9 @@
-
- - -
-
- -
+
{tmpl_var name='apps_vhost_settings_txt'}
+
@@ -165,6 +176,9 @@
+
+
{tmpl_var name='awstats_settings_txt'}
+
@@ -181,6 +195,7 @@
+
diff --git a/interface/web/themes/default/css/screen/content_ispc.css b/interface/web/themes/default/css/screen/content_ispc.css index 9e65bd41c..796cd5711 100644 --- a/interface/web/themes/default/css/screen/content_ispc.css +++ b/interface/web/themes/default/css/screen/content_ispc.css @@ -912,6 +912,87 @@ max-width: 80%; min-width: 680px; } + + div.subsectiontoggle { + border:1px solid #ccc; + font-weight:bold; + font-size:14px; + padding-top:10px; + padding-bottom:0; + margin-top:5px; + text-indent:15px; + cursor:pointer; + margin-bottom:10px; + background-color:#f4f4f4; + -moz-border-radius:5px; + -webkit-border-radius:5px; + -khtml-border-radius:5px; + -o-border-radius:5px; + -ms-border-radius:5px; + border-radius:5px; + } + div.subsectiontoggle span{ + display:inline-block; + margin-bottom:-3px; + margin-right:10px; + width:16px; + height:16px; + background:url(../../icons/x16/plus_circle_frame.png) top left no-repeat; + } + div.subsectiontoggle span.showing{ + background:url(../../icons/x16/minus_circle_frame.png) top left no-repeat; + } + div.subsectiontoggle em{ + display:block; + position:relative; + left:425px; + top:-13px; + margin-bottom:-3px; + width:13px; + height:13px; + background:url(../../images/chevron.png) top left no-repeat; + -webkit-transform:none; + -moz-transform:none; + -khtml-transform:none; + -o-transform:none; + -ms-transform:none; + transform:none; + -webkit-transition-duration: .2s; + -moz-transition-duration: .2s; + -khtml-transition-duration: .2s; + -o-transition-duration: .2s; + -ms-transition-duration: .2s; + transition-duration: .2s; + -webkit-transition-property: -webkit-transform; + -moz-transition-property: -moz-transform; + -khtml-transition-property: -khtml-transform; + -o-transition-property: -o-transform; + -ms-transition-property: -ms-transform; + transition-property: transform; + } + div.subsectiontoggle em.showing{ + display:block; + position:relative; + left:425px; + top:-13px; + background:url(../../images/chevron.png) top left no-repeat; + width:13px; + height:13px; + -webkit-transform:rotate(90deg); + -moz-transform:rotate(90deg); + -khtml-transform:rotate(90deg); + -o-transform:rotate(90deg); + -ms-transform:rotate(90deg); + transform:rotate(90deg); + } + div.subsectiontoggle:hover em{ + -webkit-transform:rotate(90deg); + -moz-transform:rotate(90deg); + -khtml-transform:rotate(90deg); + -o-transform:rotate(90deg); + -ms-transform:rotate(90deg); + transform:rotate(90deg); + } } diff --git a/interface/web/themes/default/images/chevron.png b/interface/web/themes/default/images/chevron.png new file mode 100644 index 0000000000000000000000000000000000000000..7ca05879425ec644442a7590157616f4de3eb77d GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4xHBpZ(Y^aoPv0X`wFA3l8O?CjjLXV1QU`*!Tu zv2EM7`uh5*Q>X6Uy}PBQ<@M{=rKP3+|NrMJzOWLgg|Q^aFPOpM*^M+H$IjEmF@)oK za>9d*1cv5!vI4iNw=>O1ySbNBNnr172A|FE?(qnoxW~CnqWnD5 0) { $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit(); } }); - diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm index c90c9f225..c7fca67bd 100644 --- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm +++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm @@ -78,6 +78,10 @@ e.preventDefault(); } }); + + jQuery('.subsectiontoggle').live("click", function(){ + jQuery(this).children().toggleClass('showing').end().next().slideToggle(); + }); }); jQuery(document).bind("change", function(event) { @@ -86,7 +90,7 @@ } }); - //Use jQuery submit with kespress Enter in panel filterbar + //Use jQuery submit with keypress Enter in panel filterbar jQuery(document).bind("keypress", function(event) { if (event.which == '13' && $(".panel #Filter").length > 0) { $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit(); diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm index 5b73fbacb..55917dae4 100644 --- a/interface/web/themes/default_combobox/templates/main.tpl.htm +++ b/interface/web/themes/default_combobox/templates/main.tpl.htm @@ -79,6 +79,10 @@ e.preventDefault(); } }); + + jQuery('.subsectiontoggle').live("click", function(){ + jQuery(this).children().toggleClass('showing').end().next().slideToggle(); + }); }); jQuery(document).bind("change", function(event) { @@ -93,7 +97,7 @@ } }); - //Use jQuery submit with kespress Enter in panel filterbar + //Use jQuery submit with keypress Enter in panel filterbar jQuery(document).bind("keypress", function(event) { if (event.which == '13' && $(".panel #Filter").length > 0) { $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit(); diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm index ff939af3f..61df5fd2c 100644 --- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm +++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm @@ -78,6 +78,10 @@ e.preventDefault(); } }); + + jQuery('.subsectiontoggle').live("click", function(){ + jQuery(this).children().toggleClass('showing').end().next().slideToggle(); + }); }); jQuery(document).bind("change", function(event) { @@ -86,7 +90,7 @@ } }); - //Use jQuery submit with kespress Enter in panel filterbar + //Use jQuery submit with keypress Enter in panel filterbar jQuery(document).bind("keypress", function(event) { if (event.which == '13' && $(".panel #Filter").length > 0) { $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit(); -- GitLab