Add badges to rule status

diff --git a/ChangeLog b/ChangeLog
index afb7899..887aec9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
 ===========
+0.9.7 RELEASE
+Minor UI improvements (check Requirements)
+
+Requirements:
+       -south migration to include database changes if you are at 
+       <=0.9.5
+
+UI Improvements:
+       -Added badges in rule status
+
+===========
 0.9.6 RELEASE
 New Feature and minor UI improvements (check Requirements)
 

diff --git a/templates/overview/index.html b/templates/overview/index.html
index 41e262d..522c8e9 100644 (file)
--- a/templates/overview/index.html
+++ b/templates/overview/index.html
@@ -203,9 +203,9 @@ oTableI.fnDraw();
     
     <td style="text-align: center;">{{route.get_then|safe|escape}}</td>
     
-    <td style="text-align: center; ">{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
-        {% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}SUSPENDED{% else %}{% if route.status == 'OUTOFSYNC' %}ERROR{% else %}{{route.status}}{% endif %}{% endif %}{% else %}{{route.status}}{% endif %}</td>
-        
+       <td style="text-align: center; ">{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
+               {% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}<span class="label">DEACTIVATED</span>{% else %}{% if route.status == 'OUTOFSYNC' %}<span class="label label-important">ERROR</span>{% else %}{{route.status}}{% endif %}{% endif %}{% else %}{% if route.status == 'ACTIVE' %}<span class="label label-success">{{route.status}}</span>{% else %}{% if route.status == 'PENDING' %}<span class="label label-info">{{route.status}}</span>{% else %}<span class="label label-important">{{route.status}}</span>{% endif %}{% endif %}{% endif %}</td>
+
     {% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}
     
     <td style="text-align: center;">{{ route.applier }}</td>

diff --git a/templates/user_routes.html b/templates/user_routes.html
index 5fd4911..984e513 100644 (file)
--- a/templates/user_routes.html
+++ b/templates/user_routes.html
@@ -272,7 +272,7 @@ function delete_route(route){
        <td style="text-align: center;">{{route.get_then|safe|escape}}</td>
        
        <td style="text-align: center; ">{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
-               {% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}DEACTIVATED{% else %}{% if route.status == 'OUTOFSYNC' %}ERROR{% else %}{{route.status}}{% endif %}{% endif %}{% else %}{{route.status}}{% endif %}</td>
+               {% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}<span class="label">DEACTIVATED</span>{% else %}{% if route.status == 'OUTOFSYNC' %}<span class="label label-important">ERROR</span>{% else %}{{route.status}}{% endif %}{% endif %}{% else %}{% if route.status == 'ACTIVE' %}<span class="label label-success">{{route.status}}</span>{% else %}{% if route.status == 'PENDING' %}<span class="label label-info">{{route.status}}</span>{% else %}<span class="label label-important">{{route.status}}</span>{% endif %}{% endif %}{% endif %}</td>
                
        {% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}