From d141df306994cef2fec197d2392a3d15b84c023c Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabianfrz@users.noreply.github.com>
Date: Tue, 23 May 2017 22:21:52 +0200
Subject: [PATCH] add IPv6 routing table support; replace icon (#162)

* add IPv6 routing table support

* replace route sign by cogs in menu for general

* Changes requested by @fichtner

* Changes requested by @fichtner
---
 .../app/models/OPNsense/Quagga/Menu/Menu.xml  |  2 +-
 .../OPNsense/Quagga/diagnosticsgeneral.volt   | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/Menu/Menu.xml b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/Menu/Menu.xml
index 2dbceccd3..721bfc81e 100644
--- a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/Menu/Menu.xml
+++ b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/Menu/Menu.xml
@@ -1,6 +1,6 @@
 <menu>
   <Routing cssClass="fa fa-map-signs" order="45">
-    <General VisibleName="General" cssClass="fa fa-map-signs fa-fw" url="/ui/quagga/general/index" order="1"/>
+    <General VisibleName="General" cssClass="fa fa-cog fa-fw" url="/ui/quagga/general/index" order="1"/>
     <RIP VisibleName="RIP" cssClass="fa fa-expand fa-fw" url="/ui/quagga/rip/index" order="10" />
     <OSPF VisibleName="OSPF" cssClass="fa fa-map fa-fw" url="/ui/quagga/ospf/index" order="20" />
     <OSPFv3 VisibleName="OSPFv3" cssClass="fa fa-map fa-fw" url="/ui/quagga/ospf6/index" order="25" />
diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt
index ec46071fd..89b4467cc 100644
--- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt
+++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/diagnosticsgeneral.volt
@@ -100,10 +100,15 @@ $(document).ready(function() {
       updateServiceStatusUI(data['status'])
   });
   ajaxCall(url="/api/quagga/diagnostics/generalroutes", sendData={}, callback=function(data,status) {
-  content = _.template($('#routestpl').html())(data['response'])
-  $('#routing').html(content)
-  //$('#routing table').bootgrid({converters: dataconverters})
-});
+    content = _.template($('#routestpl').html())(data['response'])
+    $('#routing').html(content)
+    //$('#routing table').bootgrid({converters: dataconverters})
+  });
+  ajaxCall(url="/api/quagga/diagnostics/generalroutes6", sendData={}, callback=function(data,status) {
+    content = _.template($('#routestpl').html())({general_routes: data['response']['general_routes6']})
+    $('#routing6').html(content)
+    //$('#routing6 table').bootgrid({converters: dataconverters})
+  });
 
 
 });
@@ -111,10 +116,11 @@ $(document).ready(function() {
 
 <!-- Navigation bar -->
 <ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
-    <li class="active"><a data-toggle="tab" href="#routing">{{ lang._('Routing Table') }}</a></li>
+    <li class="active"><a data-toggle="tab" href="#routing">{{ lang._('IPv4 Routes') }}</a></li>
+    <li><a data-toggle="tab" href="#routing6">{{ lang._('IPv6 Routes') }}</a></li>
 </ul>
 
 <div class="tab-content content-box tab-content">
-    <div id="routing" class="tab-pane fade in active">
-    </div>
+    <div id="routing" class="tab-pane fade in active"></div>
+    <div id="routing6" class="tab-pane fade in"></div>
 </div>