Layout fix: wrong dom elements

interface/web/admin/templates/language_import.htm

@@ -11,13 +11,11 @@
             </div>
             <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 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>
                 
                 

interface/web/admin/templates/server_config_mail_edit.htm

@@ -22,27 +22,21 @@
                 <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">
-					<div class="col-sm-9"><select name="dkim_strength" id="dkim_strength" class="form-control">
+				<div class="col-sm-9"><select name="dkim_strength" id="dkim_strength" class="form-control">
 						{tmpl_var name='dkim_strength'}
 					</select></div>
-				</div>
 			</div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='pop3_imap_daemon_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><select name="pop3_imap_daemon" id="pop3_imap_daemon" class="form-control">
+                <div class="col-sm-9"><select name="pop3_imap_daemon" id="pop3_imap_daemon" class="form-control">
                         {tmpl_var name='pop3_imap_daemon'}
                     </select></div>
-                </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mail_filter_syntax_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><select name="mail_filter_syntax" id="mail_filter_syntax" class="form-control">
+                <div class="col-sm-9"><select name="mail_filter_syntax" id="mail_filter_syntax" class="form-control">
                         {tmpl_var name='mail_filter_syntax'}
                     </select></div>
-                </div>
             </div>
             <div class="form-group">
                 <label for="mailuser_uid" class="col-sm-3 control-label">{tmpl_var name='mailuser_uid_txt'}</label>

interface/web/admin/templates/server_config_web_edit.htm

@@ -7,11 +7,9 @@
         
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='server_type_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
+                <div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
                         {tmpl_var name='server_type'}
                     </select></div>
-                </div>
             </div>
             <div class="form-group">
                 <label for="website_basedir" class="col-sm-3 control-label">{tmpl_var name='website_basedir_txt'}</label>
@@ -58,11 +56,9 @@
                 <div class="col-sm-9"><input type="text" name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" class="form-control" /></div></div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='security_level_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
+                <div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
                         {tmpl_var name='security_level'}
                     </select></div>
-                </div>
             </div>
             <div class="form-group apache">
                 <label class="col-sm-3 control-label">{tmpl_var name='check_apache_config_txt'}</label>
@@ -225,11 +221,9 @@
                 </div></div>
                 <div class="form-group">
                     <label for="php_handler" class="col-sm-3 control-label">{tmpl_var name='php_handler_txt'}</label>
-                    <div class="col-sm-9">
-                        <div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
+                    <div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
                             {tmpl_var name='php_handler'}
                         </select></div>
-                    </div>
                 </div>
             </div>
             <div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>

interface/web/admin/templates/system_config_domains_edit.htm

@@ -16,9 +16,7 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='new_domain_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><textarea class="form-control" name="new_domain_html" id="new_domain_html" height: 250px">{tmpl_var name='new_domain_html'}</textarea></div>
-                </div>
+                <div class="col-sm-9"><textarea class="form-control" name="new_domain_html" id="new_domain_html" height: 250px">{tmpl_var name='new_domain_html'}</textarea></div>
             </div>
         
             

interface/web/mail/templates/mail_transport_edit.htm

@@ -22,8 +22,7 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='mx_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} /></div>
             </div>
             <div class="form-group">
                 <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>

interface/web/tools/templates/dns_import_tupa.htm

@@ -5,23 +5,19 @@
         <legend>PowerDNS Tupa import</legend>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Tupa database hostname</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Tupa database name</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Tupa database user</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Tupa database password</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div>
             </div>                
         
 

interface/web/tools/templates/import_ispconfig.htm

@@ -15,13 +15,11 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Remote User</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="remote_user" value="{tmpl_var name='remote_user'}" name="remote_user" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="remote_user" value="{tmpl_var name='remote_user'}" name="remote_user" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Remote password</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" /></div>
             </div>
         
     </div>
@@ -42,33 +40,27 @@
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name="import_mailbox_txt"}</label>
-                    <div class="col-sm-9">
-                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" /></div></div>
+                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" /></div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name="import_user_filter_txt"}</label>
-                    <div class="col-sm-9">
-                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_user_filter" value="1" name="import_user_filter" checked="checked" /></div></div>
+                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_user_filter" value="1" name="import_user_filter" checked="checked" /></div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name="import_spamfilter_txt"}</label>
-                    <div class="col-sm-9">
-                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_spamfilter" value="1" name="import_spamfilter" checked="checked" /></div></div>
+                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_spamfilter" value="1" name="import_spamfilter" checked="checked" /></div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name="import_alias_txt"}</label>
-                    <div class="col-sm-9">
-                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_alias" value="1" name="import_alias" checked="checked" /></div></div>
+                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_alias" value="1" name="import_alias" checked="checked" /></div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name="import_forward_txt"}</label>
-                    <div class="col-sm-9">
-                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_forward" value="1" name="import_forward" checked="checked" /></div></div>
+                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_forward" value="1" name="import_forward" checked="checked" /></div>
                 </div>
                 <div class="form-group">
                     <label class="col-sm-3 control-label">{tmpl_var name="import_aliasdomain_txt"}</label>
-                    <div class="col-sm-9">
-                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" /></div></div>
+                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" /></div>
                 </div>
             
         </div>

interface/web/tools/templates/import_plesk.htm

@@ -5,44 +5,36 @@
         <legend>Plesk data import</legend>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Plesk database hostname</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Plesk database name</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Plesk database user</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Plesk database password</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Web content backup file (on this server, optional)</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="webcontent" value="{tmpl_var name='webcontent'}" name="webcontent" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="webcontent" value="{tmpl_var name='webcontent'}" name="webcontent" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Maildir content backup file (on this server, optional)</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="mailcontent" value="{tmpl_var name='mailcontent'}" name="mailcontent" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="mailcontent" value="{tmpl_var name='mailcontent'}" name="mailcontent" /></div>
             </div>
                 
             <div class="form-group">
                 <label class="col-sm-3 control-label">Import all data (that can be imported)</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="start" value="1" name="start" checked/></div></div>
+                <div class="col-sm-9"><input class="form-control" type="checkbox" id="start" value="1" name="start" checked/></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Import database contents (make sure the database user has the rights to do so)</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="dbdata" value="1" name="dbdata" checked/></div></div>
+                <div class="col-sm-9"><input class="form-control" type="checkbox" id="dbdata" value="1" name="dbdata" checked/></div>
             </div>
         
 

interface/web/tools/templates/import_vpopmail.htm

@@ -9,28 +9,23 @@
         <legend>{tmpl_var name="legend_txt"}</legend>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Database Hostname</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="db_hostname" value="{tmpl_var name='db_hostname'}" name="db_hostname" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="db_hostname" value="{tmpl_var name='db_hostname'}" name="db_hostname" /></div>
             </div>
 			<div class="form-group">
                 <label class="col-sm-3 control-label">Database Name</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="db_name" value="{tmpl_var name='db_name'}" name="db_name" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="db_name" value="{tmpl_var name='db_name'}" name="db_name" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Database User</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="db_user" value="{tmpl_var name='db_user'}" name="db_user" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="db_user" value="{tmpl_var name='db_user'}" name="db_user" /></div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">Database password</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="db_password" value="{tmpl_var name='db_password'}" name="db_password" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="db_password" value="{tmpl_var name='db_password'}" name="db_password" /></div>
             </div>
 			<div class="form-group">
                 <label class="col-sm-3 control-label">Server ID of local mailserver</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="text" id="local_server_id" value="{tmpl_var name='local_server_id'}" name="local_server_id" /></div></div>
+                <div class="col-sm-9"><input class="form-control" type="text" id="local_server_id" value="{tmpl_var name='local_server_id'}" name="local_server_id" /></div>
             </div>
         
     </div>

interface/web/vm/templates/openvz_action.htm

@@ -15,27 +15,23 @@
                 
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='start_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="start" name="action" {tmpl_var name='start_option_enabled'}/></div></div>
+                <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="start" name="action" {tmpl_var name='start_option_enabled'}/></div>
             </div>
                 
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='stop_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/></div></div>
+                <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/></div>
             </div>
                 
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='restart_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/></div></div>
+                <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/></div>
             </div>
                 
             <div class="form-group">
                 <label class="col-sm-3 control-label">{tmpl_var name='ostemplate_txt'}</label>
-                <div class="col-sm-9">
-                    <div class="col-sm-9"><input class="form-control" type="radio" style="float:left; margin-right:10px;" id="action" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/></div><div class="col-sm-6"><input type="text" name="ostemplate_name" class="form-control" value="{tmpl_var name='ostemplate_name'}" onclick="$('[name=action]').filter('[value=ostemplate]').attr('checked','checked');" /></div><div class="col-sm-3 input-sm"> &nbsp;{tmpl_var name='ostemplate_desc_txt'}
-                </div></div>
+                <div class="col-sm-9"><input class="form-control" type="radio" style="float:left; margin-right:10px;" id="action" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/></div><div class="col-sm-6"><input type="text" name="ostemplate_name" class="form-control" value="{tmpl_var name='ostemplate_name'}" onclick="$('[name=action]').filter('[value=ostemplate]').attr('checked','checked');" /></div><div class="col-sm-3 input-sm"> &nbsp;{tmpl_var name='ostemplate_desc_txt'}
+                </div>
             </div>
              
         <input type="hidden" name="id" value="{tmpl_var name='id'}">