tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105029 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2010-05-17 09:53:07 +00:00 committed by Sam Minnee
parent a6c968b3f3
commit d602d55477
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev/install/config-form.html
View File

@ -255,12 +255,14 @@
</label><p> </label><p>
<?php if($alreadyInstalled) { ?> <?php if($alreadyInstalled) { ?>
<p class="warning"> <div class="warning">
<strong>Note:</strong> It seems as though SilverStripe is already installed here.<br /> <p><strong>Note:</strong> 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. Installing again will overwrite the <strong><?php echo $webserverConfigFile ?></strong> and <strong>mysite/_config.php</strong> files.</p>
<br /> <div class="warning_actions">
<input type="checkbox" id="ReIn" name="force_reinstall"><label for="ReIn">That's okay, please re-install SilverStripe and overwrite these files.</label> <input type="checkbox" id="reinstall_confirmation" name="force_reinstall">
</p> <label for="reinstall_confirmation">That's okay, please re-install SilverStripe and overwrite these files.</label>
</div>
</div>
<?php } ?> <?php } ?>
<p> <p>

7
dev/install/install.css
View File

@ -57,6 +57,13 @@ h4.sectionHeading {
margin-left: 5px; margin-left: 5px;
color: #cb6a1c color: #cb6a1c
} }
.warning p {
font-size: 12px;
margin-bottom: 0;
}
.warning .warning_actions {
margin: 5px 0 5px 0;
}
.good { .good {
padding: 0.5em; padding: 0.5em;
background-color: #e2fee1; background-color: #e2fee1;