From f4c2d5c890436a83eb0f59e2558f1a7370b4a360 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 7 Oct 2015 12:42:06 +0200 Subject: [PATCH] added initial login templates and navigation rules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/faces-config.xml | 14 +++++++++++ web/WEB-INF/templates.dist/login_page.xhtml | 27 ++++++++++---------- web/WEB-INF/templates/login/login_base.tpl | 6 +++++ web/WEB-INF/templates/login/login_menu.tpl | 7 +++++- web/login/index.xhtml | 28 +++++++++++++++++++++ 5 files changed, 68 insertions(+), 14 deletions(-) create mode 100644 web/login/index.xhtml diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 3ad8b75f..988756c8 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -100,6 +100,20 @@ +<<<<<<< HEAD +======= + /user/login.xhtml + + login + /login/login_index.xhtml + + + login_index + /login/index.xhtml + + + +>>>>>>> 8eb0fb9... added initial login templates and navigation rules /user/register.xhtml register_done diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index c387a134..a0b74076 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -1,28 +1,29 @@ - + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + > #{msg.PAGE_TITLE_LOGIN_FOO} + + + - #{msg.CONTENT_TITLE_LOGIN_FOO} + #{msg.SUB_TITLE_LOGIN_FOO} - - Here goes your content. - + Here goes your content. + - - - + + diff --git a/web/WEB-INF/templates/login/login_base.tpl b/web/WEB-INF/templates/login/login_base.tpl index dafc7786..0a2d405d 100644 --- a/web/WEB-INF/templates/login/login_base.tpl +++ b/web/WEB-INF/templates/login/login_base.tpl @@ -2,6 +2,7 @@ @@ -19,4 +20,9 @@ +======= + xmlns:ui="http://java.sun.com/jsf/facelets"> + + Benutzerbereich - +>>>>>>> b5abdb2... added initial login templates and navigation rules diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl index 6a0fc02a..1b67a2fb 100644 --- a/web/WEB-INF/templates/login/login_menu.tpl +++ b/web/WEB-INF/templates/login/login_menu.tpl @@ -15,6 +15,7 @@
    • +
    • @@ -46,7 +47,11 @@
    • - + +
      • + +
    • +
    diff --git a/web/login/index.xhtml b/web/login/index.xhtml new file mode 100644 index 00000000..dafff409 --- /dev/null +++ b/web/login/index.xhtml @@ -0,0 +1,28 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_FOO} + + + + + + #{msg.SUB_TITLE_LOGIN_FOO} + + + + Here goes your content. + + + + + + -- 2.39.5