Merge branch 'master' into 'master'

Master

Added the graphics files to the project such as logo, texture, colors etc. Modified the template to remove the <h1> element Development text and replaced it with image to be able to control width better.

See merge request !214

code/moya-web/WebContent/info/index.xhtml

@@ -27,7 +27,7 @@
 
 
 		<ui:define name="content">
 		<ui:define name="content">
 			<infoview:userselector />
 			<infoview:userselector />
-			<br /><br /><br /><br /><br /><br />
+			<br /><br />
 			<reader:multireaderselect />
 			<reader:multireaderselect />
 			
 			
 			
 			

code/moya-web/WebContent/resources/templates/moyav2/css/style.css

@@ -394,6 +394,7 @@ HEADER
         background: #70cbc3;
         background: #70cbc3;
         text-align: center;
         text-align: center;
         height: 101px;
         height: 101px;
+        line-height: 101px;
     }
     }
     #header_first a {
     #header_first a {
         display: table;
         display: table;
@@ -401,6 +402,9 @@ HEADER
         height: 100%;
         height: 100%;
         width: 100%;
         width: 100%;
     }
     }
+    #header_first a img {
+        vertica-align: middle;
+    }
     #header_first a h1 {
     #header_first a h1 {
         text-decoration: none;
         text-decoration: none;
         color: #FFF;
         color: #FFF;

code/moya-web/WebContent/resources/templates/moyav2/template.xhtml

@@ -48,7 +48,7 @@
 						<h:link outcome="/index">
 						<h:link outcome="/index">
 							<c:choose>
 							<c:choose>
 								<c:when test="#{sessionHandler.isInDevelopmentMode()}">
 								<c:when test="#{sessionHandler.isInDevelopmentMode()}">
-									<h1>Development</h1>
+									<img src="#{request.contextPath}/resources/templates/moyav2/img/dev_logo.png" alt="Development" />
 								</c:when>
 								</c:when>
 								<c:otherwise>
 								<c:otherwise>
 									<p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" />
 									<p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" />