Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

This commit is contained in:
Brion Vibber 2010-03-04 08:57:51 -08:00
commit e3e3694bd9

View File

@ -490,17 +490,17 @@ function showForm()
<input type="radio" name="fancy" id="fancy-disable" value="" /> disable<br /> <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> <p class="form_guide" id='fancy-form_guide'>Enable fancy (pretty) URLs. Auto-detection failed, it depends on Javascript.</p>
</li> </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> </ul>
</fieldset> </fieldset>
<fieldset id="settings_db"> <fieldset id="settings_db">
<legend>Database settings</legend> <legend>Database settings</legend>
<ul class="form_data"> <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> <li>
<label for="dbtype">Type</label> <label for="dbtype">Type</label>
$dbRadios $dbRadios