diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index 94ed93b5..a25c99ac 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -162,7 +162,7 @@ JS $uploadBtn = new LiteralField( 'UploadButton', sprintf( - '%s', + '%s', Controller::join_links(singleton('CMSFileAddController')->Link(), '?ID=' . $folder->ID), _t('Folder.UploadFilesButton', 'Upload') ) @@ -275,6 +275,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/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 @@ -
+
diff --git a/templates/Includes/AssetAdmin_UploadContent.ss b/templates/Includes/AssetAdmin_UploadContent.ss index 693b3ed8..af6be21a 100644 --- a/templates/Includes/AssetAdmin_UploadContent.ss +++ b/templates/Includes/AssetAdmin_UploadContent.ss @@ -1,4 +1,4 @@ -
+
diff --git a/templates/Includes/CMSMain_Content.ss b/templates/Includes/CMSMain_Content.ss index b53c7dd8..1e0d0b76 100644 --- a/templates/Includes/CMSMain_Content.ss +++ b/templates/Includes/CMSMain_Content.ss @@ -1,4 +1,4 @@ -
+
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss index 5a8ca5a7..0b056d91 100644 --- a/templates/Includes/CMSPagesController_Content.ss +++ b/templates/Includes/CMSPagesController_Content.ss @@ -1,4 +1,4 @@ -
+
diff --git a/templates/Includes/CMSSettingsController_Content.ss b/templates/Includes/CMSSettingsController_Content.ss index baf0ceec..bf45dce8 100644 --- a/templates/Includes/CMSSettingsController_Content.ss +++ b/templates/Includes/CMSSettingsController_Content.ss @@ -1,4 +1,4 @@ -
+
diff --git a/templates/Includes/ReportAdmin_Content.ss b/templates/Includes/ReportAdmin_Content.ss index 04ff5800..c926d375 100644 --- a/templates/Includes/ReportAdmin_Content.ss +++ b/templates/Includes/ReportAdmin_Content.ss @@ -1,4 +1,4 @@ -
+