From: Roland Häder Date: Wed, 19 Apr 2017 14:07:36 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0e227fe95ceb3a1eb1f022317a174ede84543f96;p=jjobs-war.git Please cherry-pick: - used h:outputText to wrap text ... this is a WUI (like a GUI) and text elements should be wrapped into JSF tags Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java index dc3785b6..2f31e6b0 100644 --- a/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java +++ b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java @@ -103,7 +103,7 @@ public class JobsMobileNumberConverter implements Converter { } // Trace message - // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: cellphone={0} - EXIT!", cellphone)); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: mobileNumber={0} - EXIT!", mobileNumber)); //NOI18N // Return it return mobileNumber; diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index e7e19ac0..7f043630 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -123,8 +123,8 @@ MENU_LOGOUT_TITLE=Ausloggen CLICK_HERE=hier GUEST_ALREADY_USER_CONTINUE_LOGIN_1=Sie sind bereits angemeldet? Dann GUEST_ALREADY_USER_CONTINUE_LOGIN_2=einloggen. -PAGE_TITLE_LOGIN_HOME=Willkommen zum Benutzerbereich -CONTENT_TITLE_LOGIN_HOME=\u00dcbersicht Ihrer Bewerbungen: +PAGE_TITLE_USER_LOGIN_HOME=Willkommen zum Benutzerbereich +CONTENT_TITLE_USER_LOGIN_HOME=\u00dcbersicht Ihrer Bewerbungen: LINK_LOGIN_LOGOUT=Ausloggen COUNTRY_GERMANY=Deutschland COUNTRY_PHILIPPINES=Philippinen @@ -223,7 +223,6 @@ PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Ihre persoenlichen Daten aendern CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Aendern Ihrer Adresse, Telefonnummer usw.: LOGIN_MESSAGE_DATA_SAVED=Daten wurden gespeichert. PAGE_TITLE_LOGIN_DATA_SAVED=Ihre Daten wurden gespeichert -CONTENT_TITLE_LOGIN_DATA_SAVED=Daten wurden gespeichert: LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie Ihre Email-Adresse: LOGIN_USER_CHANGE_EMAIL_LEGEND=Email-Adresse \u00e4ndern: LOGIN_USER_CHANGE_EMAIL_LEGEND_TITLE=Hier k\u00f6nnen Sie Ihre Email-Adresse \u00e4ndern. Dazu m\u00fcssen Sie diese zweimal eingeben und die neue Adresse best\u00e4tigen. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index cb70030b..c143bc9a 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -123,8 +123,8 @@ MENU_LOGOUT_TITLE=Logout CLICK_HERE=here GUEST_ALREADY_USER_CONTINUE_LOGIN_1=Already registered? Then click GUEST_ALREADY_USER_CONTINUE_LOGIN_2=to login. -PAGE_TITLE_LOGIN_HOME=Welcome to user area -CONTENT_TITLE_LOGIN_HOME=Overview of your applications: +PAGE_TITLE_USER_LOGIN_HOME=Welcome to user area +CONTENT_TITLE_USER_LOGIN_HOME=Overview of your applications: LINK_LOGIN_LOGOUT=Logout PAGE_TITLE_LOGIN_AREA=User area COUNTRY_GERMANY=Germany diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index f9126cf0..a47f1bf5 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -7,13 +7,9 @@ > -<<<<<<< HEAD -======= - #{msg.PAGE_TITLE_LOGIN_FOO} ->>>>>>> 1b276cd... Cleanups: diff --git a/web/admin/mobile/admin_cellphone_delete.xhtml b/web/admin/mobile/admin_cellphone_delete.xhtml new file mode 100644 index 00000000..072aae18 --- /dev/null +++ b/web/admin/mobile/admin_cellphone_delete.xhtml @@ -0,0 +1,25 @@ + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE} + + + + + + + Here goes your content. + + + diff --git a/web/admin/mobile/admin_cellphone_show.xhtml b/web/admin/mobile/admin_cellphone_show.xhtml new file mode 100644 index 00000000..71fb8338 --- /dev/null +++ b/web/admin/mobile/admin_cellphone_show.xhtml @@ -0,0 +1,92 @@ + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_SHOW_CELLPHONE} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    +
  • + + + + + +
    • +
+
+ + + + + diff --git a/web/admin/mobile/admin_contact_cellphone_list.xhtml b/web/admin/mobile/admin_contact_cellphone_list.xhtml new file mode 100644 index 00000000..b8c0d07b --- /dev/null +++ b/web/admin/mobile/admin_contact_cellphone_list.xhtml @@ -0,0 +1,27 @@ + + + + + #{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE} + + + + + + + + + + + + + + + + diff --git a/web/admin/mobile/admin_contact_cellphone_unlink.xhtml b/web/admin/mobile/admin_contact_cellphone_unlink.xhtml new file mode 100644 index 00000000..fadc8b53 --- /dev/null +++ b/web/admin/mobile/admin_contact_cellphone_unlink.xhtml @@ -0,0 +1,26 @@ + + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE} + + + + + + + Here goes your content. + + + diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index 548f8898..74860144 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -21,7 +21,7 @@ - #{msg.CONTENT_TITLE_ADMIN_LOCK_USER} + diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml new file mode 100644 index 00000000..5ee98148 --- /dev/null +++ b/web/guest/user/login.xhtml @@ -0,0 +1,43 @@ + + + + + #{msg.PAGE_TITLE_USER_LOGIN} + + + + + + + + +
+ + + +
+ + +
+ +
+ + +
+ +
+ + + + + + + + + diff --git a/web/guest/user/show_addressbook.xhtml b/web/guest/user/show_addressbook.xhtml deleted file mode 100644 index 6a1aa0b9..00000000 --- a/web/guest/user/show_addressbook.xhtml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK} - #{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK} - - - #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK} - - - - - #{msg.TABLE_HEADER_SHOW_ADDRESSBOOK} - - #{msg.ADDRESSBOOK_NAME} - - - #{msg.ADDRESSBOOK_OWNER} - - - - - #{msg.ADDRESSBOOK_CREATED} - - - - - #{msg.ADDRESSBOOK_STATUS} - - - - - - - - - - - - - - diff --git a/web/guest/user/show_addressbook_entries.xhtml b/web/guest/user/show_addressbook_entries.xhtml deleted file mode 100644 index 88472995..00000000 --- a/web/guest/user/show_addressbook_entries.xhtml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} - - - #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} - - - - Here goes your content. - - - diff --git a/web/logout.xhtml b/web/logout.xhtml deleted file mode 100644 index eeed5167..00000000 --- a/web/logout.xhtml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - #{msg.PAGE_TITLE_INDEX_LOGOUT} - - - #{msg.CONTENT_TITLE_INDEX_LOGOUT} - - - - Here goes your content. - - - diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml index 0af70f0d..ffb94fcb 100644 --- a/web/user/login_add_addressbook.xhtml +++ b/web/user/login_add_addressbook.xhtml @@ -30,7 +30,7 @@
- +
diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index e92ea8fe..2e95fcc8 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -13,7 +13,7 @@ - + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 3dde1ed8..96a0f0f1 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -11,7 +11,7 @@ #{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA} - #{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA} + diff --git a/web/user/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml new file mode 100644 index 00000000..5e3c94ea --- /dev/null +++ b/web/user/login_list_sharing_addressbooks.xhtml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + #{msg.PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS} + + + #{msg.CONTENT_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS} + + + + + + Here goes your content. + + + + + + + + + + + + + diff --git a/web/user/login_other_addressbooks.xhtml b/web/user/login_other_addressbooks.xhtml new file mode 100644 index 00000000..84602842 --- /dev/null +++ b/web/user/login_other_addressbooks.xhtml @@ -0,0 +1,28 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS} + + + #{msg.CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS} + + + + + Here goes your content. + + + + + + + + diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml index d8fb15f5..126fa9f8 100644 --- a/web/user/login_own_addressbooks.xhtml +++ b/web/user/login_own_addressbooks.xhtml @@ -16,7 +16,7 @@ - +
#{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS} @@ -57,7 +57,7 @@
- + diff --git a/web/user/login_shared_addressbooks.xhtml b/web/user/login_shared_addressbooks.xhtml new file mode 100644 index 00000000..94b3db87 --- /dev/null +++ b/web/user/login_shared_addressbooks.xhtml @@ -0,0 +1,66 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS} + + + #{msg.CONTENT_TITLE_LOGIN_SHARED_ADDRESSBOOKS} + + + + +
+
+ #{msg.LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS} +
+ +
+ + + #{msg.SHARED_ADDRESSBOOK} + + + + + + + + + #{msg.SHAREE_USER_NAME} + + + + + + + #{msg.SHARE_CREATED} + + + + + +
+ +
+ +
+ +
+ +
+
+ + + + + + + + diff --git a/web/user/login_start_sharing_addressbook.xhtml b/web/user/login_start_sharing_addressbook.xhtml new file mode 100644 index 00000000..aebbdd02 --- /dev/null +++ b/web/user/login_start_sharing_addressbook.xhtml @@ -0,0 +1,70 @@ + + + + + + #{msg.PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK} + + + #{msg.CONTENT_TITLE_LOGIN_START_SHARING_ADDRESSBOOK} + + + + +
+ +
+ #{msg.TABLE_HEADER_CHOOSE_USER_FOR_SHARING} +
+ +
+ + + + + + #{msg.USER_ID} + + + + + #{msg.USER_NAME} + + + + + + + #{msg.LOGIN_START_SHARING_TITLE} + + + + + + + + + +
+ +
+
    +
  • #{msg.LOGIN_START_SHARING_NOTICE1}
    • +
  • #{msg.LOGIN_START_SHARING_NOTICE2}
    • +
+
+
+ + + + + + + + diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index ceb7b32c..e8f52fda 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 1cd19d20..d55eb2be 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml index a1fd6f19..32286f30 100644 --- a/web/user/login_user_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -14,7 +14,7 @@ - + diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml index 1eceebde..4de72ddf 100644 --- a/web/user/login_user_contact_data_saved.xhtml +++ b/web/user/login_user_contact_data_saved.xhtml @@ -13,7 +13,7 @@ - + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index 91818480..ddb9e96b 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -13,7 +13,7 @@ - +