Merge remote-tracking branch 'origin/3.1'

Conflicts: .travis.yml templates/Includes/ReportAdmin_Content.ss templates/ReportAdminForm.ss
2024-10-22 08:05:56 +02:00 · 2013-08-03 19:46:46 +02:00 · 2013-08-03 19:46:46 +02:00 · e0aa610172
commit e0aa610172
parent 27de4367b8 f937b95eaf
20 changed files with 83 additions and 82 deletions
--- a/code/controllers/ContentController.php
+++ b/code/controllers/ContentController.php
@ -24,7 +24,8 @@ class ContentController extends Controller {

 	private static $allowed_actions = array(
 		'successfullyinstalled',
-		'deleteinstallfiles' // secured through custom code
+		'deleteinstallfiles', // secured through custom code
+		'LoginForm'
 	);
 	
 	/**
--- a/templates/BreadcrumbsTemplate.ss
+++ b/templates/BreadcrumbsTemplate.ss
@ -1,5 +1,5 @@
-<% if Pages %>
-	<% loop Pages %>
-		<% if Last %>$MenuTitle.XML<% else %><a href="$Link" class="breadcrumb-$Pos">$MenuTitle.XML</a> &raquo;<% end_if %>
+<% if $Pages %>
+	<% loop $Pages %>
+		<% if $Last %>$MenuTitle.XML<% else %><a href="$Link" class="breadcrumb-$Pos">$MenuTitle.XML</a> &raquo;<% end_if %>
 	<% end_loop %>
 <% end_if %>
--- a/templates/CMSPageHistoryController_versions.ss
+++ b/templates/CMSPageHistoryController_versions.ss
@ -9,14 +9,14 @@
 	</thead>

 	<tbody>
-		<% loop Versions %>
+		<% loop $Versions %>
 		<tr id="page-$RecordID-version-$Version" class="$EvenOdd $PublishedClass<% if not WasPublished %><% if not Active %> ui-helper-hidden<% end_if %><% end_if %><% if Active %> active<% end_if %>" data-published="<% if WasPublished %>true<% else %>false<% end_if %>">
 			<td class="ui-helper-hidden"><input type="checkbox" name="Versions[]" id="cms-version-{$Version}" value="$Version"<% if Active %> checked="checked"<% end_if %> /></td>
-			<% with LastEdited %>
+			<% with $LastEdited %>
 				<td class="last-edited first-column" title="$Ago - $Nice">$Nice</td>
 			<% end_with %>
-			<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %></td>
-			<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('CMSPageHistoryController_versions.ss.NOTPUBLISHED','Not published') %><% end_if %></td>			
+			<td><% if $Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %></td>
+			<td class="last-column"><% if $Published %><% if $Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('CMSPageHistoryController_versions.ss.NOTPUBLISHED','Not published') %><% end_if %></td>
 		</tr>
 		<% end_loop %>
 	</tbody>
--- a/templates/Includes/AssetAdmin_Content.ss
+++ b/templates/Includes/AssetAdmin_Content.ss
@ -1,22 +1,22 @@
 <div id="assetadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">

-	<% with EditForm %>
+	<% with $EditForm %>
 	<div class="cms-content-header north">
 		<div class="cms-content-header-info">
 			<% include BackLink_Button %>


-			<% with Controller %>
+			<% with $Controller %>
 				<% include CMSBreadcrumbs %>
 			<% end_with %>

 		</div>
-		<% if Fields.hasTabset %>
-			<% with Fields.fieldByName('Root') %>
+		<% if $Fields.hasTabset %>
+			<% with $Fields.fieldByName('Root') %>
 			<div class="cms-content-header-tabs">
 				<ul class="cms-tabset-nav-primary">
-				<% loop Tabs %>
-					<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+				<% loop $Tabs %>
+					<li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
 				<% end_loop %>
 				</ul>
 			</div>
--- a/templates/Includes/AssetAdmin_EditForm.ss
+++ b/templates/Includes/AssetAdmin_EditForm.ss
@ -1,25 +1,25 @@
 <form $FormAttributes>

-	<% if Message %>
+	<% if $Message %>
 	<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 	<% else %>
 	<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
 	<% end_if %>

 	<fieldset>
-		<% if Legend %><legend>$Legend</legend><% end_if %> 
-		<% loop Fields %>
+		<% if $Legend %><legend>$Legend</legend><% end_if %>
+		<% loop $Fields %>
 			$FieldHolder
 		<% end_loop %>
 		<div class="clear"><!-- --></div>
 	</fieldset>

-	<% if Actions %>
+	<% if $Actions %>
 	<div class="Actions">
-		<% loop Actions %>
+		<% loop $Actions %>
 			$Field
 		<% end_loop %>
-		<% if CurrentPage.LinkPreview %>
+		<% if $CurrentPage.LinkPreview %>
 		<a href="$CurrentPage.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
 			<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
 		</a>
--- a/templates/Includes/CMSMain_EditForm.ss
+++ b/templates/Includes/CMSMain_EditForm.ss
@ -1,15 +1,15 @@
 <form $FormAttributes data-layout-type="border">

 	<div class="cms-content-fields center">
-		<% if Message %>
+		<% if $Message %>
 		<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 		<% else %>
 		<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
 		<% end_if %>

 		<fieldset>
-			<% if Legend %><legend>$Legend</legend><% end_if %> 
-			<% loop Fields %>
+			<% if $Legend %><legend>$Legend</legend><% end_if %>
+			<% loop $Fields %>
 				$FieldHolder
 			<% end_loop %>
 			<div class="clear"><!-- --></div>
@ -17,12 +17,12 @@
 	</div>

 	<div class="cms-content-actions cms-content-controls south">
-		<% if Actions %>
+		<% if $Actions %>
 		<div class="Actions">
-			<% loop Actions %>
+			<% loop $Actions %>
 				$Field
 			<% end_loop %>
-				<% if Controller.LinkPreview %>
+				<% if $Controller.LinkPreview %>
 			<a href="$Controller.LinkPreview" target="_cmsPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
 				<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
 			</a>
--- a/templates/Includes/CMSMain_ListView.ss
+++ b/templates/Includes/CMSMain_ListView.ss
@ -7,7 +7,7 @@
 </div>

 <div class="cms-panel-content center">
-	<% if TreeIsFiltered %>
+	<% if $TreeIsFiltered %>
 	<div class="cms-tree-filtered cms-notice">
 		<strong><% _t('CMSMain.ListFiltered', 'Filtered list.') %></strong>
 		<a href="$LinkPages" class="cms-panel-link">
--- a/templates/Includes/CMSMain_TreeView.ss
+++ b/templates/Includes/CMSMain_TreeView.ss
@ -10,7 +10,7 @@
 $ExtraTreeTools

 <div class="center">
-	<% if TreeIsFiltered %>
+	<% if $TreeIsFiltered %>
 	<div class="cms-tree-filtered cms-notice">
 		<strong><% _t('CMSMain.TreeFiltered', 'Filtered tree.') %></strong>
 		<a href="$LinkPages" class="cms-panel-link">
--- a/templates/Includes/CMSPageAddController_Content.ss
+++ b/templates/Includes/CMSPageAddController_Content.ss
@ -1,5 +1,5 @@
 <div class="cms-content center $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
-	<% with AddForm %>
+	<% with $AddForm %>
 		<form $FormAttributes data-layout-type="border">
 			<div class="cms-content-header north">
 				<div class="cms-content-header-info">
@ -8,24 +8,24 @@
 			</div>

 			<div class="cms-content-fields center cms-panel-content cms-panel-padded">
-				<% if Message %>
+				<% if $Message %>
 				<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 				<% else %>
 				<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
 				<% end_if %>

 				<fieldset>
-					<% if Legend %><legend>$Legend</legend><% end_if %> 
-					<% loop Fields %>
+					<% if $Legend %><legend>$Legend</legend><% end_if %>
+					<% loop $Fields %>
 						$FieldHolder
 					<% end_loop %>
 				</fieldset>
 			</div>

 			<div class="cms-content-actions south">
-				<% if Actions %>
+				<% if $Actions %>
 				<div class="Actions">
-					<% loop Actions %>
+					<% loop $Actions %>
 						$Field
 					<% end_loop %>
 				</div>
--- a/templates/Includes/CMSSettingsController_Content.ss
+++ b/templates/Includes/CMSSettingsController_Content.ss
@ -1,18 +1,18 @@
 <div id="settings-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content CurrentForm">

 	<div class="cms-content-header north">
-		<% with EditForm %>
+		<% with $EditForm %>
 			<div class="cms-content-header-info">
-				<% with Controller %>
+				<% with $Controller %>
 					<% include CMSBreadcrumbs %>
 				<% end_with %>
 			</div>
-			<% if Fields.hasTabset %>
-				<% with Fields.fieldByName('Root') %>
+			<% if $Fields.hasTabset %>
+				<% with $Fields.fieldByName('Root') %>
 				<div class="cms-content-header-tabs">
 					<ul class="cms-tabset-nav-primary">
-					<% loop Tabs %>
-						<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+					<% loop $Tabs %>
+						<li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
 					<% end_loop %>
 					</ul>
 				</div>
--- a/templates/Includes/CMSSettingsController_EditForm.ss
+++ b/templates/Includes/CMSSettingsController_EditForm.ss
@ -1,25 +1,25 @@
 <form $FormAttributes>

-	<% if Message %>
+	<% if $Message %>
 	<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 	<% else %>
 	<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
 	<% end_if %>

 	<fieldset>
-		<% if Legend %><legend>$Legend</legend><% end_if %>
-		<% loop Fields %>
+		<% if $Legend %><legend>$Legend</legend><% end_if %>
+		<% loop $Fields %>
 			$FieldHolder
 		<% end_loop %>
 		<div class="clear"><!-- --></div>
 	</fieldset>

-	<% if Actions %>
+	<% if $Actions %>
 	<div class="Actions">
-		<% loop Actions %>
+		<% loop $Actions %>
 			$Field
 		<% end_loop %>
-		<% if Controller.LinkPreview %>
+		<% if $Controller.LinkPreview %>
 			<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
 				<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
 			</a>
--- a/templates/Includes/Install_deleteinstallfiles.ss
+++ b/templates/Includes/Install_deleteinstallfiles.ss
@ -1,10 +1,10 @@
-<% if UnsuccessfulFiles %>
+<% if $UnsuccessfulFiles %>
 	<p style=\"margin: 1em 0\">
 		<%t ContentController.UnableDeleteInstall "Unable to delete installation files. Please delete the files below manually" %>:
 	</p>

 	<ul>
-		<% loop UnsuccessfulFiles %>
+		<% loop $UnsuccessfulFiles %>
 		<li>$File</li>
 		<% end_loop %>
 	</ul>
--- a/templates/Includes/Install_successfullyinstalled.ss
+++ b/templates/Includes/Install_successfullyinstalled.ss
@ -2,7 +2,7 @@
 	<%t ContentController.InstallSuccessCongratulations "SilverStripe has been successfully installed!" %>
 </p>

-<% if Project == 'tutorial' %>
+<% if $Project == 'tutorial' %>
 	<%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/framework/en/tutorials">our tutorials</a>' %>
 <% end_if %>

--- a/templates/SSReportTableField_printable.ss
+++ b/templates/SSReportTableField_printable.ss
@ -8,13 +8,13 @@

 <%-- <body onload="window.print();"> --%>
 <body>
-	<% with Form.Controller %>
+	<% with $Form.Controller %>
 		<h1 style="margin-bottom: 0">$CurrentReport.Title</h1>
-		<% with CurrentReport.getCmsFields %>
-			<% if Name == Filters %>
+		<% with $CurrentReport.getCmsFields %>
+			<% if $Name == Filters %>
 				<h2 style="margin-bottom: 0; margin-top: 0;">Filters</h2>
 				<ul style="margin-top: 0">
-				<% loop FieldSet %>
+				<% loop $FieldSet %>
 					<li>$Title = $performReadonlyTransformation.Field</li>
 				<% end_loop %>
 				</ul>
--- a/templates/SiteTree_Information.ss
+++ b/templates/SiteTree_Information.ss
@ -1,6 +1,6 @@
 <div class='cms-sitetree-information'>
 	<p class="meta-info"><% _t('SiteTree.LASTSAVED', 'Last saved') %> $LastEdited.Ago(0)
-	<% if ExistsOnLive %>
+	<% if $ExistsOnLive %>
 		<br /><% _t('SiteTree.LASTPUBLISHED', 'Last published') %> $Live.LastEdited.Ago(0)
 	<% else %>
 		<br /><em><% _t('SiteTree.NOTPUBLISHED', 'Not published') %></em>
--- a/templates/forms/SiteTreeURLSegmentField.ss
+++ b/templates/forms/SiteTreeURLSegmentField.ss
@ -14,5 +14,5 @@
 	<button class="cancel ss-ui-button-small ss-ui-action-minor">
 		<% _t('URLSegmentField.Cancel', 'Cancel') %>
 	</button>
-	<% if HelpText %><p class="help">$HelpText</p><% end_if %>
+	<% if $HelpText %><p class="help">$HelpText</p><% end_if %>
 </div>