diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 02f12150..9bc10357 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -169,7 +169,7 @@ JS
$uploadBtn = new LiteralField(
'UploadButton',
sprintf(
- '%s',
+ '%s',
Controller::join_links(singleton('CMSFileAddController')->Link(), '?ID=' . $folder->ID),
_t('Folder.UploadFilesButton', 'Upload')
)
@@ -282,6 +282,7 @@ JS
$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
// TODO Can't merge $FormAttributes in template at the moment
$form->addExtraClass('cms-edit-form cms-panel-padded center ' . $this->BaseCSSClasses());
+ $form->setAttribute('data-pjax-fragment', 'CurrentForm');
$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
$this->extend('updateEditForm', $form);
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index ceec2522..05a3e7ff 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -625,6 +625,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
// TODO Can't merge $FormAttributes in template at the moment
$form->addExtraClass('center ss-tabset ' . $this->BaseCSSClasses());
// if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+ $form->setAttribute('data-pjax-fragment', 'CurrentForm');
if(!$record->canEdit() || $deletedFromStage) {
$readonlyFields = $form->Fields()->makeReadonly();
@@ -720,7 +721,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$num = $item->numChildren();
if($num) {
return sprintf(
- '%s',
+ '%s',
$controller->Link(),
$item->ID,
$num
@@ -737,6 +738,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
new FieldList($gridField),
new FieldList()
);
+ $listview->setAttribute('data-pjax-fragment', 'ListViewForm');
$this->extend('updateListView', $listview);
diff --git a/code/controllers/CMSPagesController.php b/code/controllers/CMSPagesController.php
index 62180d60..5f401d7a 100644
--- a/code/controllers/CMSPagesController.php
+++ b/code/controllers/CMSPagesController.php
@@ -15,6 +15,13 @@ class CMSPagesController extends CMSMain {
return false;
}
+ /**
+ * @return String
+ */
+ public function ViewState() {
+ return $this->request->getVar('view');
+ }
+
/**
* Doesn't deal with a single record, and we need
* to avoid session state from previous record edits leaking in here.
diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
index c4d6fb1b..f85e365d 100644
--- a/templates/Includes/AssetAdmin_Content.ss
+++ b/templates/Includes/AssetAdmin_Content.ss
@@ -1,4 +1,4 @@
-