Merge branch '4.1' into 4.2

_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'

code/Model/SiteTree.php

@@ -2296,7 +2296,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

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'

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('/<input type="submit"[^>]+name="action_(restore|revert)"/i', $response->getBody());
+        $this->assertRegExp('/<button type="submit"[^>]+name="action_(restore|revert)"/i', $response->getBody());
     }
 
     /**