Commit 82d8e9a1 authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos

Deploy minor UI improvements/fixes

 * Change button size
 * Change 'Add Rule' button color
 * Change wording from suspend to deactivate where it appears
parent f86873f9
......@@ -18,7 +18,7 @@ $(document).ready(function(){
modal: true,
autoOpen: false,
buttons: {
'{% trans "Suspend" %}': function(){
'{% trans "Deactivate" %}': function(){
route = $('#route_to_delete').text();
route_url_id = '#del_route_' + route;
url = $(route_url_id).attr('href');
......@@ -223,9 +223,9 @@ function delete_route(route){
<div class="span10">
<div class='button_place' style="float:right">
<button id="consolebutton" class="btn btn-small btn-inverse">
<button id="consolebutton" class="btn btn-inverse">
<i class="icon-tasks icon-white" style="align:left;"></i>{% trans "Console" %}</button>
<a href="{% url add-route %}" id="routebutton" class="btn btn-small btn-inverse"><i class="icon-plus-sign icon-white"></i>{% trans "Add Rule" %}</a>
<a href="{% url add-route %}" id="routebutton" class="btn btn-primary"><i class="icon-plus-sign icon-white"></i>{% trans "Add Rule" %}</a>
</div>
</div>
</div>
......@@ -235,7 +235,7 @@ function delete_route(route){
<div id='itoggle' class="span12" style="text-align:center;">
<div class="btn-group" data-toggle="buttons-checkbox">
<button type="button" class="btn btn-small" name="status_filter" value="ACTIVE" id="show_active">Active</button>
<button type="button" class="btn btn-small" name="status_filter" value="SUSPENDED" id="show_inactive">Suspended</button>
<button type="button" class="btn btn-small" name="status_filter" value="DEACTIVATED" id="show_inactive">Deactivated</button>
<button type="button" class="btn btn-small" name="status_filter" value="ERROR" id="show_error">Error</button>
<button type="button" class="btn btn-small" name="status_filter" value="PENDING" id="show_pending">Pending</button>
</div>
......@@ -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' %}SUSPENDED{% 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' %}DEACTIVATED{% else %}{% if route.status == 'OUTOFSYNC' %}ERROR{% else %}{{route.status}}{% endif %}{% endif %}{% else %}{{route.status}}{% endif %}</td>
{% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}
......@@ -292,26 +292,26 @@ function delete_route(route){
{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
data-placement="top"
title = "{% ifequal route.status 'INACTIVE' %}
{% trans 'Suspended by user' %}
{% trans 'Deactivated by user' %}
{% else %}
{% ifequal route.status 'ADMININACTIVE' %}
{% trans 'Suspended by administrator' %}
{% trans 'Deactivated by administrator' %}
{% else %}
{% ifequal route.status 'EXPIRED' %}
{% trans 'Suspended due to expiration' %}
{% trans 'Deactivated due to expiration' %}
{% else %}
{% ifequal route.status 'OUTOFSYNC' %}
{% trans 'Syncronization error. Configuration in device deffers from rule' %}
{% trans 'Syncronization error. Configuration in device differs from rule' %}
{% endifequal %}
{% endifequal %}
{% endifequal %}
{% endifequal %}"
{% endif %}>{% trans "Rule expired" %}</span>{% else %}{% if route.status == 'ADMININACTIVE' %}{% trans "Suspended by administrator" %}{% else %}{% if route.status == 'INACTIVE' %}{% trans "Suspended by user" %}{% else %}{{ route.response }}{% if route.status == 'PENDING' %}<img src="/fodstatic/dots.gif">{% endif %}{% endif %}{% endif %}{% endif %}</td>
{% endif %}>{% trans "Rule expired" %}</span>{% else %}{% if route.status == 'OUTOFSYNC' %}{% trans 'Syncronization error. Configuration in device differs from rule' %}{% else %}{% if route.status == 'ADMININACTIVE' %}{% trans "Deactivated by administrator" %}{% else %}{% if route.status == 'INACTIVE' %}{% trans "Deactivated by user" %}{% else %}{{ route.response }}{% if route.status == 'PENDING' %}<img src="/fodstatic/dots.gif">{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}</td>
<td style="text-align: center; width:180px;">
{% ifequal route.status 'ACTIVE' %}
<a href="{% url edit-route route.name %}" class="edit_button btn btn-small" id="edit_button_{{route.pk}}">{% trans "Edit" %}</a>
<button class="del_button btn btn-small" id="{{route.name}}" onclick="javascript:delete_route(this.id)">{% trans "Suspend" %}</button>
<button class="del_button btn btn-small" id="{{route.name}}" onclick="javascript:delete_route(this.id)">{% trans "Deactivate" %}</button>
<a href="{% url delete-route route.name %}" style="display:none" id="del_route_{{route.name}}" class="btn btn btn-danger btn-small"></a>
{% else %}
{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}
......@@ -334,9 +334,9 @@ function delete_route(route){
{% endfor %}
</tbody>
</table>
<div id="dialog" title="{% trans "Suspend Rule" %}">
<p>{% blocktrans %}You are about to suspend rule{% endblocktrans %} <strong><span id="route_to_delete"></span></strong></p>
<p>{% blocktrans %}Suspending the rule will automatically remove the configuration from the network and mark this rule as inactive.{% endblocktrans %}</p>
<div id="dialog" title="{% trans "Deactivate Rule" %}">
<p>{% blocktrans %}You are about to deactivate rule{% endblocktrans %} <strong><span id="route_to_delete"></span></strong></p>
<p>{% blocktrans %}Deactivating the rule will automatically remove the configuration from the network and mark this rule as inactive.{% endblocktrans %}</p>
<p>{% blocktrans %}Are you sure you want to proceed?{% endblocktrans %}</p>
</div>
<div id="console" title="{% trans "Console" %}">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment