Revision 861e8360

b/ChangeLog
1 1
===========
2
0.9.7 RELEASE
3
Minor UI improvements (check Requirements)
4

  
5
Requirements:
6
	-south migration to include database changes if you are at 
7
	<=0.9.5
8

  
9
UI Improvements:
10
	-Added badges in rule status
11

  
12
===========
2 13
0.9.6 RELEASE
3 14
New Feature and minor UI improvements (check Requirements)
4 15

  
b/templates/overview/index.html
203 203
    
204 204
    <td style="text-align: center;">{{route.get_then|safe|escape}}</td>
205 205
    
206
    <td style="text-align: center; ">{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
207
        {% 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>
208
        
206
	<td style="text-align: center; ">{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
207
		{% 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>
208

  
209 209
    {% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}
210 210
    
211 211
    <td style="text-align: center;">{{ route.applier }}</td>
b/templates/user_routes.html
272 272
	<td style="text-align: center;">{{route.get_then|safe|escape}}</td>
273 273
	
274 274
	<td style="text-align: center; ">{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
275
		{% 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>
275
		{% 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>
276 276
		
277 277
	{% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}
278 278
	

Also available in: Unified diff