Remove bugged tooltip and redraw table on sidenav collapse (#62)

* Remove bugged tooltip and redraw table on sidenac collapse

* Redraw table without fetching data

Author: Christoffer-Cortes

src/main/resources/static/js/main.js

@@ -17,36 +17,43 @@ jQuery(document).ready(function() {
 	var frontendServiceUrl = $('#frontendServiceUrl').text();
 
 	function loadMainPage() {
+		$("#navbarResponsive").removeClass("show");
 	    $("#selectInstances").visible();
 		$("#mainFrame").load("subscriptionpage.html");
 	}
 
 	$("#testRulesBtn").click(function() {
+		$("#navbarResponsive").removeClass("show");
 	    $("#selectInstances").visible();
 		$("#mainFrame").load("testRules.html");
 	});
 
 	$("#eiInfoBtn").click(function() {
+		$("#navbarResponsive").removeClass("show");
 	    $("#selectInstances").visible();
 		$("#mainFrame").load("eiInfo.html");
 	});
 
 	$("#loginBtn").click(function() {
+		$("#navbarResponsive").removeClass("show");
 	    $("#selectInstances").visible();
 		$("#mainFrame").load("login.html");
 	});
 
 	$("#addInstanceBtn").click(function() {
+		$("#navbarResponsive").removeClass("show");
 	    $("#selectInstances").invisible();
       	$("#mainFrame").load("add-instances.html");
     });
 
     $("#switcherBtn").click(function() {
+		$("#navbarResponsive").removeClass("show");
         $("#selectInstances").invisible();
       	$("#mainFrame").load("switch-backend.html");
     });
 
 	$("#logoutBtn").click(function() {
+		$("#navbarResponsive").removeClass("show");
 	    $("#selectInstances").visible();
 		$.ajax({
 			url : frontendServiceUrl + "/auth/logout",
@@ -65,6 +72,7 @@ jQuery(document).ready(function() {
 	});
 
 	$("#jmesPathRulesSetUpBtn").click(function() {
+		$("#navbarResponsive").removeClass("show");
 	    $("#selectInstances").visible();
 		$("#mainFrame").load("jmesPathRulesSetUp.html");
 	});
@@ -161,30 +169,4 @@ jQuery(document).ready(function() {
             ko.applyBindings(new viewModel(responseData),observableObject);
         }
 	});
-	
-	// Hide menu navbar when clicking a link
-	$("#subscriptionBtn").click(function(e) {
-		e.preventDefault();
-		$("#navbarResponsive").removeClass("show");
-	});
-	$("#testRulesBtn").click(function(e) {
-		e.preventDefault();
-		$("#navbarResponsive").removeClass("show");
-	});
-	$("#jmesPathRulesSetUpBtn").click(function(e) {
-		e.preventDefault();
-		$("#navbarResponsive").removeClass("show");
-	});
-	$("#eiInfoBtn").click(function(e) {
-		e.preventDefault();
-		$("#navbarResponsive").removeClass("show");
-	});
-	$("#addInstanceBtn").click(function(e) {
-		e.preventDefault();
-		$("#navbarResponsive").removeClass("show");
-	});
-	$("#switcherBtn").click(function(e) {
-		e.preventDefault();
-		$("#navbarResponsive").removeClass("show");
-	});
 });

src/main/resources/static/js/subscription.js

@@ -414,6 +414,11 @@ jQuery(document).ready(function () {
             }
         }
     });
+
+    $("#sidenavCollapse").click(function() {
+		table.responsive.rebuild();
+        table.responsive.recalc();
+	});
     // /Stop ## Datatables ##################################################
 
 

src/main/resources/templates/index.html

@@ -42,31 +42,31 @@
     <select id="selectInstances" data-bind="optionsCaption: 'Choose backend instance', options: instances, optionsText: 'information', optionsValue: 'name', value: selectedActive, event: {change: onChange}"></select>
     <div class="collapse navbar-collapse" id="navbarResponsive">
       <ul class="navbar-nav navbar-sidenav" id="exampleAccordion">
-        <li id="subscriptionBtn" class="nav-item" data-toggle="tooltip" data-placement="right" title="Eiffel Subscription">
+        <li id="subscriptionBtn" class="nav-item">
           <a class="nav-link" href="#">
             <i class="fa fa-fw fa-table"></i>
             <span class="nav-link-text">Subscription Handling</span>
           </a>
         </li>
-        <li id="testRulesBtn" class="nav-item" data-toggle="tooltip" data-placement="right" title="Test Rules">
+        <li id="testRulesBtn" class="nav-item">
           <a class="nav-link" href="#">
             <i class="fa fa-fw fa-dashboard"></i>
             <span class="nav-link-text">Test Rules</span>
           </a>
         </li>
-        <li id="jmesPathRulesSetUpBtn" class="nav-item" data-toggle="tooltip" data-placement="right">
+        <li id="jmesPathRulesSetUpBtn" class="nav-item">
           <a class="nav-link" href="#">
             <i class="fa fa-fw fa-book"></i>
             <span class="nav-link-text">Test Rules User Guide</span>
           </a>
         </li>
-        <li id="eiInfoBtn" class="nav-item" data-toggle="tooltip" data-placement="right" title="Eiffel Intelligence Information">
+        <li id="eiInfoBtn" class="nav-item">
           <a class="nav-link" href="#">
             <i class="fa fa-fw fa-info"></i>
             <span class="nav-link-text">Eiffel Intelligence Info</span>
           </a>
         </li>
-        <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Documentation Links">
+        <li class="nav-item">
           <a class="nav-link nav-link-collapse" data-toggle="collapse" href="#collapseDocPages" data-parent="#exampleAccordion">
             <i class="fa fa-fw fa-file"></i>
             <span class="nav-link-text">Documentation Links</span>
@@ -75,7 +75,7 @@
             <!-- Li and A tags and document links content is injected from main.js  -->
           </ul>
         </li>
-        <li id="adminBackendInstancesBtn" class="nav-item" data-toggle="tooltip" data-placement="right" title="Administration backend instances">
+        <li id="adminBackendInstancesBtn" class="nav-item">
           <a class="nav-link nav-link-collapse" data-toggle="collapse" href="#collapseBackEndPages" data-parent="#exampleAccordion">
             <i class="fa fa-fw fa-file"></i>
             <span class="nav-link-text">Administration backend instances</span>
@@ -91,7 +91,7 @@
         </li>
       </ul>
       <ul class="navbar-nav sidenav-toggler">
-        <li class="nav-item">
+        <li class="nav-item" id="sidenavCollapse">
           <a class="nav-link text-center" id="sidenavToggler">
             <i class="fa fa-fw fa-angle-left"></i>
           </a>