Merge branch '129-admin-link' into 'master'

Resolve "Admin link"

Closes #129

See merge request !26

frontend-js/src/main/js/gui/Header.js

@@ -19,17 +19,26 @@ Header.prototype.constructor = Header;
 
 Header.prototype._createHeaderGui = function() {
   var self = this;
+  self.getElement().className = "minerva-header";
+  
   var projectId = self.getMap().getProject().getProjectId();
   var projectName = self.getMap().getProject().getName();
 
   var link = Functions.createElement({
     type : "a",
-    name : "headerPanel",
-    className : "mainTitle",
     content : '<i class="fa fa-home" style="font-size:17px"></i> ' + projectName,
   });
-  link.href = ServerConnector.getServerBaseUrl() + "/?id=" + projectId;
+  link.href = ServerConnector.getServerBaseUrl() + "?id=" + projectId;
   self.getElement().appendChild(link);
+  
+  link = Functions.createElement({
+    type : "a",
+    style : "padding-right:15px; float:right",
+    content : '<i class="fa fa-lock" style="font-size:17px"></i>&nbsp;',
+  });
+  link.href = ServerConnector.getServerBaseUrl() + "admin.xhtml?id=" + projectId;
+  self.getElement().appendChild(link);
+  
 };
 
 module.exports = Header;

frontend-js/src/main/js/gui/leftPanel/Footer.js

@@ -27,15 +27,6 @@ Footer.prototype._createFooterGui = function() {
   self.getElement().className = "footerLinks";
 
   var link = Functions.createElement({
-    type : "a",
-    name : "footerAdminLink",
-    style : "padding-left:25px;",
-    content : '<i class="fa fa-lock" style="font-size:17px"></i> &nbsp;ADMIN',
-  });
-  link.href = ServerConnector.getServerBaseUrl() + "/admin.xhtml?id=" + projectId;
-  self.getElement().appendChild(link);
-
-  link = Functions.createElement({
     type : "a",
     name : "footerManualLink",
     style : "padding-left:25px;",

web/src/main/webapp/WEB-INF/components/admin/header.xhtml

@@ -4,7 +4,11 @@
 	xmlns:ui="http://java.sun.com/jsf/facelets"
 	xmlns:p="http://primefaces.org/ui">
 
-	<a href="#{request.contextPath}/?id=#{mapMB.currentMapId}" class="mainTitle"><i class="fa fa-home" style="font-size:17px"></i> #{mapMB.currentProject.name}</a>
+	<h:outputStylesheet library="css" name="global.css"	/>
+				
+	<div class="minerva-header">
+		<a href="#{request.contextPath}/?id=#{mapMB.currentMapId}" class="mainTitle"><i class="fa fa-home" style="font-size:17px"></i> #{mapMB.currentProject.name}</a>
+	</div>
  
 </html>
 

web/src/main/webapp/resources/css/global.css

@@ -7,6 +7,29 @@ table.mapInfoBoxResultsTable, table.mapInfoBoxResultsTable th, table.mapInfoBoxR
 	border: 1px solid black;
 }
 
+.minerva-header{
+  background-color:#333333;
+	color:#ffffff;				
+	display:block; 
+}
+.minerva-header a:link, .minerva-header a:visited {
+  background-color:#333333;
+	color:#ffffff;
+	line-height:36px; 
+	height:36px; 
+	text-decoration:none; 
+	transition: background-color 0.4s ease-in-out 0s; 
+	font-size:13px; 
+	font-weight:900; 
+	padding-left:15px;
+}
+
+.minerva-header a:hover {
+	background-color:#000000; 
+	transition: background-color 0.4s ease-in-out 0s;
+}
+
+
 .mapChartNameDiv {
 	width: 150px;
 	float: left;

web/src/main/webapp/resources/css/style.css

@@ -1018,11 +1018,6 @@ ui-overlay-visible *{visibility:visible !important;}
 .ui-wizard-nav-next{float:right;}
 .ui-wizard-step-title{font-size:18px;margin:0 3px 0 0;padding:0.4em;float:left;}
 
-
-
-a.mainTitle:link, a.mainTitle:visited {background-color:#333333; color:#ffffff; display:block; flaot:left; line-height:36px; height:36px; text-decoration:none; transition: background-color 0.4s ease-in-out 0s; font-size:13px; font-weight:900; padding-left:15px;}
-a.mainTitle:hover {background-color:#000000; transition: background-color 0.4s ease-in-out 0s;}
-
 .overview_button {color:#FFFFFF; height:36px; line-height:35px; padding:0 18px; margin:0; border:none; background-color:#017DA7; font-size:13px; font-weight:900; border-right:1px solid #9DE1F8; cursor:pointer; transition: background-color 0.4s ease-in-out 0s; }
 .overview_button:hover {background-color:#01536D; transition: background-color 0.4s ease-in-out 0s; }