Commit 879c7fee authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos
Browse files

Minor bug fix that caused datatables content no to be rendered properly

parent d60db93b
......@@ -32,8 +32,6 @@ $(document).ready(function(){
Cancel: function(){
$('#dialog').dialog('close');
},
},
close: function(){
update_val = $("#hid_mid").val();
......@@ -59,6 +57,37 @@ $(document).ready(function(){
});
$('#console').parent().css('opacity', 0.9);
$('#console').parent().css('filter', 'alpha(opacity=90)');
$(".button_place #routebutton").button({
icons: {
primary: "ui-icon-circle-plus"
},
});
$(".edit_button").button({
icons: {
primary: "ui-icon-wrench"
},
}).css('width','100px');;
$(" .del_button").button({
icons: {
primary: "ui-icon-circle-close"
},
}).click(function(){
$('#dialog').dialog('open');
return false;
}).css('width','100px');
$("#consolebutton").button({
icons: {
primary: "ui-icon-image"
},
}).click(function(){
$("#consolebutton").stop().stop();
$("#consolebutton").css('color', '#555555');
$('#console').dialog('open');
return false;
});
$(".statustootipclass").tooltip();
$(".expiresclass").tooltip();
$(".commentclass").tooltip();
var oTable = $('#routes_table').dataTable({
"bJQueryUI": true,
"aoColumns": [{
......@@ -97,47 +126,13 @@ $(document).ready(function(){
},
"iDisplayLength": 25,
});
oTable.fnDraw();
$('input[name="status_filter"]').click(function(){
//slice off the last '|' or it doesn't work
//also be sure to use the third parameter
});
$(".button_place #routebutton").button({
icons: {
primary: "ui-icon-circle-plus"
},
});
$(".edit_button").button({
icons: {
primary: "ui-icon-wrench"
},
}).css('width','100px');;
$(" .del_button").button({
icons: {
primary: "ui-icon-circle-close"
},
}).click(function(){
$('#dialog').dialog('open');
return false;
}).css('width','100px');
$("#consolebutton").button({
icons: {
primary: "ui-icon-image"
},
}).click(function(){
$("#consolebutton").stop().stop();
$("#consolebutton").css('color', '#555555');
$('#console').dialog('open');
return false;
});
$(".statustootipclass").tooltip();
$(".expiresclass").tooltip();
$(".commentclass").tooltip();
var reg_exp = '';
var checkboxs = document.getElementsByName('status_filter');
for (var i = 0, inp; inp = checkboxs[i]; i++) {
......@@ -249,7 +244,6 @@ function delete_route(route){
</tbody>
</table>
</div>
<table class="display" width="100%" id="nodes_table">
<table class="display" width="100%" id="routes_table">
<thead>
<tr>
......@@ -271,17 +265,10 @@ function delete_route(route){
<tr class="GradeC" >
<td>{{ route.pk }}</td>
<td><span {% if route.comments %}
class="commentclass"
style="border-bottom:1px dotted red;"
title="{{route.comments}}"
{% endif %}>{{ route.name }}</span></td>
<td><span {% if route.comments %} class="commentclass" style="border-bottom:1px dotted red;" title="{{route.comments}}" {% endif %}>{{ route.name }}</span></td>
<td>{{ route.get_match|safe|escape }}</td>
<td style="text-align: center;">{{route.get_then|safe|escape}}</td>
<td style="text-align: center; "><span
{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
class="statustootipclass"
style="border-bottom:1px dotted red;"
<td style="text-align: center; "><span {% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%} class="statustootipclass" style="border-bottom:1px dotted red;"
title = "{% ifequal route.status 'INACTIVE' %}Suspended by user{% else %}{% ifequal route.status 'ADMININACTIVE' %}Suspended by administrator{% else %}{% ifequal route.status 'EXPIRED' %}Suspended due to expiration{% else %}{% ifequal route.status 'OUTOFSYNC' %}Syncronization error. Configuration in device deffers from rule{% endifequal %}{% endifequal %}{% endifequal %}{% endifequal %}"{% endif %}>{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}SUSPENDED{% else %}{% if route.status == 'OUTOFSYNC' %}ERROR{% else %}{{route.status}}{% endif %}{% endif %}</span></td>
{% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}
<td style="text-align: center;">{{ route.applier }}</td>
......
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