Permalink
Browse files

BUGFIX Fixed inconsistent styling of reinstall actions at the bottom …

…of the installer, and if using IIS, warn that this will overwrite the web.config file, not .htaccess (from r105029)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112436 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent 0b3ff09 commit 55f1df0f6d88f73bc30854ec34c25dc6f8b951ac @chillu chillu committed Oct 15, 2010
Showing with 15 additions and 6 deletions.
  1. +8 −6 dev/install/config-form.html
  2. +7 −0 dev/install/install.css
@@ -255,12 +255,14 @@ <h4 id="install"><em class="inlineBarText">Confirm Install</em> <span>Step: 5 of
</label><p>
<?php if($alreadyInstalled) { ?>
- <p class="warning">
- <strong>Note:</strong> It seems as though SilverStripe is already installed here.<br />
- If you ask me to install, I will overwrite the <strong>.htaccess</strong> and <strong>mysite/_config.php</strong> files.
- <br />
- <input type="checkbox" id="ReIn" name="force_reinstall"><label for="ReIn">That's okay, please re-install SilverStripe and overwrite these files.</label>
- </p>
+ <div class="warning">
+ <p><strong>Note:</strong> SilverStripe is already installed here.<br>
+ Installing again will overwrite the <strong><?php echo $webserverConfigFile ?></strong> and <strong>mysite/_config.php</strong> files.</p>
+ <div class="warning_actions">
+ <input type="checkbox" id="reinstall_confirmation" name="force_reinstall">
+ <label for="reinstall_confirmation">That's okay, please re-install SilverStripe and overwrite these files.</label>
+ </div>
+ </div>
<?php } ?>
<p>
View
@@ -57,6 +57,13 @@ h4.sectionHeading {
margin-left: 5px;
color: #cb6a1c
}
+ .warning p {
+ font-size: 12px;
+ margin-bottom: 0;
+ }
+ .warning .warning_actions {
+ margin: 5px 0 5px 0;
+ }
.good {
padding: 0.5em;
background-color: #e2fee1;

0 comments on commit 55f1df0

Please sign in to comment.