mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #8377 from creative-commoners/pulls/4.3/bootstrap-alerts
NEW Use Bootstrap alerts throughout the CMS
This commit is contained in:
commit
a12a5b7168
@ -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 %>
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user