X-Git-Url: https://code.grnet.gr/git/flowspy/blobdiff_plain/6ee21ffd7e1ac6443ab91f4937bddd37e7cdfe8a..6d87724ebc42f8f838afeca0b339e10e481a8238:/templates/user_routes.html

diff --git a/templates/user_routes.html b/templates/user_routes.html
index 46ff25f..73ced25 100644
--- a/templates/user_routes.html
+++ b/templates/user_routes.html
@@ -4,6 +4,7 @@
 <script type="text/javascript" src="/static/js/jquery.dataTables.js"></script>
 <script type="text/javascript">
 	$(document).ready( function(){
+		$("#hid_mid").val('');
 		$('#dialog').dialog({
 			height: 220,
             width: 300,
@@ -13,33 +14,60 @@
 		'Delete': function() {
 		route = $('#route_to_delete').text();
 		route_url_id = '#del_route_'+route;
-		console.log(route_url_id);
 		url = $(route_url_id).attr('href');
-		console.log(route, url);
 			$.ajax({
 			url: url ,
 			cache: false,
 			success: function(data) {
 				$('#dialog').dialog('close');
+				window.setTimeout('location.reload()', 1000);
 			  }
 		});
-//				$('#dialog').dialog('close');
 		},
 		Cancel: function() {
 			$('#dialog').dialog('close');
+		},
+		
+
+	},
+	close: function() {
+        update_val = $("#hid_mid").val();
+		if (update_val == 'UPDATED'){
+			$("#hid_mid").val('');
+			window.setTimeout('location.reload()', 500);
 		}
-	}
+    }
 		});
 		$('#console').dialog({
 			height: 250,
-            width: 500,
+            width: 800,
 			modal: true,
-			autoOpen: false
-			});
-			$('#routes_table').dataTable( {
+			autoOpen: false,
+			close: function() {
+		        update_val = $("#hid_mid").val();
+				if (update_val == 'UPDATED'){
+					$("#hid_mid").val('');
+					window.setTimeout('location.reload()', 500);
+				}
+		    }
+		});
+			
+		$('#routes_table').dataTable( {
 			"bJQueryUI": true,
+			"aoColumns": [ 
+				{"bVisible": false, "bSearchable": false,"bSortable": false },
+				{"bSearchable": true,"bSortable": true},
+				{"bSearchable": true,"bSortable": true},
+				{"bSearchable": true,"bSortable": true},
+				{"bSearchable": true,"bSortable": true},
+				{"bSearchable": true,"bSortable": true},
+				{"bSearchable": true,"bSortable": true},
+				{"bSearchable": true,"bSortable": true},
+				{"bVisible": true, "bSearchable": false,"bSortable": false}
+			],
+			 "aaSorting": [[0,'desc']],
 			"oLanguage": {
-				"sLengthMenu": '{% trans "Display" %} <select><option value="25">25</option><option value="50">50</option><option value="-1">{% trans "All" %}</option></select> routes'
+				"sLengthMenu": '{% trans "Display" %} <select><option value="25">25</option><option value="50">50</option><option value="-1">{% trans "All" %}</option></select> rules'
 			},
 			"iDisplayLength": 25,
 	} );
@@ -73,6 +101,7 @@
 				$('#console').dialog('open');
 				return false;
 			});
+
 		});
 		
 function delete_route(route){
@@ -96,17 +125,18 @@ function delete_route(route){
 	
 </style>
 {% endblock %}
-{% block title %}{% trans "My routes" %}{% endblock %}
+{% block title %}{% trans "My rules" %}{% endblock %}
 {% block content %}
 <div style="float:left">
-	<h3 style="margin-top: 0px;">{% trans "My routes" %}</h3>
+	<h3 style="margin-top: 0px;">{% trans "My rules" %}</h3>
 </div>
 <div class='button_place' style="float:right">
-	<button id="consolebutton">Console</button> <a href="{% url add-route %}" id="routebutton">Add Route</a>
+	<button id="consolebutton">Console</button> <a href="{% url add-route %}" id="routebutton">Add Rule</a>
 </div>
 <table class="display" width="100%" id="routes_table">
 <thead>
 <tr>
+	<th>Id</th>
 	<th>{% trans "Name" %}</th>
 	<th>{% trans "Match" %}</th>
 	<th style="text-align: center;">{% trans "Then" %}</th>
@@ -115,30 +145,39 @@ function delete_route(route){
 	<th style="text-align: center;">{% trans "Applier" %}</th>
 	<th style="text-align: center;">{% trans "Expires" %}</th>
 	<th style="text-align: center;">{% trans "Response" %}</th>
-	<th style="text-align: center; width:120px;">{% trans "Actions" %}</th>
+	<th style="text-align: center; width:130px;">{% trans "Actions" %}</th>
 </tr>
 </thead>
 
 <tbody>
 {% for route in routes %}
 
-<tr {% if route.is_online %} class="GradeA" {% else %} class="GradeX" {% endif %}>
+<tr {% ifequal route.status 'ACTIVE' %} class="GradeA" {% else %} class="GradeX" {% endifequal %}>
+	<td>{{ route.pk }}</td>
 	<td>{{ route.name }}</td>
 	<td>{{ route.get_match|safe|escape }}</td>
 	<td style="text-align: center;">{{route.get_then|safe|escape}}</td>
-	<td style="text-align: center;">{% if route.is_online %}Online{% else %}Offline{% endif %}</td>
+	<td style="text-align: center;">{{route.status}}</td>
 	{% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}
 	<td style="text-align: center;">{{ route.applier }}</td>
 	<td style="text-align: center;">{{ route.expires }}</td>
 	<td style="text-align: center;">{{ route.response }}</td>
-	<td style="text-align: center;">
-		{% if route.is_active %}
+	<td style="text-align: center; width:140px;">
+		{% ifequal route.status 'ACTIVE' %}
 		<a href="{% url edit-route route.name %}" class="edit_button" id="edit_button_{{route.pk}}">Edit</a> 
 		<button class="del_button" id="{{route.name}}" onclick="javascript:delete_route(this.id)">Del</button>
 		<a href="{% url delete-route route.name %}" style="display:none" id="del_route_{{route.name}}"></a>
 		{% else %}
+		{% ifequal route.status 'INACTIVE' %}
+		<a href="{% url edit-route route.name %}" class="edit_button" id="edit_button_{{route.pk}}">Reactivate</a>
+		{% else %}
+		{% ifequal route.status 'OUTOFSYNC' %}
+		<a href="{% url edit-route route.name %}" class="edit_button" id="edit_button_{{route.pk}}">ReSync</a>
+		{% else %}
 		-
-		{% endif %}</td>
+		{% endifequal %}
+		{% endifequal %}
+		{% endifequal %}</td>
 </tr>
 
 {% endfor %}
@@ -146,8 +185,8 @@ function delete_route(route){
 </table>
 
 <div id="dialog" title="Delete Route">
-		<p>You are about to delete route <strong><span id="route_to_delete"></span></strong></p>
-		<p>Deleting the route will automatically remove the configuration from the network and mark this route as inactive.</p>
+		<p>You are about to delete rule <strong><span id="route_to_delete"></span></strong></p>
+		<p>Deleting the rule will automatically remove the configuration from the network and mark this route as inactive.</p>
 		<p>Are you sure you want to proceed?</p>
 </div>
 <div id="console" title="Console">