Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 8dd484b9 by Tuomas Riihimäki
Options

Prettify login

1 parent de441eb5
Inline Side-by-side
Showing with 27 additions and 19 deletions
code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml
...@@ -21,7 +21,7 @@ ...@@ -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/style.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/template1/css/general.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> <script src="#{request.contextPath}/resources/templates/template1/js/modernizr-2.6.2.min.js"></script>
<h:outputStylesheet> <h:outputStylesheet>
.bgColor1 { .bgColor1 {
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<h:body> <h:body>
<!-- Javascript-lokalisaatiolippupuljausta --> <!-- Javascript-lokalisaatiolippupuljausta -->
<script type="text/javascript"> <script type="text/javascript">
$(document) $(document)
.ready( .ready(
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<header class="bgColor1 box"> <header class="bgColor1 box">
<div id="header_left"> <div id="header_left">
<h:link outcome="/index"> <h:link outcome="/index">
<c:choose> <c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}"> <c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" /> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
...@@ -79,15 +79,15 @@ ...@@ -79,15 +79,15 @@
</h:link> </h:link>
</div> </div>
<div id="header_center" class="flex1"> <div id="header_center" class="flex1">
<ui:fragment rendered="#{layoutView.canManageContent}"> <ui:fragment rendered="#{layoutView.canManageContent}">
<div> <div>
<h:form> <h:form>
<h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" /> <h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" />
<h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" /> <h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" />
</h:form> </h:form>
</div> </div>
</ui:fragment> </ui:fragment>
</div> </div>
<div id="header_right"> <div id="header_right">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<nav> <nav>
<div id="menu"> <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" /> <h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
</div> </div>
</nav> </nav>
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
<p:ajax update="@all" event="change" /> <p:ajax update="@all" event="change" />
</p:selectOneButton> </p:selectOneButton>
</h:form> </h:form>
<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage"> <h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage">
<f:param name="pagename" value="#{layoutView.pagepath}:top" /> <f:param name="pagename" value="#{layoutView.pagepath}:top" />
</h:link> </h:link>
...@@ -143,16 +143,24 @@ ...@@ -143,16 +143,24 @@
<aside class="flex1"> <aside class="flex1">
<div id="aside"> <div id="aside">
<div class="ui-widget-header">Login</div> <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}"> <ui:fragment rendered="#{sessionHandler.loggedIn}">
<h:outputText value="#{i18n['template.loggedInAs']}" /> <h:outputText value="#{i18n['template.loggedInAs']}" />
<br /> <br />
<b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b> <b><h:outputText value="#{sessionHandler.currentUser.nick}" /></b>
</ui:fragment> </ui:fragment>
<div> <ui:fragment rendered="#{!sessionHandler.loggedIn}">
<tools:loginLogout /> <div style="text-align: left; padding: 0.7em;">
</div> <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> </div>
<br /> <br />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!