Skip to content

Commit dd0ddd1

Browse files
falkotimmefalkotimme
committed
- Introduced subsections for forms. With subsections, you can split up large forms. Subsections can be slid into/out of view.
1 parent 9616774 commit dd0ddd1

File tree

9 files changed

+165
-42
lines changed

9 files changed

+165
-42
lines changed

‎interface/web/admin/lib/lang/de_server_config.lng‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,16 @@ $wb['do_not_try_rescue_httpd_txt'] = 'Deaktiviere HTTPD Monitoring';
148148
$wb['do_not_try_rescue_mysql_txt'] = 'Deaktiviere MySQL Monitoring';
149149
$wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere Email Monitoring';
150150
$wb['rescue_description_txt'] = '<b>Information:</b> Falls Sie MySQL stoppen m&ouml;chten, w&auml;hlen Sie die &quot;Deaktiviere MySQL Monitoring&quot; Checkbox und warten Sie 2-3 Minuten.<br>Falls Sie nicht 2-3 Minuten warten, wird Rescue versuchen, MySQL neu zu starten!';
151-
$wb['enable_sni_txt'] = 'Enable SNI';
152-
$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
153-
$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
154-
$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
155-
$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
151+
$wb['enable_sni_txt'] = 'Aktiviere SNI';
152+
$wb['set_folder_permissions_on_update_txt'] = 'Verzeichnisberechtigungen beim Update setzen';
153+
$wb['add_web_users_to_sshusers_group_txt'] = 'Webuser zur -sshusers- hinzufügen';
154+
$wb['connect_userid_to_webid_txt'] = 'Linux-Userid mit webid verknüpfen';
155+
$wb['connect_userid_to_webid_start_txt'] = 'Start-ID für userid/webid-Verknüpfung';
156+
$wb["realtime_blackhole_list_txt"] = 'Real-time Blackhole List';
157+
$wb["realtime_blackhole_list_note_txt"] = '(RBL\'s mit Kommas trennen)';
158+
$wb["ssl_settings_txt"] = 'SSL-Einstellungen';
159+
$wb["permissions_txt"] = 'Berechtigungen';
160+
$wb["php_settings_txt"] = 'PHP-Einstellungen';
161+
$wb["apps_vhost_settings_txt"] = 'Apps-Vhost-Einstellungen';
162+
$wb["awstats_settings_txt"] = 'AWStats-Einstellungen';
156163
?>

‎interface/web/admin/lib/lang/en_server_config.lng‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,9 @@ $wb["connect_userid_to_webid_txt"] = 'Connect Linux userid to webid';
157157
$wb["connect_userid_to_webid_start_txt"] = 'Start ID for userid/webid connect';
158158
$wb["realtime_blackhole_list_txt"] = 'Real-time Blackhole List';
159159
$wb["realtime_blackhole_list_note_txt"] = '(Separate RBL\'s with commas)';
160+
$wb["ssl_settings_txt"] = 'SSL Settings';
161+
$wb["permissions_txt"] = 'Permissions';
162+
$wb["php_settings_txt"] = 'PHP Settings';
163+
$wb["apps_vhost_settings_txt"] = 'Apps Vhost Settings';
164+
$wb["awstats_settings_txt"] = 'AWStats Settings';
160165
?>

‎interface/web/admin/templates/server_config_web_edit.htm‎

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ <h2><tmpl_var name="list_head_txt"></h2>
4747
<label for="nginx_vhost_conf_enabled_dir">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
4848
<input name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
4949
</div>
50-
<div class="ctrlHolder">
51-
<label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
52-
<input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
53-
</div>
54-
<div class="ctrlHolder">
55-
<label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
56-
<input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
57-
</div>
5850
<div class="ctrlHolder">
5951
<p class="label">{tmpl_var name='security_level_txt'}</p>
6052
<div class="multiField">
@@ -69,12 +61,49 @@ <h2><tmpl_var name="list_head_txt"></h2>
6961
{tmpl_var name='check_apache_config'}
7062
</div>
7163
</div>
72-
<div class="ctrlHolder">
64+
<div class="ctrlHolder apache">
65+
<label for="user">{tmpl_var name='web_user_txt'}</label>
66+
<input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
67+
</div>
68+
<div class="ctrlHolder apache">
69+
<label for="group">{tmpl_var name='web_group_txt'}</label>
70+
<input name="group" id="group" value="{tmpl_var name='group'}" size="40" maxlength="255" type="text" class="textInput" />
71+
</div>
72+
<div class="ctrlHolder nginx">
73+
<label for="nginx_user">{tmpl_var name='nginx_user_txt'}</label>
74+
<input name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" size="40" maxlength="255" type="text" class="textInput" />
75+
</div>
76+
<div class="ctrlHolder nginx">
77+
<label for="nginx_group">{tmpl_var name='nginx_group_txt'}</label>
78+
<input name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" size="40" maxlength="255" type="text" class="textInput" />
79+
</div>
80+
<div class="ctrlHolder nginx">
81+
<label for="nginx_cgi_socket">{tmpl_var name='nginx_cgi_socket_txt'}</label>
82+
<input name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" size="40" maxlength="255" type="text" class="textInput" />
83+
</div>
84+
<div class="ctrlHolder apache">
85+
<label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
86+
<input name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" size="40" maxlength="255" type="text" class="textInput" />
87+
</div>
88+
<div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
89+
<div style="display:none;">
90+
<div class="ctrlHolder">
7391
<p class="label">{tmpl_var name='enable_sni_txt'}</p>
7492
<div class="multiField">
7593
{tmpl_var name='enable_sni'}
7694
</div>
7795
</div>
96+
<div class="ctrlHolder">
97+
<label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
98+
<input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" class="textInput" />
99+
</div>
100+
<div class="ctrlHolder">
101+
<label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
102+
<input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" class="textInput" />
103+
</div>
104+
</div>
105+
<div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>
106+
<div style="display:none;">
78107
<div class="ctrlHolder">
79108
<p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
80109
<div class="multiField">
@@ -97,22 +126,9 @@ <h2><tmpl_var name="list_head_txt"></h2>
97126
<label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
98127
<input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
99128
</div>
100-
<div class="ctrlHolder apache">
101-
<label for="user">{tmpl_var name='web_user_txt'}</label>
102-
<input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
103-
</div>
104-
<div class="ctrlHolder apache">
105-
<label for="group">{tmpl_var name='web_group_txt'}</label>
106-
<input name="group" id="group" value="{tmpl_var name='group'}" size="40" maxlength="255" type="text" class="textInput" />
107-
</div>
108-
<div class="ctrlHolder nginx">
109-
<label for="nginx_user">{tmpl_var name='nginx_user_txt'}</label>
110-
<input name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" size="40" maxlength="255" type="text" class="textInput" />
111-
</div>
112-
<div class="ctrlHolder nginx">
113-
<label for="nginx_group">{tmpl_var name='nginx_group_txt'}</label>
114-
<input name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" size="40" maxlength="255" type="text" class="textInput" />
115-
</div>
129+
</div>
130+
<div class="subsectiontoggle"><span></span>{tmpl_var name='php_settings_txt'}<em></em></div>
131+
<div style="display:none;">
116132
<div class="ctrlHolder apache">
117133
<label for="php_ini_path_apache">{tmpl_var name='php_ini_path_apache_txt'}</label>
118134
<input name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -145,14 +161,9 @@ <h2><tmpl_var name="list_head_txt"></h2>
145161
<label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
146162
<input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" type="text" class="textInput" />
147163
</div>
148-
<div class="ctrlHolder nginx">
149-
<label for="nginx_cgi_socket">{tmpl_var name='nginx_cgi_socket_txt'}</label>
150-
<input name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" size="40" maxlength="255" type="text" class="textInput" />
151-
</div>
152-
<div class="ctrlHolder apache">
153-
<label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
154-
<input name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" size="40" maxlength="255" type="text" class="textInput" />
155164
</div>
165+
<div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>
166+
<div style="display:none;">
156167
<div class="ctrlHolder">
157168
<label for="apps_vhost_port">{tmpl_var name='apps_vhost_port_txt'}</label>
158169
<input name="apps_vhost_port" id="apps_vhost_port" value="{tmpl_var name='apps_vhost_port'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -165,6 +176,9 @@ <h2><tmpl_var name="list_head_txt"></h2>
165176
<label for="apps_vhost_servername">{tmpl_var name='apps_vhost_servername_txt'}</label>
166177
<input name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" size="40" maxlength="255" type="text" class="textInput" />
167178
</div>
179+
</div>
180+
<div class="subsectiontoggle"><span></span>{tmpl_var name='awstats_settings_txt'}<em></em></div>
181+
<div style="display:none;">
168182
<div class="ctrlHolder">
169183
<label for="awstats_conf_dir">{tmpl_var name='awstats_conf_dir_txt'}</label>
170184
<input name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
@@ -181,6 +195,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
181195
<label for="awstats_buildstaticpages_pl">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
182196
<input name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" size="40" maxlength="255" type="text" class="textInput" />
183197
</div>
198+
</div>
184199
</fieldset>
185200

186201
<input type="hidden" name="id" value="{tmpl_var name='id'}">

‎interface/web/themes/default/css/screen/content_ispc.css‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,87 @@
912912
max-width: 80%;
913913
min-width: 680px;
914914
}
915+
916+
div.subsectiontoggle {
917+
border:1px solid #ccc;
918+
font-weight:bold;
919+
font-size:14px;
920+
padding-top:10px;
921+
padding-bottom:0;
922+
margin-top:5px;
923+
text-indent:15px;
924+
cursor:pointer;
925+
margin-bottom:10px;
926+
background-color:#f4f4f4;
927+
-moz-border-radius:5px;
928+
-webkit-border-radius:5px;
929+
-khtml-border-radius:5px;
930+
-o-border-radius:5px;
931+
-ms-border-radius:5px;
932+
border-radius:5px;
933+
}
934+
div.subsectiontoggle span{
935+
display:inline-block;
936+
margin-bottom:-3px;
937+
margin-right:10px;
938+
width:16px;
939+
height:16px;
940+
background:url(../../icons/x16/plus_circle_frame.png) top left no-repeat;
941+
}
942+
div.subsectiontoggle span.showing{
943+
background:url(../../icons/x16/minus_circle_frame.png) top left no-repeat;
944+
}
945+
div.subsectiontoggle em{
946+
display:block;
947+
position:relative;
948+
left:425px;
949+
top:-13px;
950+
margin-bottom:-3px;
951+
width:13px;
952+
height:13px;
953+
background:url(../../images/chevron.png) top left no-repeat;
954+
-webkit-transform:none;
955+
-moz-transform:none;
956+
-khtml-transform:none;
957+
-o-transform:none;
958+
-ms-transform:none;
959+
transform:none;
960+
-webkit-transition-duration: .2s;
961+
-moz-transition-duration: .2s;
962+
-khtml-transition-duration: .2s;
963+
-o-transition-duration: .2s;
964+
-ms-transition-duration: .2s;
965+
transition-duration: .2s;
966+
-webkit-transition-property: -webkit-transform;
967+
-moz-transition-property: -moz-transform;
968+
-khtml-transition-property: -khtml-transform;
969+
-o-transition-property: -o-transform;
970+
-ms-transition-property: -ms-transform;
971+
transition-property: transform;
972+
}
973+
div.subsectiontoggle em.showing{
974+
display:block;
975+
position:relative;
976+
left:425px;
977+
top:-13px;
978+
background:url(../../images/chevron.png) top left no-repeat;
979+
width:13px;
980+
height:13px;
981+
-webkit-transform:rotate(90deg);
982+
-moz-transform:rotate(90deg);
983+
-khtml-transform:rotate(90deg);
984+
-o-transform:rotate(90deg);
985+
-ms-transform:rotate(90deg);
986+
transform:rotate(90deg);
987+
}
988+
div.subsectiontoggle:hover em{
989+
-webkit-transform:rotate(90deg);
990+
-moz-transform:rotate(90deg);
991+
-khtml-transform:rotate(90deg);
992+
-o-transform:rotate(90deg);
993+
-ms-transform:rotate(90deg);
994+
transform:rotate(90deg);
995+
}
915996

916997
}
917998

‎interface/web/themes/default/images/chevron.png‎

183 Bytes
Loading

‎interface/web/themes/default/templates/main.tpl.htm‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@
7777
e.preventDefault();
7878
}
7979
});
80+
81+
jQuery('.subsectiontoggle').live("click", function(){
82+
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
83+
});
8084
});
8185

8286

@@ -86,13 +90,12 @@
8690
}
8791
});
8892

89-
//Use jQuery submit with kespress Enter in panel filterbar
93+
//Use jQuery submit with keypress Enter in panel filterbar
9094
jQuery(document).bind("keypress", function(event) {
9195
if (event.which == '13' && $(".panel #Filter").length > 0) {
9296
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
9397
}
9498
});
95-
9699
</script>
97100
</head>
98101
<body>

‎interface/web/themes/default_64_navimg/templates/main.tpl.htm‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@
7878
e.preventDefault();
7979
}
8080
});
81+
82+
jQuery('.subsectiontoggle').live("click", function(){
83+
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
84+
});
8185
});
8286

8387
jQuery(document).bind("change", function(event) {
@@ -86,7 +90,7 @@
8690
}
8791
});
8892

89-
//Use jQuery submit with kespress Enter in panel filterbar
93+
//Use jQuery submit with keypress Enter in panel filterbar
9094
jQuery(document).bind("keypress", function(event) {
9195
if (event.which == '13' && $(".panel #Filter").length > 0) {
9296
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();

‎interface/web/themes/default_combobox/templates/main.tpl.htm‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@
7979
e.preventDefault();
8080
}
8181
});
82+
83+
jQuery('.subsectiontoggle').live("click", function(){
84+
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
85+
});
8286
});
8387

8488
jQuery(document).bind("change", function(event) {
@@ -93,7 +97,7 @@
9397
}
9498
});
9599

96-
//Use jQuery submit with kespress Enter in panel filterbar
100+
//Use jQuery submit with keypress Enter in panel filterbar
97101
jQuery(document).bind("keypress", function(event) {
98102
if (event.which == '13' && $(".panel #Filter").length > 0) {
99103
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();

‎interface/web/themes/default_no_navimg/templates/main.tpl.htm‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@
7878
e.preventDefault();
7979
}
8080
});
81+
82+
jQuery('.subsectiontoggle').live("click", function(){
83+
jQuery(this).children().toggleClass('showing').end().next().slideToggle();
84+
});
8185
});
8286

8387
jQuery(document).bind("change", function(event) {
@@ -86,7 +90,7 @@
8690
}
8791
});
8892

89-
//Use jQuery submit with kespress Enter in panel filterbar
93+
//Use jQuery submit with keypress Enter in panel filterbar
9094
jQuery(document).bind("keypress", function(event) {
9195
if (event.which == '13' && $(".panel #Filter").length > 0) {
9296
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();

0 commit comments

Comments
 (0)