From 2f311b74a1b84698aeae20d50c1189ebe0213990 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 10 Jan 2016 09:12:10 -0500
Subject: [PATCH] Adapted package installer UI to Bootstrap theme.
---
interface/web/sites/templates/aps_install_package.htm | 17 +++++++++++++----
interface/web/sites/aps_install_package.php | 18 +++++++++---------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/interface/web/sites/aps_install_package.php b/interface/web/sites/aps_install_package.php
index 05e4e9e..bcd4184 100644
--- 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
index c3f3d9a..31d62cb 100644
--- a/interface/web/sites/templates/aps_install_package.htm
+++ b/interface/web/sites/templates/aps_install_package.htm
@@ -15,10 +15,19 @@
<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):// </div>DOMAIN_LIST_SPACE<div style="float:left;"> / </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>
--
Gitblit v1.9.1