Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ENHANCEMENT:incorporating "simple" theme into the the SS3 Install - s…

…tyling the install page to fit with the "simple" theme
  • Loading branch information...
commit 63b23a215532ae9ff913aed75414d2d3a9419b28 1 parent d71b04f
Jeremy Bridson authored
View
454 dev/install/config-form.html
@@ -5,201 +5,204 @@
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<script type="text/javascript" src="sapphire/thirdparty/jquery/jquery.js"></script>
<script type="text/javascript" src="sapphire/dev/install/install.js"></script>
- <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css">
- <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css">
- <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css">
+ <link rel="stylesheet" type="text/css" href="themes/simple/css/layout.css">
+ <link rel="stylesheet" type="text/css" href="themes/simple/css/typography.css">
+ <link rel="stylesheet" type="text/css" href="themes/simple/css/form.css">
<link rel="stylesheet" type="text/css" href="sapphire/dev/install/install.css">
<link rel="shortcut icon" href="favicon.ico">
</head>
- <body>
- <div id="BgContainer">
- <div id="Container">
- <div id="Header">
- <h1>SilverStripe CMS / Framework Installation</h1>
- <p>Version <?php echo $silverstripe_version; ?></p>
+ <body class="page no-sidebar">
+ <div class="header">
+ <div class="inner">
+ <div class="brand">
+ <h1>SilverStripe</h1>
</div>
-
- <div id="Navigation">&nbsp;</div>
- <div class="clear"><!-- --></div>
-
- <div id="Layout">
- <div class="typography">
- <p>Thanks for choosing to use SilverStripe! Please follow the instructions below and you should be up in running in no time.<br>
- If you get stuck, head over to the <a href="http://silverstripe.org/installing-silverstripe" target="_blank">installation forum</a>, or check out our <a href="http://doc.silverstripe.org/doku.php?id=suggested-web-hosts" target="_blank">list of suggested web hosts</a> known to work with SilverStripe.
- </p>
-
- <form action="install.php" method="post">
- <?php if(isset($hasErrorOtherThanDatabase)) { ?>
- <p class="error">
- You aren't currently able to install the software. Please <a href="#requirements">see below</a> for details.<br>
+ <p>Version <?php echo $silverstripe_version; ?></p>
+ </div>
+ </div>
+
+ <div id="Navigation">&nbsp;</div>
+ <div class="clear"><!-- --></div>
+ <div class="main">
+ <div class="inner">
+ <div class="content-container">
+ <h1>CMS/Framework Installation</h1>
+ <p>Thanks for choosing to use SilverStripe! Please follow the instructions below and you should be up in running in no time.<br>
+ If you get stuck, head over to the <a href="http://silverstripe.org/installing-silverstripe" target="_blank">installation forum</a>, or check out our <a href="http://doc.silverstripe.org/doku.php?id=suggested-web-hosts" target="_blank">list of suggested web hosts</a> known to work with SilverStripe.
+ </p>
+
+ <form action="install.php" method="post">
+ <?php if(isset($hasErrorOtherThanDatabase)) { ?>
+ <p class="error">
+ You aren't currently able to install the software. Please <a href="#requirements">see below</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 if (isset($phpIniLocation)) { ?>
+ <p>Your php.ini file is located at <?php echo $phpIniLocation; ?></p>
+ <?php } ?>
+ <?php } else { ?>
+ <?php if($alreadyInstalled) { ?>
+ <div class="warning">
+ <p><strong>Note:</strong> SilverStripe is already installed here.<br>
+ If you wish to reinstall SilverStripe, please delete the <strong>mysite/_config.php</strong> file first.</p>
+ </div>
+ <?php } else if($req->hasWarnings()) { ?>
+ <p class="warning">
+ There are some issues that we recommend you look at before installing, however, you are still able to install the software.
+ 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 if (isset($phpIniLocation)) { ?>
- <p>Your php.ini file is located at <?php echo $phpIniLocation; ?></p>
- <?php } ?>
- <?php } else { ?>
- <?php if($alreadyInstalled) { ?>
- <div class="warning">
- <p><strong>Note:</strong> SilverStripe is already installed here.<br>
- If you wish to reinstall SilverStripe, please delete the <strong>mysite/_config.php</strong> file first.</p>
- </div>
- <?php } else if($req->hasWarnings()) { ?>
- <p class="warning">
- There are some issues that we recommend you look at before installing, however, you are still able to install the software.
- 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(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
- <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()) { ?>
- <p class="error">
- The database details don't appear to be correct. Please <a href="#database_credentials">review and correct</a> before installing.
- </p>
- <?php } ?>
-
- <?php if($adminReq->hasErrors()) { ?>
- <p class="error">
- Please <a href="#AdminAccount">enter an email address and password</a> for the default administrator account before installing.
- </p>
- <?php } ?>
+ <?php } else if(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
+ <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()) { ?>
+ <p class="error">
+ The database details don't appear to be correct. Please <a href="#database_credentials">review and correct</a> before installing.
+ </p>
+ <?php } ?>
- <h4 id="requirements"><em class="inlineBarText">Requirements</em> <span>Step: 1 of 5</span></h4>
- <?php $req->showTable(); ?>
- <?php $dbReq->showTable(); ?>
-
- <p>
- Read more about our <a href="http://doc.silverstripe.org/doku.php?id=server-requirements" target="_blank">server requirements</a>.
- </p>
+ <?php if($adminReq->hasErrors()) { ?>
+ <p class="error">
+ Please <a href="#AdminAccount">enter an email address and password</a> for the default administrator account before installing.
+ </p>
+ <?php } ?>
+ <?php } ?>
+
+
+ <h2 id="requirements"><em class="inlineBarText">Requirements</em> <span>Step: 1 of 5</span></h2>
+ <?php $req->showTable(); ?>
+ <?php $dbReq->showTable(); ?>
+
+ <p>
+ Read more about our <a href="http://doc.silverstripe.org/doku.php?id=server-requirements" target="_blank">server requirements</a>.
+ </p>
+
+ <div class="action">
+ <input type="submit" class="action" value="Re-check requirements?">
+ </div>
+
+ <h2 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2 of 5</span></h2>
+ <div id="database_credentials" class="section">
- <div class="action">
- <input type="submit" class="action" value="Re-check requirements">
- </div>
+ <?php $dbReq->showTable("Database Configuration"); ?>
- <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
- database that already exists.<br><br>
- <strong>Other databases:</strong><br>
- Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies.
- </p>
- <div class="fields">
- <div class="field">
- <ul id="database_selection">
- <?php
- foreach($databaseClasses as $class => $details) {
- $checked = ($databaseConfig['type'] == $class || $type == $class) ? ' checked="checked"' : '';
- $disabled = $help = '';
- if($usingEnv) {
- // All are disabled by default when environment is used
- $disabled = 'disabled="disabled"';
- // If SS_DATABASE_CLASS is specified, check the database in the list
- if(defined('SS_DATABASE_CLASS') && SS_DATABASE_CLASS == $class) {
- $checked = ' checked="checked"';
- }
- } else {
- $disabled = !$details['supported'] || !$details['hasModule'] ? 'notavailable="true"' : '';
- if ($disabled) {
- if (!$details['supported'] && !$details['hasModule']) {
- $help = 'PHP does not have the required extension, and SilverStripe does not have the correct module installed';
- $helpText = '<li style="width:auto">'.$details['missingExtensionText'].'</li>';
- $helpText .= '<li style="width:auto">'.$details['missingModuleText'].'</li>';
- } else if ($details['supported'] && !$details['hasModule']) {
- $help = 'PHP has the required extension, but SilverStripe is missing the module';
- $helpText = '<li style="width:auto">'.$details['missingModuleText'].'</li>';
- } else if (!$details['supported'] && $details['hasModule']) {
- $help = 'SilverStripe has the module installed, but PHP is missing the required extension';
- $helpText = '<li style="width:auto">'.$details['missingExtensionText'].'</li>';
- }
- $help .= "<ul>$helpText</ul>";
- }
+ <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
+ database that already exists.<br><br>
+ <strong>Other databases:</strong><br>
+ Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies.
+ </p>
+ <div class="fields">
+ <div class="field">
+ <ul id="database_selection">
+ <?php
+ foreach($databaseClasses as $class => $details) {
+ $checked = ($databaseConfig['type'] == $class || $type == $class) ? ' checked="checked"' : '';
+ $disabled = $help = '';
+ if($usingEnv) {
+ // All are disabled by default when environment is used
+ $disabled = 'disabled="disabled"';
+ // If SS_DATABASE_CLASS is specified, check the database in the list
+ if(defined('SS_DATABASE_CLASS') && SS_DATABASE_CLASS == $class) {
+ $checked = ' checked="checked"';
}
- echo "<li>";
- echo "<input id=\"$class\" class=\"databaseClass\" type=\"radio\" name=\"db[type]\" value=\"$class\"$checked $disabled>";
- echo "<label class=\"left\" ".($help || $disabled ? 'style="font-weight:normal;color:grey" ' : 'style="color:green"')."for=\"$class\">{$details['title']}</label>";
- if ($help) {
- echo '<div class="error databaseError">'.$help.'</div>';
+ } else {
+ $disabled = !$details['supported'] || !$details['hasModule'] ? 'notavailable="true"' : '';
+ if ($disabled) {
+ if (!$details['supported'] && !$details['hasModule']) {
+ $help = 'PHP does not have the required extension, and SilverStripe does not have the correct module installed';
+ $helpText = '<li style="width:auto">'.$details['missingExtensionText'].'</li>';
+ $helpText .= '<li style="width:auto">'.$details['missingModuleText'].'</li>';
+ } else if ($details['supported'] && !$details['hasModule']) {
+ $help = 'PHP has the required extension, but SilverStripe is missing the module';
+ $helpText = '<li style="width:auto">'.$details['missingModuleText'].'</li>';
+ } else if (!$details['supported'] && $details['hasModule']) {
+ $help = 'SilverStripe has the module installed, but PHP is missing the required extension';
+ $helpText = '<li style="width:auto">'.$details['missingExtensionText'].'</li>';
+ }
+ $help .= "<ul>$helpText</ul>";
}
+ }
+ echo "<li>";
+ echo "<input id=\"$class\" class=\"databaseClass\" type=\"radio\" name=\"db[type]\" value=\"$class\"$checked $disabled>";
+ echo "<label class=\"left\" ".($help || $disabled ? 'style="font-weight:normal;color:grey" ' : 'style="color:green"')."for=\"$class\">{$details['title']}</label>";
+ if ($help) {
+ echo '<div class="error databaseError">'.$help.'</div>';
+ }
- // generate db-specific config fields
- echo '<div class="dbfields">';
- if(isset($details['fields'])) foreach($details['fields'] as $fieldName => $fieldSpec) {
- $fieldTitle = $fieldSpec['title'];
- $fieldType = ($fieldName == 'password') ? 'password' : 'text';
+ // generate db-specific config fields
+ echo '<div class="dbfields">';
+ if(isset($details['fields'])) foreach($details['fields'] as $fieldName => $fieldSpec) {
+ $fieldTitle = $fieldSpec['title'];
+ $fieldType = ($fieldName == 'password') ? 'password' : 'text';
- // values
- $defaultValue = (isset($fieldSpec['default'])) ? $fieldSpec['default'] : null;
- if($usingEnv && isset($fieldSpec['envVar']) && defined($fieldSpec['envVar'])) {
- $value = constant($fieldSpec['envVar']);
- } else {
- $value = (isset($databaseConfig[$fieldName])) ? $databaseConfig[$fieldName] : $defaultValue;
- }
-
- // attributes
- $attrs = array(
- 'id' => "db_{$class}_{$fieldName}",
- 'class' => 'text',
- 'type' => $fieldType,
- 'name' => "db[$class][$fieldName]",
- 'value' => $value,
- );
- if($usingEnv && isset($fieldSpec['envVar']) && defined($fieldSpec['envVar'])) {
- $attrs['disabled'] = 'disabled';
- }
- if(isset($fieldSpec['envVar'])) {
- $attrs['class'] .= ' configured-by-env';
- }
- $attrHTML = '';
- foreach($attrs as $attrName => $attrValue) $attrHTML .= "$attrName=\"$attrValue\" ";
- if(isset($fieldSpec['attributes'])) $attrs = array_merge($attrs, $fieldSpec['attributes']);
-
- // html
- echo "<div class=\"field\">";
- echo "<label for=\"db_{$class}_$fieldName\">$fieldTitle:</label>";
- echo "<span class=\"middleColumn\">";
- echo "<input $attrHTML>";
- echo "</span>";
- echo "</div>";
+ // values
+ $defaultValue = (isset($fieldSpec['default'])) ? $fieldSpec['default'] : null;
+ if($usingEnv && isset($fieldSpec['envVar']) && defined($fieldSpec['envVar'])) {
+ $value = constant($fieldSpec['envVar']);
+ } else {
+ $value = (isset($databaseConfig[$fieldName])) ? $databaseConfig[$fieldName] : $defaultValue;
+ }
+
+ // attributes
+ $attrs = array(
+ 'id' => "db_{$class}_{$fieldName}",
+ 'class' => 'text',
+ 'type' => $fieldType,
+ 'name' => "db[$class][$fieldName]",
+ 'value' => $value,
+ );
+ if($usingEnv && isset($fieldSpec['envVar']) && defined($fieldSpec['envVar'])) {
+ $attrs['disabled'] = 'disabled';
+ }
+ if(isset($fieldSpec['envVar'])) {
+ $attrs['class'] .= ' configured-by-env';
}
- echo '</div>';
+ $attrHTML = '';
+ foreach($attrs as $attrName => $attrValue) $attrHTML .= "$attrName=\"$attrValue\" ";
+ if(isset($fieldSpec['attributes'])) $attrs = array_merge($attrs, $fieldSpec['attributes']);
- echo "</li>";
+ // html
+ echo "<div class=\"field\">";
+ echo "<label for=\"db_{$class}_$fieldName\">$fieldTitle:</label>";
+ echo "<span class=\"middleColumn\">";
+ echo "<input $attrHTML>";
+ echo "</span>";
+ echo "</div>";
}
- ?>
- </ul>
-
- <?php if($envFileExists) { ?>
- <div id="use_environment_field" class="field">
- <input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>>
- <label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/doku.php?id=environment-management" target="_blank">?</a>)</label>
- </div>
- <?php } ?>
-
- </div>
+ echo '</div>';
+
+ echo "</li>";
+ }
+ ?>
+ </ul>
- <div class="action">
- <input type="submit" class="action" value="Re-check requirements">
+ <?php if($envFileExists) { ?>
+ <div id="use_environment_field" class="field">
+ <input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>>
+ <label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/doku.php?id=environment-management" target="_blank">?</a>)</label>
</div>
+ <?php } ?>
+
+ </div>
+
+ <div class="action">
+ <input type="submit" class="action" value="Re-check requirements?">
</div>
</div>
-
- <div class="clear"><!-- --></div>
-
- <h4><em class="inlineBarText">CMS Admin Account</em> <span>Step: 3 of 5</span></h4>
+ </div>
- <div id="AdminAccount" class="section">
-
- <div class="fieldGroup">
- <p class="helpText">We will set up the first administrator account for you automatically. You can change these details later in the "Security" section within the CMS.</p>
-
+ <div class="clear"><!-- --></div>
+
+ <h2><em class="inlineBarText">CMS Admin Account</em> <span>Step: 3 of 5</span></h2>
+
+ <div id="AdminAccount" class="section">
+
+ <div class="fieldGroup">
+ <p class="helpText">We will set up the first administrator account for you automatically. You can change these details later in the "Security" section within the CMS.</p>
+ <div class="fields">
<div class="field">
<label for="admin_username">Email:</label>
<span class="middleColumn">
@@ -213,17 +216,18 @@ <h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2
<input type="password" class="text configured-by-env" name="admin[password]" id="admin_password" value="<?php echo $adminConfig['password']; ?>" <?php if($usingEnv && defined('SS_DEFAULT_ADMIN_PASSWORD')) echo 'disabled="disabled"' ?>>
</span>
</div>
- </div>
-
- <div class="fieldGroup">
- <p class="helpText">
- "Default language" determines the default locale settings
- (for dates, currencies, etc.), as well as the default language
- of the CMS interface. This can be changed for each user.
- <br><br>
- Warning: The CMS interface may be missing translations in certain locales.
- </p>
-
+ </div>
+ </div>
+
+ <div class="fieldGroup">
+ <p class="helpText">
+ "Default language" determines the default locale settings
+ (for dates, currencies, etc.), as well as the default language
+ of the CMS interface. This can be changed for each user.
+ <br><br>
+ Warning: The CMS interface may be missing translations in certain locales.
+ </p>
+ <div class="fields">
<div class="field">
<label for="locale">Default language:</label>
<span class="middleColumn">
@@ -240,54 +244,56 @@ <h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2
</div>
</div>
</div>
+ </div>
+
+ <h2><em class="inlineBarText">Theme</em> <span>Step: 4 of 5</span></h2>
+ <p class="helpText">You can change the theme or <a href="http://silverstripe.org/themes">download</a> another from the SilverStripe website after installation.</p>
+ <div class="fields">
+ <ul id="Themes">
+ <li><input type="radio" name="template" value="simple" id="Simple" <?php if(!isset($_POST['template']) || $_POST['template'] == 'Simple') {?>checked="checked"<?php }?>><label for="Simple"><a href="http://silverstripe.org/Simple/">Simple</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>
+ </div>
+
+ <h2 id="install"><em class="inlineBarText">Confirm Install</em> <span>Step: 5 of 5</span></h2>
+
+ <?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>(anonymous version information, used for statistical purposes)</small>
+ </label><p>
- <h4><em class="inlineBarText">Theme</em> <span>Step: 4 of 5</span></h4>
- <p class="helpText">You can change the theme or <a href="http://silverstripe.org/themes">download</a> another from the SilverStripe website after installation.</p>
- <div class="field">
- <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>
- </div>
-
- <h4 id="install"><em class="inlineBarText">Confirm Install</em> <span>Step: 5 of 5</span></h4>
-
- <?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>(anonymous version information, used for statistical purposes)</small>
- </label><p>
+ <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 } ?>
- <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="sapphire/images/network-save.gif">
- (this will take a minute or so)
- </span>
- </p>
- <?php } ?>
- </form>
- </div>
+ <span id="saving_top" style="display: none">
+ &nbsp;
+ <img src="sapphire/images/network-save.gif">
+ (this will take a minute or so)
+ </span>
+ </p>
+ <?php } ?>
+ </form>
</div>
- <div class="clear"><!-- --></div>
</div>
+ </div>
+ <div class="clear"><!-- --></div>
- <div id="Footer">
+ <div class="footer">
+ <div class="inner">
<div class="footerTop"><!-- --></div>
<p><a href="http://silverstripe.org">SilverStripe Open Source CMS / Framework</a> | Copyright &copy; <?php echo date('Y'); ?> SilverStripe Limited</p>
- </div>
+ </div>
</div>
</body>
</html>
View
132 dev/install/install.css
@@ -1,18 +1,17 @@
-body {
- text-align: center;
+.header {
+ padding-bottom:10px;
}
-#Container .typography p {
- margin-left: 0;
- margin-right: 0;
+.header p {
+ color:#fff;
}
-#Container * {
- text-align: left;
+.brand {
+ float:none;
}
-#Header p {
- margin-left: 30px;
+#Navigation {
+ display:none;
}
ul#Themes{
@@ -20,6 +19,7 @@ ul#Themes{
margin: 0 5px 20px 5px;
float: left;
width: 320px;
+ padding:0;
}
ul#Themes li {
clear: both;
@@ -35,7 +35,7 @@ ul#Themes{
margin: -2px 5px 0 15px;
}
-h4.sectionHeading {
+h1.sectionHeading {
margin-top: 20px;
}
@@ -45,10 +45,11 @@ h4.sectionHeading {
border: 1px #ff8e8e solid;
color: #f03838;
}
- #Container p.error { color: #f03838;}
+ .main p.error { color: #f03838;}
.warning {
padding: 0.5em;
background-color: #fcf8f2;
+ border-radius:4px;
border: 1px #ffc28b solid;
color: #cb6a1c;
}
@@ -81,9 +82,9 @@ p.error a:hover {
}
span.middleColumn {
width: 297px;
- margin-right: 0;
- margin-top: 5px;
+ margin:0;
padding: 4px;
+ float:right;
}
input.text, textarea, select {
padding: 2px;
@@ -99,25 +100,19 @@ input.text, textarea, select {
#stats {
margin-right: 5px;
}
-table.testResults {
- border-collapse: collapse;
- width: 100%;
- margin: 10px 0;
-}
-#Layout h4 {
- font-size: 2em;
+
+.main h2 {
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;
+ border-top:1px solid #E5E5E5;
}
- #Layout h4 span {
+ .main h2 span {
float: right;
- font-size: 10px;
+ font-size: 0.8em;
padding: 10px 10px 0 0;
font-weight: normal;
color: #888;
@@ -127,7 +122,9 @@ table.testResults {
* Requirements and test results
* ------------------------------------------------ */
table.testResults {
- margin-top: 0;
+ border-collapse: collapse;
+ width: 100%;
+ margin: -1px 0px 10px 0;
}
table.testResults td {
border: 1px #CCC solid;
@@ -160,7 +157,8 @@ h5.requirement {
padding: 10px;
background: #f1f1f1;
border: 1px solid #ccc;
- border-width: 0 1px 1px 1px;
+ border-radius:4px 4px 0 0;
+ border-width: 1px;
margin: 0;
overflow: hidden;
}
@@ -179,7 +177,7 @@ h5.requirement {
h5.requirement a {
font-size: 10px;
float: right;
- line-height: 19px;
+ line-height: 13px;
margin: 0 0 0 30px;
color: #666;
text-decoration: none;
@@ -198,9 +196,9 @@ h5.requirement {
margin-bottom: 0;
}
-#Layout .helpText {
+.main .helpText {
float: right;
- width: 370px;
+ width: 350px;
padding-right: 10px;
}
@@ -210,7 +208,7 @@ h5.requirement {
.fields {
float: left;
- width: 330px;
+ width: 450px;
}
#devHelp,
@@ -218,16 +216,23 @@ h5.requirement {
height: 18em;
}
-#Layout input.action {
- text-align: center;
+.main .action input{
+ cursor:pointer;
+ text-align:center;
+ color:#fff;
+ background-color:#EF7F24;
+ border:none;
+ border-radius:4px;
font-size: 13px;
width: 220px;
font-weight: bold;
margin: 5px 0;
+ padding:5px;
+ font-family:"HelveticaNeueLTPro-Bd", "Helvetica Neue LT Pro Bold", "HelveticaNeueBold", "HelveticaNeue-Bold", "Helvetica Neue Bold", "Helvetica Neue LT Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
}
#use_environment_field {
- margin-bottom: 25px;
+ margin: 20px 0 10px;
}
#use_environment_field input {
@@ -236,7 +241,7 @@ h5.requirement {
}
.dbfields {
- margin: 10px;
+ margin: 10px 10px 10px 0;
}
#database_credentials {
@@ -247,26 +252,60 @@ h5.requirement {
#database_selection {
overflow: hidden;
margin: 0;
+ padding-left:5px;
}
#database_selection li {
margin-left: 0;
padding-left: 0;
+ list-style-type:none;
}
#database_selection li input {
margin-right: 5px;
+ border-radius:4px;
+ background:#ededed;
+ }
+
+ #database_selection li input:focus{
+ outline:none; background-color:#fff;
}
- #database_selection li label {
- display: inline;
+
+ #database_selection li .field label {
+ float:left;
+ margin-top:15px;
}
+#AdminAccount input {
+ border-radius:4px;
+ background:#ededed;
+}
+
+#AdminAccount select {
+ border-radius:4px;
+ background:none;
+ margin-top:5px;
+}
+
+#AdminAccount select:focus{
+ outline:none;
+}
+
+#AdminAccount input:focus{
+ outline:none; background-color:#fff;
+}
+
+#AdminAccount .field label {
+ float:left;
+ margin-top:15px;
+}
+
.databaseError {
clear:both;
overflow: hidden;
width: 290px;
line-height: 1.2;
- margin: 10px;
- margin-bottom: 0;
+ margin: 10px 0 20px;
display: none;
+ border-radius:4px;
}
.databaseError ul {
@@ -277,6 +316,21 @@ h5.requirement {
padding-left: 0;
}
+input#install_button {
+ cursor:pointer;
+ text-align:center;
+ color:#fff;
+ background-color:#359318;
+ border:none;
+ border-radius:4px;
+ font-size: 13px;
+ width: 220px;
+ font-weight: bold;
+ margin: 5px 0;
+ padding:5px;
+ font-family:"HelveticaNeueLTPro-Bd", "Helvetica Neue LT Pro Bold", "HelveticaNeueBold", "HelveticaNeue-Bold", "Helvetica Neue Bold", "Helvetica Neue LT Pro", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
.goodInstall {
padding: 0.5em;
background-color: #e2fee1;
@@ -286,7 +340,7 @@ h5.requirement {
line-height: 18px;
padding: 10px;
}
- #Layout p.goodInstall {
+ .main p.goodInstall {
color: #359318;
}
.goodInstall a {
View
8 dev/install/install.php5
@@ -945,9 +945,9 @@ class Installer extends InstallRequirements {
<html>
<head>
<title>Installing SilverStripe...</title>
- <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css" />
- <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css" />
- <link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css" />
+ <link rel="stylesheet" type="text/css" href="themes/simple/css/layout.css" />
+ <link rel="stylesheet" type="text/css" href="themes/simple/css/typography.css" />
+ <link rel="stylesheet" type="text/css" href="themes/simple/css/form.css" />
<link rel="stylesheet" type="text/css" href="sapphire/dev/install/install.css" />
<script src="sapphire/thirdparty/jquery/jquery.js"></script>
</head>
@@ -1017,7 +1017,7 @@ class Installer extends InstallRequirements {
$fh = fopen('mysite/_config.php', 'wb');
fclose($fh);
}
- $theme = isset($_POST['template']) ? $_POST['template'] : 'blackcandy';
+ $theme = isset($_POST['template']) ? $_POST['template'] : 'simple';
$locale = isset($_POST['locale']) ? $_POST['locale'] : 'en_US';
$type = $config['db']['type'];
$dbConfig = $config['db'][$type];
Please sign in to comment.
Something went wrong with that request. Please try again.