From 532a3b7f9ecc80212ba6e4a28c69cb27d3e9570a 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 | 37 ++++++++++++++++---
 .../admin/country/admin_form_country_data.tpl | 33 +++++++++++++++--
 web/WEB-INF/templates/master.tpl              |  1 +
 web/resources/css/{layout.css => custom.css}  | 11 ++++--
 web/resources/css/default.css                 | 25 -------------
 5 files changed, 70 insertions(+), 37 deletions(-)
 rename web/resources/css/{layout.css => custom.css} (97%)
 delete mode 100644 web/resources/css/default.css

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
index 568fcf76..6f3ae3d1 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -69,15 +69,31 @@
 			</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: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}">
+			<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:inputText
+				id="city"
+				size="10"
+				maxlength="255"
+				value="#{adminContactController.city}"
+				/>
 
 			<p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
 			<core:outputCountrySelector
@@ -97,7 +113,13 @@
 			<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}">
+			<p:inputText
+				id="emailAddress"
+				size="20"
+				maxlength="255"
+				value="#{adminContactController.emailAddress}"
+				validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}"
+				>
 				<validator:emailAddressValidator allowEmptyRequiredData="true" />
 			</p:inputText>
 
@@ -111,7 +133,12 @@
 				/>
 
 			<p:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
-			<p:inputTextarea id="contactComment" value="#{adminContactController.comment}" rows="7" cols="35" />
+			<p:inputTextarea
+				id="contactComment"
+				value="#{adminContactController.comment}"
+				rows="7"
+				cols="35"
+				/>
 		</p:panelGrid>
 	</p:fieldset>
 
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
index 980adb56..63d2f3d7 100644
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -46,7 +46,13 @@
 				</div>
 
 				<div class="table-right-medium">
-					<p:inputText id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+					<p:inputText
+						id="countryCode"
+						size="2"
+						maxlength="2"
+						value="#{adminCountryController.countryCode}"
+						required="true"
+						>
 						<f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
 					</p:inputText>
 
@@ -86,7 +92,12 @@
 				</div>
 
 				<div class="table-right-medium">
-					<h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1">
+					<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>
@@ -103,7 +114,14 @@
 				</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}">
+					<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>
@@ -119,7 +137,14 @@
 				</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}">
+					<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>
 
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/layout.css b/web/resources/css/custom.css
similarity index 97%
rename from web/resources/css/layout.css
rename to web/resources/css/custom.css
index f5e91104..3cb3ff74 100644
--- a/web/resources/css/layout.css
+++ b/web/resources/css/custom.css
@@ -1,8 +1,13 @@
 /**
-div, table {
-	border: 1px solid #ff0000;
+ * Custom CSS file
+ *
+ * @deprecated
+ */
+body {
+	font-size: 0.9em !important;
+	font-family: sans-serif !important;
+	margin: 0px;
 }
-/**/
 
 #page-header {
 	border-bottom: 1px solid grey;
diff --git a/web/resources/css/default.css b/web/resources/css/default.css
deleted file mode 100644
index 42fb9258..00000000
--- a/web/resources/css/default.css
+++ /dev/null
@@ -1,25 +0,0 @@
-body {
-	background-color: white;
-	font-size: 12px;
-	font-family: sans-serif;
-	color: black;
-	margin: 0px;
-}
-
-h1 {
-	border-bottom: 1px solid #AFAFAF;
-	font-size:  16px;
-	font-weight: bold;
-	margin: 0px;
-	padding: 0px;
-}
-
-a:link, a:visited {
-	color: #045491;
-	text-decoration: none;
-}
-
-a:link:hover, a:visited:hover {
-	color: #045491;
-	text-decoration : underline;
-}
-- 
2.39.5