Skip to content
This repository
Browse code

BUG: Installer templates

Installer was feeing the title "Title" to the template. Template
rearranged for usability concerns (people were missing the email and
password when going to the CMS login page)
  • Loading branch information...
commit 4fdc76d9047cc1c4a12e56d7654fe262dfb9b62b 1 parent 2e791ab
Naomi Guyer authored August 22, 2012
2  code/controllers/ContentController.php
@@ -401,7 +401,7 @@ function successfullyinstalled() {
401 401
 		));
402 402
 		
403 403
 		return array(
404  
-			"Title" => DBField::create_field('Varchar', "Title", "Installation Successful"),
  404
+			"Title" =>  _t("ContentController.INSTALL_SUCCESS", "Installation Successful!"),
405 405
 			"Content" => $data->renderWith('Install_successfullyinstalled'),
406 406
 		);
407 407
 	}
15  templates/Includes/Install_successfullyinstalled.ss
... ...
@@ -1,17 +1,18 @@
1  
-<p style="margin: 1em 0">
2  
-	<b><%t ContentController.InstallSuccessCongratulations "SilverStripe has been successfully installed." %></b>
  1
+<p>
  2
+	<%t ContentController.InstallSuccessCongratulations "SilverStripe has been successfully installed!" %>
3 3
 </p>
4 4
 
5 5
 <% if Project == 'tutorial' %>
6  
-	<%t ContentController.PostInstallTutorialIntro 'This website is a simplistic version of a SilverStripe 2 site. To extend this, please take a look at {link}.' link='<a href="http://doc.silverstripe.org/doku.php?id=tutorials">our new tutorials</a>' %>
  6
+	<%t ContentController.PostInstallTutorialIntro 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.' link='<a href="http://doc.silverstripe.org/doku.php?id=tutorials">our tutorials</a>' %>
7 7
 <% end_if %>
8 8
 
  9
+	<p><strong>&nbsp; &nbsp; <%t ContentController.Email "Email" %>: $Username</strong></br>
  10
+	<strong>&nbsp; &nbsp; <%t ContentController.Password "Password" %>: $Password</strong></p>
  11
+
9 12
 <p>
10  
-	<%t ContentController.StartEditing 'You can start editing your site\'s content by opening <a href="{link}">the CMS</a>.' link="admin/" %> 
11  
-	<br />
12  
-	&nbsp; &nbsp; <%t ContentController.Email "Email" %>: $Username<br />
13  
-	&nbsp; &nbsp; <%t ContentController.Password "Password" %>: $Password<br />
  13
+	<%t ContentController.StartEditing "You can start editing your site's content by opening <a href=\"{link}\">the CMS</a>." link="admin/" %> 
14 14
 </p>
  15
+
15 16
 <div style="background:#fcf8f2; border-radius:4px; border: 1px solid #ffc28b; padding:5px; margin:5px;">
16 17
 	<img src="cms/images/dialogs/alert.gif" style="border: none; margin-right: 10px; float: left; height:48px; width:48px" />
17 18
 	<p style="color: #cb6a1c; margin-bottom:0;">

0 notes on commit 4fdc76d

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