Permalink
Browse files

ENHANCEMENT #5024 Installer now checks that the user has entered a us…

…ername and password correctly for the default admin, an additional button for re-checking requirements is now found at the bottom of the admin configuration section

ENHANCEMENT Error messages for database AND admin configuration are now in the same place at the top of the installer (from r99841)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105535 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent b3409a2 commit 4d2cc5dbe855d939be0a10921e1f8ca29f93d378 @chillu chillu committed May 25, 2010
Showing with 20 additions and 15 deletions.
  1. +20 −15 dev/install/config-form.html
@@ -80,14 +80,26 @@
Please see below for details.<br>
If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/doku.php?id=server-requirements">server requirements wiki page</a>.
</p>
- <?php } else if(!$adminConfig['username'] || !$adminConfig['password']) { ?>
- <p class="warning">
- Please fill in a username and password for the admin account to install.
- </p>
- <?php } else if(!$dbReq->hasErrors()) { ?>
+ <?php } else if(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
<p class="good">You're ready to install!</p>
<?php } ?>
+ <?php if($dbReq->hasErrors()) { ?>
+ <p class="error">
+ The database details don't appear to be correct. Please <a href="#database_credentials">enter the correct details</a> before installing.
+ </p>
+ <?php } else { ?>
+ <p class="good">
+ These database details look all good!
+ </p>
+ <?php } ?>
+
+ <?php if($adminReq->hasErrors()) { ?>
+ <p class="error">
+ Please <a href="#AdminAccount">enter a username and password</a> for the default administrator account before installing.
+ </p>
+ <?php } ?>
+
<h3>Template to install:</h3>
<ul id="Themes">
<li><input type="radio" name="template" value="blackcandy" id="BlackCandy" <?php if(!isset($_POST['template']) || $_POST['template'] == 'blackcandy') {?>checked="checked"<?php }?>><label for="BlackCandy">BlackCandy, default template ready to use.</label></li>
@@ -122,16 +134,6 @@
<?php } ?>
<h4 class="sectionHeading">Database</h4>
- <?php if($dbReq->hasErrors()) { ?>
- <p class="error">
- These database details don't appear to be correct. Please enter the correct details before installing.
- </p>
- <?php } else { ?>
- <p class="good">
- These database details look all good!
- </p>
- <?php } ?>
-
<div id="database_credentials" class="section">
<?php if($envFileExists) { ?>
<div id="use_environment_field" class="field">
@@ -228,6 +230,9 @@ <h4 class="sectionHeading">SilverStripe Administration Account</h4>
<input type="text" class="text" name="admin[surname]" id="admin_surname" value="<?php echo $adminConfig['surname']; ?>">
</span>
</div>
+ <div class="action">
+ <input type="submit" class="action" value="Re-check requirements">
+ </div>
</div>
<p id="adminAcc" class="helpText">

0 comments on commit 4d2cc5d

Please sign in to comment.