]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Thu, 24 Aug 2017 20:56:39 +0000 (22:56 +0200)
committerRoland Häder <roland@mxchange.org>
Thu, 24 Aug 2017 20:58:51 +0000 (22:58 +0200)
- got rid of CSS class 'clear' in favour of pseudo class ::after which does the
  same thing with much lesser HTML code
- very nice thing!

Signed-off-by: Roland Häder <roland@mxchange.org>
31 files changed:
web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
web/WEB-INF/templates/admin/admin_footer.tpl
web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
web/WEB-INF/templates/base.tpl
web/WEB-INF/templates/contact/form_contact_data.tpl
web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
web/WEB-INF/templates/guest/guest_footer.tpl
web/WEB-INF/templates/guest/guest_privacy_terms.tpl
web/WEB-INF/templates/guest/user/guest_login_form.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
web/WEB-INF/templates/login/user/user_enter_current_password.tpl
web/WEB-INF/templates/login/user/user_footer.tpl
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_list.xhtml
web/guest/user/user_lost_password.xhtml
web/resources/css/cssLayout.css [deleted file]
web/resources/css/layout.css [new file with mode: 0644]
web/user/login_user_change_email_address.xhtml
web/user/login_user_change_password.xhtml

index 4a462acb40e9fb28532fc2e6c8ee11413671505a..3609e807db01130e525dab27e65f43fbdbddc417 100644 (file)
@@ -20,8 +20,6 @@
                                        <f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
                                </h:selectOneMenu>
                        </div>
-
-                       <div class="clear"></div>
                </h:panelGroup>
 
                <h:panelGroup styleClass="error_container" layout="block">
index 132e28db6376c0e58ce1871e882f0f2cd885f1d0..c94a608756afa9de5806d71a70e3737d94ce1fb4 100644 (file)
@@ -21,8 +21,6 @@
                                        <f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
                                </h:selectOneMenu>
                        </div>
-
-                       <div class="clear"></div>
                </h:panelGroup>
 
                <h:panelGroup styleClass="error_container" layout="block">
index e8c6756d4f73ac4680ed4c34581566e84aabbc31..b569c98d5d3a519f937e2bed37c4ad3773288f70 100644 (file)
@@ -9,6 +9,4 @@
                        <li><h:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
                </ul>
        </div>
-
-       <div class="clear"></div>
 </ui:composition>
index 178c70cb2b96099e575ae2ff5b774fa0cb5fb0bd..b7948ff7e7cbe159e5e6626eb3f9c54a0767bd40 100644 (file)
@@ -19,8 +19,6 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED}" value="#{adminBusinessDataController.companyName}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -38,8 +36,6 @@
                                                <f:attribute name="allowEmptyEmail" value="true" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -54,8 +50,6 @@
                                <div class="table_right_medium">
                                        <h:outputText styleClass="warnings" value="#{msg.ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -70,8 +64,6 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminBusinessDataController.companyTaxNumber}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -86,8 +78,6 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminBusinessDataController.companyWebsiteUrl}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:selectItems value="#{userController.allUsers()}" var="companyUserOwner" itemValue="#{companyUserOwner}" itemLabel="#{companyUserOwner.userContact.contactFirstName} #{companyUserOwner.userContact.contactFamilyName} (#{companyUserOwner.userName})" />
                                        </h:selectOneMenu>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:selectItems value="#{companyHeadquartersController.allCompanyHeadquarters()}" var="companyHeadQuarters" itemValue="#{companyHeadQuarters}" itemLabel="#{companyHeadQuarters.foo}" />
                                        </h:selectOneMenu>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_right_medium">
                                        <h:inputTextarea styleClass="input" id="companyComments" rows="7" cols="25" value="#{adminBusinessDataController.companyComments}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index da4a550eb2fe0938ada903ddd71da4b403b424cf..f9c13e4d6649950372fa08a5b3a9a00bcd40cbb8 100644 (file)
@@ -25,8 +25,6 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -41,8 +39,6 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -57,8 +53,6 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -73,8 +67,6 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -91,8 +83,6 @@
                                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <widgets:outputMobileNumberTableRow targetController="#{adminContactController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
                                                <f:attribute name="allowEmptyEmail" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                <div class="table_right_medium">
                                        <h:inputTextarea id="contactComment" styleClass="input" value="#{adminContactController.comment}" rows="7" cols="25" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index cbed24ae28f8379368e030227f356d846db55eaa..da4401285551acf77474a7129293ea15b7336ee8 100644 (file)
@@ -25,8 +25,6 @@
                                                <f:validator validatorId="AbroadDialValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -45,8 +43,6 @@
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -63,8 +59,6 @@
                                                <f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
@@ -82,8 +76,6 @@
                                                <f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
                                        </h:selectOneListbox>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
index f40395f386589745000c73130ee4b188815ac22d..f7c8841eb4a84664f6929853059490a5ffd13469 100644 (file)
@@ -30,8 +30,6 @@
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <div class="para">
@@ -48,8 +46,6 @@
                                                <ui:param name="targetController" value="#{adminContactPhoneController}" />
                                        </ui:include>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
index ab6654f46047470899cbfd784ef8ff64a38bb7cb..2355ffaff5fe348784c14fe033fe04f0b4240141 100644 (file)
@@ -22,8 +22,6 @@
                                <div class="table_right_medium">
                                        <h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
@@ -36,8 +34,6 @@
                                                <ui:param name="targetController" value="#{adminPhoneController}" />
                                        </ui:include>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
index 1c131bdb83aade3a2617f79b0e40fce4b1f6e3aa..6b866a079b600e3c347e12e37c4492b536001ef2 100644 (file)
@@ -30,8 +30,6 @@
                                                <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <div class="para">
@@ -48,8 +46,6 @@
                                                <ui:param name="targetController" value="#{adminPhoneController}" />
                                        </ui:include>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
index c6047b4e26ab740ffec6b82dfca6c57f6ddc5744..cdf8995132174b648648466807f7a645561fab50 100644 (file)
@@ -22,8 +22,6 @@
                                <div class="table_right_medium">
                                        <h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
@@ -36,8 +34,6 @@
                                                <ui:param name="targetController" value="#{adminPhoneController}" />
                                        </ui:include>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
index 625f4ff7c7b6a5859519139b225b0d360a946028..0b5f36a2f2cf865a5d8f72ac6d96c0cb51577989 100644 (file)
@@ -22,8 +22,6 @@
                                <div class="table_right_medium">
                                        <h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
                                        </h:selectOneMenu>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index 46a68868f5423d71925d693ec7cd071dc5f5be1c..00d1cf0e1838562ed437210b2893c3afea27f575 100644 (file)
                                                <f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
                                        </h:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
@@ -43,8 +41,6 @@
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
@@ -55,8 +51,6 @@
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
@@ -70,8 +64,6 @@
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index 4d533c4c219fa40da700793d72e9b4467707b53a..a2c3dab36d9c9d45236799c1ae8d51954832cd54 100644 (file)
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
-                       <div class="para"></div>
-
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                        <h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
@@ -36,8 +32,6 @@
                                <div class="table_right_medium">
                                        <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
@@ -48,8 +42,6 @@
                                <div class="table_right_medium">
                                        <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
                                <div class="table_right_medium">
                                        <h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
-                       <div class="para notice">
+                       <h:panelGroup styleClass="para notice" layout="block">
                                <ul>
                                        <li><h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" /></li>
 
@@ -73,7 +63,7 @@
                                                <h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
                                        </li>
                                </ul>
-                       </div>
+                       </h:panelGroup>
                </fieldset>
        </h:panelGroup>
 </ui:composition>
index 0540ecc1230ff6704e1eea8d6e566a69cff251cf..a535c73e6280d36266aa8a8136ae4391955b8f24 100644 (file)
@@ -15,7 +15,7 @@
                                <f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
 
                                <h:outputStylesheet name="/css/default.css" />
-                               <h:outputStylesheet name="/css/cssLayout.css" />
+                               <h:outputStylesheet name="/css/layout.css" />
 
                                <title>
                                        <h:outputText value="Pizza-Service" />
@@ -70,8 +70,6 @@
                                                        </ui:insert>
                                                </div>
                                        </h:panelGroup>
-
-                                       <div class="clear"></div>
                                </h:panelGroup>
 
                                <h:panelGroup id="page_footer" layout="block">
index 78580ad687c534cca5eb2f71c054828e1763fa16..a42ec3d0db76dec0209a00d317a58fbb8bc33047 100644 (file)
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:validator for="familyName" validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
                                        </h:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_right_medium">
                                        <h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:validateLongRange minimum="1" maximum="99999" />
                                        </h:inputText>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                                <f:validator validatorId="NameValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
+                       </h:panelGroup>
 
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                                <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
+                       </h:panelGroup>
 
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                                <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
                                        </h:selectOneMenu>
                                </div>
-
-                               <div class="clear"></div>
+                       </h:panelGroup>
 
                                <h:panelGroup styleClass="error_container" layout="block">
                                        <h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                </h:panelGroup>
-                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                <div class="table_left_medium">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
                                                <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                                        </h:inputText>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
index 0f512b25db11dc60295e7d183ced47c596ca2ca5..d930846ffc4ea59c53d9cbb3196f697a25357631 100644 (file)
@@ -16,8 +16,6 @@
                                <f:validator validatorId="EmailAddressValidator" />
                        </h:inputText>
                </div>
-
-               <div class="clear"></div>
        </h:panelGroup>
 
        <h:panelGroup styleClass="error_container" layout="block">
@@ -32,8 +30,6 @@
                <div class="table_right_medium">
                        <h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
                </div>
-
-               <div class="clear"></div>
        </h:panelGroup>
 
        <h:panelGroup styleClass="error_container" layout="block">
index 77b56d5c51d5495370968360c3aa3af972f661d5..13f1a363fc73e90ee5fa9fa4751c991f186a1661 100644 (file)
@@ -38,6 +38,4 @@
                        <li class="footer_copyright">Copyright (c) 2016, 2017 Roland Häder</li>
                </ul>
        </div>
-
-       <div class="clear"></div>
 </ui:composition>
index 0e81ece225dd4a0516e9e8ebba3727366a4162d9..bb86d274e1806d508abb99046fd90306ef614f58 100644 (file)
                                        <h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="table_row" layout="block">
                                        <h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index 74f86eebebdfc7913d991cc16fdb2bde121dd397..10aee0b6061fc4361351572f541ce90647f546f3 100644 (file)
@@ -4,8 +4,9 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-       <div id="user_login_content">
-               <h:form id="form_user_login" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+
+       <h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
+               <h:form id="form_user_login">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table_header">
                                        <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
                                                <div class="table_right">
                                                        <h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
                                                </div>
+                                       </h:panelGroup>
 
-                                               <div class="clear"></div>
-
-                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                               </h:panelGroup>
+                                       <h:panelGroup styleClass="error_container" layout="block">
+                                               <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                        </h:panelGroup>
 
                                        <h:panelGroup styleClass="table_row" layout="block">
                                                <div class="table_right">
                                                        <h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
                                                </div>
+                                       </h:panelGroup>
 
-                                               <div class="clear"></div>
-
-                                               <h:panelGroup styleClass="error_container" layout="block">
-                                                       <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                               </h:panelGroup>
+                                       <h:panelGroup styleClass="error_container" layout="block">
+                                               <h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                        </h:panelGroup>
                                </fieldset>
 
@@ -59,5 +56,5 @@
                <h:panelGroup styleClass="error_container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
                </h:panelGroup>
-       </div>
+       </h:panelGroup>
 </ui:composition>
index e7f92540957f4a8cc9a590dcbcdf7b39e0733675..36eea09ee94575a58672ce319878f53d0c1d7808 100644 (file)
@@ -26,8 +26,6 @@
                                                        <div class="table_right_medium">
                                                                <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
@@ -48,8 +46,6 @@
                                                        <div class="table_right_medium">
                                                                <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
@@ -64,8 +60,6 @@
                                                        <div class="table_right_medium">
                                                                <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
index 98f822df618c26f914d3a7d90b9a6866428685ff..a3c7829d77514287334ed076ec58cb4cdefd74a8 100644 (file)
                                                        <div class="table_right">
                                                                <h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
                                                        </div>
+                                               </h:panelGroup>
 
-                                                       <div class="clear"></div>
-
-                                                       <h:panelGroup styleClass="error_container" layout="block">
-                                                               <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                                                       </h:panelGroup>
+                                               <h:panelGroup styleClass="error_container" layout="block">
+                                                       <h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
                                                </h:panelGroup>
                                        </ui:fragment>
 
@@ -50,8 +48,6 @@
                                                        <div class="table_right">
                                                                <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
@@ -66,8 +62,6 @@
                                                        <div class="table_right">
                                                                <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
                                                <div class="para notice">
                                                        <ul>
                                                                <li><h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" /></li>
+
                                                                <ui:fragment rendered="#{featureController.isFeatureEnabled('allow_user_registration_empty_password')}">
                                                                        <li><h:outputText value="#{msg.GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_ALLOWED}" /></li>
                                                                </ui:fragment>
+
                                                                <ui:fragment rendered="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}">
                                                                        <li><h:outputText value="#{msg.GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED}" /></li>
                                                                </ui:fragment>
index 7c3976d9bd342ba2faf16270b371e466297433f0..090520cf154c4cbe7e391103c8bbfa3bb91dc6e1 100644 (file)
@@ -16,8 +16,6 @@
                                <f:validator validatorId="EmailAddressValidator" />
                        </h:inputText>
                </div>
-
-               <div class="clear"></div>
        </h:panelGroup>
 
        <h:panelGroup styleClass="error_container" layout="block">
@@ -32,8 +30,6 @@
                <div class="table_right">
                        <h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{userEmailChangeController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
                </div>
-
-               <div class="clear"></div>
        </h:panelGroup>
 
        <h:panelGroup styleClass="error_container" layout="block">
index 97a4e7c992f38a16f04ea9e8d3283cd7ee1a932a..c94c5fb895f3857c593f7f812470c90d6e08e96a 100644 (file)
                                                <!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
                                        </h:inputSecret>
                                </div>
+                       </h:panelGroup>
 
-                               <div class="clear"></div>
-
-                               <h:panelGroup styleClass="error_container" layout="block">
-                                       <h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error_container" layout="block">
+                               <h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
                </fieldset>
        </h:panelGroup>
index d31305de26aa3ac8b467ef1a9ab031c86d0a86f0..5682983c0a88cd8e854dc24e5de878b8d21f6743 100644 (file)
@@ -32,6 +32,4 @@
                        <li class="footer_copyright">Copyright (c) 2016, 2017 Roland Häder</li>
                </ul>
        </div>
-
-       <div class="clear"></div>
 </ui:composition>
index 51f5b4149331800b9adafa6507f1b8b26df9afe1..c6afca17596c2d22e940c80df5d034b1a3c3d425 100644 (file)
@@ -47,8 +47,6 @@
                                        <div class="table_right75_medium">
                                                <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
                                        </div>
-
-                                       <div class="clear"></div>
                                </h:panelGroup>
 
                                <div class="table_footer">
index ae93f79fe008eede9e2b08f4b3e0c89b9d03113e..fda0cf0937041d97bd71cc2bb30d4761c00fa03e 100644 (file)
                                                                        <f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
                                                                </h:selectOneMenu>
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
                                        </fieldset>
                                </h:panelGroup>
index 0896b864f82c1dc40d030334c52b047a64c9addb..47d3c46075d4d66ce6a35f48ab760be630c39cb4 100644 (file)
@@ -36,8 +36,6 @@
                                                                <div class="table_right">
                                                                        <h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
                                                                </div>
-
-                                                               <div class="clear"></div>
                                                        </h:panelGroup>
 
                                                        <div class="table_header">
@@ -52,8 +50,6 @@
                                                                <div class="table_right">
                                                                        <h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
                                                                </div>
-
-                                                               <div class="clear"></div>
                                                        </h:panelGroup>
                                                </fieldset>
 
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
deleted file mode 100644 (file)
index c20b788..0000000
+++ /dev/null
@@ -1,365 +0,0 @@
-/**
-div, table {
-       border: 1px solid #ff0000;
-}
-/**/
-
-#page_title {
-       border-bottom: 1px solid #AFAFAF;
-}
-
-#top {
-       position: relative;
-       background-color: #036fab;
-       color: #ffffff;
-       padding: 5px;
-       margin: 0px 0px 10px 0px;
-}
-
-#page_footer {
-       position: relative;
-       background-color: #c2dfef;
-       padding: 5px;
-       margin: 10px 0px 0px 0px;
-}
-
-#left {
-       float: left;
-       background-color: #ece3a5;
-       padding: 5px;
-       width: 170px;
-}
-
-#right {
-       float: right;
-       background-color: #ece3a5;
-       padding: 5px;
-       width: 150px;
-}
-
-.center_content {
-       position: relative;
-       background-color: #dddddd;
-       padding: 5px;
-}
-
-.left_content {
-       padding-right: 5px;
-       padding-bottom: 5px;
-       margin-left: 190px;
-}
-
-.table_footer {
-       margin: 2px;
-}
-
-#top a:link, #top a:visited {
-       color: #ffffff;
-       font-weight : bold;
-       text-decoration: none;
-}
-
-#top a:link:hover, #top a:visited:hover  {
-       color: #000000;
-       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 {
-       width: 100%;
-}
-
-.table_row {
-       width: 100%;
-       min-height: 20px;
-       margin: 2px;
-}
-
-.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 5px 5px 5px;
-}
-
-.clear {
-       clear: both;
-}
-
-ul.footer_nav, ul.mini_nav {
-       display: block;
-       text-align: center;
-       list-style: none;
-       margin: 0px;
-       padding: 0px;
-}
-
-ul.footer_nav li.footer_link, ul.mini_nav li.mini_link {
-       display: block;
-       float: left;
-}
-
-ul.footer_nav li.footer_link {
-       width: 100px;
-}
-
-ul.mini_nav li.mini_link {
-       padding: 1px;
-}
-
-ul.footer_nav li.footer_copyright {
-       float: right;
-       width: 300px;
-       margin-right: 10px;
-}
-
-.menu ul {
-       list-style: none;
-       padding-left: 5px;
-}
-
-.menu_header {
-       font-weight: bold;
-}
-
-.table_header, .table_label, .message_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, #bbbbbb);
-       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: #888888;
-       background-image: linear-gradient(#eeeeee, #aaaaaa);
-       font-weight: bold;
-       font-size: 18px;
-       margin-bottom: 20px;
-       padding-left: 5px;
-}
-
-.table_header_column {
-       width: 100px;
-}
-
-.table_header_column25 {
-       width: 25%;
-}
-
-.table_data_column {
-       width: 100px;
-}
-
-.item_price, .item_total_price {
-       text-align: right;
-}
-
-.errors {
-       color: red;
-}
-
-.errors:hover {
-       cursor: not-allowed;
-}
-
-.fatals {
-       color: red;
-       font-weight: bold;
-}
-
-.infos {
-       color: cornflowerblue;
-}
-
-.warnings {
-       color: gold;
-}
-
-.message_box, .message_box_mini {
-       border: 1px solid #888888;
-       border-top-right-radius: 8px;
-       border-bottom-left-radius: 8px;
-       background-color: #f0f0fa;
-}
-
-.message_box {
-       width: 400px;
-}
-
-.message_box_mini {
-       width: 160px;
-}
-
-.message_header {
-       border-bottom: 1px solid #888888;
-       background-image: linear-gradient(#eeeeee, #aaaaaa);
-}
-
-.okay {
-       color: #00aa00;
-}
-
-.user_status_confirmed, .customer_status_confirmed {
-       color: #00aa00;
-}
-
-.user_status_unconfirmed, .customer_status_unconfirmed {
-       color: #00aaaa;
-}
-
-.user_status_locked, .customer_status_locked {
-       color: #aa0000;
-}
-
-.unlink_link {
-       color: #aaaa00;
-}
-
-.delete_link {
-       color: #aa0000;
-}
-
-.right_space {
-       margin-right: 2px;
-}
-
-#content_header, .input, .select, .submit, .reset, .delete_button, .unlink_button, .fieldset {
-       border: 1px solid #888888;
-       border-top-right-radius: 8px;
-       border-bottom-left-radius: 8px;
-}
-
-.checkbox {
-       border: 1px solid #888888;
-}
-
-input, textarea, select, option {
-       background-color: #fbfbfb;
-}
-
-.submit, .reset, .delete_button, .unlink_button {
-       cursor: pointer;
-}
-
-input:hover, textarea:hover, select:hover, option:hover {
-       border-color: #666666;
-       background-color: #eeeeee;
-}
-
-.delete_button:hover {
-       border-color: #dd0000;
-       background-color: #aa0000;
-       color: #eeeeee;
-}
-
-.unlink_button:hover {
-       border-color: #dddd00;
-       background-color: #cccc00;
-       color: #eeeeee;
-}
-
-.delete_button {
-       border-color: #ee0000;
-       background-color: #880000;
-       color: #ffffff;
-}
-
-.unlink_button {
-       border-color: #eeee00;
-       background-color: #aaaa00;
-       color: #ffffff;
-}
-
-.fieldset {
-       padding: 5px;
-}
-
-.input {
-       padding-left: 4px;
-       padding-right: 4px;
-}
diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css
new file mode 100644 (file)
index 0000000..5e55798
--- /dev/null
@@ -0,0 +1,373 @@
+/**
+div, table {
+       border: 1px solid #ff0000;
+}
+/**/
+
+#page_title {
+       border-bottom: 1px solid #AFAFAF;
+}
+
+#top {
+       position: relative;
+       background-color: #036fab;
+       color: #ffffff;
+       padding: 5px;
+       margin: 0px 0px 10px 0px;
+}
+
+#page_footer {
+       position: relative;
+       background-color: #c2dfef;
+       padding: 5px;
+       margin: 10px 0px 0px 0px;
+}
+
+#left {
+       float: left;
+       background-color: #ece3a5;
+       padding: 5px;
+       width: 170px;
+}
+
+#right {
+       float: right;
+       background-color: #ece3a5;
+       padding: 5px;
+       width: 150px;
+}
+
+.center_content {
+       position: relative;
+       background-color: #dddddd;
+       padding: 5px;
+}
+
+.left_content {
+       padding-right: 5px;
+       padding-bottom: 5px;
+       margin-left: 190px;
+}
+
+#menu_content::after {
+       clear: both;
+}
+
+.table_footer {
+       margin: 2px;
+}
+
+#top a:link, #top a:visited {
+       color: #ffffff;
+       font-weight : bold;
+       text-decoration: none;
+}
+
+#top a:link:hover, #top a:visited:hover  {
+       color: #000000;
+       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 {
+       width: 100%;
+}
+
+.table_row {
+       width: 100%;
+       min-height: 20px;
+       margin: 2px;
+}
+
+.table_row::after {
+       clear: both;
+}
+
+.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.footer_nav, ul.mini_nav {
+       display: block;
+       text-align: center;
+       list-style: none;
+       margin: 0px;
+       padding: 0px;
+}
+
+ul.footer_nav li.footer_link, ul.mini_nav li.mini_link {
+       display: block;
+       float: left;
+}
+
+ul.footer_nav li.footer_link {
+       width: 100px;
+}
+
+ul.mini_nav li.mini_link {
+       padding: 1px;
+}
+
+ul.footer_nav li.footer_copyright {
+       float: right;
+       width: 300px;
+       margin-right: 10px;
+}
+
+.menu ul {
+       list-style: none;
+       padding-left: 5px;
+}
+
+.menu_header {
+       font-weight: bold;
+}
+
+.table_header, .table_label, .message_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, #bbbbbb);
+       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: #888888;
+       background-image: linear-gradient(#eeeeee, #aaaaaa);
+       font-weight: bold;
+       font-size: 18px;
+       margin-bottom: 20px;
+       padding-left: 5px;
+}
+
+.table_header_column {
+       width: 100px;
+}
+
+.table_header_column25 {
+       width: 25%;
+}
+
+.table_data_column {
+       width: 100px;
+}
+
+.item_price, .item_total_price {
+       text-align: right;
+}
+
+.errors {
+       color: red;
+}
+
+.errors:hover {
+       cursor: not-allowed;
+}
+
+.fatals {
+       color: red;
+       font-weight: bold;
+}
+
+.infos {
+       color: cornflowerblue;
+}
+
+.warnings {
+       color: gold;
+}
+
+.message_box, .message_box_mini {
+       border: 1px solid #888888;
+       border-top-right-radius: 8px;
+       border-bottom-left-radius: 8px;
+       background-color: #f0f0fa;
+}
+
+.message_box {
+       width: 400px;
+}
+
+.message_box_mini {
+       width: 160px;
+}
+
+.message_header {
+       border-bottom: 1px solid #888888;
+       background-image: linear-gradient(#eeeeee, #aaaaaa);
+}
+
+.okay {
+       color: #00aa00;
+}
+
+.user_status_confirmed, .customer_status_confirmed {
+       color: #00aa00;
+}
+
+.user_status_unconfirmed, .customer_status_unconfirmed {
+       color: #00aaaa;
+}
+
+.user_status_locked, .customer_status_locked {
+       color: #aa0000;
+}
+
+.unlink_link {
+       color: #aaaa00;
+}
+
+.delete_link {
+       color: #aa0000;
+}
+
+.right_space {
+       margin-right: 2px;
+}
+
+#content_header, .input, .select, .submit, .reset, .delete_button, .unlink_button, .fieldset {
+       border: 1px solid #888888;
+       border-top-right-radius: 8px;
+       border-bottom-left-radius: 8px;
+}
+
+.checkbox {
+       border: 1px solid #888888;
+}
+
+input, textarea, select, option {
+       background-color: #fbfbfb;
+}
+
+.submit, .reset, .delete_button, .unlink_button {
+       cursor: pointer;
+}
+
+input:hover, textarea:hover, select:hover, option:hover {
+       border-color: #666666;
+       background-color: #eeeeee;
+}
+
+.delete_button:hover {
+       border-color: #dd0000;
+       background-color: #aa0000;
+       color: #eeeeee;
+}
+
+.unlink_button:hover {
+       border-color: #dddd00;
+       background-color: #cccc00;
+       color: #eeeeee;
+}
+
+.delete_button {
+       border-color: #ee0000;
+       background-color: #880000;
+       color: #ffffff;
+}
+
+.unlink_button {
+       border-color: #eeee00;
+       background-color: #aaaa00;
+       color: #ffffff;
+}
+
+.fieldset {
+       padding: 5px;
+}
+
+.input {
+       padding-left: 4px;
+       padding-right: 4px;
+}
+
+.footer::after {
+       clear: both;
+}
index 03674f1ce46f4b8b5d0694d7c8b9dcdbe301e6e8..fedd9d48bd6c54ecdd7809a5ee53a100c24329fd 100644 (file)
@@ -36,8 +36,6 @@
                                                <div class="table_right">
                                                        <h:outputText value="#{contactController.emailAddress}" />
                                                </div>
-
-                                               <div class="clear"></div>
                                        </h:panelGroup>
 
                                        <ui:include src="/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl" />
index 98003d1f1f68fdb017328a393ce4d7f03e149d7f..9d641961a092508c811e136ac6ead0324bbe7f2c 100644 (file)
@@ -37,8 +37,6 @@
                                                        <div class="table_right">
                                                                <h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
@@ -53,8 +51,6 @@
                                                        <div class="table_right">
                                                                <h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
                                                        </div>
-
-                                                       <div class="clear"></div>
                                                </h:panelGroup>
 
                                                <h:panelGroup styleClass="error_container" layout="block">
@@ -62,6 +58,7 @@
                                                </h:panelGroup>
                                        </fieldset>
 
+                                       <!-- @TODO Get rid of this ugly class=para abuse -->
                                        <div class="para"></div>
 
                                        <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />