openstack/horizon
Code Issues Proposed changes

Merge "update/cleanup bootstrap 3 icon usage"

Browse Source
This commit is contained in:
Jenkins 2014-12-12 00:43:30 +00:00 committed by Gerrit Code Review
commit 3ec0757913
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/templates/horizon/common/_data_table.html
View File

@ -33,7 +33,7 @@
{{ column }}
{% if column.help_text %}
<span class="help-icon" data-toggle="tooltip" title="{{ column.help_text }}">
<span class="glyphicon glyphicon-question-sign"></span>
<span class="fa fa-question-circle"></span>
</span>
{% endif %}
</th>

2
horizon/templates/horizon/common/_form_field.html
View File

@ -61,7 +61,7 @@
{{ field|add_bootstrap_class }}
<span class="input-group-btn">
<a href="{{ add_item_link }}" data-add-to-field="{{ field.auto_id }}" class='btn btn-default ajax-add ajax-modal'>
<span class="glyphicon glyphicon-plus"></span>
<span class="fa fa-plus"></span>
</a>
</span>
</div>

4
openstack_dashboard/dashboards/project/network_topology/templates/network_topology/index.html
View File

@ -19,8 +19,8 @@
<div class="topologyNavi">
<div class="toggleView btn-group" data-toggle="buttons-radio">
<button type="button" class="btn small" data-value="small"><i class="icon-th"></i>{%trans "Small" %}</button>
<button type="button" class="btn normal" data-value="normal"><i class="icon-th-large"></i>{%trans "Normal" %}</button>
<button type="button" class="btn small" data-value="small"><i class="fa fa-th"></i>{%trans "Small" %}</button>
<button type="button" class="btn normal" data-value="normal"><i class="fa fa-th-large"></i>{%trans "Normal" %}</button>
</div>
<div class="launchButtons">

10
openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
View File

@ -74,13 +74,13 @@
{% endif %}
{% if dest.reachable == 'none' %}
<center>
<i class="icon-ban-circle"></i>
<button type="submit" class="btn btn-default btn-xs" href="#"><i class="icon-random"></i></button></center>
<i class="fa fa-ban"></i>
<button type="submit" class="btn btn-default btn-xs" href="#"><i class="fa fa-random"></i></button></center>
{% elif dest.reachable == 'full' %}
<center>
<i class="icon-ok"></i>
<i class="fa fa-check"></i>
{% if not dest.cidr == row.source.cidr %}
<button type="submit" class="btn btn-default btn-xs" href="#"><i class="icon-random"></i></button>
<button type="submit" class="btn btn-default btn-xs" href="#"><i class="fa fa-random"></i></button>
{% else %}
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
{% endif %}
@ -121,7 +121,7 @@
</table>
<h3>{% trans "Description" %}</h3>
<p>{% blocktrans %}The color and icon of an intersection indicates whether or not traffic is permitted from the source (row) to the destination (column).
Clicking the <i class="icon-random"></i> button in the intersection will install a rule to switch the traffic behavior.<br/>
Clicking the <i class="fa fa-random"></i> button in the intersection will install a rule to switch the traffic behavior.<br/>
<b>Note:</b> Rules only affect one direction of traffic. The opposite direction is outlined when hovering over an intersection.
{% endblocktrans %} </p>

8
openstack_dashboard/templates/_header.html
View File

@ -28,21 +28,21 @@
<div id="user_info" class="pull-right">
<div id="profile_editor_switcher" class="dropdown switcher_bar" tabindex='1'>
<button class="btn btn-default btn-topnav dropdown-toggle" data-toggle="dropdown">
<span class="glyphicon glyphicon-user"></span>
<span class="fa fa-user"></span>
{{ request.user.username }}
<span class="caret"></span>
</button>
<ul id="editor_list" class="dropdown-menu topbar-dropdown-menu pull-right">
<li>
<a href="{% url 'horizon:settings:user:index' %}">
<span class="glyphicon glyphicon-cog"></span>
<span class="fa fa-cog"></span>
{% trans "Settings" %}
</a>
</li>
{% if HORIZON_CONFIG.help_url %}
<li>
<a href="{{ HORIZON_CONFIG.help_url }}" target="_blank">
<span class="glyphicon glyphicon-question-sign"></span>
<span class="fa fa-question-circle"></span>
{% trans "Help" %}
</a>
</li>
@ -50,7 +50,7 @@
<li class="divider"></li>
<li>
<a href="{% url 'logout' %}">
<span class="glyphicon glyphicon-log-out"></span>
<span class="fa fa-sign-out"></span>
{% trans "Sign Out" %}
</a>
</li>