Merge branch 'master' into integration

code/controllers/AssetAdmin.php

@@ -88,15 +88,14 @@ JS
 			new GridFieldPaginator(10),
 			new GridFieldAction_Delete(),
 			new GridFieldAction_Edit(),
-			$gridFieldForm = new GridFieldPopupForms(Controller::curr(), 'EditForm')
+			new GridFieldPopupForms()
 		);
-		$gridFieldForm->setTemplate('CMSGridFieldPopupForms');
 		$files = DataList::create('File')
 			->filter('ParentID', $folder->ID)
 			->sort('(CASE WHEN "ClassName" = \'Folder\' THEN 0 ELSE 1 END)');	
 		$gridField = new GridField('File','Files', $files, $gridFieldConfig);
 		$gridField->setDisplayFields(array(
-			'StripThumbnail' => '',
+			// 'StripThumbnail' => '',
 			// 'Parent.FileName' => 'Folder',
 			'Title' => _t('File.Name'),
 			'Created' => _t('AssetAdmin.CREATED', 'Date'),

css/ReportAdmin.css

@@ -1,59 +0,0 @@
-#ReportSelector_holder {
-	background-color: #EEE;
-	border-bottom: 1px #CCC solid;
-	margin: 0;
-	padding: 3px;
-}
-
-#right iframe.AWStatsReport {
-	width: 98%;
-	height: 85%;
-}
-
-.ReportAdmin h4 {
-	border-bottom: 1px #AAA solid;
-	margin-bottom: 0.5em;
-}
-
-.ReportAdmin .right form h4 {
-	font-size: 11px;
-}
-
-.ReportAdmin .filters {
-	overflow: auto;
-}
-
-.ReportAdmin .filters .field {
-	padding: 0;
-}
-
-.ReportAdmin .filters > .field {
-	float: left;
-	clear: none;
-	margin-right: 1em;
-	margin-bottom: .5em;
-}
-
-.ReportAdmin .right form .field label.left {
-	width: auto;
-	height: 15px;
-}
-
-.ReportAdmin .right form .field .middleColumn {
-	width: auto;
-	padding: 0;
-}
-
-.ReportAdmin .filters .field .middleColumn {
-	background: none;
-}
-
-.ReportAdmin .filters .field.checkbox {
-	margin-top: 18px;
-	padding: 0;
-}
-
-.ReportAdmin .filters .field.datetime .field.date,
-.ReportAdmin .filters .field.datetime .field.time {
-	float: left;
-}

javascript/CMSMain.GridField.js

@@ -0,0 +1,13 @@
+jQuery(function($){
+	$('fieldset.ss-gridfield').entwine({
+		onopennewview: function(e, url) {
+			$('.cms-container').entwine('ss').loadPanel(url);
+			return false;
+		},
+
+		onopeneditview: function(e, url) {
+			$('.cms-container').entwine('ss').loadPanel(url);
+			return false;
+		}
+	});
+});