mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-09 11:29:49 -04:00
Replace message_status component with banner
Message status was almost identical to banner, visually and semantically. This consolidates the two into one component. This means adding an extra parameter which controls whether or not the banner has a tick (with and without a tick are the only two variations currently).
This commit is contained in:
@@ -1,14 +1,22 @@
|
|||||||
|
%banner,
|
||||||
.banner {
|
.banner {
|
||||||
|
|
||||||
@include core-19;
|
@include core-19;
|
||||||
background: $turquoise;
|
background: $turquoise;
|
||||||
color: $white;
|
color: $white;
|
||||||
display: block;
|
display: block;
|
||||||
padding: $gutter-half $gutter;
|
padding: $gutter-half;
|
||||||
margin: 0 0 $gutter 0;
|
margin: 0 0 $gutter 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.banner-with-tick {
|
||||||
|
|
||||||
|
@extend %banner;
|
||||||
|
padding: $gutter-half $gutter;
|
||||||
|
|
||||||
&:before {
|
&:before {
|
||||||
@include core-24;
|
@include core-24;
|
||||||
content: '✔';
|
content: '✔';
|
||||||
|
|||||||
@@ -45,27 +45,4 @@
|
|||||||
margin: -$gutter-half 0 $gutter 0;
|
margin: -$gutter-half 0 $gutter 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
&-history {
|
|
||||||
|
|
||||||
background: $turquoise;
|
|
||||||
color: $white;
|
|
||||||
padding: $gutter-half;
|
|
||||||
@include bold-19;
|
|
||||||
margin: 0 0 $gutter 0;
|
|
||||||
|
|
||||||
&-heading {
|
|
||||||
|
|
||||||
@include bold-19;
|
|
||||||
margin: 0;
|
|
||||||
|
|
||||||
&-time {
|
|
||||||
@include inline-block;
|
|
||||||
margin-left: 10px;
|
|
||||||
font-weight: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
{% macro banner(body) %}
|
{% macro banner(body, with_tick=False) %}
|
||||||
<div class='banner'>{{ body }}</div>
|
<div class='banner{% if with_tick %}-with-tick{% endif %}'>
|
||||||
|
{{ body }}
|
||||||
|
</div>
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|||||||
@@ -10,11 +10,3 @@
|
|||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
{% macro message_status(status, time) %}
|
|
||||||
<div class="sms-message-history">
|
|
||||||
<p class="sms-message-history-heading">
|
|
||||||
{{ status }} <span class="sms-message-history-heading-time">{{ time }}</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
{% endmacro %}
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ GOV.UK Notify | Notifications activity
|
|||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
{{ banner(flash_message) }}
|
{{ banner(flash_message, with_tick=True) }}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<ul class="grid-row job-totals">
|
<ul class="grid-row job-totals">
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{% extends "withnav_template.html" %}
|
{% extends "withnav_template.html" %}
|
||||||
{% from "components/sms-message.html" import sms_message, message_status %}
|
{% from "components/sms-message.html" import sms_message, message_status %}
|
||||||
|
{% from "components/banner.html" import banner %}
|
||||||
{% from "components/page-footer.html" import page_footer %}
|
{% from "components/page-footer.html" import page_footer %}
|
||||||
|
|
||||||
{% block page_title %}
|
{% block page_title %}
|
||||||
@@ -18,7 +19,9 @@ GOV.UK Notify | Notifications activity
|
|||||||
{{ sms_message(message.message, message.phone) }}
|
{{ sms_message(message.message, message.phone) }}
|
||||||
</div>
|
</div>
|
||||||
<div class="column-one-third">
|
<div class="column-one-third">
|
||||||
{{ message_status(message.status, delivered_at) }}
|
{{ banner(
|
||||||
|
"{} {}".format(message.status, delivered_at)
|
||||||
|
) }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
{% from "components/big-number.html" import big_number %}
|
{% from "components/big-number.html" import big_number %}
|
||||||
{% from "components/browse-list.html" import browse_list %}
|
{% from "components/browse-list.html" import browse_list %}
|
||||||
{% from "components/page-footer.html" import page_footer %}
|
{% from "components/page-footer.html" import page_footer %}
|
||||||
{% from "components/sms-message.html" import sms_message, message_status %}
|
{% from "components/sms-message.html" import sms_message %}
|
||||||
{% from "components/table.html" import mapping_table, list_table, row, field %}
|
{% from "components/table.html" import mapping_table, list_table, row, field %}
|
||||||
{% from "components/textbox.html" import textbox %}
|
{% from "components/textbox.html" import textbox %}
|
||||||
|
|
||||||
@@ -20,7 +20,12 @@
|
|||||||
|
|
||||||
<h2 class="heading-large">Banner</h2>
|
<h2 class="heading-large">Banner</h2>
|
||||||
<p>Used to show the result of a user’s action.</p>
|
<p>Used to show the result of a user’s action.</p>
|
||||||
{{ banner("This is a banner") }}
|
{{ banner("This is a banner", with_tick=True) }}
|
||||||
|
<div class="grid-row">
|
||||||
|
<div class="column-one-third">
|
||||||
|
{{ banner("Delivered 10:20") }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<h2 class="heading-large">Big number</h2>
|
<h2 class="heading-large">Big number</h2>
|
||||||
|
|
||||||
@@ -97,13 +102,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h2 class="heading-large">Message status</h2>
|
|
||||||
<div class="grid-row">
|
|
||||||
<div class="column-third">
|
|
||||||
{{ message_status("Delivered 10:20") }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2 class="heading-large">Tables</h2>
|
<h2 class="heading-large">Tables</h2>
|
||||||
|
|
||||||
{% call mapping_table(
|
{% call mapping_table(
|
||||||
|
|||||||
Reference in New Issue
Block a user