Skip to content
This repository
Browse code

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
authored April 03, 2012
454  dev/install/config-form.html
@@ -5,201 +5,204 @@
5 5
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
6 6
 		<script type="text/javascript" src="sapphire/thirdparty/jquery/jquery.js"></script>
7 7
 		<script type="text/javascript" src="sapphire/dev/install/install.js"></script>
8  
-		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css">
9  
-		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css">
10  
-		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css">
  8
+		<link rel="stylesheet" type="text/css" href="themes/simple/css/layout.css">
  9
+		<link rel="stylesheet" type="text/css" href="themes/simple/css/typography.css">
  10
+		<link rel="stylesheet" type="text/css" href="themes/simple/css/form.css">
11 11
 		<link rel="stylesheet" type="text/css" href="sapphire/dev/install/install.css">
12 12
 		<link rel="shortcut icon" href="favicon.ico">
13 13
 	</head>
14  
-	<body>
15  
-		<div id="BgContainer">
16  
-			<div id="Container">
17  
-				<div id="Header">
18  
-					<h1>SilverStripe CMS / Framework Installation</h1>
19  
-					<p>Version <?php echo $silverstripe_version; ?></p>
  14
+	<body class="page no-sidebar">
  15
+		<div class="header">
  16
+			<div class="inner">
  17
+				<div class="brand">
  18
+					<h1>SilverStripe</h1>
20 19
 				</div>
21  
-				
22  
-				<div id="Navigation">&nbsp;</div>
23  
-				<div class="clear"><!-- --></div>
24  
-				
25  
-				<div id="Layout">
26  
-					<div class="typography">
27  
-						<p>Thanks for choosing to use SilverStripe! Please follow the instructions below and you should be up in running in no time.<br>
28  
-							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.
29  
-						</p>
30  
-			
31  
-						<form action="install.php" method="post">
32  
-							<?php if(isset($hasErrorOtherThanDatabase)) { ?>
33  
-								<p class="error">
34  
-									You aren't currently able to install the software.  Please <a href="#requirements">see below</a> for details.<br>
  20
+				<p>Version <?php echo $silverstripe_version; ?></p>
  21
+			</div>	
  22
+		</div>
  23
+		
  24
+		<div id="Navigation">&nbsp;</div>
  25
+		<div class="clear"><!-- --></div>
  26
+		<div class="main">
  27
+			<div class="inner">
  28
+				<div class="content-container">
  29
+					<h1>CMS/Framework Installation</h1>
  30
+					<p>Thanks for choosing to use SilverStripe! Please follow the instructions below and you should be up in running in no time.<br>
  31
+						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.
  32
+					</p>
  33
+		
  34
+					<form action="install.php" method="post">
  35
+						<?php if(isset($hasErrorOtherThanDatabase)) { ?>
  36
+							<p class="error">
  37
+								You aren't currently able to install the software.  Please <a href="#requirements">see below</a> for details.<br>
  38
+								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>.
  39
+							</p>
  40
+							<?php if (isset($phpIniLocation)) { ?>  
  41
+								<p>Your php.ini file is located at <?php echo $phpIniLocation; ?></p>
  42
+							<?php } ?>
  43
+						<?php } else { ?>
  44
+							<?php if($alreadyInstalled) { ?>
  45
+								<div class="warning">
  46
+									<p><strong>Note:</strong> SilverStripe is already installed here.<br>
  47
+									If you wish to reinstall SilverStripe, please delete the <strong>mysite/_config.php</strong> file first.</p>
  48
+								</div>
  49
+							<?php } else if($req->hasWarnings()) { ?>
  50
+								<p class="warning">
  51
+									There are some issues that we recommend you look at before installing, however, you are still able to install the software.
  52
+									Please see below for details.<br>
35 53
 									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>.
36 54
 								</p>
37  
-								<?php if (isset($phpIniLocation)) { ?>  
38  
-									<p>Your php.ini file is located at <?php echo $phpIniLocation; ?></p>
39  
-								<?php } ?>
40  
-							<?php } else { ?>
41  
-								<?php if($alreadyInstalled) { ?>
42  
-									<div class="warning">
43  
-										<p><strong>Note:</strong> SilverStripe is already installed here.<br>
44  
-										If you wish to reinstall SilverStripe, please delete the <strong>mysite/_config.php</strong> file first.</p>
45  
-									</div>
46  
-								<?php } else if($req->hasWarnings()) { ?>
47  
-									<p class="warning">
48  
-										There are some issues that we recommend you look at before installing, however, you are still able to install the software.
49  
-										Please see below for details.<br>
50  
-										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>.
51  
-									</p>
52  
-								<?php } else if(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
53  
-									<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>
54  
-								<?php } ?>
55  
-								
56  
-								<?php if($dbReq->hasErrors()) { ?>
57  
-									<p class="error">
58  
-										The database details don't appear to be correct.  Please <a href="#database_credentials">review and correct</a> before installing.
59  
-									</p>
60  
-								<?php } ?>
61  
-								
62  
-								<?php if($adminReq->hasErrors()) { ?>
63  
-									<p class="error">
64  
-										Please <a href="#AdminAccount">enter an email address and password</a> for the default administrator account before installing.
65  
-									</p>
66  
-								<?php } ?>
  55
+							<?php } else if(!$dbReq->hasErrors() && !$adminReq->hasErrors()) { ?>
  56
+								<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>
67 57
 							<?php } ?>
68 58
 							
  59
+							<?php if($dbReq->hasErrors()) { ?>
  60
+								<p class="error">
  61
+									The database details don't appear to be correct.  Please <a href="#database_credentials">review and correct</a> before installing.
  62
+								</p>
  63
+							<?php } ?>
69 64
 							
70  
-							<h4 id="requirements"><em class="inlineBarText">Requirements</em> <span>Step: 1 of 5</span></h4>
71  
-							<?php $req->showTable(); ?>
72  
-							<?php $dbReq->showTable(); ?>
73  
-							
74  
-							<p>
75  
-								Read more about our <a href="http://doc.silverstripe.org/doku.php?id=server-requirements" target="_blank">server requirements</a>.
76  
-							</p>
  65
+							<?php if($adminReq->hasErrors()) { ?>
  66
+								<p class="error">
  67
+									Please <a href="#AdminAccount">enter an email address and password</a> for the default administrator account before installing.
  68
+								</p>
  69
+							<?php } ?>
  70
+						<?php } ?>
  71
+						
  72
+						
  73
+						<h2 id="requirements"><em class="inlineBarText">Requirements</em> <span>Step: 1 of 5</span></h2>
  74
+						<?php $req->showTable(); ?>
  75
+						<?php $dbReq->showTable(); ?>
  76
+						
  77
+						<p>
  78
+							Read more about our <a href="http://doc.silverstripe.org/doku.php?id=server-requirements" target="_blank">server requirements</a>.
  79
+						</p>
  80
+						
  81
+						<div class="action">
  82
+							<input type="submit" class="action" value="Re-check requirements?">
  83
+						</div>
  84
+						
  85
+						<h2 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2 of 5</span></h2>
  86
+						<div id="database_credentials" class="section">
77 87
 							
78  
-							<div class="action">
79  
-								<input type="submit" class="action" value="Re-check requirements">
80  
-							</div>
  88
+							<?php $dbReq->showTable("Database Configuration"); ?>
81 89
 							
82  
-							<h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2 of 5</span></h4>
83  
-							<div id="database_credentials" class="section">
84  
-								
85  
-								<?php $dbReq->showTable("Database Configuration"); ?>
86  
-								
87  
-								<p id="dbHelp" class="helpText">
88  
-									SilverStripe stores its content in a relational SQL database. Please provide the username and password to connect to the server here.
89  
-									If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a
90  
-									database that already exists.<br><br>
91  
-									<strong>Other databases:</strong><br>
92  
-									Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies.
93  
-								</p>
94  
-								<div class="fields">							
95  
-									<div class="field">
96  
-										<ul id="database_selection">
97  
-											<?php
98  
-											foreach($databaseClasses as $class => $details) {
99  
-												$checked = ($databaseConfig['type'] == $class || $type == $class) ? ' checked="checked"' : '';
100  
-												$disabled = $help = '';
101  
-												if($usingEnv) {
102  
-													// All are disabled by default when environment is used
103  
-													$disabled = 'disabled="disabled"';
104  
-													// If SS_DATABASE_CLASS is specified, check the database in the list
105  
-													if(defined('SS_DATABASE_CLASS') && SS_DATABASE_CLASS == $class) {
106  
-														$checked = ' checked="checked"';
107  
-													}
108  
-												} else {
109  
-													$disabled = !$details['supported'] || !$details['hasModule'] ? 'notavailable="true"' : '';
110  
-													if ($disabled) {
111  
-														if (!$details['supported'] && !$details['hasModule']) {
112  
-															$help = 'PHP does not have the required extension, and SilverStripe does not have the correct module installed';
113  
-															$helpText = '<li style="width:auto">'.$details['missingExtensionText'].'</li>';
114  
-															$helpText .= '<li style="width:auto">'.$details['missingModuleText'].'</li>';
115  
-														} else if ($details['supported'] && !$details['hasModule']) {
116  
-															$help = 'PHP has the required extension, but SilverStripe is missing the module';
117  
-															$helpText = '<li style="width:auto">'.$details['missingModuleText'].'</li>';
118  
-														} else if (!$details['supported'] && $details['hasModule']) {
119  
-															$help = 'SilverStripe has the module installed, but PHP is missing the required extension';
120  
-															$helpText = '<li style="width:auto">'.$details['missingExtensionText'].'</li>';
121  
-														}
122  
-														$help .= "<ul>$helpText</ul>";
123  
-													}
  90
+							<p id="dbHelp" class="helpText">
  91
+								SilverStripe stores its content in a relational SQL database. Please provide the username and password to connect to the server here.
  92
+								If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a
  93
+								database that already exists.<br><br>
  94
+								<strong>Other databases:</strong><br>
  95
+								Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies.
  96
+							</p>
  97
+							<div class="fields">							
  98
+								<div class="field">
  99
+									<ul id="database_selection">
  100
+										<?php
  101
+										foreach($databaseClasses as $class => $details) {
  102
+											$checked = ($databaseConfig['type'] == $class || $type == $class) ? ' checked="checked"' : '';
  103
+											$disabled = $help = '';
  104
+											if($usingEnv) {
  105
+												// All are disabled by default when environment is used
  106
+												$disabled = 'disabled="disabled"';
  107
+												// If SS_DATABASE_CLASS is specified, check the database in the list
  108
+												if(defined('SS_DATABASE_CLASS') && SS_DATABASE_CLASS == $class) {
  109
+													$checked = ' checked="checked"';
124 110
 												}
125  
-												echo "<li>";
126  
-												echo "<input id=\"$class\" class=\"databaseClass\" type=\"radio\" name=\"db[type]\" value=\"$class\"$checked $disabled>";
127  
-												echo "<label class=\"left\" ".($help || $disabled ? 'style="font-weight:normal;color:grey" ' : 'style="color:green"')."for=\"$class\">{$details['title']}</label>";
128  
-												if ($help) {
129  
-													echo '<div class="error databaseError">'.$help.'</div>';
  111
+											} else {
  112
+												$disabled = !$details['supported'] || !$details['hasModule'] ? 'notavailable="true"' : '';
  113
+												if ($disabled) {
  114
+													if (!$details['supported'] && !$details['hasModule']) {
  115
+														$help = 'PHP does not have the required extension, and SilverStripe does not have the correct module installed';
  116
+														$helpText = '<li style="width:auto">'.$details['missingExtensionText'].'</li>';
  117
+														$helpText .= '<li style="width:auto">'.$details['missingModuleText'].'</li>';
  118
+													} else if ($details['supported'] && !$details['hasModule']) {
  119
+														$help = 'PHP has the required extension, but SilverStripe is missing the module';
  120
+														$helpText = '<li style="width:auto">'.$details['missingModuleText'].'</li>';
  121
+													} else if (!$details['supported'] && $details['hasModule']) {
  122
+														$help = 'SilverStripe has the module installed, but PHP is missing the required extension';
  123
+														$helpText = '<li style="width:auto">'.$details['missingExtensionText'].'</li>';
  124
+													}
  125
+													$help .= "<ul>$helpText</ul>";
130 126
 												}
  127
+											}
  128
+											echo "<li>";
  129
+											echo "<input id=\"$class\" class=\"databaseClass\" type=\"radio\" name=\"db[type]\" value=\"$class\"$checked $disabled>";
  130
+											echo "<label class=\"left\" ".($help || $disabled ? 'style="font-weight:normal;color:grey" ' : 'style="color:green"')."for=\"$class\">{$details['title']}</label>";
  131
+											if ($help) {
  132
+												echo '<div class="error databaseError">'.$help.'</div>';
  133
+											}
131 134
 
132  
-												// generate db-specific config fields
133  
-												echo '<div class="dbfields">';
134  
-												if(isset($details['fields'])) foreach($details['fields'] as $fieldName => $fieldSpec) {
135  
-													$fieldTitle = $fieldSpec['title'];
136  
-													$fieldType = ($fieldName == 'password') ? 'password' : 'text';
  135
+											// generate db-specific config fields
  136
+											echo '<div class="dbfields">';
  137
+											if(isset($details['fields'])) foreach($details['fields'] as $fieldName => $fieldSpec) {
  138
+												$fieldTitle = $fieldSpec['title'];
  139
+												$fieldType = ($fieldName == 'password') ? 'password' : 'text';
137 140
 
138  
-													// values
139  
-													$defaultValue = (isset($fieldSpec['default'])) ? $fieldSpec['default'] : null;
140  
-													if($usingEnv && isset($fieldSpec['envVar']) && defined($fieldSpec['envVar'])) {
141  
-														$value = constant($fieldSpec['envVar']);
142  
-													} else {
143  
-														$value = (isset($databaseConfig[$fieldName])) ? $databaseConfig[$fieldName] : $defaultValue;
144  
-													}
145  
-													
146  
-													// attributes
147  
-													$attrs = array(
148  
-														'id' => "db_{$class}_{$fieldName}",
149  
-														'class' => 'text',
150  
-														'type' => $fieldType,
151  
-														'name' => "db[$class][$fieldName]",
152  
-														'value' => $value,
153  
-													);
154  
-													if($usingEnv && isset($fieldSpec['envVar']) && defined($fieldSpec['envVar'])) {
155  
-														$attrs['disabled'] = 'disabled';
156  
-													}
157  
-													if(isset($fieldSpec['envVar'])) {
158  
-														$attrs['class'] .= ' configured-by-env';
159  
-													}
160  
-													$attrHTML = '';
161  
-													foreach($attrs as $attrName => $attrValue) $attrHTML .= "$attrName=\"$attrValue\" ";
162  
-													if(isset($fieldSpec['attributes'])) $attrs = array_merge($attrs, $fieldSpec['attributes']);
163  
-													
164  
-													// html
165  
-													echo "<div class=\"field\">";
166  
-													echo "<label for=\"db_{$class}_$fieldName\">$fieldTitle:</label>";
167  
-													echo "<span class=\"middleColumn\">";
168  
-													echo "<input $attrHTML>";
169  
-													echo "</span>";
170  
-													echo "</div>";
  141
+												// values
  142
+												$defaultValue = (isset($fieldSpec['default'])) ? $fieldSpec['default'] : null;
  143
+												if($usingEnv && isset($fieldSpec['envVar']) && defined($fieldSpec['envVar'])) {
  144
+													$value = constant($fieldSpec['envVar']);
  145
+												} else {
  146
+													$value = (isset($databaseConfig[$fieldName])) ? $databaseConfig[$fieldName] : $defaultValue;
  147
+												}
  148
+												
  149
+												// attributes
  150
+												$attrs = array(
  151
+													'id' => "db_{$class}_{$fieldName}",
  152
+													'class' => 'text',
  153
+													'type' => $fieldType,
  154
+													'name' => "db[$class][$fieldName]",
  155
+													'value' => $value,
  156
+												);
  157
+												if($usingEnv && isset($fieldSpec['envVar']) && defined($fieldSpec['envVar'])) {
  158
+													$attrs['disabled'] = 'disabled';
  159
+												}
  160
+												if(isset($fieldSpec['envVar'])) {
  161
+													$attrs['class'] .= ' configured-by-env';
171 162
 												}
172  
-												echo '</div>';
  163
+												$attrHTML = '';
  164
+												foreach($attrs as $attrName => $attrValue) $attrHTML .= "$attrName=\"$attrValue\" ";
  165
+												if(isset($fieldSpec['attributes'])) $attrs = array_merge($attrs, $fieldSpec['attributes']);
173 166
 												
174  
-												echo "</li>";
  167
+												// html
  168
+												echo "<div class=\"field\">";
  169
+												echo "<label for=\"db_{$class}_$fieldName\">$fieldTitle:</label>";
  170
+												echo "<span class=\"middleColumn\">";
  171
+												echo "<input $attrHTML>";
  172
+												echo "</span>";
  173
+												echo "</div>";
175 174
 											}
176  
-											?>
177  
-										</ul>
178  
-										
179  
-										<?php if($envFileExists) { ?>
180  
-										<div id="use_environment_field" class="field">
181  
-											<input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>>
182  
-											<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>
183  
-										</div>
184  
-										<?php } ?>
185  
-										
186  
-									</div>
  175
+											echo '</div>';
  176
+											
  177
+											echo "</li>";
  178
+										}
  179
+										?>
  180
+									</ul>
187 181
 									
188  
-									<div class="action">
189  
-										<input type="submit" class="action" value="Re-check requirements">
  182
+									<?php if($envFileExists) { ?>
  183
+									<div id="use_environment_field" class="field">
  184
+										<input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>>
  185
+										<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>
190 186
 									</div>
  187
+									<?php } ?>
  188
+									
  189
+								</div>
  190
+								
  191
+								<div class="action">
  192
+									<input type="submit" class="action" value="Re-check requirements?">
191 193
 								</div>
192 194
 							</div>
193  
-							
194  
-							<div class="clear"><!-- --></div>
195  
-							
196  
-							<h4><em class="inlineBarText">CMS Admin Account</em> <span>Step: 3 of 5</span></h4>
  195
+						</div>
197 196
 						
198  
-							<div id="AdminAccount" class="section">
199  
-								
200  
-								<div class="fieldGroup">
201  
-									<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>
202  
-									
  197
+						<div class="clear"><!-- --></div>
  198
+						
  199
+						<h2><em class="inlineBarText">CMS Admin Account</em> <span>Step: 3 of 5</span></h2>
  200
+					
  201
+						<div id="AdminAccount" class="section">
  202
+							
  203
+							<div class="fieldGroup">
  204
+								<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>
  205
+								<div class="fields">
203 206
 									<div class="field">	
204 207
 										<label for="admin_username">Email:</label>
205 208
 										<span class="middleColumn">
@@ -213,17 +216,18 @@ <h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2
213 216
 											<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"' ?>>
214 217
 										</span>
215 218
 									</div>
216  
-								</div>
217  
-								
218  
-								<div class="fieldGroup">
219  
-									<p class="helpText">
220  
-										"Default language" determines the default locale settings
221  
-										(for dates, currencies, etc.), as well as the default language
222  
-										of the CMS interface. This can be changed for each user.
223  
-										<br><br>
224  
-										Warning: The CMS interface may be missing translations in certain locales.
225  
-									</p>
226  
-									
  219
+								</div>	
  220
+							</div>
  221
+							
  222
+							<div class="fieldGroup">
  223
+								<p class="helpText">
  224
+									"Default language" determines the default locale settings
  225
+									(for dates, currencies, etc.), as well as the default language
  226
+									of the CMS interface. This can be changed for each user.
  227
+									<br><br>
  228
+									Warning: The CMS interface may be missing translations in certain locales.
  229
+								</p>
  230
+								<div class="fields">	
227 231
 									<div class="field">
228 232
 										<label for="locale">Default language:</label>
229 233
 										<span class="middleColumn">
@@ -240,54 +244,56 @@ <h4 class="sectionHeading"><em class="inlineBarText">Database</em> <span>Step: 2
240 244
 									</div>
241 245
 								</div>
242 246
 							</div>
  247
+						</div>
  248
+						
  249
+						<h2><em class="inlineBarText">Theme</em> <span>Step: 4 of 5</span></h2>
  250
+						<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>
  251
+						<div class="fields">
  252
+							<ul id="Themes">
  253
+								<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>
  254
+								<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>
  255
+							</ul>
  256
+						</div>
  257
+						
  258
+						<h2 id="install"><em class="inlineBarText">Confirm Install</em> <span>Step: 5 of 5</span></h2>
  259
+						
  260
+						<?php if(isset($hasErrorOtherThanDatabase)) { ?>
  261
+							<p class="error">
  262
+								You aren't currently able to install the software.  Please <a href="#requirements">see above</a> for details.<br>
  263
+								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>.
  264
+							</p>
  265
+						<?php } else { ?>
  266
+							<p id="stats-container">
  267
+								<input type="checkbox" id="stats" name="stats" checked="checked">
  268
+									<label for="stats">Send information about my webserver to silverstripe.org<br />
  269
+										<small>(anonymous version information, used for statistical purposes)</small>
  270
+								</label><p>
243 271
 							
244  
-							<h4><em class="inlineBarText">Theme</em> <span>Step: 4 of 5</span></h4>
245  
-							<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>
246  
-							<div class="field">
247  
-								<ul id="Themes">
248  
-									<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>
249  
-									<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>
250  
-								</ul>
251  
-							</div>
252  
-							
253  
-							<h4 id="install"><em class="inlineBarText">Confirm Install</em> <span>Step: 5 of 5</span></h4>
254  
-							
255  
-							<?php if(isset($hasErrorOtherThanDatabase)) { ?>
256  
-								<p class="error">
257  
-									You aren't currently able to install the software.  Please <a href="#requirements">see above</a> for details.<br>
258  
-									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>.
259  
-								</p>
260  
-							<?php } else { ?>
261  
-								<p id="stats-container">
262  
-									<input type="checkbox" id="stats" name="stats" checked="checked">
263  
-										<label for="stats">Send information about my webserver to silverstripe.org<br />
264  
-											<small>(anonymous version information, used for statistical purposes)</small>
265  
-									</label><p>
  272
+							<p>
  273
+								<?php if($alreadyInstalled) { ?>
  274
+									<input id="install_button" type="submit" disabled="disabled" class="action" name="go" value="Install SilverStripe">
  275
+								<?php } else { ?>
  276
+									<input id="install_button" type="submit" class="action" name="go" value="Install SilverStripe">
  277
+								<?php } ?>
266 278
 								
267  
-								<p>
268  
-									<?php if($alreadyInstalled) { ?>
269  
-										<input id="install_button" type="submit" disabled="disabled" class="action" name="go" value="Install SilverStripe">
270  
-									<?php } else { ?>
271  
-										<input id="install_button" type="submit" class="action" name="go" value="Install SilverStripe">
272  
-									<?php } ?>
273  
-									
274  
-									<span id="saving_top" style="display: none">
275  
-										&nbsp;
276  
-										<img src="sapphire/images/network-save.gif">
277  
-										(this will take a minute or so)
278  
-									</span>
279  
-								</p>
280  
-							<?php } ?>
281  
-						</form>
282  
-					</div>
  279
+								<span id="saving_top" style="display: none">
  280
+									&nbsp;
  281
+									<img src="sapphire/images/network-save.gif">
  282
+									(this will take a minute or so)
  283
+								</span>
  284
+							</p>
  285
+						<?php } ?>
  286
+					</form>
283 287
 				</div>
284  
-				<div class="clear"><!-- --></div>
285 288
 			</div>
  289
+		</div>	
  290
+		<div class="clear"><!-- --></div>
286 291
 			
287  
-			<div id="Footer">
  292
+		<div class="footer">
  293
+			<div class="inner">
288 294
 				<div class="footerTop"><!-- --></div>
289 295
 				<p><a href="http://silverstripe.org">SilverStripe Open Source CMS / Framework</a> | Copyright &copy; <?php echo date('Y'); ?> SilverStripe Limited</p>
290  
-			</div>
  296
+			</div>	
291 297
 		</div>
292 298
 	</body>
293 299
 </html>
132  dev/install/install.css
... ...
@@ -1,18 +1,17 @@
1  
-body {
2  
-	text-align: center;
  1
+.header {
  2
+	padding-bottom:10px;
3 3
 }
4 4
 
5  
-#Container .typography p {
6  
-	margin-left: 0;
7  
-	margin-right: 0;
  5
+.header p {
  6
+	color:#fff;
8 7
 }
9 8
 
10  
-#Container * {
11  
-	text-align: left;
  9
+.brand {
  10
+	float:none;
12 11
 }
13 12
 
14  
-#Header p {
15  
-	margin-left: 30px;
  13
+#Navigation {
  14
+	display:none;
16 15
 }
17 16
 
18 17
 ul#Themes{
@@ -20,6 +19,7 @@ ul#Themes{
20 19
 	margin: 0 5px 20px 5px;
21 20
 	float: left;
22 21
 	width: 320px;
  22
+	padding:0;
23 23
 }
24 24
 	ul#Themes li {
25 25
 		clear: both;
@@ -35,7 +35,7 @@ ul#Themes{
35 35
 		margin: -2px 5px 0 15px;
36 36
 	}
37 37
 
38  
-h4.sectionHeading {
  38
+h1.sectionHeading {
39 39
 	margin-top: 20px;
40 40
 }
41 41
 
@@ -45,10 +45,11 @@ h4.sectionHeading {
45 45
 	border: 1px #ff8e8e solid;
46 46
 	color: #f03838;
47 47
 }
48  
-	#Container p.error { color: #f03838;}
  48
+	.main p.error { color: #f03838;}
49 49
 .warning {
50 50
 	padding: 0.5em;
51 51
 	background-color: #fcf8f2;
  52
+	border-radius:4px;
52 53
 	border: 1px #ffc28b solid;
53 54
 	color: #cb6a1c;
54 55
 }
@@ -81,9 +82,9 @@ p.error a:hover {
81 82
 }
82 83
 span.middleColumn {
83 84
 	width: 297px;
84  
-	margin-right: 0;
85  
-	margin-top: 5px;
  85
+	margin:0;
86 86
 	padding: 4px;
  87
+	float:right;
87 88
 }
88 89
 input.text, textarea, select {
89 90
 	padding: 2px;
@@ -99,25 +100,19 @@ input.text, textarea, select {
99 100
 #stats {
100 101
 	margin-right: 5px;
101 102
 }
102  
-table.testResults {
103  
-	border-collapse: collapse;
104  
-	width: 100%;
105  
-	margin: 10px 0;
106  
-}
107  
-#Layout h4 {
108  
-	font-size: 2em;
  103
+
  104
+.main h2 {
109 105
 	margin: 36px 0 18px 0;
110 106
 	font-weight: bold;
111  
-	line-height: 1.8;
112 107
 	clear: left;
113  
-	border-top: 2px solid #888;
114 108
 	text-indent: 5px;
115 109
 	width: 100%;
116 110
 	overflow: hidden;
  111
+	border-top:1px solid #E5E5E5;
117 112
 }
118  
-	#Layout h4 span {
  113
+	.main h2 span {
119 114
 		float: right;
120  
-		font-size: 10px;
  115
+		font-size: 0.8em;
121 116
 		padding: 10px 10px 0 0;
122 117
 		font-weight: normal;
123 118
 		color: #888;
@@ -127,7 +122,9 @@ table.testResults {
127 122
  * Requirements and test results
128 123
  * ------------------------------------------------ */
129 124
 table.testResults {
130  
-	margin-top: 0;
  125
+	border-collapse: collapse;
  126
+	width: 100%;
  127
+	margin: -1px 0px 10px 0;
131 128
 }
132 129
 	table.testResults td {
133 130
 		border: 1px #CCC solid;
@@ -160,7 +157,8 @@ h5.requirement {
160 157
 	padding: 10px;
161 158
 	background: #f1f1f1;
162 159
 	border: 1px solid #ccc;
163  
-	border-width: 0 1px 1px 1px;
  160
+	border-radius:4px 4px 0 0;
  161
+	border-width: 1px;
164 162
 	margin: 0;
165 163
 	overflow: hidden;
166 164
 }	
@@ -179,7 +177,7 @@ h5.requirement {
179 177
 	h5.requirement a {
180 178
 		font-size: 10px;
181 179
 		float: right;
182  
-		line-height: 19px;
  180
+		line-height: 13px;
183 181
 		margin: 0 0 0 30px;
184 182
 		color: #666;
185 183
 		text-decoration: none;
@@ -198,9 +196,9 @@ h5.requirement {
198 196
 	margin-bottom: 0;
199 197
 }
200 198
 
201  
-#Layout .helpText {
  199
+.main .helpText {
202 200
 	float: right;
203  
-	width: 370px;
  201
+	width: 350px;
204 202
 	padding-right: 10px;
205 203
 }
206 204
 
@@ -210,7 +208,7 @@ h5.requirement {
210 208
 
211 209
 .fields {
212 210
 	float: left;
213  
-	width: 330px;
  211
+	width: 450px;
214 212
 }
215 213
 
216 214
 #devHelp,
@@ -218,16 +216,23 @@ h5.requirement {
218 216
 	height: 18em;
219 217
 }
220 218
 
221  
-#Layout input.action {
222  
-	text-align: center;
  219
+.main .action input{
  220
+	cursor:pointer;
  221
+	text-align:center;
  222
+	color:#fff;
  223
+	background-color:#EF7F24;
  224
+	border:none;
  225
+	border-radius:4px;
223 226
 	font-size: 13px;
224 227
 	width: 220px;
225 228
 	font-weight: bold;
226 229
 	margin: 5px 0;
  230
+	padding:5px;
  231
+	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;
227 232
 }
228 233
 
229 234
 #use_environment_field {
230  
-	margin-bottom: 25px;
  235
+	margin: 20px 0 10px;
231 236
 }
232 237
 
233 238
 #use_environment_field input {
@@ -236,7 +241,7 @@ h5.requirement {
236 241
 }
237 242
 
238 243
 .dbfields {
239  
-	margin: 10px;
  244
+	margin: 10px 10px 10px 0;
240 245
 }
241 246
 
242 247
 #database_credentials {
@@ -247,26 +252,60 @@ h5.requirement {
247 252
 #database_selection {
248 253
 	overflow: hidden;
249 254
 	margin: 0;
  255
+	padding-left:5px;
250 256
 }
251 257
 	#database_selection li {
252 258
 		margin-left: 0;
253 259
 		padding-left: 0;
  260
+		list-style-type:none;
254 261
 	}
255 262
 		#database_selection li input {
256 263
 			margin-right: 5px;
  264
+			border-radius:4px;
  265
+			background:#ededed;
  266
+		}
  267
+
  268
+		#database_selection li input:focus{
  269
+			outline:none; background-color:#fff;
257 270
 		}
258  
-		#database_selection li label {
259  
-			display: inline;
  271
+
  272
+		#database_selection li .field label {
  273
+			float:left;
  274
+			margin-top:15px;
260 275
 		}
261 276
 
  277
+#AdminAccount input {
  278
+	border-radius:4px;
  279
+	background:#ededed;
  280
+}
  281
+
  282
+#AdminAccount select {
  283
+	border-radius:4px;
  284
+	background:none;
  285
+	margin-top:5px;
  286
+}
  287
+
  288
+#AdminAccount select:focus{
  289
+	outline:none;
  290
+}
  291
+
  292
+#AdminAccount input:focus{
  293
+	outline:none; background-color:#fff;
  294
+}
  295
+
  296
+#AdminAccount .field label {
  297
+	float:left;
  298
+	margin-top:15px;
  299
+}
  300
+
262 301
 .databaseError {
263 302
 	clear:both;
264 303
 	overflow: hidden;
265 304
 	width: 290px;
266 305
 	line-height: 1.2;
267  
-	margin: 10px;
268  
-	margin-bottom: 0;
  306
+	margin: 10px 0 20px;
269 307
 	display: none;
  308
+	border-radius:4px;
270 309
 }
271 310
 
272 311
 	.databaseError ul {
@@ -277,6 +316,21 @@ h5.requirement {
277 316
 		padding-left: 0;
278 317
 	}
279 318
 
  319
+input#install_button {
  320
+	cursor:pointer;
  321
+	text-align:center;
  322
+	color:#fff;
  323
+	background-color:#359318;
  324
+	border:none;
  325
+	border-radius:4px;
  326
+	font-size: 13px;
  327
+	width: 220px;
  328
+	font-weight: bold;
  329
+	margin: 5px 0;
  330
+	padding:5px;
  331
+	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;
  332
+}
  333
+
280 334
 .goodInstall {
281 335
 	padding: 0.5em;
282 336
 	background-color: #e2fee1;
@@ -286,7 +340,7 @@ h5.requirement {
286 340
 	line-height: 18px;
287 341
 	padding: 10px;
288 342
 }
289  
-	#Layout p.goodInstall {
  343
+	.main p.goodInstall {
290 344
 		color: #359318;
291 345
 	}
292 346
 	.goodInstall a {
8  dev/install/install.php5
@@ -945,9 +945,9 @@ class Installer extends InstallRequirements {
945 945
 <html>
946 946
 	<head>
947 947
 		<title>Installing SilverStripe...</title>
948  
-		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css" />
949  
-		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css" />
950  
-		<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css" />
  948
+		<link rel="stylesheet" type="text/css" href="themes/simple/css/layout.css" />
  949
+		<link rel="stylesheet" type="text/css" href="themes/simple/css/typography.css" />
  950
+		<link rel="stylesheet" type="text/css" href="themes/simple/css/form.css" />
951 951
 		<link rel="stylesheet" type="text/css" href="sapphire/dev/install/install.css" />
952 952
 		<script src="sapphire/thirdparty/jquery/jquery.js"></script>
953 953
 	</head>
@@ -1017,7 +1017,7 @@ class Installer extends InstallRequirements {
1017 1017
 			$fh = fopen('mysite/_config.php', 'wb');
1018 1018
 			fclose($fh);
1019 1019
 		}
1020  
-		$theme = isset($_POST['template']) ? $_POST['template'] : 'blackcandy';
  1020
+		$theme = isset($_POST['template']) ? $_POST['template'] : 'simple';
1021 1021
 		$locale = isset($_POST['locale']) ? $_POST['locale'] : 'en_US';
1022 1022
 		$type = $config['db']['type'];
1023 1023
 		$dbConfig = $config['db'][$type];

0 notes on commit 63b23a2

Please sign in to comment.
Something went wrong with that request. Please try again.