diff --git a/_config/scripts.yml b/_config/scripts.yml
new file mode 100644
index 00000000..241ef2bb
--- /dev/null
+++ b/_config/scripts.yml
@@ -0,0 +1,9 @@
+---
+Name: cmsscripts
+---
+SilverStripe\Admin\LeftAndMain:
+ extra_requirements_javascript:
+ - 'silverstripe/cms: client/dist/js/bundle.js'
+ - 'silverstripe/cms: client/dist/js/SilverStripeNavigator.js'
+ extra_requirements_css:
+ - 'silverstripe/cms: client/dist/styles/bundle.css'
diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
index b96ca223..2ff363a0 100755
--- a/code/Model/SiteTree.php
+++ b/code/Model/SiteTree.php
@@ -2309,7 +2309,11 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
// "restore"
if ($canEdit && !$isOnDraft && $isPublished) {
- $majorActions->push(FormAction::create('revert', _t('SilverStripe\\CMS\\Controllers\\CMSMain.RESTORE', 'Restore')));
+ $majorActions->push(
+ FormAction::create('revert', _t('SilverStripe\\CMS\\Controllers\\CMSMain.RESTORE', 'Restore'))
+ ->addExtraClass('btn-warning font-icon-back-in-time')
+ ->setUseButtonTag(true)
+ );
}
// Check if we can restore a deleted page
diff --git a/lang/fr.yml b/lang/fr.yml
index bb37f273..2066d024 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -269,8 +269,6 @@ fr:
TITLE_TYPE: Type
TITLE_USED_ON: 'Utilisé dans'
SilverStripe\CMS\Model\SiteTreeFileFormFactoryExtension:
- BACKLINKCOUNT: 'Utilisé dans:'
- PAGES: page(s)
USAGE: Usage
SilverStripe\CMS\Model\VirtualPage:
CHOOSE: 'Page liée'
diff --git a/tests/php/Controllers/CMSMainTest.php b/tests/php/Controllers/CMSMainTest.php
index d7ae073d..f1f6527c 100644
--- a/tests/php/Controllers/CMSMainTest.php
+++ b/tests/php/Controllers/CMSMainTest.php
@@ -219,7 +219,7 @@ class CMSMainTest extends FunctionalTest
$this->assertTrue($livePage->canDelete());
// Check that the 'restore' button exists as a simple way of checking that the correct page is returned.
- $this->assertRegExp('/]+name="action_(restore|revert)"/i', $response->getBody());
+ $this->assertRegExp('/