]> 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: 0f24810)
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Wed, 19 Apr 2017 15:41:08 +0000 (17:41 +0200)
committerRoland Häder <roland@mxchange.org>
Wed, 19 Apr 2017 15:49:02 +0000 (17:49 +0200)
- text should be wrapped in h:outputText as this is like a GUI for web browsers

Signed-off-by: Roland Häder <roland@mxchange.org>
web/admin/mobile/admin_contact_mobile_list.xhtml patch | blob | history
web/admin/mobile/admin_contact_mobile_unlink.xhtml patch | blob | history
web/guest/user/login.xhtml patch | blob | history
web/user/login_contact_data_saved.xhtml [new file with mode: 0644] patch | blob
web/user/login_edit_user_data.xhtml patch | blob | history

diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml
index b8c0d07bcfaae20ef0323b4fd43ca00d5ee4c1ba..17b42720b836e9fea46b63126c77c8496e0c1c85 100644 (file)
--- a/web/admin/mobile/admin_contact_mobile_list.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_list.xhtml
@@ -8,7 +8,9 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}" />
+               </ui:define>
 
                <ui:define name="content_header">
                        <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}" />
diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index fadc8b530484b291e76818339ad3104e87a92ca1..836c6acaac087ccff38e22465e4d3def3beb853f 100644 (file)
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -13,7 +13,9 @@
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}" />
+               </ui:define>
 
                <ui:define name="content_header">
                        <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}" />
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index 5ee98148bf5abb712e14825dc5fe28a5f651d0b3..ffe5e52513bdfa04f66876970353b304991c370f 100644 (file)
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -8,7 +8,9 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
+               </ui:define>
 
                <ui:define name="content_header">
                        <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN}" />
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
new file mode 100644 (file)
index 0000000..b2807f0
--- /dev/null
+++ b/web/user/login_contact_data_saved.xhtml
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+       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"
+       >
+
+       <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
+               </ui:define>
+
+               <ui:define name="content_header">
+                       <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
+               </ui:define>
+
+               <ui:define name="content">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+                               <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                                       <ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+                               </ui:include>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       </ui:fragment>
+
+                       <h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+
+                       <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+                               <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+                       </ui:fragment>
+               </ui:define>
+       </ui:composition>
+</html>
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 96a0f0f1f155534c232a7b60ff859e603198b3b7..73e9e26214ce563ca95fc442ca2c9d385cb94079 100644 (file)
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -8,7 +8,9 @@
        >
 
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>
+               <ui:define name="login_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
+               </ui:define>
 
                <ui:define name="content_header">
                        <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}" />
Unnamed repository; edit this file 'description' to name the repository.