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

ENHANCEMENT: tidied up installer process to streamline process. Moved requirements to top and button to bottom and added visual seperation of the individual steps (from r101661)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112015 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-13 00:57:05 +00:00
parent c08e277ba0
commit 5aa012335a
2 changed files with 98 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@
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(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
<p class="good">You're ready to install!</p>
<p class="goodInstall"><em class="inlineBarText">You're ready to install!. Please confirm the configuration options below.</em> <a href="#install">Install SilverStripe</a></p>
<?php } ?>
<?php if($dbReq->hasErrors()) { ?>
@ -56,40 +56,25 @@
Please <a href="#AdminAccount">enter an email address and password</a> for the default administrator account before installing.
</p>
<?php } ?>
<p id="stats-container">
<input type="checkbox" id="stats" name="stats" checked="checked">
<label for="stats">Send information about my webserver to silverstripe.org<br />
<small>(anonymized version information, used for statistical purposes)</small>
</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>
<?php } ?>
<h4 id="requirements"><em class="inlineBarText">Requirements</em> <span>Step: 1 of 5</span></h4>
<?php $req->showTable(); ?>
<p>
<?php if($alreadyInstalled) { ?>
<input id="install_button" type="submit" disabled="disabled" class="action" name="go" value="Install SilverStripe">
<?php } else { ?>
<input id="install_button" type="submit" class="action" name="go" value="Install SilverStripe">
<?php } ?>
<span id="saving_top" style="display: none">
&nbsp;
<img src="cms/images/network-save.gif">
(this will take a minute or so)
</span>
Read more about our <a href="http://doc.silverstripe.org/doku.php?id=server-requirements" target="_blank">server requirements</a>.
</p>
<?php } ?>
<div class="action">
<input type="submit" class="action" value="Re-check requirements">
</div>
<h4 class="sectionHeading">Database</h4>
<h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2 of 5</span></h4>
<div id="database_credentials" class="section">
<?php $dbReq->showTable("Database Configuration"); ?>
<p id="dbHelp" class="helpText">
SilverStripe stores its content in a relational SQL database. Please provide the username and password to connect to the server here.
If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a
@ -198,9 +183,7 @@
<div class="clear"><!-- --></div>
<?php $dbReq->showTable("Database Configuration"); ?>
<h4>CMS Admin Account</h4>
<h4><em class="inlineBarText">CMS Admin Account</em> <span>Step: 3 of 5</span></h4>
<div id="AdminAccount" class="section">
@ -248,24 +231,50 @@
</div>
</div>
<h4>Theme</h4>
<h4><em class="inlineBarText">Theme</em> <span>Step: 4 of 5</span></h4>
<p>You can change the theme or <a href="http://silverstripe.org/themes">download</a> another from the SilverStripe website after installation.</p>
<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"><a href="http://silverstripe.org/blackcandy/">BlackCandy</a> - our default theme ready to use.</label></li>
<li><input type="radio" name="template" value="tutorial" id="EmptyTemplate" <?php if(isset($_POST['template']) && $_POST['template'] == 'tutorial') {?>checked="checked"<?php }?>><label for="EmptyTemplate">Empty template - ready to begin the <a href="http://doc.silverstripe.org/doku.php?id=tutorials" target="_blank">tutorial</a>.</label></li>
</ul>
<h4 id="install"><em class="inlineBarText">Confirm Install</em> <span>Step: 5 of 5</span></h4>
<h4 id="requirements">Requirements</h4>
<?php $req->showTable(); ?>
<?php if(isset($hasErrorOtherThanDatabase)) { ?>
<p class="error">
You aren't currently able to install the software. Please <a href="#requirements">see above</a> 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 { ?>
<p id="stats-container">
<input type="checkbox" id="stats" name="stats" checked="checked">
<label for="stats">Send information about my webserver to silverstripe.org<br />
<small>(anonymized version information, used for statistical purposes)</small>
</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>
<?php } ?>
<p>
Read more about our <a href="http://doc.silverstripe.org/doku.php?id=server-requirements" target="_blank">server requirements</a>.
</p>
<?php if($alreadyInstalled) { ?>
<input id="install_button" type="submit" disabled="disabled" class="action" name="go" value="Install SilverStripe">
<?php } else { ?>
<input id="install_button" type="submit" class="action" name="go" value="Install SilverStripe">
<?php } ?>
<div class="action">
<input type="submit" class="action" value="Re-check requirements">
</div>
<span id="saving_top" style="display: none">
&nbsp;
<img src="cms/images/network-save.gif">
(this will take a minute or so)
</span>
</p>
<?php } ?>
</form>
</div>
</div>

47
dev/install/install.css
View File

@ -96,9 +96,21 @@ table.testResults {
}
#Layout h4 {
font-size: 2em;
margin-top: 18px;
line-height: 1.4;
margin: 36px 0 18px 0;
font-weight: bold;
line-height: 1.8;
clear: left;
border-top: 2px solid #888;
text-indent: 5px;
width: 100%;
overflow: hidden;
}
#Layout h4 span {
float: right;
font-size: 10px;
padding: 10px 10px 0 0;
font-weight: normal;
color: #888;
}
/**
@ -109,8 +121,8 @@ table.testResults {
}
table.testResults td {
border: 1px #CCC solid;
border-top: none;
width: 400px;
line-height: 15px;
padding: 6px;
}
table.testResults tr.good {
@ -140,6 +152,7 @@ h5.requirement {
border: 1px solid #ccc;
border-width: 0 1px 1px 1px;
margin: 0;
overflow: hidden;
}
h5.requirement span {
float: right;
@ -154,7 +167,7 @@ h5.requirement {
color: #F03838;
}
h5.requirement a {
font-size: 9px;
font-size: 10px;
float: right;
line-height: 19px;
margin: 0 0 0 30px;
@ -230,7 +243,7 @@ h5.requirement {
padding-left: 0;
}
#database_selection li input {
margin-right: 5px;;
margin-right: 5px;
}
#database_selection li label {
display: inline;
@ -253,3 +266,27 @@ h5.requirement {
margin-left: 0;
padding-left: 0;
}
.goodInstall {
padding: 0.5em;
background-color: #e2fee1;
border: 1px #43cb3e solid;
color: #359318;
overflow: hidden;
line-height: 18px;
padding: 10px;
}
#Layout p.goodInstall {
color: #359318;
}
.goodInstall a {
float: right;
font-size: 18px;
padding: 0 2px 2px 0;
font-weight: bold;
}
em.inlineBarText {
float: left;
font-style: normal;
}