From: Roland Häder Date: Wed, 19 Apr 2017 14:52:47 +0000 (+0200) Subject: Continued porting templates: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8937525cfc9600503415f5cf361f3428c51920b7;p=addressbook-war.git Continued porting templates: - added a lot missing templates which are used for handling fax/land-line numbers - no more cellphone, now all mobiles are welcome ... - renamed files as they belong to user (not generic) Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 37d27da8..a234dd04 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -122,8 +122,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 diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 447ee6d8..44dc0a2a 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -122,8 +122,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/faces-config.xml b/web/WEB-INF/faces-config.xml index ad91027e..9d8871b5 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -163,11 +163,11 @@ user_show_addressbook - /guest/user/show_addressbook.xhtml + /guest/user/user_show_addressbook.xhtml show_addressbook_entries - /guest/user/show_addressbook_entries.xhtml + /guest/user/user_show_addressbook_entries.xhtml @@ -178,7 +178,7 @@ - /guest/user/show_addressbook.xhtml + /guest/user/user_show_addressbook.xhtml login_start_sharing_addressbook /user/login_start_sharing_addressbook.xhtml @@ -188,7 +188,7 @@ /user/login_shared_addressbooks.xhtml user_show_addressbook - /guest/user/show_addressbook.xhtml + /guest/user/user_show_addressbook.xhtml diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index faec4153..7e5a13f3 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_ADMIN_LOGOUT} + + + @@ -16,7 +18,7 @@ -
+
@@ -26,10 +28,9 @@
- +
diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/cellphone/admin_cellphone_delete.xhtml deleted file mode 100644 index 072aae18..00000000 --- a/web/admin/cellphone/admin_cellphone_delete.xhtml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE} - - - - - - - Here goes your content. - - - diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/cellphone/admin_cellphone_edit.xhtml deleted file mode 100644 index e48c4042..00000000 --- a/web/admin/cellphone/admin_cellphone_edit.xhtml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_EDIT_CELLPHONE} - - - - - - - Here goes your content. - - - diff --git a/web/admin/cellphone/admin_cellphone_show.xhtml b/web/admin/cellphone/admin_cellphone_show.xhtml deleted file mode 100644 index bd140ab7..00000000 --- a/web/admin/cellphone/admin_cellphone_show.xhtml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_SHOW_CELLPHONE} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
    - -
-
-
-
-
-
- diff --git a/web/admin/cellphone/admin_contact_cellphone_list.xhtml b/web/admin/cellphone/admin_contact_cellphone_list.xhtml deleted file mode 100644 index 2881b151..00000000 --- a/web/admin/cellphone/admin_contact_cellphone_list.xhtml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - #{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE} - - - - - - - - - - - - - - - - diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml deleted file mode 100644 index fadc8b53..00000000 --- a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE} - - - - - - - Here goes your content. - - - diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index c332e485..9707352b 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -7,23 +7,32 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - - #{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT} + + + + + + + + + + - + + + + + + -
+
@@ -34,13 +43,13 @@
- + -
+
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 2026b38f..000a0b7d 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -7,23 +7,32 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - - #{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT} + + + + + + + + + + - + + + + + + -
+
@@ -39,10 +48,10 @@ -
+
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index 6ba68ed4..e42651ff 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -9,21 +9,30 @@ xmlns:p="http://primefaces.org/ui"> - #{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT} + + + - - + + + + + + + + + - + @@ -120,10 +129,10 @@ - + - + @@ -153,7 +162,7 @@ -
+
@@ -167,7 +176,7 @@
-
+
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 5a101fd7..5f2cae8c 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -8,20 +8,29 @@ > - #{msg.PAGE_TITLE_ADMIN_LIST_CONTACT} + + + - + + + + + + + + - + @@ -69,8 +78,8 @@ -
- + +
@@ -82,11 +91,11 @@ -
-
+ +
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index facf5b99..b8368b89 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -7,30 +7,49 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - - #{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT} + + + + + + + + + + - + + + + + + + + + + +
+ +
- +
+ +
-
- -
+
+ +
-
- -
+
+ +
+
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml new file mode 100644 index 00000000..92b938f3 --- /dev/null +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ + + + +
+ +
+ + + + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
+
+ diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml new file mode 100644 index 00000000..83c4aec9 --- /dev/null +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ + + + +
+ +
+ + + + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
+
+ diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml new file mode 100644 index 00000000..ef2a67d5 --- /dev/null +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ + + + +
+ +
+ + + + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
+
+ diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml index cfe3270c..256dc932 100644 --- a/web/admin/country/admin_country_delete.xhtml +++ b/web/admin/country/admin_country_delete.xhtml @@ -1,3 +1,4 @@ + - #{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY} + + + diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml index 6183baa3..f52766e4 100644 --- a/web/admin/country/admin_country_edit.xhtml +++ b/web/admin/country/admin_country_edit.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY} + + + diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index 21463e08..d821574a 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY} + + + @@ -52,7 +54,7 @@ -
+
@@ -60,10 +62,10 @@ -
+
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml new file mode 100644 index 00000000..6c575941 --- /dev/null +++ b/web/admin/fax/admin_fax_delete.xhtml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ +
+ +
+ + +
+
+ + + + + + + +
+
+ diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml new file mode 100644 index 00000000..984dcfe2 --- /dev/null +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + +
+
+ + + + + + + +
+
+ diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml new file mode 100644 index 00000000..e6606f80 --- /dev/null +++ b/web/admin/fax/admin_fax_list.xhtml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml new file mode 100644 index 00000000..1c2773d3 --- /dev/null +++ b/web/admin/fax/admin_fax_show.xhtml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    + +
+
+
+
+
+
+ diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml index c764ee06..4f9e2292 100644 --- a/web/admin/index.xhtml +++ b/web/admin/index.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_ADMIN_WELCOME} + + + diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml new file mode 100644 index 00000000..a3a1bbba --- /dev/null +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ +
+ +
+ + +
+
+ + + + + + + +
+
+ diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml new file mode 100644 index 00000000..ce87dc57 --- /dev/null +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + +
+
+ + + + + + + +
+
+ diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml new file mode 100644 index 00000000..354478e6 --- /dev/null +++ b/web/admin/landline/admin_landline_list.xhtml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml new file mode 100644 index 00000000..e14c2bc7 --- /dev/null +++ b/web/admin/landline/admin_landline_show.xhtml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    + +
+
+
+
+
+
+ diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml new file mode 100644 index 00000000..b8c0d07b --- /dev/null +++ b/web/admin/mobile/admin_contact_mobile_list.xhtml @@ -0,0 +1,27 @@ + + + + + #{msg.PAGE_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 new file mode 100644 index 00000000..fadc8b53 --- /dev/null +++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml @@ -0,0 +1,26 @@ + + + + + + + + + + #{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE} + + + + + + + Here goes your content. + + + diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml new file mode 100644 index 00000000..de23aa3f --- /dev/null +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ +
+ +
+ + +
+
+ + + + + + + +
+
+ diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml new file mode 100644 index 00000000..88328ed0 --- /dev/null +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + +
+
+ + + + + + + +
+
+ diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml new file mode 100644 index 00000000..6c4dcad1 --- /dev/null +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml new file mode 100644 index 00000000..8332a7c1 --- /dev/null +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + #{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    + +
+
+
+
+
+
+ diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml index 04eba36c..1553f750 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE} + + + diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml index 16242a6d..b4a05224 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT} + + + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index 557e4726..6593d0d7 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -8,14 +8,16 @@ > - #{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST} + + + - + @@ -62,7 +64,7 @@ -
+
@@ -70,10 +72,10 @@ -
+
diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml index 85ed97ce..fb95c150 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER} + + + diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml new file mode 100644 index 00000000..84858cab --- /dev/null +++ b/web/admin/user/admin_user_activity_log.xhtml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index d6d207cb..f62ff88c 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -7,22 +7,63 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - - #{msg.PAGE_TITLE_ADMIN_DELETE_USER} + + + + + + + + + + - + + + + + + + + + +
+ + + + +
+ +
+ +
+ + + +
+
+ +
+ +
+ +
+ +
+
- Here goes your content. + +
+
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index b9fc96cb..9d8c1263 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -8,29 +8,38 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - - #{msg.PAGE_TITLE_ADMIN_EDIT_USER} + + + + + + + + + + - + + + + + + -
+
- #{msg.ADMIN_EDIT_USER_TITLE} +
- #{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE} +
@@ -38,10 +47,10 @@ -
+
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 0d87a41a..49638be8 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -5,19 +5,27 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core" - xmlns:p="http://primefaces.org/ui"> - #{msg.PAGE_TITLE_ADMIN_EXPORT_USER} + + + - - + + + + + + + + + @@ -138,10 +146,10 @@ - + - + @@ -171,7 +179,7 @@ -
+
@@ -185,7 +193,7 @@
-
+
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index f6a238f6..02a58ddb 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -8,14 +8,23 @@ > - #{msg.PAGE_TITLE_ADMIN_LIST_USER} + + + - + + + + + + + + @@ -26,13 +35,15 @@ - - - - + + + + + - - + + + @@ -85,14 +96,15 @@ -
+
-
-
+ +
+
@@ -103,8 +115,7 @@
- - + @@ -116,17 +127,24 @@
- + +
+ + +
+
- + + + -
+
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index 1468eaca..74860144 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -8,23 +8,32 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - - #{msg.PAGE_TITLE_ADMIN_LOCK_USER} + + + + + + + + + + - + + + + + + -
+
@@ -38,7 +47,7 @@
- +
@@ -48,7 +57,7 @@
- +
@@ -58,7 +67,7 @@
- +
@@ -68,21 +77,27 @@
- - - +
- +
- + + + + + + + + +
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml new file mode 100644 index 00000000..036f97cc --- /dev/null +++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ +
+ +
+ +
+ +
+ + +
+
+ + + + + + + + + + +
+
+ diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index e92cee10..cbe6b44a 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -7,184 +7,46 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - - - #{msg.PAGE_TITLE_ADMIN_SHOW_USER} + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
- - - -
-
+
+ +
-
- +
+
-
- +
+
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index d5b45feb..ec1edd88 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -7,23 +7,32 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - - - + + + + + + - #{msg.PAGE_TITLE_ADMIN_UNLOCK_USER} + + + - + + + + + + -
+
@@ -32,56 +41,86 @@
-
+
+ +
+ +
+ + + +
+
+ +
+
-
+
-
+
-
+
-
+
-
+
-
- +
+
-
- +
+ + + +
+
+ +
+
+ +
- +
+
-
+ - + + + + + + + + + diff --git a/web/exception.xhtml b/web/exception.xhtml index 296d7284..0e145b20 100644 --- a/web/exception.xhtml +++ b/web/exception.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_EXCEPTION_THROWN} + + + diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml deleted file mode 100644 index c38d0f63..00000000 --- a/web/guest/user/confirm_account.xhtml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - #{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT} - - - - - - - - -
-
- -
- -
- - - - - -
-
-
- - - - -
- - - - -
-
- diff --git a/web/guest/user/login_error.xhtml b/web/guest/user/login_error.xhtml deleted file mode 100644 index ed3a6deb..00000000 --- a/web/guest/user/login_error.xhtml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - #{msg.PAGE_TITLE_USER_LOGIN_ERROR} - - - - - - - Hier kommt die Fehlermeldung hin. - - - diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml deleted file mode 100644 index 2227657d..00000000 --- a/web/guest/user/lost_passwd.xhtml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - #{msg.PAGE_TITLE_USER_LOST_PASSWORD} - - - - - - - -
- -
-
- -
- -
- - - - -
-
- -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
- -
-
- -
- - -
-
-
-
- - - - -
-
- diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml deleted file mode 100644 index 32b24579..00000000 --- a/web/guest/user/register.xhtml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - #{msg.PAGE_TITLE_USER_REGISTER} - - - - - - - - -
- - - -
-
- -
- - - - - - - -
-
- - - - -
-
- diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml deleted file mode 100644 index c0e4757c..00000000 --- a/web/guest/user/register_done.xhtml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - #{msg.PAGE_TITLE_USER_REGISTER_DONE} - - - - - - -
- -
- -
- -
-
-
- diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/register_page2.xhtml deleted file mode 100644 index d6176438..00000000 --- a/web/guest/user/register_page2.xhtml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - #{msg.PAGE_TITLE_USER_REGISTER_PAGE2} - - - - - - - - -
- #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} - - #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2} -
-
- -
- -
-
- - - - -
-
- diff --git a/web/guest/user/resend_done.xhtml b/web/guest/user/resend_done.xhtml deleted file mode 100644 index 3c2ae96a..00000000 --- a/web/guest/user/resend_done.xhtml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - #{msg.PAGE_TITLE_USER_RESEND_DONE} - - - - - - - - - - - - diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml deleted file mode 100644 index b4d2f8be..00000000 --- a/web/guest/user/resend_link.xhtml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - #{msg.PAGE_TITLE_INDEX_RESEND_LINK} - - - - - - - -
-
- -
- -
- - - - -
-
- -
- -
- - - -
-
-
- -
- -
- -
- -
- - -
-
- - -
-
- 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/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml new file mode 100644 index 00000000..f394d378 --- /dev/null +++ b/web/guest/user/user_confirm_account.xhtml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + +
+
+ + + + + + + +
+ + + + + + + +
+
+ diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index 897b9ef9..38fcfdbc 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -2,57 +2,45 @@ + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core"> - #{msg.PAGE_TITLE_USER_LIST} + + + - -
-
- -
- - - - #{msg.USER_NAME} - - - - - - - #{msg.USER_CREATED} - - - - - #{msg.USER_CREATED} - - - - - #{msg.USER_LIST_SHARING_ADDRESSBOOKS} - - - - - - - - - - + +
+
- + + + #{msg.USER_NAME} + + + + + + + #{msg.USER_CREATED} + + + +
> + + + + + + diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml new file mode 100644 index 00000000..fe615ac7 --- /dev/null +++ b/web/guest/user/user_login.xhtml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + +
+ + + + + + + +
+
+ diff --git a/web/guest/user/user_login_error.xhtml b/web/guest/user/user_login_error.xhtml new file mode 100644 index 00000000..03d80839 --- /dev/null +++ b/web/guest/user/user_login_error.xhtml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + Hier kommt die Fehlermeldung hin. + + + diff --git a/web/guest/user/user_lost_passwd.xhtml b/web/guest/user/user_lost_passwd.xhtml new file mode 100644 index 00000000..2d6a6a06 --- /dev/null +++ b/web/guest/user/user_lost_passwd.xhtml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + +
+ + +
+ +
+ +
+ + + + +
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+ +
+ + +
+
+
+
+ + + + + + + +
+
+ diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index ec67dbcc..55f8af2a 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -6,16 +6,23 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - - - - - - - - #{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE} - #{msg.PAGE_TITLE_INDEX_USER_PROFILE} + + + + + + + + + + + + + + + + @@ -27,7 +34,12 @@ - + + + + + +
@@ -41,7 +53,10 @@ - + + + + diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml new file mode 100644 index 00000000..17c6ad47 --- /dev/null +++ b/web/guest/user/user_register.xhtml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + +
+ + + + + +
+
+ +
+ + + + + + + +
+
+ + + + + + + + + + + + + + +
+
+ diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml new file mode 100644 index 00000000..65b3bda1 --- /dev/null +++ b/web/guest/user/user_register_done.xhtml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + +
+ +
+ +
+ +
+
+
+ diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml new file mode 100644 index 00000000..35557e62 --- /dev/null +++ b/web/guest/user/user_register_page2.xhtml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + +
+ #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} + + #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2} +
+
+ +
+ +
+
+ + + + + + + +
+
+ diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml new file mode 100644 index 00000000..c062782f --- /dev/null +++ b/web/guest/user/user_resend_done.xhtml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml new file mode 100644 index 00000000..c4da123a --- /dev/null +++ b/web/guest/user/user_resend_link.xhtml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+
+ +
+ +
+ + + +
+
+
+ + + + + +
+ +
+ + +
+
+ + + + + + + +
+
+ diff --git a/web/guest/user/user_show_addressbook.xhtml b/web/guest/user/user_show_addressbook.xhtml new file mode 100644 index 00000000..6a1aa0b9 --- /dev/null +++ b/web/guest/user/user_show_addressbook.xhtml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + #{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/user_show_addressbook_entries.xhtml b/web/guest/user/user_show_addressbook_entries.xhtml new file mode 100644 index 00000000..88472995 --- /dev/null +++ b/web/guest/user/user_show_addressbook_entries.xhtml @@ -0,0 +1,22 @@ + + + + + + #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} + + + #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} + + + + Here goes your content. + + + diff --git a/web/imprint.xhtml b/web/imprint.xhtml index 91448b82..3a54f92c 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_INDEX_IMPRINT} + + + diff --git a/web/index.xhtml b/web/index.xhtml index b34c72cd..8273fa14 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -8,14 +8,30 @@ > - #{msg.PAGE_TITLE_INDEX_WELCOME} + + + - Default content + +
+ + + +
+ +
+ +
+
+ + + +
diff --git a/web/privacy.xhtml b/web/privacy.xhtml index 0a113dee..01a29d18 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_INDEX_PRIVACY} + + + diff --git a/web/terms.xhtml b/web/terms.xhtml index 6b4a3b65..c6be672e 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_INDEX_TERMS} + + + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index 2a063464..2e95fcc8 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -8,14 +8,16 @@ > - #{msg.PAGE_TITLE_LOGIN_DATA_SAVED} + + + - + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index 7a892786..c8f9c836 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -8,10 +8,12 @@ > - #{msg.PAGE_TITLE_LOGIN_HOME} + + + - + diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml index 7b55cc85..10efa901 100644 --- a/web/user/login_logout.xhtml +++ b/web/user/login_logout.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_LOGIN_USER_LOGOUT} + + + @@ -16,7 +18,7 @@ -
+
@@ -26,10 +28,9 @@
-
+ diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index 95827a75..e8f52fda 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -1,3 +1,4 @@ + - - #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS} + + + + - -
-
- -
- - -
-
- - - + +
+ +
-
-
- -
+ +
+
+ + + -
- -
+
+
+ +
-
+
+
- -
-
+
+
- + +
+
- -
-
-
+ - + + + - - + + + + + - - + +
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 339571e0..d55eb2be 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -1,3 +1,4 @@ + - #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_PASSWORD} + + + - - -
-
- -
- - -
-
- - - + + + + + -
-
- -
+ + +
+ +
-
- -
+ +
+
+ + + -
+
+
+
-
- +
+
-
-
- -
- -
- -
+
+
-
-
+ + + -
- +
+
+
-
-
- -
- -
- -
- -
+
+
-
- -
-
-
- - -
-
+
+
- + + + + +
- -
+ - - - + + + +
+ + + + + + + + + + +
diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml index 0e330310..32286f30 100644 --- a/web/user/login_user_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -1,3 +1,4 @@ + - #{msg.PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA} + + + - -
-
- -
+ +
+ +
- - + + - + - + - - -
+ + + + + + + + + - - diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml new file mode 100644 index 00000000..4de72ddf --- /dev/null +++ b/web/user/login_user_contact_data_saved.xhtml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index dd0a2451..ddb9e96b 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -8,7 +8,9 @@ > - #{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED} + + +