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

136
install.php
View File

@ -474,76 +474,80 @@ 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">
<ul class="form_data"> <legend>Site settings</legend>
<li> <ul class="form_data">
<label for="sitename">Site name</label> <li>
<input type="text" id="sitename" name="sitename" value="{$post->value('sitename')}" /> <label for="sitename">Site name</label>
<p class="form_guide">The name of your site</p> <input type="text" id="sitename" name="sitename" value="{$post->value('sitename')}" />
</li> <p class="form_guide">The name of your site</p>
<li> </li>
<label for="fancy-enable">Fancy URLs</label> <li>
<input type="radio" name="fancy" id="fancy-enable" value="enable" checked='checked' /> enable<br /> <label for="fancy-enable">Fancy URLs</label>
<input type="radio" name="fancy" id="fancy-disable" value="" /> disable<br /> <input type="radio" name="fancy" id="fancy-enable" value="enable" checked='checked' /> enable<br />
<p class="form_guide" id='fancy-form_guide'>Enable fancy (pretty) URLs. Auto-detection failed, it depends on Javascript.</p> <input type="radio" name="fancy" id="fancy-disable" value="" /> disable<br />
</li> <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> <li>
<input type="text" id="host" name="host" value="{$post->value('host')}" /> <label for="host">Hostname</label>
<p class="form_guide">Database hostname</p> <input type="text" id="host" name="host" value="{$post->value('host')}" />
</li> <p class="form_guide">Database hostname</p>
<li> </li>
</ul>
</fieldset>
<label for="dbtype">Type</label> <fieldset id="settings_db">
$dbRadios <legend>Database settings</legend>
<p class="form_guide">Database type</p> <ul class="form_data">
</li> <li>
<label for="dbtype">Type</label>
$dbRadios
<p class="form_guide">Database type</p>
</li>
<li>
<label for="database">Name</label>
<input type="text" id="database" name="database" value="{$post->value('database')}" />
<p class="form_guide">Database name</p>
</li>
<li>
<label for="dbusername">DB username</label>
<input type="text" id="dbusername" name="dbusername" value="{$post->value('dbusername')}" />
<p class="form_guide">Database username</p>
</li>
<li>
<label for="dbpassword">DB password</label>
<input type="password" id="dbpassword" name="dbpassword" value="{$post->value('dbpassword')}" />
<p class="form_guide">Database password (optional)</p>
</li>
</ul>
</fieldset>
<li> <fieldset id="settings_admin">
<label for="database">Name</label> <legend>Administrator settings</legend>
<input type="text" id="database" name="database" value="{$post->value('database')}" /> <ul class="form_data">
<p class="form_guide">Database name</p> <li>
</li> <label for="admin_nickname">Administrator nickname</label>
<li> <input type="text" id="admin_nickname" name="admin_nickname" value="{$post->value('admin_nickname')}" />
<label for="dbusername">DB username</label> <p class="form_guide">Nickname for the initial StatusNet user (administrator)</p>
<input type="text" id="dbusername" name="dbusername" value="{$post->value('dbusername')}" /> </li>
<p class="form_guide">Database username</p> <li>
</li> <label for="admin_password">Administrator password</label>
<li> <input type="password" id="admin_password" name="admin_password" value="{$post->value('admin_password')}" />
<label for="dbpassword">DB password</label> <p class="form_guide">Password for the initial StatusNet user (administrator)</p>
<input type="password" id="dbpassword" name="dbpassword" value="{$post->value('dbpassword')}" /> </li>
<p class="form_guide">Database password (optional)</p> <li>
</li> <label for="admin_password2">Confirm password</label>
<li> <input type="password" id="admin_password2" name="admin_password2" value="{$post->value('admin_password2')}" />
<label for="admin_nickname">Administrator nickname</label> </li>
<input type="text" id="admin_nickname" name="admin_nickname" value="{$post->value('admin_nickname')}" /> <li>
<p class="form_guide">Nickname for the initial StatusNet user (administrator)</p> <label for="admin_email">Administrator e-mail</label>
</li> <input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" />
<li> <p class="form_guide">Optional email address for the initial StatusNet user (administrator)</p>
<label for="admin_password">Administrator password</label> </li>
<input type="password" id="admin_password" name="admin_password" value="{$post->value('admin_password')}" /> </ul>
<p class="form_guide">Password for the initial StatusNet user (administrator)</p> </fieldset>
</li>
<li>
<label for="admin_password2">Confirm password</label>
<input type="password" id="admin_password2" name="admin_password2" value="{$post->value('admin_password2')}" />
</li>
<li>
<label for="admin_email">Administrator e-mail</label>
<input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" />
<p class="form_guide">Optional email address for the initial StatusNet user (administrator)</p>
</li>
</ul>
<input type="submit" name="submit" class="submit" value="Submit" /> <input type="submit" name="submit" class="submit" value="Submit" />
</fieldset> </fieldset>
</form> </form>