Reworks messages so they display if they have multiple tags applied.

Change-Id: If53f6b51d52edb846861e7df12dd7ba891ec3ed6
This commit is contained in:
Gabriel Hurley
2011-12-07 16:15:23 -08:00
parent 0cb30bf803
commit 5fa8539f4f
2 changed files with 7 additions and 5 deletions

View File

@@ -1,21 +1,21 @@
{% load i18n %}
{% for message in messages %}
{% if message.tags == "info" %}
{% if "info" in message.tags %}
<div class="alert-message info">
<p><strong>{% trans "Info: " %}</strong>{{ message }}</p>
</div>
{% endif %}
{% if message.tags == "warning" %}
{% if "warning" in message.tags %}
<div class="alert-message warning">
<p><strong>{% trans "Warning: " %}</strong>{{ message }}</p>
</div>
{% endif %}
{% if message.tags == "success" %}
{% if "success" in message.tags %}
<div class="alert-message success">
<p><strong>{% trans "Success: " %}</strong>{{ message }}</p>
</div>
{% endif %}
{% if message.tags == "error" %}
{% if "error" in message.tags %}
<div class="alert-message error">
<p><strong>{% trans "Error: " %}</strong>{{ message }}</p>
</div>

View File

@@ -87,8 +87,10 @@ class Login(forms.SelfHandlingForm):
data['username'],
data['password'])
except keystone_exceptions.Unauthorized:
LOG.exception("Failed login attempt for %s."
% data['username'])
messages.error(request, _('Bad user name or password.'),
extra_tags="login")
extra_tags="login")
return
# Unscoped token