]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
projects / pizzaservice-war.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 45c75c2)
from merge (jjobs)
authorRoland Häder <roland@mxchange.org>
Tue, 3 May 2016 07:37:14 +0000 (09:37 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 3 May 2016 20:07:00 +0000 (22:07 +0200)
Signed-off-by: Roland Häder <roland@haeder.net>
Signed-off-by: Roland Häder <roland@mxchange.org>
web/WEB-INF/templates.dist/login_page.xhtml patch | blob | history
web/WEB-INF/templates/generic/form_personal_data.tpl patch | blob | history
web/WEB-INF/templates/login/login_menu.tpl patch | blob | history

diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index c91b0f83c8952201451994dc39c2749ffaeb6049..cccd59ba4aff878ed0605a6b8e7fa863f32da9b6 100644 (file)
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -1,18 +1,15 @@
 <?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"
-         >
+       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"
+       >
 
        <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.SUB_TITLE_LOGIN_FOO}
                </ui:define>
@@ -20,9 +17,5 @@
                <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>
diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
index cd04d70a4d16399f68deec506ff4b7158624bbc0..1285185d5657d0ed2f29371e9ed640ddea5e4761 100644 (file)
--- a/web/WEB-INF/templates/generic/form_personal_data.tpl
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -187,4 +187,32 @@
                        </div>
                </fieldset>
        </div>
+
+       <div class="para">
+               <fieldset id="user_profile">
+                       <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">#{msg.USER_PROFILE_LEGEND}</legend>
+
+                       <div class="table_row">
+                               <div class="table_left">
+                                       <h:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
+                               </div>
+
+                               <div class="table_right">
+                                       <ui:include src="/WEB-INF/templates/generic/profile_mode_selection_box.tpl" />
+                               </div>
+
+                               <div class="clear"></div>
+                       </div>
+
+                       <div class="table_row">
+                               <div class="para notice">
+                                       <ul>
+                                               <li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}</li>
+                                               <li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}</li>
+                                               <li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}</li>
+                                       </ul>
+                               </div>
+                       </div>
+               </fieldset>
+       </div>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl
index 08ce0c8fc5982f505b9ce772749066c8c2fe8564..b91fd2c8101200538a4cdb7f1b5b77f1545d3af4 100644 (file)
--- a/web/WEB-INF/templates/login/login_menu.tpl
+++ b/web/WEB-INF/templates/login/login_menu.tpl
@@ -12,8 +12,47 @@
                        </div>
 
                        <ul>
-                               <li><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>
+                               <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>
+                       </ul>
+
+                       <div class="menu_header">
+                               #{msg.MENU_EDIT_PROFILE_TITLE}
+                       </div>
+
+                       <ul>
+                               <li>
+                                       <h:link title="#{msg.LINK_LOGIN_EDIT_USER_DATA_TITLE}" outcome="login_edit_user_data" value="#{msg.LINK_LOGIN_EDIT_USER_DATA}" />
+                               </li>
+                       </ul>
+
+                       <div class="menu_header">
+                               #{msg.MENU_APPLICATIONS_TITLE}
+                       </div>
+
+                       <ul>
+                               <li>
+                                       <h:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="login_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
+                               </li>
+                       </ul>
+
+                       <div class="menu_header">
+                               #{msg.MENU_LOGOUT_TITLE}
+                       </div>
+
+                       <ul>
+                               <li>
+                                       <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>
        </div>
Unnamed repository; edit this file 'description' to name the repository.