From 8216d498088b09f39fb56d125fe780552f08ed4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 3 May 2016 09:37:14 +0200 Subject: [PATCH] from merge (jjobs) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- web/WEB-INF/templates.dist/login_page.xhtml | 17 +++----- .../templates/generic/form_personal_data.tpl | 28 ++++++++++++ web/WEB-INF/templates/login/login_menu.tpl | 43 ++++++++++++++++++- 3 files changed, 74 insertions(+), 14 deletions(-) diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index c91b0f83..cccd59ba 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -1,18 +1,15 @@ + lang="#{localizationController.language}" xml:lang="#{localizationController.language}" + 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.SUB_TITLE_LOGIN_FOO} @@ -20,9 +17,5 @@ Here goes your content. - - - diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl index cd04d70a..1285185d 100644 --- a/web/WEB-INF/templates/generic/form_personal_data.tpl +++ b/web/WEB-INF/templates/generic/form_personal_data.tpl @@ -187,4 +187,32 @@ + +
+
+ #{msg.USER_PROFILE_LEGEND} + +
+
+ +
+ +
+ +
+ +
+
+ +
+
+
    +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}
    • +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}
    • +
  • #{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}
    • +
+
+
+
+
diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl index 08ce0c8f..b91fd2c8 100644 --- a/web/WEB-INF/templates/login/login_menu.tpl +++ b/web/WEB-INF/templates/login/login_menu.tpl @@ -12,8 +12,47 @@
    -
    • -
    • +
  • + +
    • + +
  • + +
    • +
+ +
+ #{msg.MENU_EDIT_PROFILE_TITLE} +
+ +
    +
  • + +
    • +
+ +
+ #{msg.MENU_APPLICATIONS_TITLE} +
+ +
    +
  • + +
    • +
+ +
+ #{msg.MENU_LOGOUT_TITLE} +
+ +
    +
  • + +
    • + +
  • + +
-- 2.39.5