From 94e98955596609da356846a1c95f4ab3c9b24183 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 27 Aug 2017 15:21:06 +0200 Subject: [PATCH] Please cherry-pick: - converted administrative fax, land-line and mobile number data templates as custom JSF tags, having again more type-safe tags instead of outputting messages on missing bean properties MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../form_data}/fax/admin_form_fax_data.tpl | 6 +-- .../landline/admin_form_landline_data.tpl | 6 +-- .../mobile/admin_form_mobile_data.tpl | 6 +-- web/WEB-INF/widgets.jsf.taglib.xml | 51 +++++++++++++++++++ web/admin/fax/admin_fax_edit.xhtml | 2 +- web/admin/landline/admin_landline_edit.xhtml | 2 +- web/admin/mobile/admin_mobile_edit.xhtml | 2 +- 7 files changed, 60 insertions(+), 15 deletions(-) rename web/WEB-INF/{templates/admin => resources/tags/admin/form_data}/fax/admin_form_fax_data.tpl (72%) rename web/WEB-INF/{templates/admin => resources/tags/admin/form_data}/landline/admin_form_landline_data.tpl (71%) rename web/WEB-INF/{templates/admin => resources/tags/admin/form_data}/mobile/admin_form_mobile_data.tpl (88%) diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl similarity index 72% rename from web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl rename to web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl index 78e7d6e5..4d773ad2 100644 --- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl @@ -6,9 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - - +
@@ -20,7 +18,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl similarity index 71% rename from web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl rename to web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl index 6c9a55a4..8461e52e 100644 --- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl @@ -6,9 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - - +
@@ -20,7 +18,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl similarity index 88% rename from web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl rename to web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl index 9eb576d1..6e454c15 100644 --- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl @@ -6,9 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - - +
@@ -20,7 +18,7 @@
- +
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml index 66d02b6b..11287cce 100644 --- a/web/WEB-INF/widgets.jsf.taglib.xml +++ b/web/WEB-INF/widgets.jsf.taglib.xml @@ -138,6 +138,57 @@ along with this program. If not, see . java.lang.Boolean + + outputAdminFaxDataFormFields + This tag renders a fieldset for administrative purposes of fax data. + resources/tags/admin/form_data/fax/admin_form_fax_data.tpl + + faxNumber + The fax instance that provides the data for this tag. + true + org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputAdminLandLineDataFormFields + This tag renders a fieldset for administrative purposes of land-line data. + resources/tags/admin/form_data/landline/admin_form_landline_data.tpl + + landLineNumber + The fax instance that provides the data for this tag. + true + org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + + + outputAdminMobileDataFormFields + This tag renders a fieldset for administrative purposes of mobile data. + resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl + + mobileNumber + The mobile instance that provides the data for this tag. + true + org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber + + + rendered + Whether this tag is being rendered by JSF engine. + false + java.lang.Boolean + + outputAdminUserDataFormFields This tag renders a fieldset for administrative purposes of user data. diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index 6d4379e1..a4107367 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -30,7 +30,7 @@ - +
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index 1c95ee01..02715dc7 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -30,7 +30,7 @@
- +
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index 89558499..ab3381bf 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -30,7 +30,7 @@
- +
-- 2.39.5