Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEW Use Bootstrap alerts throughout the CMS #643

Merged
merged 1 commit into from
Nov 9, 2018
Merged

NEW Use Bootstrap alerts throughout the CMS #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions _config/forms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,11 @@ Name: adminforms
SilverStripe\Forms\GridField\GridFieldPrintButton:
extensions:
- SilverStripe\Admin\Forms\GridFieldPrintButtonExtension

SilverStripe\Forms\Form:
extensions:
- SilverStripe\Forms\FormMessageBootstrapExtension

SilverStripe\Forms\FormField:
extensions:
- SilverStripe\Forms\FormMessageBootstrapExtension
38 changes: 38 additions & 0 deletions code/Forms/FormMessageBootstrapAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

namespace SilverStripe\Forms;

use SilverStripe\Core\Extension;

/**
* Will convert a SilverStripe message type into a Bootstrap alert type
*/
class FormMessageBootstrapExtension extends Extension
{
/**
* @var string[]
*/
protected $bootstrapAlertsMap = [
'good' => 'alert-success',
'bad' => 'alert-danger',
'required' => 'alert-danger',
'warning' => 'alert-warning',
];

/**
* Maps a SilverStripe message type to a Bootstrap alert type
*
* {@inheritdoc}
*/
public function getAlertType()
{
$type = $this->owner->getMessageType();

if (isset($this->bootstrapAlertsMap[$type])) {
return $this->bootstrapAlertsMap[$type];
}

// Fallback to original
return $type;
}
}
4 changes: 2 additions & 2 deletions templates/SilverStripe/Admin/Includes/CMSProfileController_EditForm.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<div class="panel panel--padded panel--scrollable flexbox-area-grow cms-content-fields">
<% if $Message %>
<p id="{$FormName}_error" class="message $MessageType">$Message</p>
<p id="{$FormName}_error" class="alert $AlertType">$Message</p>
<% else %>
<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
<p id="{$FormName}_error" class="alert $AlertType" style="display: none"></p>
<% end_if %>

<fieldset>
Expand Down
4 changes: 2 additions & 2 deletions templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

<div class="panel panel--padded panel--scrollable flexbox-area-grow <% if not $Fields.hasTabset %>cms-panel-padded<% end_if %>">
<% if $Message %>
<p id="{$FormName}_error" class="message $MessageType">$Message</p>
<p id="{$FormName}_error" class="alert $AlertType">$Message</p>
<% else %>
<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
<p id="{$FormName}_error" class="alert $AlertType" style="display: none"></p>
<% end_if %>

<fieldset>
Expand Down
5 changes: 5 additions & 0 deletions themes/cms-forms/templates/RightLabelledFieldHolder.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<p id="$Name" class="field $Type">
$Field
<label class="right" for="$id">$Title</label>
<% if $Message %><span class="alert $AlertType">$Message</span><% end_if %>
</p>
3 changes: 1 addition & 2 deletions themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
$Field
$Title
</label>
<%-- TODO: change $MessageType to match Bootstraps alert types, e.g. alert-info, alert-danger etc --%>
<% if $Message %><p class="alert $MessageType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
<% if $RightTitle %><p class="form__field-extra-label" id="extra-label-$ID">$RightTitle</p><% end_if %>
Expand Down
3 changes: 1 addition & 2 deletions themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<% if $Zebra %> form__fieldgroup-zebra<% end_if %>"
>
$Field
<%-- TODO: change $MessageType to match Bootstraps alert types, e.g. alert-info, alert-danger etc --%>
<% if $Message %><p class="alert $MessageType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</$Tag>
<% if $RightTitle %><p class="form__field-extra-label" id="extra-label-$ID">$RightTitle</p><% end_if %>
Expand Down
3 changes: 1 addition & 2 deletions themes/cms-forms/templates/SilverStripe/Forms/DatetimeField_holder.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<% if $extraClass %> $extraClass<% end_if %>"
>
$Field
<%-- TODO: change $MessageType to match Bootstraps alert types, e.g. alert-info, alert-danger etc --%>
<% if $Message %><p class="alert $MessageType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
<% if $RightTitle %><p class="form__field-extra-label" id="extra-label-$ID">$RightTitle</p><% end_if %>
Expand Down
3 changes: 1 addition & 2 deletions themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_holder.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
<% if $extraClass %> $extraClass<% end_if %>"
>
$Field
<%-- TODO: change $MessageType to match Bootstraps alert types, e.g. alert-info, alert-danger etc --%>
<% if $Message %><p class="alert $MessageType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
<% if $RightTitle %><p class="form__field-extra-label" id="extra-label-$ID">$RightTitle</p><% end_if %>
Expand Down
3 changes: 1 addition & 2 deletions themes/cms-forms/templates/SilverStripe/Forms/FormField_holder.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<% end_if %>
<div class="form__field-holder<% if not $Title %> form__field-holder--no-label<% end_if %>">
$Field
<%-- TODO: change $MessageType to match Bootstraps alert types, e.g. alert-info, alert-danger etc --%>
<% if $Message %><p class="alert $MessageType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
<% if $RightTitle %><p class="form__field-extra-label" id="extra-label-$ID">$RightTitle</p><% end_if %>
Expand Down
27 changes: 27 additions & 0 deletions themes/cms-forms/templates/SilverStripe/Forms/Includes/Form.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<% if $IncludeFormTag %>
<form $AttributesHTML>
<% end_if %>
<% if $Message %>
<p id="{$FormName}_error" class="alert $AlertType">$Message</p>
<% else %>
<p id="{$FormName}_error" class="alert $AlertType" style="display: none"></p>
<% end_if %>

<fieldset>
<% if $Legend %><legend>$Legend</legend><% end_if %>
<% loop $Fields %>
$FieldHolder
<% end_loop %>
<div class="clear"><!-- --></div>
</fieldset>

<% if $Actions %>
<div class="btn-toolbar">
<% loop $Actions %>
$Field
<% end_loop %>
</div>
<% end_if %>
<% if $IncludeFormTag %>
</form>
<% end_if %>
3 changes: 1 addition & 2 deletions themes/cms-forms/templates/SilverStripe/Forms/OptionsetField_holder.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<% end_if %>
<div class="form__field-holder<% if not $Title %> form__field-holder--no-label<% end_if %>">
$Field
<%-- TODO: change $MessageType to match Bootstraps alert types, e.g. alert-info, alert-danger etc --%>
<% if $Message %><p class="alert $MessageType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
<% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
</div>
<% if $RightTitle %><p class="form__field-extra-label" id="extra-label-$ID">$RightTitle</p><% end_if %>
Expand Down