tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-29 12:49:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2090 from creative-commoners/pulls/4.1/bs4-history-notice

Browse Source 
NEW Convert page history notice to use Bootstrap 4 info alert
This commit is contained in:
Loz Calver 2018-02-07 09:21:00 +00:00 committed by GitHub
commit 46a445d7fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/Controllers/CMSPageHistoryController.php
View File

@ -220,10 +220,10 @@ class CMSPageHistoryController extends CMSMain
$id $id
); );
$view = _t('SilverStripe\\CMS\\Controllers\\CMSPageHistoryController.VIEW', "view"); $view = _t(__CLASS__ . '.VIEW', "view");
$message = _t( $message = _t(
'SilverStripe\\CMS\\Controllers\\CMSPageHistoryController.COMPARINGVERSION', __CLASS__ . '.COMPARINGVERSION',
"Comparing versions {version1} and {version2}.", "Comparing versions {version1} and {version2}.",
array( array(
'version1' => sprintf('%s (<a href="%s">%s</a>)', $versionID, Controller::join_links($link, $versionID), $view), 'version1' => sprintf('%s (<a href="%s">%s</a>)', $versionID, Controller::join_links($link, $versionID), $view),
@ -234,10 +234,10 @@ class CMSPageHistoryController extends CMSMain
$revert->setReadonly(true); $revert->setReadonly(true);
} else { } else {
if ($record->isLatestVersion()) { if ($record->isLatestVersion()) {
$message = _t('SilverStripe\\CMS\\Controllers\\CMSPageHistoryController.VIEWINGLATEST', 'Currently viewing the latest version.'); $message = _t(__CLASS__ . '.VIEWINGLATEST', 'Currently viewing the latest version.');
} else { } else {
$message = _t( $message = _t(
'SilverStripe\\CMS\\Controllers\\CMSPageHistoryController.VIEWINGVERSION', __CLASS__ . '.VIEWINGVERSION',
"Currently viewing version {version}.", "Currently viewing version {version}.",
array('version' => $versionID) array('version' => $versionID)
); );
@ -247,9 +247,9 @@ class CMSPageHistoryController extends CMSMain
/** @var Tab $mainTab */ /** @var Tab $mainTab */
$mainTab = $fields->fieldByName('Root.Main'); $mainTab = $fields->fieldByName('Root.Main');
$mainTab->unshift( $mainTab->unshift(
new LiteralField('CurrentlyViewingMessage', ArrayData::create(array( LiteralField::create('CurrentlyViewingMessage', ArrayData::create(array(
'Content' => DBField::create_field('HTMLFragment', $message), 'Content' => DBField::create_field('HTMLFragment', $message),
'Classes' => 'notice' 'Classes' => 'alert alert-info'
))->renderWith($this->getTemplatesWithSuffix('_notice'))) ))->renderWith($this->getTemplatesWithSuffix('_notice')))
); );

4
templates/SilverStripe/CMS/Controllers/Includes/CMSMain_notice.ss
View File

@ -1,3 +1,3 @@
<div class="message $Classes"> <div class="$Classes">
<p>$Content</p> $Content
</div> </div>