Prettify login

code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml

@@ -21,7 +21,7 @@
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/style.css" />
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/general.css" />
 		<script src="#{request.contextPath}/resources/templates/template1/js/modernizr-2.6.2.min.js"></script>
-		
+
 
 		<h:outputStylesheet>
 		.bgColor1 {
@@ -36,7 +36,7 @@
 
 
 	<h:body>
-	<!-- Javascript-lokalisaatiolippupuljausta -->
+		<!-- Javascript-lokalisaatiolippupuljausta -->
 		<script type="text/javascript">
 			$(document)
 					.ready(
@@ -62,7 +62,7 @@
 		<header class="bgColor1 box">
 			<div id="header_left">
 				<h:link outcome="/index">
-				
+
 					<c:choose>
 						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
 							<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
@@ -79,15 +79,15 @@
 				</h:link>
 			</div>
 			<div id="header_center" class="flex1">
-				
+
 				<ui:fragment rendered="#{layoutView.canManageContent}">
-						<div>
-							<h:form>
-								<h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" />
-								<h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" />
-							</h:form>
-						</div>
-					</ui:fragment>
+					<div>
+						<h:form>
+							<h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" />
+							<h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" />
+						</h:form>
+					</div>
+				</ui:fragment>
 
 			</div>
 			<div id="header_right">
@@ -103,7 +103,7 @@
 
 			<nav>
 				<div id="menu">
-					<p:panelMenu model="#{primeMenuView.menuModel}"  />
+					<p:panelMenu model="#{primeMenuView.menuModel}" />
 					<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
 				</div>
 			</nav>
@@ -115,9 +115,9 @@
 							<p:ajax update="@all" event="change" />
 						</p:selectOneButton>
 					</h:form>
-					
-					
-					
+
+
+
 					<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage">
 						<f:param name="pagename" value="#{layoutView.pagepath}:top" />
 					</h:link>
@@ -143,16 +143,24 @@
 			<aside class="flex1">
 				<div id="aside">
 					<div class="ui-widget-header">Login</div>
-					<div class="ui-widget-content" style="text-align: center">
+					<div class="ui-widget-content" style="text-align: center;">
 
 						<ui:fragment rendered="#{sessionHandler.loggedIn}">
 							<h:outputText value="#{i18n['template.loggedInAs']}" />
 							<br />
 							<b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b>
 						</ui:fragment>
-						<div>
-							<tools:loginLogout />
-						</div>
+						<ui:fragment 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>
+							</div>
+						</ui:fragment>
 					</div>
 					<br />