Adapted package installer UI to Bootstrap theme.

Till Brehm · Till Brehm · commit 2f311b74a1b8 · 2016-01-10T15:12:10.000+01:00
diff --git a/interface/web/sites/aps_install_package.php b/interface/web/sites/aps_install_package.php
@@ -129,7 +129,7 @@
 if(!empty($domains))
 {
 	$set = array();
-	$set[] = '<select name="main_domain" id="main_domain" class="selectInput">';
+	$set[] = '<select name="main_domain" id="main_domain" class="form-control">';
 	foreach($domains as $domain)
 	{
 		$selected = '';
@@ -153,8 +153,8 @@
 	$set[] = '<legend>'.$app->lng('package_settings_txt').'</legend>';
 	foreach($settings as $setting)
 	{
-		$set[] = '<div class="ctrlHolder">';
-		$set[] = '<label for="'.$setting['SettingID'].'">'.$setting['SettingName'].'</label>';
+		$set[] = '<div class="form-group">';
+		$set[] = '<label for="'.$setting['SettingID'].'" class="col-sm-3 control-label">'.$setting['SettingName'].'</label>';
 		if($setting['SettingInputType'] == 'string' || $setting['SettingInputType'] == 'password')
 		{
 			$input_type = ($setting['SettingInputType'] == 'string') ? 'text' : 'password';
@@ -165,8 +165,8 @@
 				$input_value = $result['input'][$setting['SettingID']];
 			else $input_value = @$setting['SettingDefaultValue'];
 
-			$set[] = '<input type="'.$input_type.'" class="textInput" name="'.$setting['SettingID'].'" maxlength="'.$setting['SettingMaxLength'].'" id="'.$setting['SettingID'].'" value="'.$input_value.'" />
-                <p class="formHint">'.$setting['SettingDescription'].'</p>';
+			$set[] = '<div class="col-sm-9"><input type="'.$input_type.'" class="form-control" name="'.$setting['SettingID'].'" maxlength="'.$setting['SettingMaxLength'].'" id="'.$setting['SettingID'].'" value="'.$input_value.'" />
+                <p class="formHint">'.$setting['SettingDescription'].'</p></div>';
 		}
 		else if($setting['SettingInputType'] == 'checkbox')
 			{
@@ -177,12 +177,12 @@
 					$checked = 'checked ';
 				else if($setting['SettingDefaultValue'] == '1') $checked = 'checked ';
 
-					$set[] = '<input type="checkbox" id="'.$setting['SettingID'].'" name="'.$setting['SettingID'].'" '.$checked.'/>
-                <p class="formHint">'.$setting['SettingDescription'].'</p>';
+					$set[] = '<div class="col-sm-9"><input type="checkbox" id="'.$setting['SettingID'].'" name="'.$setting['SettingID'].'" '.$checked.'/>
+                <p class="formHint">'.$setting['SettingDescription'].'</p></div>';
 			}
 		else if($setting['SettingInputType'] == 'select')
 			{
-				$set[] =  '<select size="1" class="selectInput" name="'.$setting['SettingID'].'">';
+				$set[] =  '<div class="col-sm-9"><select size="1" class="form-control" name="'.$setting['SettingID'].'">';
 				foreach($setting['SettingChoices'] as $choice)
 				{
 					$selected = '';
@@ -197,7 +197,7 @@
 						$set[] = '<option value="'.$choice['EnumID'].'" '.$selected.'>'.$choice['EnumName'].'</option>';
 				}
 				$set[] = '</select>
-                <p class="formHint">'.$setting['SettingDescription'].'</p>';
+                <p class="formHint">'.$setting['SettingDescription'].'</p></div>';
 			}
 
 		$set[] = '</div>';
diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm
@@ -15,10 +15,19 @@ <h2>
         
             <legend>{tmpl_var name='basic_settings_txt'}</legend>
             <div class="form-group">
-                <label for="main_domain" class="col-sm-3 control-label">{tmpl_var name='install_location_txt'}</label>
-                <div class="resetButton">http(s)://&nbsp;</div>DOMAIN_LIST_SPACE<div style="float:left;">&nbsp;/&nbsp;</div>
-                <div class="col-sm-9"><input type="text" name="main_location" id="main_location" value="{tmpl_var name='inp_main_location'}" class="form-control" /></div></div>
-            <tmpl_if name='pkg_requirements_database' op='!=' value=''>
+                <label class="col-sm-3 control-label">{tmpl_var name='install_location_txt'}</label>
+                <div class="col-sm-9">
+				    <div class='input-group'>
+						<span class='input-group-addon'>http(s)://</span>
+						<div class='input-group-field'>
+							DOMAIN_LIST_SPACE
+						</div>
+						<span class='input-group-addon'>/</span>
+						<input type="text" id="main_location" name="main_location" value="{tmpl_var name='inp_main_location'}" class="form-control" />
+                    </div>
+				</div>
+            </div>
+			<tmpl_if name='pkg_requirements_database' op='!=' value=''>
                 <div class="form-group">
                     <label for="main_database_password" class="col-sm-3 control-label">{tmpl_var name='new_database_password_txt'}</label>
                     <div class="col-sm-9"><input type="text" class="form-control" name="main_database_password" id="main_database_password" value="{tmpl_var name='inp_main_database_password'}" /></div></div>

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@`
`129`	`129`	`if(!empty($domains))`
`130`	`130`	`{`
`131`	`131`	`$set = array();`
`132`		`- $set[] = '<select name="main_domain" id="main_domain" class="selectInput">';`
	`132`	`+ $set[] = '<select name="main_domain" id="main_domain" class="form-control">';`
`133`	`133`	`foreach($domains as $domain)`
`134`	`134`	`{`
`135`	`135`	`$selected = '';`
`@@ -153,8 +153,8 @@`
`153`	`153`	`$set[] = '<legend>'.$app->lng('package_settings_txt').'</legend>';`
`154`	`154`	`foreach($settings as $setting)`
`155`	`155`	`{`
`156`		`- $set[] = '<div class="ctrlHolder">';`
`157`		`- $set[] = '<label for="'.$setting['SettingID'].'">'.$setting['SettingName'].'</label>';`
	`156`	`+ $set[] = '<div class="form-group">';`
	`157`	`+ $set[] = '<label for="'.$setting['SettingID'].'" class="col-sm-3 control-label">'.$setting['SettingName'].'</label>';`
`158`	`158`	`if($setting['SettingInputType'] == 'string' \|\| $setting['SettingInputType'] == 'password')`
`159`	`159`	`{`
`160`	`160`	`$input_type = ($setting['SettingInputType'] == 'string') ? 'text' : 'password';`
`@@ -165,8 +165,8 @@`
`165`	`165`	`$input_value = $result['input'][$setting['SettingID']];`
`166`	`166`	`else $input_value = @$setting['SettingDefaultValue'];`
`167`	`167`
`168`		`- $set[] = '<input type="'.$input_type.'" class="textInput" name="'.$setting['SettingID'].'" maxlength="'.$setting['SettingMaxLength'].'" id="'.$setting['SettingID'].'" value="'.$input_value.'" />`
`169`		`- <p class="formHint">'.$setting['SettingDescription'].'</p>';`
	`168`	`+ $set[] = '<div class="col-sm-9"><input type="'.$input_type.'" class="form-control" name="'.$setting['SettingID'].'" maxlength="'.$setting['SettingMaxLength'].'" id="'.$setting['SettingID'].'" value="'.$input_value.'" />`
	`169`	`+ <p class="formHint">'.$setting['SettingDescription'].'</p></div>';`
`170`	`170`	`}`
`171`	`171`	`else if($setting['SettingInputType'] == 'checkbox')`
`172`	`172`	`{`
`@@ -177,12 +177,12 @@`
`177`	`177`	`$checked = 'checked ';`
`178`	`178`	`else if($setting['SettingDefaultValue'] == '1') $checked = 'checked ';`
`179`	`179`
`180`		`- $set[] = '<input type="checkbox" id="'.$setting['SettingID'].'" name="'.$setting['SettingID'].'" '.$checked.'/>`
`181`		`- <p class="formHint">'.$setting['SettingDescription'].'</p>';`
	`180`	`+ $set[] = '<div class="col-sm-9"><input type="checkbox" id="'.$setting['SettingID'].'" name="'.$setting['SettingID'].'" '.$checked.'/>`
	`181`	`+ <p class="formHint">'.$setting['SettingDescription'].'</p></div>';`
`182`	`182`	`}`
`183`	`183`	`else if($setting['SettingInputType'] == 'select')`
`184`	`184`	`{`
`185`		`- $set[] = '<select size="1" class="selectInput" name="'.$setting['SettingID'].'">';`
	`185`	`+ $set[] = '<div class="col-sm-9"><select size="1" class="form-control" name="'.$setting['SettingID'].'">';`
`186`	`186`	`foreach($setting['SettingChoices'] as $choice)`
`187`	`187`	`{`
`188`	`188`	`$selected = '';`
`@@ -197,7 +197,7 @@`
`197`	`197`	`$set[] = '<option value="'.$choice['EnumID'].'" '.$selected.'>'.$choice['EnumName'].'</option>';`
`198`	`198`	`}`
`199`	`199`	`$set[] = '</select>`
`200`		`- <p class="formHint">'.$setting['SettingDescription'].'</p>';`
	`200`	`+ <p class="formHint">'.$setting['SettingDescription'].'</p></div>';`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`$set[] = '</div>';`