Merge remote-tracking branch 'origin/3.2' into 3

.gitignore

@@ -1 +1,2 @@
+.sass-cache
 .DS_Store

.travis.yml

@@ -4,6 +4,8 @@ language: php
 php: 
  - 5.3
 
+sudo: false
+
 env:
  - DB=MYSQL CORE_RELEASE=master
  - DB=PGSQL CORE_RELEASE=master
@@ -19,4 +21,4 @@ before_script:
  - cd ~/builds/ss
 
 script: 
- - phpunit reports/tests/
+ - phpunit reports/tests/

code/Report.php

@@ -25,7 +25,7 @@
  * ===========================
  * 
  * Right now, all subclasses of SS_Report will be shown in the ReportAdmin. In SS3 there is only
- * one place where reports can go, so this class is greatly simplifed from from its version in SS2.
+ * one place where reports can go, so this class is greatly simplifed from its version in SS2.
  * 
  * @package reports
  */
@@ -268,8 +268,9 @@ class SS_Report extends ViewableData {
 			new GridFieldSortableHeader(),
 			new GridFieldDataColumns(),
 			new GridFieldPaginator(),
-			new GridFieldPrintButton(),
+			new GridFieldButtonRow('after'),
-			new GridFieldExportButton()
+			new GridFieldPrintButton('buttons-after-left'),
+			new GridFieldExportButton('buttons-after-left')
 		);
 		$gridField = new GridField('Report',$this->title(), $items, $gridFieldConfig);
 		$columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns');

code/ReportAdmin.php

@@ -47,7 +47,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
 		$this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
 
 		// Set custom options for TinyMCE specific to ReportAdmin
-		HtmlEditorConfig::get('cms')->setOption('ContentCSS', project() . '/css/editor.css');
+		HtmlEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
 		HtmlEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
 
 		// Always block the HtmlEditorField.js otherwise it will be sent with an ajax request
@@ -186,4 +186,4 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
 
 		return $form;
 	}
-}
+}

composer.json

@@ -12,7 +12,7 @@
 		"homepage": "http://silverstripe.org"
 	}],
 	"require": {
-		"php": ">=5.3.2",
+		"php": ">=5.3.3",
 		"silverstripe/framework": ">=3.1.x-dev"
 	},
 	"extra": {

templates/Includes/ReportAdmin_Content.ss

@@ -1,20 +1,20 @@
 <div id="reportadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	<div class="cms-content-header north">
-		<% with EditForm %>
+		<% with $EditForm %>
 			<div class="cms-content-header-info">
-				<% include BackLink_Button %>				
+				<% include BackLink_Button %>
-				<% with Controller %>
+				<% with $Controller %>
 					<% include CMSBreadcrumbs %>
-				<% end_with %>				
+				<% end_with %>
 			</div>
 		<% end_with %>
 	</div>
 
 	<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
-		
+
 		$EditForm
-		
+
 	</div>
-	
+
 </div>

templates/ReportAdminForm.ss

@@ -1,41 +1,41 @@
 <form $FormAttributes>
 
-	
+
 	<p style="display: none;" class="message " id="Form_EditForm_error"/>
-	
+
 
 		<div id="ScrollPanel">
 		<fieldset>
 			$FieldMap.ReportTitle.FieldHolder
 			$FieldMap.ReportDescription.FieldHolder
-		
+
-			<% if FieldMap.Filters.Children %>
+			<% if $FieldMap.Filters.Children %>
 				<h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
-			
+
 				<div class="filters">
-					<% loop FieldMap.Filters %>
+					<% loop $FieldMap.Filters %>
-						<% loop Children %>
+						<% loop $Children %>
 							$FieldHolder
 						<% end_loop %>
 					<% end_loop %>
 				</div>
-			
+
 				<div id="action_updatereport">
-					<% if FieldMap.action_updatereport %>
+					<% if $FieldMap.action_updatereport %>
 						$FieldMap.action_updatereport.Field
 					<% end_if %>
 				</div>
-			
+
 				<div style="clear: both">&nbsp;</div>
 			<% end_if %>
-			
+
 			$FieldMap.ReportContent.FieldHolder
-			
+
-			<% loop HiddenFields %>$Field<% end_loop %>
+			<% loop $HiddenFields %>$Field<% end_loop %>
-			
+
 			</fieldset>
 		</div>
-			
+
-		
+
 		<div class="clear"><!-- --></div>
 </form>