openstack/deb-horizon
Code Issues Proposed changes

Branding: Horizon close buttons should use icon

Browse Source 
To increase brandability, Horizon close buttons should use an icon
font.

Closes-bug: #1546383

Change-Id: I5c9a9ffc8bbd670a642f534f16ce5559fc876005
This commit is contained in:
Diana Whitten 2016-02-16 22:08:35 -07:00
parent e8fec35f71
commit 1db4320b8d
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
horizon/templates/horizon/_messages.html
View File

@ -4,25 +4,33 @@
{% for message in messages %}
{% if "info" in message.tags %}
<div class="alert alert-info alert-dismissable fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a>
<a class="close" data-dismiss="alert" href="#">
<span class="fa fa-times"></span>
</a>
<p><strong>{% trans "Info: " %}</strong>{{ message }}</p>
</div>
{% endif %}
{% if "warning" in message.tags %}
<div class="alert alert-warning alert-dismissable fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a>
<a class="close" data-dismiss="alert" href="#">
<span class="fa fa-times"></span>
</a>
<p><strong>{% trans "Warning: " %}</strong>{{ message }}</p>
</div>
{% endif %}
{% if "success" in message.tags %}
<div class="alert alert-success alert-dismissable fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a>
<a class="close" data-dismiss="alert" href="#">
<span class="fa fa-times"></span>
</a>
<p><strong>{% trans "Success: " %}</strong>{{ message }}</p>
</div>
{% endif %}
{% if "error" in message.tags %}
<div class="alert alert-danger alert-dismissable fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a>
<a class="close" data-dismiss="alert" href="#">
<span class="fa fa-times"></span>
</a>
<p><strong>{% trans "Error: " %}</strong>{{ message }}</p>
</div>
{% endif %}

4
horizon/templates/horizon/client_side/_alert_message.html
View File

@ -5,7 +5,9 @@
{% block template %}{% spaceless %}{% jstemplate %}
<div class="alert alert-dismissable fade in alert-[[type]]">
<a class="close" data-dismiss="alert" href="#">&times;</a>
<a class="close" data-dismiss="alert" href="#">
<span class="fa fa-times"></span>
</a>
<p>
<strong>[[type_display]]</strong>
[[#safe]]

6
horizon/templates/horizon/common/_modal.html
View File

@ -5,7 +5,11 @@
<div class="{% if hide %}modal-content{% endif %}">
{% block header %}
<div class="modal-header">
{% if hide %}<a href="#" class="close" data-dismiss="modal">&times;</a>{% endif %}
{% if hide %}
<a href="#" class="close" data-dismiss="modal">
<span class="fa fa-times"></span>
</a>
{% endif %}
<h3 class="modal-title">{% block modal-header %}{{ modal_header }}{% endblock %}</h3>
</div>
{% endblock %}

6
horizon/templates/horizon/common/_workflow.html
View File

@ -9,7 +9,11 @@
<div class="modal-content">
<div class="modal-header">
{% block modal-header %}
{% if modal %}<a href="#" class="close" data-dismiss="modal">&times;</a>{% endif %}
{% if modal %}
<a href="#" class="close" data-dismiss="modal">
<span class="fa fa-times"></span>
</a>
{% endif %}
<h3 class="modal-title">{{ workflow.name }}</h3>
{% endblock %}
</div>