Skip to content

Commit

Permalink
ENHANCEMENT Installer styling, moving away from blackcandy
Browse files Browse the repository at this point in the history
  • Loading branch information
@clarkepaul
clarkepaul authored and Stig Lindqvist committed Apr 11, 2012
1 parent 6f76d42 commit 4f23ac1
Show file tree
Hide file tree
Showing 8 changed files with 749 additions and 363 deletions.
87 changes: 45 additions & 42 deletions dev/install/config-form.html
View file
@@ -1,36 +1,42 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
<head>
<title>SilverStripe CMS / Framework Installation</title>
<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="sapphire/dev/install/install.css">
<link rel="stylesheet" type="text/css" href="sapphire/dev/install/css/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>
<h1>SilverStripe</h1>
<div class="left">
<h2>CMS / Framework Installation <small>Version <?php echo $silverstripe_version; ?></small></h2>
<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 list of <a href="http://doc.silverstripe.org/doku.php?id=suggested-web-hosts" target="_blank">suggested web hosts</a> known to work with SilverStripe.
</p>
</div>
</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>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 list of <a href="http://doc.silverstripe.org/doku.php?id=suggested-web-hosts" target="_blank">suggested web hosts</a> known to work with SilverStripe.
</p>
-->

<form action="install.php" method="post">
<?php if(isset($hasErrorOtherThanDatabase)) { ?>
<p class="error">
<p class="message 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>
Expand All @@ -39,47 +45,46 @@ <h1>SilverStripe CMS / Framework Installation</h1>
<?php } ?>
<?php } else { ?>
<?php if($alreadyInstalled) { ?>
<div class="warning">
<div class="message 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>
<div class="message warning">
<p>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>
</div>
<?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>
<div class="message goodInstall"><p>You're ready to install! Please confirm the configuration options below. <a href="#install">Install SilverStripe</a></p>
</div>
<?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>
<div class="message error">
<p>The database details don't appear to be correct. Please <a href="#database_credentials">review and correct</a> before installing.</p>
</div>
<?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>
<div class="message error">
<p>Please <a href="#AdminAccount">enter an email address and password</a> for the default administrator account before installing.</p>
</div>
<?php } ?>
<?php } ?>


<h4 id="requirements"><em class="inlineBarText">Requirements</em> <span>Step: 1 of 5</span></h4>
<h3 class="sectionHeading" id="requirements">Requirements <small>Step 1 of 5</small></h3>
<?php $req->showTable(); ?>
<?php $dbReq->showTable(); ?>

<p>
<p class="helpText requirementsHelpText">
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>

<h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2 of 5</span></h4>
<div class="clear"><!-- --></div>
<h3 class="sectionHeading">Database Configuration <small>Step 2 of 5</small></h3>
<div id="database_credentials" class="section">

<?php $dbReq->showTable("Database Configuration"); ?>
Expand Down Expand Up @@ -126,7 +131,7 @@ <h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2
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>';
echo '<div class="message error databaseError"><p>'.$help.'</p></div>';
}

// generate db-specific config fields
Expand Down Expand Up @@ -193,7 +198,7 @@ <h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2

<div class="clear"><!-- --></div>

<h4><em class="inlineBarText">CMS Admin Account</em> <span>Step: 3 of 5</span></h4>
<h3 class="sectionHeading">CMS Admin Account <small>Step 3 of 5</small></h3>

<div id="AdminAccount" class="section">

Expand All @@ -220,8 +225,8 @@ <h4><em class="inlineBarText">CMS Admin Account</em> <span>Step: 3 of 5</span></
"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.
<br>
<strong>Warning:</strong> The CMS interface may be missing translations in certain locales.
</p>

<div class="field">
Expand All @@ -238,19 +243,17 @@ <h4><em class="inlineBarText">CMS Admin Account</em> <span>Step: 3 of 5</span></
</select>
</span>
</div>
<div class="clear"><!-- --></div>
</div>
</div>

<h4><em class="inlineBarText">Theme</em> <span>Step: 4 of 5</span></h4>
<h3 class="sectionHeading">Theme selection <small>Step 4 of 5</small></h3>
<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>
<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>
<h3 class="sectionHeading" id="install">Confirm Install <small>Step 5 of 5</small></h3>

<?php if(isset($hasErrorOtherThanDatabase)) { ?>
<p class="error">
Expand Down
15 changes: 15 additions & 0 deletions dev/install/config.rb
View file
@@ -0,0 +1,15 @@
# Require any additional compass plugins here.
require 'compass-colors'

project_type = :stand_alone
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "css"
sass_dir = "scss"
images_dir = "images"
javascripts_dir = "javascript"
output_style = :compact
# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true

asset_cache_buster = :none

0 comments on commit 4f23ac1

Please sign in to comment.