quick layout fixesQ

code/moya-database/src/main/java/fi/codecrew/moya/model/LanEvent.java

@@ -325,6 +325,7 @@ public class LanEvent extends GenericEntity {
 	}
 
 	public String getTheme() {
+
 		return theme;
 	}
 

code/moya-web/WebContent/eventorg/editEvent.xhtml

@@ -57,7 +57,7 @@
 
 						<p:outputLabel for="themeSwitcher" value="#{i18n['event.theme']}:" />
 						<p:themeSwitcher value="#{eventorgView.event.theme}" id="themeSwitcher" var="t" style="width: 200px;" >
-							<f:selectItem itemLabel="Choose Theme" itemValue="Aristo" />
+							<f:selectItem itemLabel="Choose Theme" itemValue="" />
 							<f:selectItems value="#{themeSwitcherView.themes}" />
 						</p:themeSwitcher>
 						<p:message for="themeSwitcher" />

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

@@ -98,6 +98,14 @@
 
 					</div>
 					<div id="header_center">
+
+
+							<h:form rendered="#{menuView.renderTopmenuChanger}">
+								<p:button outcome="/index" value="#{i18n['mode.user']}" />
+								<p:button outcome="/useradmin/list" value="#{i18n['mode.admin']}" />
+							</h:form>
+
+
 						<ui:fragment rendered="#{layoutView.canManageContent}">
 							<div>
 								<h:form>
@@ -116,12 +124,43 @@
 			</p:layoutUnit>
 
 			<p:layoutUnit header="#{i18n['menu']}" collapsible="true" id="leftpanel" position="west" resizable="true" size="200" minSize="100" >
+
+				<p:fieldset rendered="#{sessionHandler.loggedIn}">
+					<h:outputText value="#{i18n['template.loggedInAs']}" />
+					<br />
+					<b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b>
+					<br />
+					<h:link outcome="/auth/logout">
+						<h:outputText value="#{i18n['login.logout']}" />
+					</h:link>
+				</p:fieldset>
+				<br />
+
+
 				<nav>
 					<h:form id="mainMenu">
 						<p:panelMenu id="panelmenu" model="#{primeMenuView.menuModel}" />
 					</h:form>
 					<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
 				</nav>
+<br />
+				<p:fieldset rendered="#{!sessionHandler.loggedIn}">
+					<div style="text-align: left; padding: 0.7em;">
+						<h:form>
+							<p:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
+							<br />
+							<p:password styleClass="form" id="linepwd" value="#{authView.password}" />
+							<br />
+							<p:commandButton styleClass="button" id="onelinesubmit" action="#{authView.executeLoginAction}" ajax="false" value="#{i18n['login.submit']}" />
+						</h:form>
+						<ui:fragment rendered="#{authView.canCreateUser}">
+							<h:link value="#{i18n['submenu.user.create']}" outcome="/user/create" />
+							<br />
+						</ui:fragment>
+						<h:link value="#{i18n['submenu.auth.sendResetMail']}" outcome="/auth/sendResetMail" />
+
+					</div>
+				</p:fieldset>
 			</p:layoutUnit>
 
 			<p:layoutUnit position="center">
@@ -169,47 +208,6 @@
 
 			</p:layoutUnit>
 
-			<p:layoutUnit  header="#{i18n['user.info']}" resizable="true" collapsible="true" id="rightpanel" position="east">
-
-
-
-				<p:fieldset rendered="#{sessionHandler.loggedIn}">
-					<h:outputText value="#{i18n['template.loggedInAs']}" />
-					<br />
-					<b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b>
-					<br />
-					<h:link outcome="/auth/logout">
-						<h:outputText value="#{i18n['login.logout']}" />
-					</h:link>
-				</p:fieldset>
-				<p:fieldset rendered="#{!sessionHandler.loggedIn}">
-					<div style="text-align: left; padding: 0.7em;">
-						<h:form>
-							<p:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
-							<br />
-							<p:password styleClass="form" id="linepwd" value="#{authView.password}" />
-							<br />
-							<p:commandButton styleClass="button" id="onelinesubmit" action="#{authView.executeLoginAction}" ajax="false" value="#{i18n['login.submit']}" />
-						</h:form>
-						<ui:fragment rendered="#{authView.canCreateUser}">
-							<h:link value="#{i18n['submenu.user.create']}" outcome="/user/create" />
-							<br />
-						</ui:fragment>
-						<h:link value="#{i18n['submenu.auth.sendResetMail']}" outcome="/auth/sendResetMail" />
-
-					</div>
-				</p:fieldset>
-
-				<br />
-
-				<p:fieldset legend="#{i18n['mode.title']}" rendered="#{menuView.renderTopmenuChanger}">
-					<h:form>
-						<p:button outcome="/index" value="#{i18n['mode.user']}" />
-						<br />
-						<p:button outcome="/useradmin/list" value="#{i18n['mode.admin']}" />
-					</h:form>
-				</p:fieldset>
-			</p:layoutUnit>
 		</p:layout>
 
 		<h:form>

code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionHandler.java

@@ -92,7 +92,7 @@ public class SessionHandler {
 		if(theme == null) {
 			theme = eventbean.getCurrentEvent().getTheme();
 		}
-		if (theme == null) {
+		if (theme == null || theme.trim().isEmpty()) {
 			// primefaces default theme
 			theme = "aristo";
 		}
@@ -124,7 +124,7 @@ public class SessionHandler {
 			template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
 		}
 		if (template == null) {
-			template = "insomnia2";
+			template = "primelayout";
 
 		}
 		return template;