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 568fcf769386c31869ef16d1e6d7e29c5fa4722c..6f3ae3d11dcd36cf7b46de97e0999a1b829d2bbc 100644 (file)
--- 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 980adb56c37217b7101152a15d8550aed33c21e1..63d2f3d73a155757fb2a773b8cd01446840aa241 100644 (file)
--- 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 9575f14648a9e518d3694892e5ecb39c2665ddab..d9f93b2a5665132cbfb54804c4aac4ed78c27525 100644 (file)
--- 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 3f53589abefa6f37bc652d3a344dae27b19624f7..454ebb6054163d7114259ff481761af0749dc86a 100644 (file)
--- 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;