From 5c4360b944ac4ddc95159c46ea08821a3b0ebcec Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Fri, 31 Aug 2018 23:01:46 +0200
Subject: [PATCH] router_list.html/user.html: Make status column sortable

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 ffmap/web/templates/router_list.html | 10 ++--------
 ffmap/web/templates/user.html        |  5 ++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ffmap/web/templates/router_list.html b/ffmap/web/templates/router_list.html
index cf385da..0d4c3c4 100644
--- a/ffmap/web/templates/router_list.html
+++ b/ffmap/web/templates/router_list.html
@@ -46,7 +46,7 @@
 				<td class="text-responsive"><a href="{{ url_for("router_info", dbid=router.id) }}">{{ router.hostname }}</a>
 				{%- if router.reset %} - <span style="color:#d90000">Reset!</span>{%- endif %}{%- if router.blocked and not router.v2 %} - <span style="color:#d90000">Blocked!</span>{%- endif %}
 				</td>
-				<td class="text-center"><span class="{{ router.status|status2css }}">{{ router.status }}</span></td>
+				<td class="text-center" data-order="{{ router.status }}"><span class="{{ router.status|status2css }}">{{ router.status }}</span></td>
 				<td{%- if router.local %} class="hoodlocal"{%- elif router.v2 %} class="hoodv2"{%- endif %}>{{ router.hood }}</td>
 				<td>{{ router.nickname if router.nickname else "" }}</td>
 				<td class="text-nowrap">{{ router.hardware }}</td>
@@ -67,13 +67,7 @@
 		$("#routerlist").DataTable({
 			"paging": false,
 			"info": false,
-			"searching": false,
-			/*"responsive": {
-				"details": false
-			},*/
-			"columnDefs": [
-				{"orderable": false, "targets": 1},
-			]
+			"searching": false
 		});
 	});
 </script>
diff --git a/ffmap/web/templates/user.html b/ffmap/web/templates/user.html
index 52fa551..7284832 100644
--- a/ffmap/web/templates/user.html
+++ b/ffmap/web/templates/user.html
@@ -106,7 +106,7 @@
 				<td class="text-nowrap-responsive"><a href="{{ url_for("router_info", dbid=router.id) }}">{{ router.hostname }}</a>
 				{%- if router.reset %} - <span style="color:#d90000">Reset!</span>{%- endif %}{%- if router.blocked and not router.v2 %} - <span style="color:#d90000">Blocked!</span>{%- endif %}
 				</td>
-				<td class="text-center"><span class="{{ router.status|status2css }}">{{ router.status }}</span></td>
+				<td class="text-center" data-order="{{ router.status }}"><span class="{{ router.status|status2css }}">{{ router.status }}</span></td>
 				<td{%- if router.local %} class="hoodlocal"{%- elif router.v2 %} class="hoodv2"{%- endif %}>{{ router.hood }}</td>
 				<td>{{ router.firmware }}</td>
 				<td class="text-nowrap">{{ router.get("hardware", "") }}</td>
@@ -132,8 +132,7 @@
 				"details": false
 			},*/
 			"columnDefs": [
-				{"orderable": false, "targets": 1},
-				{"orderable": false, "targets": -2},
+				{"orderable": false, "targets": -2}
 			]
 		});
 	});