Merge branch 'Menustuff' into 'master'

Menu state fix

Minor fix for annoying menu state bug.

See merge request !319

code/moya-web/WebContent/resources/script/menufix.js

+$(document).ready(function() {
+	if (PrimeFaces.getCookie("moyaLeftMenu") != null) {
+		var menuToExpand = PrimeFaces.getCookie("moyaLeftMenu").split(",");
+		for (i = 0; i < menuToExpand.length; ++i) {
+			$("#" + menuToExpand[i]).css("display", "block");
+		}
+	}
+});
\ No newline at end of file

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

@@ -21,6 +21,7 @@
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/primelayout/css/structual.css" />
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/primelayout/css/structual.css" />
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/custom_components.css" />
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/custom_components.css" />
 		<script type="text/javascript" src="#{request.contextPath}/resources/script/prime_calendar.js"></script>
 		<script type="text/javascript" src="#{request.contextPath}/resources/script/prime_calendar.js"></script>
+		<script type="text/javascript" src="#{request.contextPath}/resources/script/menufix.js"></script>
 
 
 
 
 		<ui:insert name="headerdata" />
 		<ui:insert name="headerdata" />