]> git.mxchange.org Git - jjobs-war.git/commitdiff
projects / jjobs-war.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 84ea260)
added initial login templates and navigation rules
authorRoland Haeder <roland@mxchange.org>
Wed, 7 Oct 2015 10:42:06 +0000 (12:42 +0200)
committerRoland Haeder <roland@mxchange.org>
Mon, 2 May 2016 20:17:28 +0000 (22:17 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
web/WEB-INF/faces-config.xml patch | blob | history
web/WEB-INF/templates.dist/login_page.xhtml patch | blob | history
web/WEB-INF/templates/login/login_base.tpl patch | blob | history
web/WEB-INF/templates/login/login_menu.tpl patch | blob | history
web/login/index.xhtml [new file with mode: 0644] patch | blob

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 3ad8b75fe0ed47c45930bd8394d2c5f8f88c40b0..988756c8415c2a74c698e2163a823cc91b282c07 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -100,6 +100,20 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
+<<<<<<< HEAD
+=======
+               <from-view-id>/user/login.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>login</from-outcome>
+                       <to-view-id>/login/login_index.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_index</from-outcome>
+                       <to-view-id>/login/index.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+>>>>>>> 8eb0fb9... added initial login templates and navigation rules
                <from-view-id>/user/register.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>register_done</from-outcome>
diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index c387a13442f2e6eff2f16d90af0b4d893302b1f2..a0b740762104ceb815af08ca206e75a2e515a4ba 100644 (file)
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
+<html xmlns="http://www.w3.org/1999/xhtml"
        lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
+       xmlns:ui="http://java.sun.com/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
 
        <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
 
+               <ui:define name="menu">
+                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+               </ui:define>
+
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_FOO}
+                       #{msg.SUB_TITLE_LOGIN_FOO}
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-                               Here goes your content.
-                       </ui:fragment>
+                       Here goes your content.
+               </ui:define>
 
-                       <ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-                               <ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-                       </ui:fragment>
+               <ui:define name="footer">
+                       <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
                </ui:define>
        </ui:composition>
 </html>
diff --git a/web/WEB-INF/templates/login/login_base.tpl b/web/WEB-INF/templates/login/login_base.tpl
index dafc778692108fb3ae5f4c43c7fe87dc1a97f7f4..0a2d405d1aa216e6173319b680f801aa5400eda9 100644 (file)
--- a/web/WEB-INF/templates/login/login_base.tpl
+++ b/web/WEB-INF/templates/login/login_base.tpl
@@ -2,6 +2,7 @@
 <ui:composition
        template="/WEB-INF/templates/base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
+<<<<<<< HEAD
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
@@ -19,4 +20,9 @@
        <ui:define name="footer">
                <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
        </ui:define>
+=======
+       xmlns:ui="http://java.sun.com/jsf/facelets">
+
+       <ui:define name="title">Benutzerbereich - <ui:insert name="login_title" class="login_title" /></ui:define>
+>>>>>>> b5abdb2... added initial login templates and navigation rules
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl
index 6a0fc02adf9ebfe2e274add0df21558bc681c7db..1b67a2fb91fc5963b6a9e7ca3d4af34ca241d45e 100644 (file)
--- a/web/WEB-INF/templates/login/login_menu.tpl
+++ b/web/WEB-INF/templates/login/login_menu.tpl
@@ -15,6 +15,7 @@
                                <li>
                                        <h:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="login_index" value="#{msg.LINK_LOGIN_HOME}" />
                                </li>
+
                                <li>
                                        <h:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
                                </li>
@@ -46,7 +47,11 @@
 
                        <ul>
                                <li>
-                                       <h:link title="#{msg.LINK_LOGIN_LOGOUT_TITLE}" outcome="logout" value="#{msg.LINK_LOGIN_LOGOUT}" />
+                                       <h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="login_index" value="#{msg.LINK_GUEST_HOME}" />
+                               </li>
+
+                               <li>
+                                       <h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
                                </li>
                        </ul>
                </div>
diff --git a/web/login/index.xhtml b/web/login/index.xhtml
new file mode 100644 (file)
index 0000000..dafff40
--- /dev/null
+++ b/web/login/index.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
+
+               <ui:define name="menu">
+                       <ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.SUB_TITLE_LOGIN_FOO}
+               </ui:define>
+
+               <ui:define name="content">
+                       Here goes your content.
+               </ui:define>
+
+               <ui:define name="footer">
+                       <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
+               </ui:define>
+       </ui:composition>
+</html>
Unnamed repository; edit this file 'description' to name the repository.