From: Roland Häder <roland@mxchange.org>
Date: Mon, 2 Oct 2023 21:05:28 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=532a3b7f9ecc80212ba6e4a28c69cb27d3e9570a;p=pizzaservice-war.git

Please cherry-pick:
- formatted long PF tags
- /css/custom.css is now marked as deprecated
---

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/custom.css b/web/resources/css/custom.css
new file mode 100644
index 00000000..3cb3ff74
--- /dev/null
+++ b/web/resources/css/custom.css
@@ -0,0 +1,346 @@
+/**
+ * Custom CSS file
+ *
+ * @deprecated
+ */
+body {
+	font-size: 0.9em !important;
+	font-family: sans-serif !important;
+	margin: 0px;
+}
+
+#page-header {
+	border-bottom: 1px solid grey;
+	background-color: steelblue;
+	color: white;
+	padding: 5px;
+	margin: 0px 0px 10px 0px;
+}
+
+#page-footer {
+	background-color: lightblue;
+	padding: 5px;
+	margin: 10px 0px 0px 0px;
+	overflow: auto;
+}
+
+#left-menu-container {
+	float: left;
+	background-color: khaki;
+	padding: 5px;
+	width: 170px;
+}
+
+.center_content {
+	position: relative;
+	background-color: #dddddd;
+	padding: 5px;
+}
+
+.content-container {
+	padding-right: 5px;
+	padding-bottom: 5px;
+	margin-left: 190px;
+}
+
+.page-footer {
+	background-color: lightblue;
+	overflow: auto;
+}
+
+.page-header a:link, .page-header a:visited {
+	color: white;
+	font-weight : bold;
+	text-decoration: none;
+}
+
+.page-header a:link:hover, .page-header a:visited:hover  {
+	color: black;
+	font-weight : bold;
+	text-decoration : underline;
+}
+
+table, .table, .table-medium {
+	margin: 0px;
+	padding: 0px;
+}
+
+.table {
+	width: 500px;
+}
+
+.table-footer {
+	margin: 2px;
+}
+
+.table-medium {
+	width: 650px;
+}
+
+.table-full {
+	margin: 0 auto;
+	width: 100%;
+}
+
+.table-row {
+	width: 100%;
+	min-height: 20px;
+	margin: 2px;
+	overflow: auto;
+}
+
+.table-left {
+	width: 250px;
+	min-height: 20px;
+	float: left;
+}
+
+.table-right {
+	width: 200px;
+	min-height: 20px;
+	float: right;
+}
+
+.table-left25 {
+	width: 20px;
+	min-height: 20px;
+	float: left;
+}
+
+.table-right75 {
+	width: 430px;
+	min-height: 20px;
+	float: right;
+}
+
+.table-left-medium {
+	width: 300px;
+	min-height: 20px;
+	float: left;
+}
+
+.table-right-medium {
+	width: 300px;
+	min-height: 20px;
+	float: right;
+}
+
+.table-left25-medium {
+	width: 150px;
+	min-height: 20px;
+	float: left;
+}
+
+.table-right75-medium {
+	width: 490px;
+	min-height: 20px;
+	float: right;
+}
+
+.para {
+	padding: 5px;
+}
+
+ul.navbar-horizontal, ul.navbar-mini {
+	display: block;
+	text-align: center;
+	list-style: none;
+	margin: 0px;
+	padding: 0px;
+}
+
+ul.navbar-horizontal li.navlink-horizontal, ul.navbar-mini li.navlink-mini {
+	display: block;
+	float: left;
+}
+
+ul.navbar-horizontal li.navlink-horizontal {
+	width: 100px;
+}
+
+ul.navbar-mini li.navlink-mini {
+	padding: 1px;
+}
+
+ul.navbar-horizontal li.footer-copyright {
+	float: right;
+	width: 300px;
+	margin-right: 10px;
+}
+
+.table-header {
+	text-align: center;
+	font-weight: bold;
+}
+
+.table-data-label, .table-data-field {
+	display: block;
+	border: 1px solid #aaaaaa;
+	border-top-right-radius: 8px;
+	border-bottom-left-radius: 8px;
+}
+
+.table-data-label {
+	font-weight: bold;
+	background-image: linear-gradient(#eeeeee, #aaaaaa);
+	height: 16px;
+	padding-left: 4px;
+}
+
+.table-data-field {
+	background-color: #f5f5f5;
+	vertical-align: top;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	padding-left: 2px;
+	padding-right: 1px;
+	margin-top: 2px;
+	min-height: 15px;
+}
+
+#content-header {
+	border-color: grey;
+	background-image: linear-gradient(#eeeeee, #aaaaaa);
+	font-weight: bold;
+	font-size: 18px;
+	margin-bottom: 20px;
+	padding-left: 5px;
+	line-height: 20px;
+}
+
+.table-header-column {
+	width: 100px;
+}
+
+.table-header-column25 {
+	width: 25%;
+}
+
+.table-data-column {
+	width: 100px;
+}
+
+.item_price, .item_total_price {
+	text-align: right;
+}
+
+.alert-danger {
+	color: red;
+}
+
+.alert-danger:hover {
+	cursor: not-allowed;
+}
+
+.alert-warning {
+	color: orange;
+}
+
+.alert-info {
+	color: cornflowerblue;
+}
+
+.message-container {
+	border: 1px solid grey;
+	border-top-right-radius: 8px;
+	border-bottom-left-radius: 8px;
+	background-color: ghostwhite;
+}
+
+.message-medium {
+	width: 400px;
+}
+
+.message-auto {
+	margin: auto 0px;
+}
+
+.message-mini {
+	width: 160px;
+}
+
+.message-header {
+	border-bottom: 1px solid grey;
+	background-image: linear-gradient(#eeeeee, #aaaaaa);
+	border-top-right-radius: 8px;
+	line-height: 18px;
+	text-align: center;
+	font-weight: bold;
+}
+
+.user-status-confirmed, .customer-status-confirmed {
+	color: #00aa00;
+}
+
+.user-status-unconfirmed, .customer-status-unconfirmed {
+	color: #00aaaa;
+}
+
+.user-status-locked, .customer-status-locked {
+	color: #aa0000;
+}
+
+.link-warning {
+	color: #aaaa00;
+}
+
+.link-danger {
+	color: #aa0000;
+}
+
+.divider-right {
+	margin-right: 2px;
+}
+
+#content-header {
+	border: 1px solid grey;
+}
+
+#content-header, .input, .submit, .reset, .button-danger, .button-warning, .fieldset {
+	border-top-right-radius: 8px;
+	border-bottom-left-radius: 8px;
+}
+
+.fieldset {
+	padding: 5px;
+}
+
+#menu-content-wrapper {
+	overflow: auto;
+}
+
+.button-danger {
+	border-color: #ee0000;
+	background-color: #880000;
+	color: white;
+}
+
+.button-warning {
+	border-color: #eeee00;
+	background-color: #aaaa00;
+	color: white;
+}
+
+.button-danger:hover {
+	border-color: #dd0000;
+	background-color: #aa0000;
+	color: #eeeeee;
+}
+
+.button-warning:hover {
+	border-color: #dddd00;
+	background-color: #cccc00;
+	color: #eeeeee;
+}
+
+#menu-content-wrapper::after {
+	clear: both;
+}
+
+.table-row::after {
+	clear: both;
+}
+
+#footer::after {
+	clear: both;
+}
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;
-}
diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css
deleted file mode 100644
index f5e91104..00000000
--- a/web/resources/css/layout.css
+++ /dev/null
@@ -1,341 +0,0 @@
-/**
-div, table {
-	border: 1px solid #ff0000;
-}
-/**/
-
-#page-header {
-	border-bottom: 1px solid grey;
-	background-color: steelblue;
-	color: white;
-	padding: 5px;
-	margin: 0px 0px 10px 0px;
-}
-
-#page-footer {
-	background-color: lightblue;
-	padding: 5px;
-	margin: 10px 0px 0px 0px;
-	overflow: auto;
-}
-
-#left-menu-container {
-	float: left;
-	background-color: khaki;
-	padding: 5px;
-	width: 170px;
-}
-
-.center_content {
-	position: relative;
-	background-color: #dddddd;
-	padding: 5px;
-}
-
-.content-container {
-	padding-right: 5px;
-	padding-bottom: 5px;
-	margin-left: 190px;
-}
-
-.page-footer {
-	background-color: lightblue;
-	overflow: auto;
-}
-
-.page-header a:link, .page-header a:visited {
-	color: white;
-	font-weight : bold;
-	text-decoration: none;
-}
-
-.page-header a:link:hover, .page-header a:visited:hover  {
-	color: black;
-	font-weight : bold;
-	text-decoration : underline;
-}
-
-table, .table, .table-medium {
-	margin: 0px;
-	padding: 0px;
-}
-
-.table {
-	width: 500px;
-}
-
-.table-footer {
-	margin: 2px;
-}
-
-.table-medium {
-	width: 650px;
-}
-
-.table-full {
-	margin: 0 auto;
-	width: 100%;
-}
-
-.table-row {
-	width: 100%;
-	min-height: 20px;
-	margin: 2px;
-	overflow: auto;
-}
-
-.table-left {
-	width: 250px;
-	min-height: 20px;
-	float: left;
-}
-
-.table-right {
-	width: 200px;
-	min-height: 20px;
-	float: right;
-}
-
-.table-left25 {
-	width: 20px;
-	min-height: 20px;
-	float: left;
-}
-
-.table-right75 {
-	width: 430px;
-	min-height: 20px;
-	float: right;
-}
-
-.table-left-medium {
-	width: 300px;
-	min-height: 20px;
-	float: left;
-}
-
-.table-right-medium {
-	width: 300px;
-	min-height: 20px;
-	float: right;
-}
-
-.table-left25-medium {
-	width: 150px;
-	min-height: 20px;
-	float: left;
-}
-
-.table-right75-medium {
-	width: 490px;
-	min-height: 20px;
-	float: right;
-}
-
-.para {
-	padding: 5px;
-}
-
-ul.navbar-horizontal, ul.navbar-mini {
-	display: block;
-	text-align: center;
-	list-style: none;
-	margin: 0px;
-	padding: 0px;
-}
-
-ul.navbar-horizontal li.navlink-horizontal, ul.navbar-mini li.navlink-mini {
-	display: block;
-	float: left;
-}
-
-ul.navbar-horizontal li.navlink-horizontal {
-	width: 100px;
-}
-
-ul.navbar-mini li.navlink-mini {
-	padding: 1px;
-}
-
-ul.navbar-horizontal li.footer-copyright {
-	float: right;
-	width: 300px;
-	margin-right: 10px;
-}
-
-.table-header {
-	text-align: center;
-	font-weight: bold;
-}
-
-.table-data-label, .table-data-field {
-	display: block;
-	border: 1px solid #aaaaaa;
-	border-top-right-radius: 8px;
-	border-bottom-left-radius: 8px;
-}
-
-.table-data-label {
-	font-weight: bold;
-	background-image: linear-gradient(#eeeeee, #aaaaaa);
-	height: 16px;
-	padding-left: 4px;
-}
-
-.table-data-field {
-	background-color: #f5f5f5;
-	vertical-align: top;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	padding-left: 2px;
-	padding-right: 1px;
-	margin-top: 2px;
-	min-height: 15px;
-}
-
-#content-header {
-	border-color: grey;
-	background-image: linear-gradient(#eeeeee, #aaaaaa);
-	font-weight: bold;
-	font-size: 18px;
-	margin-bottom: 20px;
-	padding-left: 5px;
-	line-height: 20px;
-}
-
-.table-header-column {
-	width: 100px;
-}
-
-.table-header-column25 {
-	width: 25%;
-}
-
-.table-data-column {
-	width: 100px;
-}
-
-.item_price, .item_total_price {
-	text-align: right;
-}
-
-.alert-danger {
-	color: red;
-}
-
-.alert-danger:hover {
-	cursor: not-allowed;
-}
-
-.alert-warning {
-	color: orange;
-}
-
-.alert-info {
-	color: cornflowerblue;
-}
-
-.message-container {
-	border: 1px solid grey;
-	border-top-right-radius: 8px;
-	border-bottom-left-radius: 8px;
-	background-color: ghostwhite;
-}
-
-.message-medium {
-	width: 400px;
-}
-
-.message-auto {
-	margin: auto 0px;
-}
-
-.message-mini {
-	width: 160px;
-}
-
-.message-header {
-	border-bottom: 1px solid grey;
-	background-image: linear-gradient(#eeeeee, #aaaaaa);
-	border-top-right-radius: 8px;
-	line-height: 18px;
-	text-align: center;
-	font-weight: bold;
-}
-
-.user-status-confirmed, .customer-status-confirmed {
-	color: #00aa00;
-}
-
-.user-status-unconfirmed, .customer-status-unconfirmed {
-	color: #00aaaa;
-}
-
-.user-status-locked, .customer-status-locked {
-	color: #aa0000;
-}
-
-.link-warning {
-	color: #aaaa00;
-}
-
-.link-danger {
-	color: #aa0000;
-}
-
-.divider-right {
-	margin-right: 2px;
-}
-
-#content-header {
-	border: 1px solid grey;
-}
-
-#content-header, .input, .submit, .reset, .button-danger, .button-warning, .fieldset {
-	border-top-right-radius: 8px;
-	border-bottom-left-radius: 8px;
-}
-
-.fieldset {
-	padding: 5px;
-}
-
-#menu-content-wrapper {
-	overflow: auto;
-}
-
-.button-danger {
-	border-color: #ee0000;
-	background-color: #880000;
-	color: white;
-}
-
-.button-warning {
-	border-color: #eeee00;
-	background-color: #aaaa00;
-	color: white;
-}
-
-.button-danger:hover {
-	border-color: #dd0000;
-	background-color: #aa0000;
-	color: #eeeeee;
-}
-
-.button-warning:hover {
-	border-color: #dddd00;
-	background-color: #cccc00;
-	color: #eeeeee;
-}
-
-#menu-content-wrapper::after {
-	clear: both;
-}
-
-.table-row::after {
-	clear: both;
-}
-
-#footer::after {
-	clear: both;
-}