tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1' into 4.2

Browse Source
This commit is contained in:
Daniel Hensby 2018-07-23 14:50:50 +01:00
commit b653ebfe7a
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_config/scripts.yml Normal file
View File

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

6
code/Model/SiteTree.php
View File

@ -2296,7 +2296,11 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
// "restore" // "restore"
if ($canEdit && !$isOnDraft && $isPublished) { 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 // Check if we can restore a deleted page

2
lang/fr.yml
View File

@ -269,8 +269,6 @@ fr:
TITLE_TYPE: Type TITLE_TYPE: Type
TITLE_USED_ON: 'Utilisé dans' TITLE_USED_ON: 'Utilisé dans'
SilverStripe\CMS\Model\SiteTreeFileFormFactoryExtension: SilverStripe\CMS\Model\SiteTreeFileFormFactoryExtension:
BACKLINKCOUNT: 'Utilisé dans:'
PAGES: page(s)
USAGE: Usage USAGE: Usage
SilverStripe\CMS\Model\VirtualPage: SilverStripe\CMS\Model\VirtualPage:
CHOOSE: 'Page liée' CHOOSE: 'Page liée'

2
tests/php/Controllers/CMSMainTest.php
View File

@ -219,7 +219,7 @@ class CMSMainTest extends FunctionalTest
$this->assertTrue($livePage->canDelete()); $this->assertTrue($livePage->canDelete());
// Check that the 'restore' button exists as a simple way of checking that the correct page is returned. // 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());
} }
/** /**