From: Roland Häder Date: Fri, 28 Jul 2017 23:21:02 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=539e8229a9f5a7fa5a8c07c4092174eecafd1dfe;p=jfinancials-war.git Please cherry-pick: - all outside ui:composition is being *IGNORED* (maybe only the XML header by NetBeans IDE is used) - so you have to move your DOCTYPE and html tag to Signed-off-by: Roland Häder --- diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml index ce198007..e42352cd 100644 --- a/web/WEB-INF/templates.dist/admin_page.xhtml +++ b/web/WEB-INF/templates.dist/admin_page.xhtml @@ -1,23 +1,19 @@ - - + + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml index 5640a5b2..6bbae12b 100644 --- a/web/WEB-INF/templates.dist/guest_login_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml @@ -1,23 +1,19 @@ - - + + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index 45d21ae7..5844811c 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -1,23 +1,19 @@ - - + + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml index 127d81cf..c21917a5 100644 --- a/web/WEB-INF/templates.dist/login_page.xhtml +++ b/web/WEB-INF/templates.dist/login_page.xhtml @@ -1,22 +1,19 @@ - - + + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index cfa0128b..94886e77 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -1,11 +1,12 @@ - - - - + + + + + @@ -56,4 +57,4 @@ - + diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index 7e5a13f3..7df3ccac 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -1,37 +1,33 @@ - - + + - - - - + + + - - - + + + - - - -
- -
+ + + +
+ +
-
- -
+
+ +
-
- -
- - - - - +
+ +
+ + + + diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index 535cac3f..d02fb758 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -1,57 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- -
- -
- - - -
- - -
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
+ +
+ + + +
+ + +
+ + + + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index e9314384..c6a17122 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -1,59 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
+ +
+ + + - - - - -
- - - -
- -
- -
- - - - - -
- - -
- - - - - + +
+ + +
+ + + + diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml index db0b8832..4bd0584e 100644 --- a/web/admin/contact/admin_contact_export.xhtml +++ b/web/admin/contact/admin_contact_export.xhtml @@ -1,183 +1,179 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- - - -
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ + + +
+ + + + diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index 25bf85d9..03d8c0e1 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -1,102 +1,97 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- - - -
- - -
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + +
+ + +
+ + + + diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index 0b018ccb..72b85615 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -1,56 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + + diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index 8d1ee9b9..a196acfd 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -1,76 +1,72 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - -
- -
+ + + +
+ +
-
- -
+
+ +
-
- - - -
+
+ + + +
-
- - - - -
+
+ + + + +
-
- -
- - +
+ +
+ + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml index aa4a24a4..5c6788d5 100644 --- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -1,76 +1,72 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - -
- -
+ + + +
+ +
-
- -
+
+ +
-
- - - -
+
+ + + +
-
- - - - -
+
+ + + + +
-
- -
- - +
+ +
+ + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml index 7b020fff..4735bdaf 100644 --- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -1,76 +1,72 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - -
- -
+ + + +
+ +
-
- -
+
+ +
-
- - - -
+
+ + + +
-
- - - - -
+
+ + + + +
-
- -
- - +
+ +
+ + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + diff --git a/web/admin/contact_business/admin_contact_business_list.xhtml b/web/admin/contact_business/admin_contact_business_list.xhtml index 6236b693..0aea3c40 100644 --- a/web/admin/contact_business/admin_contact_business_list.xhtml +++ b/web/admin/contact_business/admin_contact_business_list.xhtml @@ -1,97 +1,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- - - -
- - -
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + +
+ + +
+ + + + diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml index a12d698a..d4acc07a 100644 --- a/web/admin/country/admin_country_delete.xhtml +++ b/web/admin/country/admin_country_delete.xhtml @@ -1,23 +1,19 @@ - - + + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml index 9d2303d4..e1977eca 100644 --- a/web/admin/country/admin_country_edit.xhtml +++ b/web/admin/country/admin_country_edit.xhtml @@ -1,24 +1,19 @@ - - + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index 0f056e36..3498fbd0 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -1,80 +1,75 @@ - - + - - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - -
- -
- - + + +
+ +
-
- - -
- + -
- -
    -
    • -
+
+ +
- - - - + + +
+ +
    +
    • +
+
+ + + diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml index e02e874e..1c29b537 100644 --- a/web/admin/fax/admin_fax_delete.xhtml +++ b/web/admin/fax/admin_fax_delete.xhtml @@ -1,58 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- - - - -
- -
- -
- -
- -
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index ac08ee46..88707af6 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -1,52 +1,48 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - -
- - - -
+ + + +
+ + + +
- + -
- - -
- - +
+ + +
+ + - - - - - - - - - + + + + + + + + diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml index e9573610..fb577651 100644 --- a/web/admin/fax/admin_fax_list.xhtml +++ b/web/admin/fax/admin_fax_list.xhtml @@ -1,68 +1,64 @@ - - + + - - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 0d285212..9b28b3fa 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -1,96 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
    -
  • - - - - - -
    • -
-
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    +
  • + + + + + +
    • +
+
+ + + + diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml index a9c08f43..55ae8066 100644 --- a/web/admin/index.xhtml +++ b/web/admin/index.xhtml @@ -1,27 +1,22 @@ - - + - - - - + + + - - - + + + - - - Einiges kann hier eingestellt werden. - - - + + + Einiges kann hier eingestellt werden. + + diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index 2fe57c42..f04185a9 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -1,58 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- - - - -
- -
- -
- -
- -
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index f24cf7d9..28acb79a 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -1,52 +1,48 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - -
- - - -
+ + + +
+ + + +
- + -
- - -
- - +
+ + +
+ + - - - - - - - - - + + + + + + + + diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml index b1584ff5..8767fe93 100644 --- a/web/admin/landline/admin_landline_list.xhtml +++ b/web/admin/landline/admin_landline_list.xhtml @@ -1,68 +1,64 @@ - - + + - - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index e900d982..dd860e22 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -1,97 +1,93 @@ - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
    -
  • - - - - - -
    • -
-
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    +
  • + + + + + +
    • +
+
+ + + + diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml index d4e1d24c..9534375a 100644 --- a/web/admin/mobile/admin_contact_mobile_list.xhtml +++ b/web/admin/mobile/admin_contact_mobile_list.xhtml @@ -1,29 +1,25 @@ - - + + - - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml index 3e522ca8..fbf12d95 100644 --- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml +++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml @@ -1,30 +1,26 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - - - + + + + diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index c7ad3823..ab7219d3 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -1,58 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- - - - -
- -
- -
- -
- -
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index fc9381cf..ab6b2bdd 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -1,52 +1,48 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - -
- - - -
+ + + +
+ + + +
- + -
- - -
- - +
+ + +
+ + - - - - - - - - - + + + + + + + + diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml index 5230f8b7..8f0ea330 100644 --- a/web/admin/mobile/admin_mobile_list.xhtml +++ b/web/admin/mobile/admin_mobile_list.xhtml @@ -1,78 +1,74 @@ - - + + - - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index df52fa86..fa622389 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -1,96 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
    -
  • - - - - - -
    • -
-
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
    +
  • + + + + + +
    • +
+
+ + + + diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml index a74b0be6..9758398b 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml @@ -1,24 +1,19 @@ - - + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml index fe3a89ab..0ccf4124 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml @@ -1,24 +1,19 @@ - - + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml index b6c3f734..8c5c3dd7 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml @@ -1,90 +1,85 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - -
- - -
- - -
- -
    -
    • -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
- - - - + + + +
+ + +
+ + +
+ +
    +
    • +
+
+ + + diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml index e44982e8..c4733e30 100644 --- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml +++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml @@ -1,24 +1,19 @@ - - + - - - - + + + - - - + + + - - - - - + + + + diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml index 9d7ca70d..d46cc093 100644 --- a/web/admin/user/admin_user_activity_log.xhtml +++ b/web/admin/user/admin_user_activity_log.xhtml @@ -1,115 +1,111 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml index c3740b3c..25c8161f 100644 --- a/web/admin/user/admin_user_delete.xhtml +++ b/web/admin/user/admin_user_delete.xhtml @@ -1,70 +1,65 @@ - - + - - - - - - - + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - -
- - - - -
- -
- -
- - + + +
+ + + + +
- -
- -
+
+ +
-
- -
+ -
- + +
+ +
-
- - +
+
+ +
- - - - + +
+ + +
+ + + + diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index 86dd72c1..0c4ca701 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -1,56 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + - - - - -
- -
- -
- -
- - - - - -
- - -
- - - - - + +
+ + +
+ + + + diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index b44a9eee..15bf8cbb 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -1,200 +1,197 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - - - + + + - - + + + + + + + - - - - + + + + + + - - + + + + + - + - + + - - - - - - - + + + + - - - - + + - - + + + + - - - - + + - - + + + + - - - - + + - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - - - - + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- - - -
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ + + +
+ + + + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 23890a9a..43f73d76 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -1,147 +1,142 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - - - - - - - - - - - - - -
- -
- - -
-
- - - - - -
- -
- -
- - - - -
- -
- -
-
- -
- -
- - -
- -
- -
- - -
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+
+ + + + + +
+ +
+ +
+ + + + +
+ +
+ +
+
+ +
+ +
+ + +
+ +
+ +
+ + +
+ + + + diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index f967ea64..b48474cf 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -1,102 +1,98 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ +
+
+
-
-
- -
- -
- -
+
+
+
-
-
- -
- -
- -
+
+
+
-
-
- -
- -
- -
+
+
+
-
-
- -
+
+
+ +
-
- -
+
+
+
-
- +
+
+ +
- +
+
- - - - - - - - - - - - - - - +
+ +
+ + + +
+ + + + + + + + + + + + + + diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml index a79e8dda..3c79bdeb 100644 --- a/web/admin/user/admin_user_resend_confirmation_link.xhtml +++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml @@ -1,70 +1,66 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - -
- - - - -
+ + +
+ + + + +
-
- -
+
+ +
-
- -
+
+ +
-
- +
+ - -
- - + +
+ + - - - - + + + + - - - - - - - + + + + + + diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index 96c246e9..03145215 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -1,54 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index 89779819..08acbb8a 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -1,127 +1,122 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ +
+
+
-
-
- -
- -
- - - -
+
+ + +
+
-
-
- -
- -
- -
+
+
+
-
-
- -
- -
- -
+
+
+
-
-
- -
+
+
+ +
-
- -
+
+
+
-
-
- -
+
+
+ +
-
- - - -
+
+
+
-
-
- -
+
+
+ +
-
- -
+
+ + +
+
-
- +
+
+ +
- +
+
- - - - - - - - - - - - - - - +
+ +
+ + + +
+ + + + + + + + + + + + + + diff --git a/web/exception.xhtml b/web/exception.xhtml index 0e145b20..312b89a0 100644 --- a/web/exception.xhtml +++ b/web/exception.xhtml @@ -1,23 +1,19 @@ - - + + - - - - + + + - - - + + + - - Unfortunately an unexpected error has occurred. - - - + + Unfortunately an unexpected error has occurred. + + diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml index a49b6eaa..c9c380d8 100644 --- a/web/guest/user/user_confirm_account.xhtml +++ b/web/guest/user/user_confirm_account.xhtml @@ -1,58 +1,54 @@ - - + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - -
- -
+ + + +
+ +
- - - - - - - + + + + + + + - - - - - - - - - + - + - - - + + + + + + + + + + diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index a3fa51dc..663d97a9 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -1,54 +1,50 @@ - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - > - - - - - - - - - - + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + > + + + + + + + + + diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml index 8cae955a..bf08a860 100644 --- a/web/guest/user/user_login.xhtml +++ b/web/guest/user/user_login.xhtml @@ -1,46 +1,42 @@ - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index b4a54a36..cab17c33 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -1,81 +1,76 @@ - - + - - - - + + + - - - + + + - - -
- - -
- -
+ + +
+ + +
+ +
-
- - - +
+ + + - -
- -
+ +
+ +
-
- -
+
+ +
-
- +
+ -
- -
+
+ +
- -
- -
+ +
+ +
-
- -
+
+ +
-
- +
+ -
+
-
- - -
- - -
- +
+ + +
+ + +
+ - - - - - - - - - + + + + + + + + diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml index fd6ac461..61032ce3 100644 --- a/web/guest/user/user_profile.xhtml +++ b/web/guest/user/user_profile.xhtml @@ -1,62 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + +
+ + + + + +
+ + + + + + + + + + + diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml index 8bed557c..599384f5 100644 --- a/web/guest/user/user_register.xhtml +++ b/web/guest/user/user_register.xhtml @@ -1,58 +1,60 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + - - - + + + + + + + + + - - - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/guest/user/user_register_done.xhtml b/web/guest/user/user_register_done.xhtml index 46c2e6a9..7161fce7 100644 --- a/web/guest/user/user_register_done.xhtml +++ b/web/guest/user/user_register_done.xhtml @@ -1,30 +1,25 @@ - - + - - - - + + + - - - + + + - -
- -
+ +
+ +
- - - - - - + + + + + diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml index 7e180037..d18f23ec 100644 --- a/web/guest/user/user_register_page2.xhtml +++ b/web/guest/user/user_register_page2.xhtml @@ -1,43 +1,38 @@ - - + - - - - + + + - - - + + + - - - -
- - - -
- - - - - + + + +
+ + + +
- - - - - - - - - + + + + + + + + + + + + + diff --git a/web/guest/user/user_resend_done.xhtml b/web/guest/user/user_resend_done.xhtml index c062782f..8f6d50d7 100644 --- a/web/guest/user/user_resend_done.xhtml +++ b/web/guest/user/user_resend_done.xhtml @@ -1,25 +1,21 @@ - - + + - - - - + + + - - - + + + - - - - - - - + + + + + + diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml index af96c6a9..cb9aa3a2 100644 --- a/web/guest/user/user_resend_link.xhtml +++ b/web/guest/user/user_resend_link.xhtml @@ -1,68 +1,63 @@ - - - - - - - - - - - - - - - -
- -
- -
- - - - - -
- -
- -
- - - -
- -
- - - - + + + + + + + + + + + + + +
+ +
+ +
+ + + - +
+ +
+ +
+ + + +
+
+ + + + -
- - -
+ + - - - - - - - - - - +
+ + +
+ + + + + + + + + + + diff --git a/web/imprint.xhtml b/web/imprint.xhtml index 3a54f92c..b5c44fbd 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -1,25 +1,21 @@ - - + + - - - - + + + - - - + + + - - - TODO: Hier kommt das Impressum hin! - - - - + + + TODO: Hier kommt das Impressum hin! + + + diff --git a/web/index.xhtml b/web/index.xhtml index dc096791..5c7a59e6 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -1,38 +1,33 @@ - - + - - - - + + + - - - + + + - - - - - - - + + + + + + + -
- -
- +
+ +
+ - - - - - - + + + + + diff --git a/web/privacy.xhtml b/web/privacy.xhtml index 01a29d18..bfa7c54c 100644 --- a/web/privacy.xhtml +++ b/web/privacy.xhtml @@ -1,25 +1,21 @@ - - + + - - - - + + + - - - + + + - - - Hier kommen die Datenschutzbestimmungen hin. - - - - + + + Hier kommen die Datenschutzbestimmungen hin. + + + diff --git a/web/terms.xhtml b/web/terms.xhtml index c6be672e..7d8528d5 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -1,25 +1,21 @@ - - + + - - - - + + + - - - + + + - - - Hier kommen die allgemeinen Geschäftsbedingungen hin. - - - - + + + Hier kommen die allgemeinen Geschäftsbedingungen hin. + + + diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index b2807f0d..afd73815 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -1,37 +1,33 @@ - - + + - - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - + - - - - - - + + + + + diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml index bda92d33..c21ff285 100644 --- a/web/user/login_data_saved.xhtml +++ b/web/user/login_data_saved.xhtml @@ -1,32 +1,27 @@ - - + - - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 73e9e262..67fbf8a6 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -1,59 +1,55 @@ - - - - - - - - - - - - - - -
-
- -
- -
- -
- -
-
    - -
  • - -
    • -     - - -
  • - -
    • -     - - -
  • - -
    • -     -
-
+ + + + + + + + + + + + + +
+
+
- - - - - - - - + +
+ +
+ +
+
    + +
  • + +
    • +     + + +
  • + +
    • +     + + +
  • + +
    • +     +
+
+
+ + + + + + + diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index 902550a7..207e6965 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -1,34 +1,29 @@ - - + - - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml index 10efa901..3c68ee74 100644 --- a/web/user/login_logout.xhtml +++ b/web/user/login_logout.xhtml @@ -1,41 +1,37 @@ - - + + - - - - + + + - - - + + + - - - -
- -
+ + + +
+ +
-
- -
+
+ +
-
- -
- - +
+ +
+ + - - - - - - + + + + + diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml index 4b6a1b0a..2127d8a0 100644 --- a/web/user/login_user_change_email_address.xhtml +++ b/web/user/login_user_change_email_address.xhtml @@ -1,70 +1,65 @@ - - + - - - - + + + - - - + + + - - -
- -
+ + +
+ +
- -
- - - + +
+ + + - -
- -
+ +
+ +
-
- -
+
+ +
-
- +
+ - -
+ +
-
+
- + -
- - -
- - +
+ + +
+ + - - - - - - + + + + + + - - - - - - + + + + + diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml index 780d0119..16e42405 100644 --- a/web/user/login_user_change_password.xhtml +++ b/web/user/login_user_change_password.xhtml @@ -1,97 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - -
- + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + + + + +
+ +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ +
+ + + + + +
+ +
+ + + +
+ +
- - - -
- - - - - -
- -
- -
- -
- -
- - - - - - - -
- -
- -
- -
- -
- - - - - -
- -
- - - -
- - -
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml index 32286f30..89e5b773 100644 --- a/web/user/login_user_change_personal_data.xhtml +++ b/web/user/login_user_change_personal_data.xhtml @@ -1,56 +1,51 @@ - - - - - - - - - - - - - - -
- -
+ + + + + + + + + + + + +
+ +
- - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - - - + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml index 4de72ddf..3fe4121f 100644 --- a/web/user/login_user_contact_data_saved.xhtml +++ b/web/user/login_user_contact_data_saved.xhtml @@ -1,42 +1,38 @@ - - + + - - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index bbe9c2e3..6f9eadcc 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -1,36 +1,31 @@ - - + - - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + +