Changed hardcoded localhost address in main.js to use frontendUrl variable. Fixed frontendUrls variable array to not be print in top navbar.

tobiasake · tobiasake · commit 3551f0c6b756 · 2017-12-28T10:36:34.000+01:00
diff --git a/src/main/resources/static/js/main.js b/src/main/resources/static/js/main.js
@@ -3,23 +3,24 @@ jQuery(document).ready(function() {
 	
     // Fetch injected URL from DOM
     var eiffelDocumentationUrlLinks = $('#eiffelDocumentationUrlLinks').text();
-	
+	var frontendServiceUrl = $('#frontendServiceUrl').text();
+
 	document.getElementById("testRulesBtn").onclick = function() {		  
 		
     	var iframe = document.getElementById("mainFrame");
-    	iframe.src = "http://localhost:8080/testRules.html";    
+    	iframe.src = frontendServiceUrl + "/testRules.html";    
 	}
 	
 	document.getElementById("eiInfoBtn").onclick = function() {		  
 		
     	var iframe = document.getElementById("mainFrame");
-    	iframe.src = "http://localhost:8080/eiInfo.html";    
+    	iframe.src = frontendServiceUrl + "/eiInfo.html";    
 	}
 	
 	
 	function loadLoginPage() {
     	var iframe = document.getElementById("mainFrame");
-    	iframe.src = "http://localhost:8080/login.html";  
+    	iframe.src = frontendServiceUrl + "/login.html";  
 	}
 	
 	document.getElementById("loginBtn").onclick = function() {		  
@@ -35,18 +36,18 @@ jQuery(document).ready(function() {
 	document.getElementById("registerBtn").onclick = function() {		  
 		
     	var iframe = document.getElementById("mainFrame");
-    	iframe.src = "http://localhost:8080/register.html";
+    	iframe.src = frontendServiceUrl + "/register.html";
 	}
 	
 	document.getElementById("forgotPasswordBtn").onclick = function() {		  
 		
     	var iframe = document.getElementById("mainFrame");
-    	iframe.src = "http://localhost:8080/forgot-password.html";
+    	iframe.src = frontendServiceUrl + "/forgot-password.html";
 	}
 	
 	function loadMainPage() {
 		var iframe = document.getElementById("mainFrame");
-    	iframe.src = "http://localhost:8080/subscriptionpage.html";
+    	iframe.src = frontendServiceUrl + "/subscriptionpage.html";
 	}
 	
 	document.getElementById("subscriptionBtn").onclick = function() {
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html xmlns:th="http://www.thymeleaf.org" lang="en">
 
 <head>
   <meta charset="utf-8" />
@@ -20,7 +20,7 @@
 
 <body class="fixed-nav bg-dark" id="page-top">
 
-<div class="hidden" id="eiffelDocumentationUrlLinks" th:text="${eiffelDocumentationUrlLinks}"></div>
+<div class="hidden" style="display: none" id="eiffelDocumentationUrlLinks" th:text="${eiffelDocumentationUrlLinks}"></div>
 
   <!-- Navigation-->
   <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top" id="mainNav">
