tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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)
This commit is contained in:
Naomi Guyer 2012-08-22 13:52:33 +12:00
parent 2e791abad2
commit 4fdc76d904
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/ContentController.php
View File

@ -401,7 +401,7 @@ HTML;
));
return array(
"Title" => DBField::create_field('Varchar', "Title", "Installation Successful"),
"Title" => _t("ContentController.INSTALL_SUCCESS", "Installation Successful!"),
"Content" => $data->renderWith('Install_successfullyinstalled'),
);
}

15
templates/Includes/Install_successfullyinstalled.ss
View File

@ -1,17 +1,18 @@
<p style="margin: 1em 0">
<b><%t ContentController.InstallSuccessCongratulations "SilverStripe has been successfully installed." %></b>
<p>
<%t ContentController.InstallSuccessCongratulations "SilverStripe has been successfully installed!" %>
</p>
<% if Project == 'tutorial' %>
<%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>' %>
<%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>' %>
<% end_if %>
<p><strong>&nbsp; &nbsp; <%t ContentController.Email "Email" %>: $Username</strong></br>
<strong>&nbsp; &nbsp; <%t ContentController.Password "Password" %>: $Password</strong></p>
<p>
<%t ContentController.StartEditing 'You can start editing your site\'s content by opening <a href="{link}">the CMS</a>.' link="admin/" %>
<br />
&nbsp; &nbsp; <%t ContentController.Email "Email" %>: $Username<br />
&nbsp; &nbsp; <%t ContentController.Password "Password" %>: $Password<br />
<%t ContentController.StartEditing "You can start editing your site's content by opening <a href=\"{link}\">the CMS</a>." link="admin/" %>
</p>
<div style="background:#fcf8f2; border-radius:4px; border: 1px solid #ffc28b; padding:5px; margin:5px;">
<img src="cms/images/dialogs/alert.gif" style="border: none; margin-right: 10px; float: left; height:48px; width:48px" />
<p style="color: #cb6a1c; margin-bottom:0;">