tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8377 from creative-commoners/pulls/4.3/bootstrap-alerts 

NEW Use Bootstrap alerts throughout the CMS
This commit is contained in:
Robbie Averill 2018-11-09 14:27:38 +02:00 committed by GitHub
parent bbb208e1dd 274657f4f8
commit a12a5b7168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/SilverStripe/Security/CMSSecurity_login.ss
View File

@ -7,7 +7,7 @@
<body class="cms cms-security fill-height">
<% with $Form %>
<% if $Message %>
<div class="cms-security__container__error message $MessageType">
<div class="cms-security__container__error alert $AlertType">
<p id="{$FormName}_error">$Message</p>
</div>
<% end_if %>

8
tests/behat/src/CmsUiContext.php
View File

@ -85,7 +85,13 @@ class CmsUiContext implements Context
*/
public function iShouldSeeAMessage($message)
{
$this->getMainContext()->assertElementContains('.message', $message);
$page = $this->getMainContext()->getSession()->getPage();
if ($page->find('css', '.message')) {
$this->getMainContext()->assertElementContains('.message', $message);
} else {
// Support for new Bootstrap alerts
$this->getMainContext()->assertElementContains('.alert', $message);
}
}
protected function getCmsTabsElement()