From 72047bddc9ad5b3afa4dad8dea2aad30a66ae9e0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 2 Oct 2023 23:05:28 +0200
Subject: [PATCH] Please cherry-pick: - formatted long PF tags -
 /css/custom.css is now marked as deprecated

---
 .../admin/contact/admin_form_contact_data.tpl | 152 +++++++++++++++++
 .../admin/country/admin_form_country_data.tpl | 160 ++++++++++++++++++
 web/WEB-INF/templates/master.tpl              |   1 +
 web/resources/css/custom.css                  |   5 +
 4 files changed, 318 insertions(+)
 create mode 100644 web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
 create mode 100644 web/WEB-INF/templates/admin/country/admin_form_country_data.tpl

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
new file mode 100644
index 00000000..6f3ae3d1
--- /dev/null
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:validator="http://mxchange.org/jsf/core/validators"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+	<p:fieldset
+		legend="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}"
+		title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}"
+		>
+		<p:panelGrid
+			layout="grid"
+			columns="2"
+			columnClasses="ui-grid-col-4,ui-grid-col-8"
+			styleClass="ui-noborder"
+			>
+			<p:outputLabel for="personalTitle" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+			<core:outputPersonalTitleSelectionBox targetController="#{adminContactController}" />
+
+			<p:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
+			<p:inputText
+				id="firstName"
+				size="10"
+				maxlength="255"
+				value="#{adminContactController.firstName}"
+				required="true"
+				requiredMessage="#{msg.ADMIN_CONTACT_DATA_FIRST_NAME_REQUIRED}"
+				/>
+
+			<p:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
+			<p:inputText
+				id="title"
+				size="5"
+				maxlength="255"
+				value="#{adminContactController.academicTitle}"
+				/>
+
+			<p:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
+			<p:inputText
+				id="familyName"
+				size="10"
+				maxlength="255"
+				value="#{adminContactController.familyName}"
+				required="true"
+				requiredMessage="#{msg.ADMIN_CONTACT_DATA_FAMILY_NAME_REQUIRED}"
+				/>
+
+			<p:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
+			<p:inputText
+				id="street"
+				size="20"
+				maxlength="255"
+				value="#{adminContactController.street}"
+				/>
+
+			<p:outputLabel for="houseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
+			<p:inputText
+				id="houseNumber"
+				size="3"
+				maxlength="5"
+				value="#{adminContactController.houseNumber}"
+				validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}"
+				>
+				<f:validateLongRange minimum="1" maximum="500" />
+			</p:inputText>
+
+			<p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
+			<p:inputText
+				id="houseNumberExtension"
+				size="2"
+				maxlength="2"
+				value="#{adminContactController.houseNumberExtension}"
+				/>
+
+			<p:outputLabel for="zipCode" value="#{msg.DATA_ZIP_CODE}" />
+			<p:inputText
+				id="zipCode"
+				size="5"
+				maxlength="6"
+				value="#{adminContactController.zipCode}"
+				validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}"
+				>
+				<f:validateLongRange minimum="1" maximum="99999" />
+			</p:inputText>
+
+			<p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
+			<p:inputText
+				id="city"
+				size="10"
+				maxlength="255"
+				value="#{adminContactController.city}"
+				/>
+
+			<p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
+			<core:outputCountrySelector
+				id="country"
+				value="#{adminContactController.contactCountry}"
+				required="true"
+				requiredMessage="#{msg.ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED}"
+				/>
+
+			<p:outputLabel for="landLineCountry" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
+			<core:inputLandLineNumberPanelGrid targetController="#{adminContactController}" />
+
+			<p:outputLabel for="faxCountry" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+			<core:inputFaxNumberPanelGrid targetController="#{adminContactController}" />
+
+			<p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+			<core:inputMobileNumberPanelGrid targetController="#{adminContactController}" />
+
+			<p:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
+			<p:inputText
+				id="emailAddress"
+				size="20"
+				maxlength="255"
+				value="#{adminContactController.emailAddress}"
+				validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+				>
+				<validator:emailAddressValidator allowEmptyRequiredData="true" />
+			</p:inputText>
+
+			<p:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
+			<p:calendar
+				id="contactBirthday"
+				value="#{contactController.birthday}"
+				title="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE}"
+				pattern="#{msg.DATE_PATTERN}"
+				navigator="true"
+				/>
+
+			<p:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
+			<p:inputTextarea
+				id="contactComment"
+				value="#{adminContactController.comment}"
+				rows="7"
+				cols="35"
+				/>
+		</p:panelGrid>
+	</p:fieldset>
+
+	<h:panelGroup styleClass="para notice" layout="block">
+		<ul>
+			<li>
+				<h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
+			</li>
+		</ul>
+	</h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
new file mode 100644
index 00000000..63d2f3d7
--- /dev/null
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:p="http://primefaces.org/ui"
+	>
+
+	<h:panelGroup styleClass="para notice" layout="block">
+		<h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
+	</h:panelGroup>
+
+	<h:panelGroup styleClass="para" layout="block">
+		<fieldset class="fieldset">
+			<legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">
+				<h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
+			</legend>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText
+						id="countryAbroadDialPrefix"
+						size="2"
+						maxlength="10"
+						value="#{adminCountryController.countryAbroadDialPrefix}"
+						required="true"
+						requiredMessage="#{msg.ADMIN_COUNTRY_ABROAD_DIAL_PREFIX_REQUIRED}"
+						>
+						<f:validator validatorId="AbroadDialValidator" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryAbroadDialPrefix" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText
+						id="countryCode"
+						size="2"
+						maxlength="2"
+						value="#{adminCountryController.countryCode}"
+						required="true"
+						>
+						<f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
+					</p:inputText>
+
+					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryCode" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText
+						id="countryI18nKey"
+						maxlength="100"
+						value="#{adminCountryController.countryI18nKey}"
+						required="true"
+						requiredMessage="#{msg.ADMIN_COUNTRY_I18N_KEY_REQUIRED}"
+						>
+						<f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryI18nKey" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
+				</div>
+
+				<div class="table-right-medium">
+					<h:selectOneListbox
+						required="true"
+						id="countryIsLocalPrefixRequired"
+						value="#{adminCountryController.countryIsLocalPrefixRequired}"
+						size="1"
+						>
+						<f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
+						<f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
+					</h:selectOneListbox>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryIsLocalPrefixRequired" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText
+						id="countryExternalDialPrefix"
+						size="2"
+						maxlength="10"
+						value="#{adminCountryController.countryExternalDialPrefix}"
+						required="true"
+						requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}"
+						>
+						<f:validateLongRange minimum="0" maximum="99" />
+					</p:inputText>
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryAbroadDialPrefix" />
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
+					<p:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
+				</div>
+
+				<div class="table-right-medium">
+					<p:inputText
+						id="countryPhoneCode"
+						size="2"
+						maxlength="6"
+						value="#{adminCountryController.countryPhoneCode}"
+						required="true"
+						requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}"
+						>
+						<f:validateLongRange minimum="0" maximum="999" />
+					</p:inputText>
+
+					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
+				</div>
+			</h:panelGroup>
+
+			<h:panelGroup styleClass="error-container" layout="block">
+				<p:message for="countryPhoneCode" />
+			</h:panelGroup>
+		</fieldset>
+	</h:panelGroup>
+</ui:composition>
diff --git a/web/WEB-INF/templates/master.tpl b/web/WEB-INF/templates/master.tpl
index 9575f146..d9f93b2a 100644
--- a/web/WEB-INF/templates/master.tpl
+++ b/web/WEB-INF/templates/master.tpl
@@ -34,6 +34,7 @@
 			<f:loadBundle var="project" basename="org.mxchange.localization.project" />
 			<f:loadBundle var="local" basename="org.mxchange.localization.local" />
 
+			<!-- @DEPRECATED Please get rid over time of this file //-->
 			<h:outputStylesheet name="/css/custom.css" />
 
 			<title>
diff --git a/web/resources/css/custom.css b/web/resources/css/custom.css
index 3f53589a..454ebb60 100644
--- a/web/resources/css/custom.css
+++ b/web/resources/css/custom.css
@@ -1,3 +1,8 @@
+/**
+ * Custom CSS file
+ *
+ * @deprecated
+ */
 body {
 	font-size: 0.9em !important;
 	font-family: sans-serif !important;
-- 
2.39.2