diff --git a/ChangeLog b/ChangeLog index afb78998aad9ce2c9bbbb106569da603390eecd1..887aec9c569529e99080e3a93c86ec2b24744dbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +=========== +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 41e262da414dc9695f24c3d78eddf102a627715f..522c8e96b5d5d46c1af937d60f8afe30ebf6758e 100644 --- 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 5fd491172ca1b0c83a413fb8290ff0d613261c24..984e513f3bd804927e0bd6e35c93b2ba1fba966e 100644 --- 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 %}