network: fa upgrade

a5becb5d · Kálmán Viktor · 5f4f2015 · a5becb5d · a5becb5d · a5becb5d
Commit a5becb5d authored Jul 11, 2014 by Kálmán Viktor
23 changed files
--- a/circle/network/static/js/host.js
+++ b/circle/network/static/js/host.js
-$('i[class="icon-remove"]').click(function() {
+$('i[class="fa fa-times"]').click(function() {
    href = $(this).parent('a').attr('href');
    csrf = getCookie('csrftoken');
    var click_this = this;

--- a/circle/network/templates/network/base.html
+++ b/circle/network/templates/network/base.html
@@ -40,7 +40,7 @@
  </ul>
  <a class="navbar-brand pull-right" href="{% url "dashboard.index" %}"
      style="color: white; font-size: 10px;">
-    <i class="icon-dashboard"></i> 
+    <i class="fa fa-dashboard"></i> 
    {% trans "dashboard" %}
  </a>
 {% endblock %}

--- a/circle/network/templates/network/blacklist-edit.html
+++ b/circle/network/templates/network/blacklist-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.blacklist_delete" pk=blacklist_pk %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this blaclist item" %}</a>
+    <a href="{% url "network.blacklist_delete" pk=blacklist_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this blaclist item" %}</a>
    <h2>{{ form.ipv4.value }} <small>{{ form.type.value }}</small></h2>
 </div>
 <div class="row">

--- a/circle/network/templates/network/blacklist-list.html
+++ b/circle/network/templates/network/blacklist-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header">   
-    <a href="{% url "network.blacklist_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new blacklist item" %}</a>
+    <a href="{% url "network.blacklist_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new blacklist item" %}</a>
    <h1>{% trans "Blacklist" %} <small></small></h1>
 </div>

--- a/circle/network/templates/network/columns/color-desc.html
+++ b/circle/network/templates/network/columns/color-desc.html
@@ -4,7 +4,7 @@
 {# <span style="color: #FF0000;">[{{ record.r_type }}]</span> #}
 {% if record.direction == "1" %}{{ record.foreign_network }}{% else %}{{ record.r_type }}{% endif %}
 {#<span style="color: #0000FF;"> ▸ </span>#}
-<i class="icon-arrow-right"></i>
+<i class="fa fa-arrow-right"></i>
 {% if record.direction == "0" %}{{ record.foreign_network }}{% else %}{{ record.r_type }}{% endif %}
 <span style="color: #00FF00;">            
    {% if record.proto %}

--- a/circle/network/templates/network/columns/host-rule-action.html
+++ b/circle/network/templates/network/columns/host-rule-action.html
 {% load i18n %}
 {% load l10n %}
 <div style="white-space: nowrap;">
-    <a href="{% url "network.rule_delete" pk=record.pk %}?from={{ request.path }}"><i class="icon-remove"></i></a>
+    <a href="{% url "network.rule_delete" pk=record.pk %}?from={{ request.path }}"><i class="fa fa-times"></i></a>
-    <a href="{% url "network.rule" pk=record.pk %}"><i class="icon-pencil"></i></a>
+    <a href="{% url "network.rule" pk=record.pk %}"><i class="fa fa-pencil"></i></a>
 </div>
--- a/circle/network/templates/network/columns/host-rule.html
+++ b/circle/network/templates/network/columns/host-rule.html
@@ -13,7 +13,7 @@
 {% endif %}
 {#<span style="color: #0000FF;"> ▸ </span>#}
-<i class="icon-arrow-right"></i>                                            
+<i class="fa fa-arrow-right"></i>                                            
 {% if record.direction == "0" %}
  {{ record.foreign_network }}
 {% else %}
@@ -33,6 +33,6 @@
 {% if record.nat %}
    <span class="label label-success">NAT
-        [ {{ record.dport }} <i class="icon-arrow-right"></i>
+        [ {{ record.dport }} <i class="fa fa-arrow-right"></i>
        {{record.nat_external_port}} ]</span>
 {% endif %}
--- a/circle/network/templates/network/domain-edit.html
+++ b/circle/network/templates/network/domain-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.domain_delete" pk=domain_pk %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this domain" %}</a>
+    <a href="{% url "network.domain_delete" pk=domain_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this domain" %}</a>
    <h2>{{ form.name.value }} <small></small></h2>
 </div>
@@ -17,7 +17,7 @@
    </div>
    <div class="col-sm-6 col-sm-offset-1">
        <div class="page-header">
-            <a href="{% url "network.record_create" %}?domain={{ domain_pk }}" class="btn btn-success pull-right btn-xs"><i class="icon-plus-sign"></i> {% trans "Add new record" %}</a>
+            <a href="{% url "network.record_create" %}?domain={{ domain_pk }}" class="btn btn-success pull-right btn-xs"><i class="fa fa-plus-circle"></i> {% trans "Add new record" %}</a>
            <h3>{% trans "List of this domain's records" %}</h3>
        </div>
        <div class="table-responsive">

--- a/circle/network/templates/network/domain-list.html
+++ b/circle/network/templates/network/domain-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header"> 
-    <a href="{% url "network.domain_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new domain" %}</a>
+    <a href="{% url "network.domain_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new domain" %}</a>
    <h1>{% trans "Domains" %}</h1>
 </div>

--- a/circle/network/templates/network/group-edit.html
+++ b/circle/network/templates/network/group-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.group_delete" pk=group.pk %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this group" %}</a>
+    <a href="{% url "network.group_delete" pk=group.pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this group" %}</a>
    <h2>{{ form.name.value }}</h2>
 </div>
@@ -17,7 +17,7 @@
    </div>
    <div class="col-sm-5 col-sm-offset-1">
        <div class="page-header">
-            <a href="{% url "network.rule_create" %}?hostgroup={{ group_pk }}" class="btn btn-success pull-right btn-xs"><i class="icon-plus-sign"></i> {% trans "Add new rule" %}</a>
+            <a href="{% url "network.rule_create" %}?hostgroup={{ group_pk }}" class="btn btn-success pull-right btn-xs"><i class="fa fa-plus-circle"></i> {% trans "Add new rule" %}</a>
            <h3>{% trans "Rules" %}</h3>
        </div>
        {% if rule_list.data.data.count > 0 %}

--- a/circle/network/templates/network/group-list.html
+++ b/circle/network/templates/network/group-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header"> 
-    <a href="{% url "network.group_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new host group" %}</a>
+    <a href="{% url "network.group_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new host group" %}</a>
    <h1>{% trans "Host groups" %}</h1>
 </div>

--- a/circle/network/templates/network/host-edit.html
+++ b/circle/network/templates/network/host-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.host_delete" pk=host_pk%}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this host" %}</a>
+    <a href="{% url "network.host_delete" pk=host_pk%}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this host" %}</a>
    <h2>{{ form.hostname.value }}</h2>
 </div>
@@ -17,7 +17,7 @@
    </div>
    <div class="col-sm-5">
        <div class="page-header">
-            <a href="{% url "network.rule_create" %}?host={{ host_pk }}" class="btn btn-success pull-right btn-xs"><i class="icon-plus-sign"></i> {% trans "Add new rule" %}</a>
+            <a href="{% url "network.rule_create" %}?host={{ host_pk }}" class="btn btn-success pull-right btn-xs"><i class="fa fa-plus-circle"></i> {% trans "Add new rule" %}</a>
            <h3>{% trans "Rules" %}</h3>
        </div>
        {% if rule_list.data.data.count > 0 %}
@@ -34,9 +34,9 @@
            <div>
                <h4 id="{{ group.pk }}_group_pk">{{ group.name }} 
                    <a href="{% url "network.remove_host_group" pk=host_pk group_pk=group.pk %}?from={{ request.path }}">
-                        <i class="icon-remove" style="vertical-align: middle;"></i></a>
+                        <i class="fa fa-times" style="vertical-align: middle;"></i></a>
                <a href="{% url "network.group" group.pk %}">
-                    <i class="icon-pencil" style="vertical-align: middle;"></i></a>
+                    <i class="fa fa-pencil" style="vertical-align: middle;"></i></a>
                </h4>
            </div>
            {% endfor %}

--- a/circle/network/templates/network/host-list.html
+++ b/circle/network/templates/network/host-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.host_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new host" %}</a>
+    <a href="{% url "network.host_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new host" %}</a>
    <h1>
        {% trans "Hosts" %} 
        <small>

--- a/circle/network/templates/network/record-edit.html
+++ b/circle/network/templates/network/record-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.record_delete" pk=record_pk %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this record" %}</a>
+    <a href="{% url "network.record_delete" pk=record_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this record" %}</a>
  <h2>{{ fqdn }}</h2>
 </div>

--- a/circle/network/templates/network/record-list.html
+++ b/circle/network/templates/network/record-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.record_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new record" %}</a>
+    <a href="{% url "network.record_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new record" %}</a>
    <h1>
        {% trans "Records" %}
        <small>

--- a/circle/network/templates/network/rule-edit.html
+++ b/circle/network/templates/network/rule-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.rule_delete" pk=rule.pk %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this rule" %}</a>
+    <a href="{% url "network.rule_delete" pk=rule.pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this rule" %}</a>
    <h3>
        {% with rule as record %}
            {% include "network/columns/host-rule.html" %}

--- a/circle/network/templates/network/rule-list.html
+++ b/circle/network/templates/network/rule-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.rule_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new rule" %}</a>
+    <a href="{% url "network.rule_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new rule" %}</a>
    <h1>{% trans "Rules" %} <small>{% trans "list of all rules" %}</small></h1>
 </div>

--- a/circle/network/templates/network/switch-port-edit.html
+++ b/circle/network/templates/network/switch-port-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-  <a href="{% url "network.switch_port_delete" pk=switch_port_pk %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this switchport" %}</a>
+  <a href="{% url "network.switch_port_delete" pk=switch_port_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this switchport" %}</a>
  <h2>Welp <small>dunno what to write here</small></h2>
 </div>
 <div class="row">
@@ -28,7 +28,7 @@
          <tr>
            <td>{{ i }}</td>
            <td>
-              <a href="{% url "network.remove_switch_port_device" pk=switch_port_pk device_pk=i.pk %}"><i class="icon-remove"></i></a> 
+              <a href="{% url "network.remove_switch_port_device" pk=switch_port_pk device_pk=i.pk %}"><i class="fa fa-times"></i></a> 
            </td>
          </tr>
        {% endfor %}

--- a/circle/network/templates/network/switch-port-list.html
+++ b/circle/network/templates/network/switch-port-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header">   
-    <a href="{% url "network.switch_port_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new switch port" %}</a>
+    <a href="{% url "network.switch_port_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new switch port" %}</a>
    <h1>{% trans "Switch ports" %} <small></small></h1>
 </div>

--- a/circle/network/templates/network/vlan-edit.html
+++ b/circle/network/templates/network/vlan-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.vlan_delete" vid=vlan_vid %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this vlan" %}</a>
+    <a href="{% url "network.vlan_delete" vid=vlan_vid %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this vlan" %}</a>
    <h2>{{ form.name.value }} <small>{% trans "details of vlan" %}</small></h2>
 </div>
@@ -30,12 +30,12 @@
            <th></th>
            <th>{% trans "Who" %}</th>
            <th>{% trans "What" %}</th>
-            <th><i class="icon-remove"></i></th>
+            <th><i class="fa fa-times"></i></th>
        </tr></thead>
        <tbody>
            {% for i in acl.users %}
            <tr>
-              <td><i class="icon-user"></i></td><td>{{i.user}}</td>
+              <td><i class="fa fa-user"></i></td><td>{{i.user}}</td>
              <td>
                <select class="form-control" name="perm-u-{{i.user.id}}">
                  {% for id, name in acl.levels %}
@@ -50,7 +50,7 @@
            {% endfor %}
            {% for i in acl.groups %}
            <tr>
-              <td><i class="icon-group"></i></td><td>{{i.group}}</td>
+              <td><i class="fa fa-group"></i></td><td>{{i.group}}</td>
              <td>
                <select class="form-control" name="perm-g-{{i.group.id}}">
                  {% for id, name in acl.levels %}
@@ -63,7 +63,7 @@
              </td>
            </tr>
            {% endfor %}
-            <tr><td><i class="icon-plus"></i></td>
+            <tr><td><i class="fa fa-plus"></i></td>
                <td><input type="text" class="form-control" name="perm-new-name"
                    placeholder="{% trans "Name of group or user" %}"></td>
                <td><select class="form-control" name="perm-new">

--- a/circle/network/templates/network/vlan-group-edit.html
+++ b/circle/network/templates/network/vlan-group-edit.html
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.vlan_group_delete" pk=vlangroup_pk %}" class="btn btn-danger pull-right"><i class="icon-remove-sign"></i> {% trans "Delete this group" %}</a>
+    <a href="{% url "network.vlan_group_delete" pk=vlangroup_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this group" %}</a>
    <h1>{{ form.name.value }}</h1>
 </div>

--- a/circle/network/templates/network/vlan-group-list.html
+++ b/circle/network/templates/network/vlan-group-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header">
-    <a href="{% url "network.vlan_group_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new vlan group" %}</a>
+    <a href="{% url "network.vlan_group_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new vlan group" %}</a>
    <h1>{% trans "Vlan groups" %}</h1>
 </div>

--- a/circle/network/templates/network/vlan-list.html
+++ b/circle/network/templates/network/vlan-list.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page-header"> 
-    <a href="{% url "network.vlan_create" %}" class="btn btn-success pull-right"><i class="icon-plus-sign"></i> {% trans "Create a new vlan" %}</a>
+    <a href="{% url "network.vlan_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new vlan" %}</a>
    <h1>Vlans <small>{% trans "list of all vlans" %}</small></h1>
 </div>