cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Message fixes

Browse source
This commit is contained in:
Ludovic Stephan 2020-07-20 19:06:19 +02:00
parent e64f405299
commit c8c8c6abc8
8 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bds/static/bds/css/bds.css
View file

File diff suppressed because one or more lines are too long

2
bds/static/bds/css/bds.css.map
View file

File diff suppressed because one or more lines are too long

15
bds/static/src/sass/bds.scss
View file

@ -99,22 +99,9 @@ input[type="submit"] {
/* --- Message styling --- */ /* --- Message styling --- */
.error { .notification {
background: red;
color: white;
width: 100%;
padding: 0.5em 0; padding: 0.5em 0;
margin: 0;
font-size: 1.2em; font-size: 1.2em;
text-align: center; text-align: center;
} }
.success {
background: green;
color: white;
width: 100%;
padding: 0.5em 0;
margin: 0;
font-size: 1.2em;
text-align: center;
}

16
bds/templates/bds/base_layout.html
View file

@ -1,24 +1,24 @@
{% extends "bds/base.html" %} {% extends "bds/base.html" %}
{% load bulma_utils %}
{% block body %} {% block body %}
{% include "bds/nav.html" %} {% include "bds/nav.html" %}
{% if messages %} <section class="section">
<div class="columns">
<div class="column is-two-thirds is-offset-2">
{% if messages %}
{% for message in messages %} {% for message in messages %}
<p class="{{ message.level_tag }}"> <div class="notification is-{{ message.level_tag|bulma_message_tag }}">
{% if 'safe' in message.tags %} {% if 'safe' in message.tags %}
{{ message|safe }} {{ message|safe }}
{% else %} {% else %}
{{ message }} {{ message }}
{% endif %} {% endif %}
</p> </div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<section class="section">
<div class="columns">
<div class="column is-two-thirds is-offset-2">
{% block content %} {% block content %}
{% endblock content %} {% endblock content %}
</div> </div>

2
bds/templates/bds/forms/file.html
View file

@ -8,7 +8,7 @@
<div class="control"> <div class="control">
<label class="file-label"> <label class="file-label">
{{ field|addclass:'file-input' }} {{ field|bulmafy:'file-input' }}
<span class="file-cta"> <span class="file-cta">
<span class="file-icon"> <span class="file-icon">
<i class="fa fa-upload"></i> <i class="fa fa-upload"></i>

2
bds/templates/bds/forms/input.html
View file

@ -5,7 +5,7 @@
</label> </label>
<div class="control"> <div class="control">
{{ field|addclass:'input' }} {{ field|bulmafy:'input' }}
{% for error in field.errors %} {% for error in field.errors %}
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span> <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>

2
bds/templates/bds/forms/textarea.html
View file

@ -3,7 +3,7 @@
</label> </label>
<div class="control"> <div class="control">
{{ field|addclass:'textarea' }} {{ field|bulmafy:'textarea' }}
{% for error in field.errors %} {% for error in field.errors %}
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span> <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>

10
bds/templatetags/bulma_utils.py
View file

@ -58,9 +58,17 @@ def is_file(field):
@register.filter @register.filter
def addclass(field, css_class): def bulmafy(field, css_class):
if len(field.errors) > 0: if len(field.errors) > 0:
css_class += " is-danger" css_class += " is-danger"
field_classes = field.field.widget.attrs.get("class", "") field_classes = field.field.widget.attrs.get("class", "")
field_classes += f" {css_class}" field_classes += f" {css_class}"
return field.as_widget(attrs={"class": field_classes}) return field.as_widget(attrs={"class": field_classes})
@register.filter
def bulma_message_tag(tag):
if tag == "error":
return "danger"
return tag