GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brion Vibber 2010-03-04 08:33:33 -08:00
commit c5df005662
1 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
install.php
View File

@ -474,17 +474,10 @@ function showForm()
</ul> </ul>
</dd> </dd>
</dl> </dl>
<dl id="page_notice" class="system_notice">
<dt>Page notice</dt>
<dd>
<div class="instructions">
<p>Enter your database connection information below to initialize the database.</p>
</div>
</dd>
</dl>
<form method="post" action="install.php" class="form_settings" id="form_install"> <form method="post" action="install.php" class="form_settings" id="form_install">
<fieldset> <fieldset>
<legend>Connection settings</legend> <fieldset id="settings_site">
<legend>Site settings</legend>
<ul class="form_data"> <ul class="form_data">
<li> <li>
<label for="sitename">Site name</label> <label for="sitename">Site name</label>
@ -502,13 +495,17 @@ function showForm()
<input type="text" id="host" name="host" value="{$post->value('host')}" /> <input type="text" id="host" name="host" value="{$post->value('host')}" />
<p class="form_guide">Database hostname</p> <p class="form_guide">Database hostname</p>
</li> </li>
<li> </ul>
</fieldset>
<fieldset id="settings_db">
<legend>Database settings</legend>
<ul class="form_data">
<li>
<label for="dbtype">Type</label> <label for="dbtype">Type</label>
$dbRadios $dbRadios
<p class="form_guide">Database type</p> <p class="form_guide">Database type</p>
</li> </li>
<li> <li>
<label for="database">Name</label> <label for="database">Name</label>
<input type="text" id="database" name="database" value="{$post->value('database')}" /> <input type="text" id="database" name="database" value="{$post->value('database')}" />
@ -524,6 +521,12 @@ function showForm()
<input type="password" id="dbpassword" name="dbpassword" value="{$post->value('dbpassword')}" /> <input type="password" id="dbpassword" name="dbpassword" value="{$post->value('dbpassword')}" />
<p class="form_guide">Database password (optional)</p> <p class="form_guide">Database password (optional)</p>
</li> </li>
</ul>
</fieldset>
<fieldset id="settings_admin">
<legend>Administrator settings</legend>
<ul class="form_data">
<li> <li>
<label for="admin_nickname">Administrator nickname</label> <label for="admin_nickname">Administrator nickname</label>
<input type="text" id="admin_nickname" name="admin_nickname" value="{$post->value('admin_nickname')}" /> <input type="text" id="admin_nickname" name="admin_nickname" value="{$post->value('admin_nickname')}" />
@ -544,6 +547,7 @@ function showForm()
<p class="form_guide">Optional email address for the initial StatusNet user (administrator)</p> <p class="form_guide">Optional email address for the initial StatusNet user (administrator)</p>
</li> </li>
</ul> </ul>
</fieldset>
<input type="submit" name="submit" class="submit" value="Submit" /> <input type="submit" name="submit" class="submit" value="Submit" />
</fieldset> </fieldset>
</form> </form>