- Layout fixes

interface/web/admin/templates/directive_snippets_edit.htm

@@ -7,8 +7,7 @@
         
             <div class="form-group">
                 <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div></div>
 			<div class="form-group">
                 <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
                 <div class="col-sm-9"><select name="type" id="type" class="form-control">

interface/web/admin/templates/firewall_edit.htm

@@ -13,12 +13,10 @@
             </div></div>
             <div class="form-group">
                 <label for="tcp_port" class="col-sm-3 control-label">{tmpl_var name='tcp_port_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="udp_port" class="col-sm-3 control-label">{tmpl_var name='udp_port_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="udp_port" id="udp_port" value="{tmpl_var name='udp_port'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="udp_port" id="udp_port" value="{tmpl_var name='udp_port'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-9">

interface/web/admin/templates/groups_edit.htm

@@ -7,8 +7,7 @@
         
             <div class="form-group">
                 <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
                 <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea></div>

interface/web/admin/templates/iptables_edit.htm

@@ -24,24 +24,19 @@
             </div></div>
             <div class="form-group">
                 <label for="singleport" class="col-sm-3 control-label">{tmpl_var name='singleport_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="singleport" id="singleport" value="{tmpl_var name='singleport'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="singleport" id="singleport" value="{tmpl_var name='singleport'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="multiport" class="col-sm-3 control-label">{tmpl_var name='multiport_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="multiport" id="multiport" value="{tmpl_var name='multiport'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="multiport" id="multiport" value="{tmpl_var name='multiport'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="destination_ip" class="col-sm-3 control-label">{tmpl_var name='destination_ip_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="source_ip" class="col-sm-3 control-label">{tmpl_var name='source_ip_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="state" class="col-sm-3 control-label">{tmpl_var name='state_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="target" class="col-sm-3 control-label">{tmpl_var name='target_txt'}</label>
                 <div class="col-sm-9"><select name="target" id="target" class="form-control">

interface/web/admin/templates/language_add.htm

@@ -13,8 +13,7 @@
             </div></div>
             <div class="form-group">
                 <label for="lng_new" class="col-sm-3 control-label">{tmpl_var name='language_new_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="lng_new" id="lng_new" value="" class="form-control" />
-                </div><p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
+                <div class="col-sm-9"><input type="text" name="lng_new" id="lng_new" value="" class="form-control" /></div><p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
             </div>
         
 

interface/web/admin/templates/language_edit.htm

@@ -9,8 +9,7 @@
                 <tmpl_loop name="records">
                     <span class="wf_oneField">
                         <label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
-                        <div class="col-sm-9"><input class="form-control" type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" >
-                    </div></span> 
+                        <div class="col-sm-9"><input class="form-control" type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" ></div></span> 
                 </tmpl_loop>
             </span>
         </fieldset>  

interface/web/admin/templates/language_import.htm

@@ -12,14 +12,12 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
                 <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/>
-                </div></div>
+                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/></div></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
                 <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/>
-                </div></div>
+                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/></div></div>
             </div>
                 
                 

interface/web/admin/templates/remote_user_edit.htm

@@ -8,12 +8,11 @@
             <div class="form-group">
                 <label for="remote_username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
                 <p class="prefix">{tmpl_var name='username_prefix'}</p>
-                <div class="col-sm-9"><input type="text" name="remote_username" id="username" value="{tmpl_var name='remote_username'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="remote_username" id="username" value="{tmpl_var name='remote_username'}" class="form-control" /></div></div>
                 
             <div class="form-group">
                 <label for="remote_password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
-                <input name="remote_password" id="password" value="{tmpl_var name='remote_password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />&nbsp;<a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+                <div class="col-sm-6"><input type="password" name="remote_password" id="password" value="{tmpl_var name='remote_password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
@@ -22,8 +21,7 @@
             </div>
             <div class="form-group">
                 <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
-                <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
-            </div>
+                <div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
             <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
             <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
             <div class="form-group">

interface/web/admin/templates/server_config_cron_edit.htm

@@ -7,16 +7,13 @@
         
             <div class="form-group">
                 <label for="init_script" class="col-sm-3 control-label">{tmpl_var name='init_script_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="init_script" id="init_script" value="{tmpl_var name='init_script'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="init_script" id="init_script" value="{tmpl_var name='init_script'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="crontab_dir" class="col-sm-3 control-label">{tmpl_var name='crontab_dir_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="crontab_dir" id="crontab_dir" value="{tmpl_var name='crontab_dir'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="crontab_dir" id="crontab_dir" value="{tmpl_var name='crontab_dir'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="wget" class="col-sm-3 control-label">{tmpl_var name='wget_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="wget" id="wget" value="{tmpl_var name='wget'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="wget" id="wget" value="{tmpl_var name='wget'}" class="form-control" /></div></div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">

interface/web/admin/templates/server_config_dns_edit.htm

@@ -7,24 +7,19 @@
         
             <div class="form-group">
                 <label for="bind_user" class="col-sm-3 control-label">{tmpl_var name='bind_user_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="bind_user" id="bind_user" value="{tmpl_var name='bind_user'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="bind_user" id="bind_user" value="{tmpl_var name='bind_user'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="bind_group" class="col-sm-3 control-label">{tmpl_var name='bind_group_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="bind_group" id="bind_group" value="{tmpl_var name='bind_group'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="bind_group" id="bind_group" value="{tmpl_var name='bind_group'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="bind_zonefiles_dir" class="col-sm-3 control-label">{tmpl_var name='bind_zonefiles_dir_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="bind_zonefiles_dir" id="bind_zonefiles_dir" value="{tmpl_var name='bind_zonefiles_dir'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="bind_zonefiles_dir" id="bind_zonefiles_dir" value="{tmpl_var name='bind_zonefiles_dir'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="named_conf_path" class="col-sm-3 control-label">{tmpl_var name='named_conf_path_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="named_conf_path" id="named_conf_path" value="{tmpl_var name='named_conf_path'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="named_conf_path" id="named_conf_path" value="{tmpl_var name='named_conf_path'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="named_conf_local_path" class="col-sm-3 control-label">{tmpl_var name='named_conf_local_path_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="named_conf_local_path" id="named_conf_local_path" value="{tmpl_var name='named_conf_local_path'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="named_conf_local_path" id="named_conf_local_path" value="{tmpl_var name='named_conf_local_path'}" class="form-control" /></div></div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">

interface/web/admin/templates/server_config_fastcgi_edit.htm

@@ -7,32 +7,25 @@
         
             <div class="form-group">
                 <label for="fastcgi_starter_path" class="col-sm-3 control-label">{tmpl_var name='fastcgi_starter_path_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="fastcgi_starter_script" class="col-sm-3 control-label">{tmpl_var name='fastcgi_starter_script_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="fastcgi_starter_script" id="fastcgi_starter_script" value="{tmpl_var name='fastcgi_starter_script'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="fastcgi_starter_script" id="fastcgi_starter_script" value="{tmpl_var name='fastcgi_starter_script'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="fastcgi_alias" class="col-sm-3 control-label">{tmpl_var name='fastcgi_alias_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="fastcgi_alias" id="fastcgi_alias" value="{tmpl_var name='fastcgi_alias'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="fastcgi_alias" id="fastcgi_alias" value="{tmpl_var name='fastcgi_alias'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="fastcgi_phpini_path" class="col-sm-3 control-label">{tmpl_var name='fastcgi_phpini_path_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="fastcgi_phpini_path" id="fastcgi_phpini_path" value="{tmpl_var name='fastcgi_phpini_path'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="fastcgi_phpini_path" id="fastcgi_phpini_path" value="{tmpl_var name='fastcgi_phpini_path'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="fastcgi_children" class="col-sm-3 control-label">{tmpl_var name='fastcgi_children_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="fastcgi_children" id="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="fastcgi_children" id="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="fastcgi_max_requests" class="col-sm-3 control-label">{tmpl_var name='fastcgi_max_requests_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="fastcgi_max_requests" id="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="fastcgi_max_requests" id="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="fastcgi_bin" class="col-sm-3 control-label">{tmpl_var name='fastcgi_bin_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="fastcgi_bin" id="fastcgi_bin" value="{tmpl_var name='fastcgi_bin'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="fastcgi_bin" id="fastcgi_bin" value="{tmpl_var name='fastcgi_bin'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="fastcgi_config_syntax" class="col-sm-3 control-label">{tmpl_var name='fastcgi_config_syntax_txt'}</label>
                 <div class="col-sm-9"><select name="fastcgi_config_syntax" id="fastcgi_config_syntax" class="form-control">

interface/web/admin/templates/server_config_getmail_edit.htm

@@ -7,8 +7,7 @@
         
             <div class="form-group">
                 <label for="getmail_config_dir" class="col-sm-3 control-label">{tmpl_var name='getmail_config_dir_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" class="form-control" /></div></div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">

interface/web/admin/templates/server_config_jailkit_edit.htm

@@ -7,20 +7,16 @@
         
             <div class="form-group">
                 <label for="jailkit_chroot_home" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_home_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="jailkit_chroot_app_sections" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_app_sections_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="jailkit_chroot_app_sections" id="jailkit_chroot_app_sections" value="{tmpl_var name='jailkit_chroot_app_sections'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="jailkit_chroot_app_sections" id="jailkit_chroot_app_sections" value="{tmpl_var name='jailkit_chroot_app_sections'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="jailkit_chroot_app_programs" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_app_programs_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="jailkit_chroot_app_programs" id="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="jailkit_chroot_app_programs" id="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="jailkit_chroot_cron_programs" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_cron_programs_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="jailkit_chroot_cron_programs" id="jailkit_chroot_cron_programs" value="{tmpl_var name='jailkit_chroot_cron_programs'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="jailkit_chroot_cron_programs" id="jailkit_chroot_cron_programs" value="{tmpl_var name='jailkit_chroot_cron_programs'}" class="form-control" /></div></div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">

interface/web/admin/templates/server_config_mail_edit.htm

@@ -13,16 +13,13 @@
             </div></div>
             <div class="form-group">
                 <label for="maildir_path" class="col-sm-3 control-label">{tmpl_var name='maildir_path_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="maildir_path" id="maildir_path" value="{tmpl_var name='maildir_path'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="maildir_path" id="maildir_path" value="{tmpl_var name='maildir_path'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="homedir_path" class="col-sm-3 control-label">{tmpl_var name='homedir_path_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="dkim_path" class="col-sm-3 control-label">{tmpl_var name='dkim_path_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="dkim_path" id="dkim_path" value="{tmpl_var name='dkim_path'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="dkim_path" id="dkim_path" value="{tmpl_var name='dkim_path'}" class="form-control" /></div></div>
             <div class="form-group">
 				<label class="col-sm-3 control-label">{tmpl_var name='dkim_strength_txt'}</label>
 				<div class="col-sm-9">
@@ -49,20 +46,16 @@
             </div>
             <div class="form-group">
                 <label for="mailuser_uid" class="col-sm-3 control-label">{tmpl_var name='mailuser_uid_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="mailuser_uid" id="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="mailuser_uid" id="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="mailuser_gid" class="col-sm-3 control-label">{tmpl_var name='mailuser_gid_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="mailuser_gid" id="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="mailuser_gid" id="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="mailuser_name" class="col-sm-3 control-label">{tmpl_var name='mailuser_name_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="mailuser_name" id="mailuser_name" value="{tmpl_var name='mailuser_name'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="mailuser_name" id="mailuser_name" value="{tmpl_var name='mailuser_name'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="mailuser_group" class="col-sm-3 control-label">{tmpl_var name='mailuser_group_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mailbox_virtual_uidgid_maps_txt'}</label>
                 <div class="col-sm-9">
@@ -71,23 +64,20 @@
             </div>
             <div class="form-group">
                 <label for="relayhost" class="col-sm-3 control-label">{tmpl_var name='relayhost_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="relayhost_user" class="col-sm-3 control-label">{tmpl_var name='relayhost_user_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" autocomplete="off" class="form-control" autocomplete="off" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" autocomplete="off" class="form-control" autocomplete="off" /></div></div>
             <div class="form-group">
                 <label for="relayhost_password" class="col-sm-3 control-label">{tmpl_var name='relayhost_password_txt'}</label>
-                <input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" autocomplete="off" class="textInput formLengthHalf" autocomplete="off" />
-            </div>
+                <div class="col-sm-9"><input type="password" name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" autocomplete="off" class="form-control" autocomplete="off" /></div></div>
             <div class="form-group">
                 <label for="mailbox_size_limit" class="col-sm-3 control-label">{tmpl_var name='mailbox_size_limit_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="mailbox_size_limit" id="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" class="form-control" />&nbsp;MB
+                <div class="col-sm-6"><input type="text" name="mailbox_size_limit" id="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;MB
             </div></div>
             <div class="form-group">
                 <label for="message_size_limit" class="col-sm-3 control-label">{tmpl_var name='message_size_limit_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" />&nbsp;MB
+                <div class="col-sm-6"><input type="text" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;MB
             </div></div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mailbox_quota_stats_txt'}</label>
@@ -97,7 +87,7 @@
             </div>
             <div class="form-group">
                 <label for="realtime_blackhole_list" class="col-sm-3 control-label">{tmpl_var name='realtime_blackhole_list_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" class="form-control" />&nbsp;{tmpl_var name='realtime_blackhole_list_note_txt'}
+                <div class="col-sm-6"><input type="text" name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='realtime_blackhole_list_note_txt'}
             </div></div>
 			<div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_admin_txt'}</label>
@@ -113,7 +103,7 @@
             </div>
             <div class="form-group">
                 <label for="overquota_notify_freq" class="col-sm-3 control-label">{tmpl_var name='overquota_notify_freq_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" class="form-control" />&nbsp;{tmpl_var name='overquota_notify_freq_note_txt'}
+                <div class="col-sm-6"><input type="text" name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='overquota_notify_freq_note_txt'}
             </div></div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_onok_txt'}</label>

interface/web/admin/templates/server_config_server_edit.htm

@@ -13,28 +13,22 @@
             </div>
             <div class="form-group">
                 <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="netmask" class="col-sm-3 control-label">{tmpl_var name='netmask_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="netmask" id="netmask" value="{tmpl_var name='netmask'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="netmask" id="netmask" value="{tmpl_var name='netmask'}" class="form-control" /></div></div>
 	    <div class="form-group">
 		<label for="v6_prefix" class="col-sm-3 control-label">{tmpl_var name='v6_prefix_txt'}</label>
-		<div class="col-sm-9"><input type="text" name="v6_prefix" id="v6_prefix" value="{tmpl_var name='v6_prefix'}" class="form-control" />
-            </div></div>
+		<div class="col-sm-9"><input type="text" name="v6_prefix" id="v6_prefix" value="{tmpl_var name='v6_prefix'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="gateway" class="col-sm-3 control-label">{tmpl_var name='gateway_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="gateway" id="gateway" value="{tmpl_var name='gateway'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="gateway" id="gateway" value="{tmpl_var name='gateway'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="hostname" class="col-sm-3 control-label">{tmpl_var name='hostname_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="nameservers" class="col-sm-3 control-label">{tmpl_var name='nameservers_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" class="form-control" />
-                </div><p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
+                <div class="col-sm-9"><input type="text" name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" class="form-control" /></div><p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
             </div>
             <div class="form-group">
                 <label for="firewall" class="col-sm-3 control-label">{tmpl_var name='firewall_txt'}</label>
@@ -56,8 +50,7 @@
             </div></div>
             <div class="form-group">
                 <label for="backup_dir" class="col-sm-3 control-label">{tmpl_var name='backup_dir_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" class="form-control" /></div></div>
 			<div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='backup_dir_is_mount_txt'}</label>
                 <div class="col-sm-9">
@@ -78,28 +71,24 @@
             </div>
 			<div class="form-group">
                 <label for="monit_url" class="col-sm-3 control-label">{tmpl_var name='monit_url_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="monit_url" id="monit_url" value="{tmpl_var name='monit_url'}" class="form-control" />&nbsp;{tmpl_var name='monit_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
+                <div class="col-sm-6"><input type="text" name="monit_url" id="monit_url" value="{tmpl_var name='monit_url'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='monit_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
             </div>
 			<div class="form-group">
                 <label for="monit_user" class="col-sm-3 control-label">{tmpl_var name='monit_user_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="monit_user" id="monit_user" value="{tmpl_var name='monit_user'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="monit_user" id="monit_user" value="{tmpl_var name='monit_user'}" class="form-control" /></div></div>
 			<div class="form-group">
                 <label for="monit_password" class="col-sm-3 control-label">{tmpl_var name='monit_password_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="monit_password" id="monit_password" value="{tmpl_var name='monit_password'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="monit_password" id="monit_password" value="{tmpl_var name='monit_password'}" class="form-control" /></div></div>
 			<div class="form-group">
                 <label for="munin_url" class="col-sm-3 control-label">{tmpl_var name='munin_url_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="munin_url" id="munin_url" value="{tmpl_var name='munin_url'}" class="form-control" />&nbsp;{tmpl_var name='munin_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
+                <div class="col-sm-6"><input type="text" name="munin_url" id="munin_url" value="{tmpl_var name='munin_url'}" class="form-control" /></div><div class="col-sm-3 input-sm">&nbsp;{tmpl_var name='munin_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
             </div>
 			<div class="form-group">
                 <label for="munin_user" class="col-sm-3 control-label">{tmpl_var name='munin_user_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="munin_user" id="munin_user" value="{tmpl_var name='munin_user'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="munin_user" id="munin_user" value="{tmpl_var name='munin_user'}" class="form-control" /></div></div>
 			<div class="form-group">
                 <label for="munin_password" class="col-sm-3 control-label">{tmpl_var name='munin_password_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="munin_password" id="munin_password" value="{tmpl_var name='munin_password'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="munin_password" id="munin_password" value="{tmpl_var name='munin_password'}" class="form-control" /></div></div>
 			<div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='monitor_system_updates_txt'}</label>
                 <div class="col-sm-9">

interface/web/admin/templates/server_config_vlogger_edit.htm

@@ -7,8 +7,7 @@
         
             <div class="form-group">
                 <label for="config_dir" class="col-sm-3 control-label">{tmpl_var name='config_dir_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" class="form-control" /></div></div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">

interface/web/admin/templates/server_edit_services.htm

@@ -7,8 +7,7 @@
         
             <div class="form-group">
                 <label for="server_name" class="col-sm-3 control-label">{tmpl_var name='server_name_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="server_name" id="server_name" value="{tmpl_var name='server_name'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="server_name" id="server_name" value="{tmpl_var name='server_name'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mail_server_txt'}</label>
                 <div class="col-sm-9">

interface/web/admin/templates/server_ip_edit.htm

@@ -25,8 +25,7 @@
             </div></div>
             <div class="form-group">
                 <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='virtualhost_txt'}</label>
                 <div class="col-sm-9">
@@ -35,8 +34,7 @@
             </div>
             <div class="form-group">
                 <label for="virtualhost_port" class="col-sm-3 control-label">{tmpl_var name='virtualhost_port_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="virtualhost_port" id="virtualhost_port" value="{tmpl_var name='virtualhost_port'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="virtualhost_port" id="virtualhost_port" value="{tmpl_var name='virtualhost_port'}" class="form-control" /></div></div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">

interface/web/admin/templates/server_php_fastcgi_edit.htm

@@ -7,12 +7,10 @@
         
             <div class="form-group">
                 <label for="php_fastcgi_binary" class="col-sm-3 control-label">{tmpl_var name='php_fastcgi_binary_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="php_fastcgi_binary" id="php_fastcgi_binary" value="{tmpl_var name='php_fastcgi_binary'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="php_fastcgi_binary" id="php_fastcgi_binary" value="{tmpl_var name='php_fastcgi_binary'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label for="php_fastcgi_ini_dir" class="col-sm-3 control-label">{tmpl_var name='php_fastcgi_ini_dir_txt'}</label>
-                <div class="col-sm-9"><input type="text" name="php_fastcgi_ini_dir" id="php_fastcgi_ini_dir" value="{tmpl_var name='php_fastcgi_ini_dir'}" class="form-control" />
-            </div></div>
+                <div class="col-sm-9"><input type="text" name="php_fastcgi_ini_dir" id="php_fastcgi_ini_dir" value="{tmpl_var name='php_fastcgi_ini_dir'}" class="form-control" /></div></div>
         
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">