x/tuskar-ui
Code Issues Proposed changes

Merge "Use font-awesome icons"

Browse Source
This commit is contained in:
Jenkins 2014-09-05 14:40:06 +00:00 committed by Gerrit Code Review
commit 9e61b2270f
15 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
run_tests.sh
View File

@ -6,7 +6,7 @@ set -o errexit
# Increment me any time the environment should be rebuilt. # Increment me any time the environment should be rebuilt.
# This includes dependency changes, directory renames, etc. # This includes dependency changes, directory renames, etc.
# Simple integer sequence: 1, 2, 3... # Simple integer sequence: 1, 2, 3...
environment_version=43 environment_version=44
#--------------------------------------------------------# #--------------------------------------------------------#
function usage { function usage {

2
tuskar_ui/infrastructure/nodes/templates/nodes/details.html
View File

@ -11,7 +11,7 @@
<div class="col-lg-6 col-xs-12"> <div class="col-lg-6 col-xs-12">
<h3>{% trans "Status" %}</h3> <h3>{% trans "Status" %}</h3>
<p> <p>
<span class="glyphicon glyphicon-play powerstate"></span> <i class="fa fa-play-circle powerstate"></i>
<span>{% trans "Powered" %} {{ node.power_state|default:"&mdash;" }}</span> <span>{% trans "Powered" %} {{ node.power_state|default:"&mdash;" }}</span>
</p> </p>

4
tuskar_ui/infrastructure/nodes/templates/nodes/index.html
View File

@ -12,12 +12,12 @@
<div class="col-xs-12"> <div class="col-xs-12">
<div class="actions pull-right"> <div class="actions pull-right">
<a href="{% url 'horizon:infrastructure:nodes:register' %}" class="btn btn-primary ajax-modal"> <a href="{% url 'horizon:infrastructure:nodes:register' %}" class="btn btn-primary ajax-modal">
<span class="glyphicon glyphicon-plus"></span> <span class="fa fa-plus"></span>
{% trans 'Register Nodes' %} {% trans 'Register Nodes' %}
</a> </a>
{% if ironic_enabled %} {% if ironic_enabled %}
<a href="{% url 'horizon:infrastructure:nodes:auto-discover' %}" class="btn btn-primary ajax-modal"> <a href="{% url 'horizon:infrastructure:nodes:auto-discover' %}" class="btn btn-primary ajax-modal">
<span class="glyphicon glyphicon-plus"></span> <span class="fa fa-search-plus"></span>
{% trans 'Auto-Discover Nodes' %} {% trans 'Auto-Discover Nodes' %}
</a> </a>
{% endif %} {% endif %}

4
tuskar_ui/infrastructure/overview/templates/overview/deployment_base.html
View File

@ -3,7 +3,7 @@
<div class="deployment-icon"> <div class="deployment-icon">
{% block deployment-icon %} {% block deployment-icon %}
<i class="glyphicon glyphicon-cloud text-info"></i> <i class="fa fa-cloud text-info"></i>
{% endblock %} {% endblock %}
</div> </div>
<div class="deployment-box clearfix"> <div class="deployment-box clearfix">
@ -14,7 +14,7 @@
<a <a
href="{% url 'horizon:infrastructure:overview:undeploy_confirmation' %}" href="{% url 'horizon:infrastructure:overview:undeploy_confirmation' %}"
class="btn btn-danger ajax-modal"> class="btn btn-danger ajax-modal">
<i class="glyphicon glyphicon-trash"></i> <i class="fa fa-trash"></i>
{% trans "Undeploy" %} {% trans "Undeploy" %}
</a> </a>
{% endblock %} {% endblock %}

2
tuskar_ui/infrastructure/overview/templates/overview/deployment_failed.html
View File

@ -4,7 +4,7 @@
{% load url from future%} {% load url from future%}
{% block deployment-icon %} {% block deployment-icon %}
<i class="glyphicon glyphicon-remove-circle text-danger"></i> <i class="fa fa-exclamation-circle text-danger"></i>
{% endblock %} {% endblock %}
{% block deployment-title %} {% block deployment-title %}

4
tuskar_ui/infrastructure/overview/templates/overview/deployment_initialize.html
View File

@ -4,7 +4,7 @@
{% load url from future%} {% load url from future%}
{% block deployment-icon %} {% block deployment-icon %}
<i class="glyphicon glyphicon-warning-sign text-warning"></i> <i class="fa fa-exclamation-triangle text-warning"></i>
{% endblock %} {% endblock %}
{% block deployment-title %}{% trans "Initialization" %}{% endblock %} {% block deployment-title %}{% trans "Initialization" %}{% endblock %}
@ -17,7 +17,7 @@
{{ block.super }} {{ block.super }}
<a href="{% url 'horizon:infrastructure:overview:post_deploy_init' %}" <a href="{% url 'horizon:infrastructure:overview:post_deploy_init' %}"
class="btn btn-primary ajax-modal"> class="btn btn-primary ajax-modal">
<i class="glyphicon glyphicon-flag"></i> <i class="fa fa-flag-checkered"></i>
{% trans "Initialize" %} {% trans "Initialize" %}
</a> </a>
{% endblock %} {% endblock %}

2
tuskar_ui/infrastructure/overview/templates/overview/deployment_live.html
View File

@ -4,7 +4,7 @@
{% load url from future%} {% load url from future%}
{% block deployment-icon %} {% block deployment-icon %}
<i class="glyphicon glyphicon-ok-sign text-success"></i> <i class="fa fa-check-cricle-o text-success"></i>
{% endblock %} {% endblock %}
{% block deployment-title %}{% trans "Deployment is live" %}{% endblock %} {% block deployment-title %}{% trans "Deployment is live" %}{% endblock %}
{% block deployment-info %} {% block deployment-info %}

4
tuskar_ui/infrastructure/overview/templates/overview/deployment_plan.html
View File

@ -4,7 +4,7 @@
{% load url from future%} {% load url from future%}
{% block deployment-icon %} {% block deployment-icon %}
<i class="glyphicon glyphicon-ok-circle text-success"></i> <i class="fa fa-check-circle text-success"></i>
{% endblock %} {% endblock %}
{% block deployment-title %} {% block deployment-title %}
@ -14,7 +14,7 @@
{% block deployment-buttons %} {% block deployment-buttons %}
<a href="{% url 'horizon:infrastructure:overview:deploy_confirmation' %}" <a href="{% url 'horizon:infrastructure:overview:deploy_confirmation' %}"
class="btn btn-primary ajax-modal btn-default"> class="btn btn-primary ajax-modal btn-default">
<i class="glyphicon glyphicon-ok"></i> <i class="fa fa-rocket"></i>
{% trans "Deploy" %} {% trans "Deploy" %}
</a> </a>
{% endblock %} {% endblock %}

4
tuskar_ui/infrastructure/overview/templates/overview/deployment_progress.html
View File

@ -4,7 +4,7 @@
{% load url from future%} {% load url from future%}
{% block deployment-icon %} {% block deployment-icon %}
<i class="glyphicon glyphicon-cog text-info"></i> <i class="fa fa-spinner text-info"></i>
{% endblock %} {% endblock %}
{% block deployment-title %} {% block deployment-title %}
@ -53,7 +53,7 @@
<a <a
href="{% url 'horizon:infrastructure:overview:undeploy_confirmation' %}" href="{% url 'horizon:infrastructure:overview:undeploy_confirmation' %}"
class="btn btn-danger ajax-modal"> class="btn btn-danger ajax-modal">
<i class="glyphicon glyphicon-remove"></i> <i class="fa fa-close"></i>
{% trans "Stop" %} {% trans "Stop" %}
</a> </a>
{% endif %} {% endif %}

2
tuskar_ui/infrastructure/overview/templates/overview/role_nodes_edit.html
View File

@ -26,7 +26,7 @@
{% endfor %} {% endfor %}
<hr> <hr>
<button type="submit" class="btn btn-default"> <button type="submit" class="btn btn-default">
<i class="glyphicon glyphicon-save"></i> <i class="fa fa-save"></i>
{% trans "Save changes" %} {% trans "Save changes" %}
</button> </button>
</form> </form>

4
tuskar_ui/infrastructure/static/infrastructure/angular_templates/numberpicker.html
View File

@ -4,7 +4,7 @@
class="arrow-left" class="arrow-left"
ng-class="{disabled: disabledInput || disableArrow()}" ng-class="{disabled: disabledInput || disableArrow()}"
> >
<i ng-hide="disabledInput" class="glyphicon glyphicon-chevron-left"></i> <i ng-hide="disabledInput" class="fa fa-chevron-left"></i>
</a> </a>
<input type="text" value="{$value$}" ng-model="value"> <input type="text" value="{$value$}" ng-model="value">
<a <a
@ -12,6 +12,6 @@
class="arrow-right" class="arrow-right"
ng-class="{disabled: disabledInput}" ng-class="{disabled: disabledInput}"
> >
<i ng-hide="disabledInput" class="glyphicon glyphicon-chevron-right"></i> <i ng-hide="disabledInput" class="fa fa-chevron-right"></i>
</a> </a>
</div> </div>

2
tuskar_ui/infrastructure/static/infrastructure/js/tuskar.menu_formset.js
View File

@ -32,7 +32,7 @@ tuskar.menu_formset = (function () {
function add_delete_link($nav_item) { function add_delete_link($nav_item) {
var $form = $content.find($nav_item.find('a').attr('href')); var $form = $content.find($nav_item.find('a').attr('href'));
$nav_item.prepend('<span class="btn-small pull-right delete-icon"><i class="glyphicon glyphicon-trash"></i></span>'); $nav_item.prepend('<span class="btn-small pull-right delete-icon"><i class="fa fa-trash"></i></span>');
$nav_item.find('span.delete-icon:first').click(function () { $nav_item.find('span.delete-icon:first').click(function () {
var count; var count;
$form.remove(); $form.remove();

4
tuskar_ui/infrastructure/static/infrastructure/scss/_individual_pages.scss
View File

@ -104,14 +104,14 @@ $link-color: #428bca;
} }
// Power state icons // Power state icons
.glyphicon.powerstate { .fa.powerstate {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
font-size: 18px; font-size: 18px;
background: $gray-lighter; background: $gray-lighter;
border: 1px solid $gray-light; border: 1px solid $gray-light;
padding: .2em; padding: .2em;
&.glyphicon-play { &.fa-play {
color: $brand-success; color: $brand-success;
} }
} }

2
tuskar_ui/infrastructure/templates/formset_table/menu_formset.html
View File

@ -7,7 +7,7 @@
<div class="col-xs-5"> <div class="col-xs-5">
<div class="clearfix register-nav-head"> <div class="clearfix register-nav-head">
<a class="add-node-link" href="#"> <a class="add-node-link" href="#">
<i class="glyphicon glyphicon-plus"></i> {% trans "Add Node" %} <i class="fa fa-plus"></i> {% trans "Add Node" %}
</a> </a>
<h4>Nodes to register</h4> <h4>Nodes to register</h4>
</div> </div>

2
tuskar_ui/infrastructure/templates/infrastructure/base.html
View File

@ -6,6 +6,8 @@
{% load compress %} {% load compress %}
{% compress css %} {% compress css %}
<link href='{{ STATIC_URL }}infrastructure/scss/infrastructure.scss' type='text/scss' media='screen' rel='stylesheet' /> <link href='{{ STATIC_URL }}infrastructure/scss/infrastructure.scss' type='text/scss' media='screen' rel='stylesheet' />
<link href="{{ STATIC_URL }}horizon/lib/font-awesome/css/font-awesome.css" type="text/css" media="screen" rel="stylesheet" />
{% endcompress %} {% endcompress %}
{% endblock %} {% endblock %}