summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-04 08:57:51 -0800
committerBrion Vibber <brion@pobox.com>2010-03-04 08:57:51 -0800
commite3e3694bd902465a94870e41f3be56426e6ca78a (patch)
tree6d0295371f7dcd70a88994f8c6f8979021a46042
parent0ddd1ef191389ed38988091d098463b19aa86f68 (diff)
parentef6620e5b2787ce5ee34974f3770be1d9963be4a (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
-rw-r--r--install.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/install.php b/install.php
index 47a09b67c..32b0447c8 100644
--- a/install.php
+++ b/install.php
@@ -490,11 +490,6 @@ function showForm()
<input type="radio" name="fancy" id="fancy-disable" value="" /> disable<br />
<p class="form_guide" id='fancy-form_guide'>Enable fancy (pretty) URLs. Auto-detection failed, it depends on Javascript.</p>
</li>
- <li>
- <label for="host">Hostname</label>
- <input type="text" id="host" name="host" value="{$post->value('host')}" />
- <p class="form_guide">Database hostname</p>
- </li>
</ul>
</fieldset>
@@ -502,6 +497,11 @@ function showForm()
<legend>Database settings</legend>
<ul class="form_data">
<li>
+ <label for="host">Hostname</label>
+ <input type="text" id="host" name="host" value="{$post->value('host')}" />
+ <p class="form_guide">Database hostname</p>
+ </li>
+ <li>
<label for="dbtype">Type</label>
$dbRadios
<p class="form_guide">Database type</p>