From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/templates/aps_install_package.htm | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
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