diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/installation.php | 89 | ||||
| -rw-r--r-- | templates/login.php | 7 |
2 files changed, 52 insertions, 44 deletions
diff --git a/templates/installation.php b/templates/installation.php index 5c882e81bf0..9d5eb0c4a54 100644 --- a/templates/installation.php +++ b/templates/installation.php @@ -1,50 +1,59 @@ <div id="login"> <img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /> - <form action="#" method="post"> - <input type='hidden' name='install' value='true'/> + <form action="index.php" method="post" id="setup_form"> + <input type="hidden" name="install" value="true" /> + <p class="intro"> + Welcome to <strong>ownCloud</strong>, your personnal cloud.<br /> + To finish the installation, please follow the 3 remaining steps below. + </p> + + <?php if(count($_['errors']) > 0): ?> + <ul class="errors"> + <?php foreach($_['errors'] as $err): ?> + <li><?php print $err; ?></li> + <?php endforeach; ?> + </ul> + <?php endif; ?> + <fieldset> - <input type="text" name="login" id="admin" value="admin username" /> - <input type="password" name="pass" id="password" value="password" /> + <legend><strong>STEP 1</strong> : Create an <strong>admin account.</strong></legend> + <p><label for="adminlogin">Login :</label><input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_HELPER::init_var('adminlogin'); ?>" /></p> + <p><label for="adminpass">Password :</label><input type="password" name="adminpass" id="adminpass" value="<?php print OC_HELPER::init_var('adminpass'); ?>" /></p> </fieldset> + + <fieldset> + <legend><strong>STEP 2</strong> : Set where to store the data.</legend> + <p><label for="directory">Data directory :</label><input type="text" name="directory" id="directory" value="<?php print OC_HELPER::init_var('directory', $_['directory']); ?>" /></p> + </fieldset> + <fieldset> + <legend><strong>STEP 3</strong> : Configure your database.</legend> + <?php if($_['hasSQLite']): ?> + <?php if(!$_['hasMySQL']): ?> + <p>I will use a SQLite database. You have nothing to do !</p> + <input type="hidden" id="dbtype" name="dbtype" value="sqlite" /> + <?php else: ?> + <p><label class="sqlite" for="sqlite">SQLite </label><input type="radio" name="dbtype" value='sqlite' id="sqlite" <?php OC_HELPER::init_radio('dbtype', 'sqlite', 'sqlite'); ?>/></p> + <?php endif; ?> + <?php endif; ?> + + <?php if($_['hasMySQL']): ?> <?php if(!$_['hasSQLite']): ?> - <legend><abbr title="to use SQLite instead, install it on your server">MySQL</abbr> Database</legend> - <input type="text" name="dbuser" id="dbuser" value="MySQL user" /> - <input type="password" name="dbpass" id="dbpass" value="password" /> - <input type="text" name="dbname" id="dbname" value="database name" /> - <?php endif;?> - </fieldset> - <fieldset id="advanced"> - <legend><a id="advanced_options_link" href="">Advanced ▾</a></legend> - <div id="advanced_options"> - <label>Data directory</label><input type="text" name="directory" value="<?php echo($_['datadir']);?>" /> - <?php if($_['hasMySQL'] and $_['hasSQLite']): ?> - <input type="radio" name="dbtype" value='sqlite' id="sqlite" checked="checked" /><label class="sqlite" for="sqlite">SQLite</label> - <input type="radio" name="dbtype" value='mysql' id="mysql"><label class="mysql" for="mysql">MySQL</label> - <div id="use_mysql"> - <input type="text" name="dbuser" id="dbuser" value="MySQL user" /> - <input type="password" name="dbpass" id="dbpass" value="password" /> - <input type="text" name="dbname" id="dbname" value="database name" /> - <?php endif;?> - <?php if($_['hasMySQL'] and !$_['hasSQLite']): ?> - <input type="hidden" name="dbtype" value="mysql" /> - <?php endif;?> - <?php if(!$_['hasMySQL'] and $_['hasSQLite']): ?> - <input type="hidden" name="dbtype" value="sqlite" /> - <?php endif;?> - <?php if($_['hasMySQL'] and $_['hasSQLite']): ?> - <label>Database host</label><input type="text" name="dbhost" id="dbhost" value="localhost" /> - <label>Table prefix</label><input type="text" name="dbtableprefix" id="dbtableprefix" value="oc_" /> - </div> - <?php endif;?> - <?php if($_['hasMySQL'] and !$_['hasSQLite']): ?> - <label>Database host</label><input type="text" name="dbhost" id="dbhost" value="localhost" /> - <label>Table prefix</label><input type="text" name="dbtableprefix" id="dbtableprefix" value="oc_" /> - <?php endif;?> + <p>I will use a MySQL database.</p> + <input type="hidden" id="dbtype" name="dbtype" value="mysql" /> + <?php else: ?> + <p><label class="mysql" for="mysql">MySQL </label><input type="radio" name="dbtype" value='mysql' id="mysql" <?php OC_HELPER::init_radio('dbtype', 'mysql', 'sqlite'); ?>/></p> + <?php endif; ?> + <div id="use_mysql"> + <p><label for="dbhost">Host :</label><input type="text" name="dbhost" id="dbhost" value="<?php print OC_HELPER::init_var('dbhost', 'localhost'); ?>" /></p> + <p><label for="dbname">Database name :</label><input type="text" name="dbname" id="dbname" value="<?php print OC_HELPER::init_var('dbname'); ?>" /></p> + <p><label for="dbtableprefix">Table prefix :</label><input type="text" name="dbtableprefix" id="dbtableprefix" value="<?php print OC_HELPER::init_var('dbtableprefix', 'oc_'); ?>" /></p> + <p><label for="dbuser">MySQL user login :</label><input type="text" name="dbuser" id="dbuser" value="<?php print OC_HELPER::init_var('dbuser'); ?>" /></p> + <p><label for="dbpass">MySQL user password :</label><input type="password" name="dbpass" id="dbpass" value="<?php print OC_HELPER::init_var('dbpass'); ?>" /></p> </div> + <?php endif; ?> </fieldset> - <fieldset> - <p class="submit"><input type="submit" value="Create" /></p> - </fieldset> + + <p class="submit"><input type="submit" value="Finish setup" /></p> </form> </div> diff --git a/templates/login.php b/templates/login.php index c0defdc2b08..845ae831a40 100644 --- a/templates/login.php +++ b/templates/login.php @@ -1,13 +1,12 @@ <div id="login"> <img src="<?php echo image_path('', 'owncloud-logo-medium-white.png'); ?>" alt="ownCloud" /> - <form action="index.php" method="post"> - <!-- <h1>Sign in :</h1> --> + <form action="index.php" method="post" id="login_form"> <fieldset> <?php if($_['error']): ?> Login failed! <?php endif; ?> - <input type="text" name="user" id="user" value="username" /> - <input type="password" name="password" id="password" value="password" /> + <input type="text" name="user" id="user" value="" /> + <input type="password" name="password" id="password" value="" /> <input type="submit" value="Log in" /> </fieldset> </form> |