- added missing navigation rule from admin_user_(un)lock to admin_show_mobile_provider
- removed reset-form button from logout forms
- much nicer CSS style applied for form elements and content_header
- CSS hover effects added for above buttons, select boxes and text areas
- used table_medium, table_left(25)_medium, table_right(75)_medium for registration page
- added missing context parameter is_debug_register_enabled
Signed-off-by: Roland Häder <roland@mxchange.org>
<from-outcome>admin_show_user</from-outcome>
<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>admin_show_mobile_provider</from-outcome>
+ <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/admin/user/admin_user_unlock.xhtml</from-view-id>
<from-outcome>admin_show_user</from-outcome>
<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>admin_show_mobile_provider</from-outcome>
+ <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</from-view-id>
</f:facet>
<h:column>
- <h:outputLabel for="cellphoneId" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
+ <h:outputLabel for="cellphoneId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
- <h:outputText id="cellphoneId" styleClass="data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+ <h:outputText id="cellphoneId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
</h:column>
<h:column>
- <h:outputLabel for="cellphoneProvider" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_PROVIDER_NAME}" />
+ <h:outputLabel for="cellphoneProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_PROVIDER_NAME}" />
<h:link outcome="admin_show_mobile_provider">
<f:param name="providerId" value="#{beanHelper.cellPhoneNumber.cellphoneProvider.providerId}" />
- <h:outputText id="cellphoneProvider" styleClass="data_field" value="#{beanHelper.cellPhoneNumber.cellphoneProvider.providerName}" />
+ <h:outputText id="cellphoneProvider" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.cellphoneProvider.providerName}" />
</h:link>
</h:column>
<h:column>
- <h:outputLabel for="cellphoneNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE}" />
+ <h:outputLabel for="cellphoneNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE}" />
- <h:outputText id="cellphoneNumber" styleClass="data_field" value="#{beanHelper.cellPhoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.cellphoneProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
+ <h:outputText id="cellphoneNumber" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.cellphoneProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
</h:column>
<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
- <h:outputLabel styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
+ <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
- <div class="data_field">
+ <div class="table_data_field">
<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
<ui:param name="isShowPage" value="#{isShowPage}" />
</ui:include>
<h:outputText styleClass="errors" value="#{msg.ERROR_ADMIN_BEAN_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
<div class="para">
- <fieldset id="phone_data">
+ <fieldset class="fieldset" id="phone_data">
<legend title="#{msg.ADMIN_CELLPHONE_DATA_LEGEND_TITLE}">
<h:outputText value="#{msg.ADMIN_CELLPHONE_DATA_LEGEND}" />
</legend>
</f:facet>
<h:column>
- <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+ <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
- <h:outputText id="contactId" styleClass="data_field" value="#{beanHelper.contact.contactId}" />
+ <h:outputText id="contactId" styleClass="table_data_field" value="#{beanHelper.contact.contactId}" />
</h:column>
<h:column>
- <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+ <h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
- <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.contact.contactCreated.time}">
+ <h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.contact.contactCreated.time}">
<f:convertDateTime for="contactCreated" type="both" />
</h:outputText>
</h:column>
<h:column>
- <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+ <h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
- <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.contact.contactUpdated.time}">
+ <h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.contact.contactUpdated.time}">
<f:convertDateTime for="contactUpdated" type="both" />
</h:outputText>
</h:column>
<h:column>
- <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+ <h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
- <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.contact.isOwnContact()}" />
+ <h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.contact.isOwnContact()}" />
</h:column>
<h:column>
- <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+ <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
- <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
+ <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
</h:column>
<h:column>
- <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+ <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
- <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.contact.contactTitle}" />
+ <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
</h:column>
<h:column>
- <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+ <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
- <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.contact.contactFirstName}" />
+ <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
</h:column>
<h:column>
- <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+ <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
- <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.contact.contactFamilyName}" />
+ <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
</h:column>
<h:column>
- <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+ <h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
- <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.contact.contactStreet}" />
+ <h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.contact.contactStreet}" />
</h:column>
<h:column>
- <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+ <h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
- <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumber}" />
+ <h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumber}" />
</h:column>
<h:column>
- <h:outputLabel for="contactHouseNumberExtension" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+ <h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
- <h:outputText id="contactHouseNumberExtension" styleClass="data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
+ <h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
</h:column>
<h:column>
- <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+ <h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
- <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.contact.contactZipCode}" />
+ <h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.contact.contactZipCode}" />
</h:column>
<h:column>
- <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+ <h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
- <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.contact.contactCity}" />
+ <h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.contact.contactCity}" />
</h:column>
<h:column>
- <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+ <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
- <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+ <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
</h:outputLink>
</h:column>
<h:column>
- <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+ <h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
- <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.contact.contactBirthday.time}">
+ <h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.contact.contactBirthday.time}">
<f:convertDateTime for="contactBirthday" type="date" />
</h:outputText>
</h:column>
</f:facet>
<h:column>
- <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+ <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
- <h:outputText id="contactId" styleClass="data_field" value="#{beanHelper.contact.contactId}" />
+ <h:outputText id="contactId" styleClass="table_data_field" value="#{beanHelper.contact.contactId}" />
</h:column>
<h:column>
- <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+ <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
- <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
+ <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
</h:column>
<h:column>
- <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+ <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
- <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.contact.contactTitle}" />
+ <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
</h:column>
<h:column>
- <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+ <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
- <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.contact.contactFirstName}" />
+ <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
</h:column>
<h:column>
- <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+ <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
- <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.contact.contactFamilyName}" />
+ <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
</h:column>
<h:column>
- <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+ <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
- <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+ <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
</h:outputLink>
</h:column>
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<div class="para">
- <fieldset id="personal_data">
+ <fieldset class="fieldset" id="personal_data">
<legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
</legend>
</div>
<div class="table_right_medium">
- <h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
+ <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{adminContactController.phoneCountry}">
+ <f:converter converterId="CountryConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
</h:selectOneMenu>
- <h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminContactController.phoneAreaCode}">
+ <h:inputText styleClass="input right_space" id="phoneAreaCode" size="5" maxlength="10" value="#{adminContactController.phoneAreaCode}">
<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
</h:inputText>
</div>
<div class="table_right_medium">
- <h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
+ <h:selectOneMenu styleClass="select right_space" id="faxCountryCode" value="#{adminContactController.faxCountry}">
+ <f:converter converterId="CountryConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
</h:selectOneMenu>
- <h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+ <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
</h:inputText>
</div>
<div class="para">
- <fieldset id="country_data">
+ <fieldset class="fieldset" id="country_data">
<legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">
<h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
</legend>
</div>
<div class="para">
- <fieldset id="mobile_provider">
+ <fieldset class="fieldset" id="mobile_provider">
<legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">
<h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
</legend>
<ui:fragment rendered="#{not empty mode}">
<div class="para">
- <fieldset id="login_data">
+ <fieldset class="fieldset" id="login_data">
<legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
</legend>
</div>
<div class="para">
- <fieldset id="personal_data">
+ <fieldset class="fieldset" id="personal_data">
<legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">
<h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
</legend>
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
<ui:param name="targetController" value="#{contactController}" />
</ui:include>
<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
<f:validator validatorId="NameValidator" />
</h:inputText>
<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
<f:validator for="familyName" validatorId="NameValidator" />
</h:inputText>
<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
<f:validator validatorId="NameValidator" />
</h:inputText>
<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
</h:inputText>
</div>
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
</div>
</div>
<div class="table_row">
- <div class="table_left">
- <h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
- </div>
-
- <div class="table_right">
- <h:inputText styleClass="input" id="houseNumber" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
- </div>
-
- <div class="clear"></div>
- </div>
-
- <h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
-
- <div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
<f:validateLongRange minimum="1" maximum="99999" />
</h:inputText>
<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
<f:validator validatorId="NameValidator" />
</h:inputText>
<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="birthday" value="#{msg.PERSONAL_DATA_BIRTHDAY}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="birthday" value="#{contactController.birthday}" required="true" size="10" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" converterMessage="#{msg.INVALID_BIRTHDAY}">
<f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
</h:inputText>
<h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
</div>
- <div class="table_right">
- <h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}" converter="CountryConverter">
+ <div class="table_right_medium">
+ <h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}">
+ <f:converter converterId="CountryConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nkey]})" />
</h:selectOneMenu>
<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
</div>
- <div class="table_right">
- <h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
+ <div class="table_right_medium">
+ <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{contactController.phoneCountry}">
+ <f:converter converterId="CountryConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
</h:selectOneMenu>
- <h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
+ <h:inputText styleClass="input right_space" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
<f:validator validatorId="PhoneNumberValidator" />
</h:inputText>
</div>
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
</div>
- <div class="table_right">
- <h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
+ <div class="table_right_medium">
+ <h:selectOneMenu styleClass="select right_space" id="faxCountryCode" value="#{contactController.faxCountry}">
+ <f:converter converterId="CountryConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
</h:selectOneMenu>
- <h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+ <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
</h:inputText>
</div>
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="cellphoneNumber" value="#{msg.PERSONAL_DATA_CELLPHONE_NUMBER}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
<ui:param name="targetController" value="#{contactController}" />
</ui:include>
<ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
<div class="para">
- <fieldset id="user_profile">
+ <fieldset class="fieldset" id="profile_mode">
<legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
<h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
</legend>
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<ui:include src="/WEB-INF/templates/generic/profile_mode_selection_box.tpl" />
</div>
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<h:form id="form_locale_selection">
- <h:selectOneMenu id="language_selection" value="#{localizationController.language}" onchange="submit()">
+ <h:selectOneMenu styleClass="select" id="language_selection" value="#{localizationController.language}" onchange="submit()">
<f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" />
<f:selectItems value="#{localizationController.selectableLocalizations}" var="l" itemValue="#{l}" itemLabel="#{msg[l.toString().toUpperCase()]}" />
</h:selectOneMenu>
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<ui:fragment rendered="#{not empty targetController}">
- <h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
+ <h:selectOneMenu styleClass="select right_space" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}">
+ <f:converter converterId="MobileProviderConverter" />
<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
<f:selectItems value="#{mobileProviderController.allMobileProvider()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
</h:selectOneMenu>
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<div class="para">
- <fieldset id="terms_privacy">
+ <fieldset class="fieldset" id="terms_privacy">
<legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">
<h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
</legend>
<div class="table_row">
- <div class="table_left25">
+ <div class="table_left25_medium">
<h:selectBooleanCheckbox styleClass="input" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
<f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
</h:selectBooleanCheckbox>
</div>
- <div class="table_right75">
+ <div class="table_left75_medium">
<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
<h:outputText value=" " />
<h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
<h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
<div class="table_row">
- <div class="table_left25">
+ <div class="table_left25_medium">
<h:selectBooleanCheckbox styleClass="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
<f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
</h:selectBooleanCheckbox>
</div>
- <div class="table_right75">
+ <div class="table_left75_medium">
<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
<h:outputText value=" " />
<h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}
</div>
- <fieldset id="login_data">
+ <fieldset class="fieldset" id="login_data">
<legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">
<h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}" />
</legend>
</fieldset>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
- <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
</div>
</div>
</h:form>
<h:form id="form_register_page1">
- <div class="table">
+ <div class="table_medium">
<div class="table_header">
#{msg.GUEST_REGISTRATION_PAGE1_TITLE}
</div>
<div class="para">
- <fieldset id="login_data">
+ <fieldset class="fieldset" id="login_data">
<legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
<h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
</legend>
<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
</div>
<div class="para"></div>
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
</div>
</div>
<div class="table_row">
- <div class="table_left">
+ <div class="table_left_medium">
<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
</div>
- <div class="table_right">
+ <div class="table_right_medium">
<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
</div>
<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="continueRegisterPage1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{registerController.doRegisterMultiPage1()}" />
</div>
</div>
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<h:form id="form_register_page2">
- <div class="table">
+ <div class="table_medium">
<div class="table_header">
#{msg.GUEST_REGISTRATION_PAGE2_TITLE}
</div>
<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="finish_registration" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doFinishRegistration()}" />
</div>
</div>
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<h:form id="form_register_single">
- <div class="table">
+ <div class="table_medium">
<div class="table_header">
<h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
</div>
<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
<div class="para">
- <fieldset id="login_data">
+ <fieldset class="fieldset" id="login_data">
<legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
<h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
</legend>
<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doFinishRegistration()}" />
</div>
</div>
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<div class="para">
- <fieldset id="current_password">
+ <fieldset class="fieldset" id="current_password">
<legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">
<h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
</legend>
<param-name>max_user_password_history</param-name>
<param-value>5</param-value>
</context-param>
+ <context-param>
+ <description>Whether debugging of registration form is enabled.</description>
+ <param-name>is_debug_register_enabled</param-name>
+ <param-value>false</param-value>
+ </context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
</div>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
</div>
</div>
<ui:include src="/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="edit_cellphone" value="#{msg.BUTTON_ADMIN_EDIT_CELLPHONE}" action="#{adminPhoneController.editCellphoneData()}" />
</div>
</div>
</f:facet>
<h:column>
- <h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+ <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
- <h:link id="contactId" styleClass="data_field" outcome="admin_show_contact">
+ <h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact">
<h:outputText value="#{contact.contactId}" />
<f:param name="contactId" value="#{contact.contactId}" />
</h:link>
</h:column>
<h:column>
- <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+ <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
- <h:outputText id="contactGender" styleClass="data_field" value="#{msg[contact.contactGender.messageKey]}" />
+ <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[contact.contactGender.messageKey]}" />
</h:column>
<h:column>
- <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+ <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
- <h:outputText id="contactTitle" styleClass="data_field" value="#{contact.contactTitle}" />
+ <h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
</h:column>
<h:column>
- <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+ <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
- <h:outputText id="contactFirstName" styleClass="data_field" value="#{contact.contactFirstName}" />
+ <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
</h:column>
<h:column>
- <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+ <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
- <h:outputText id="contactFamilyName" styleClass="data_field" value="#{contact.contactFamilyName}" />
+ <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
</h:column>
<h:column>
- <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+ <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
- <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{contact.contactEmailAddress}">
+ <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
<h:outputText value="#{contact.contactEmailAddress}" />
</h:outputLink>
</h:column>
<h:column>
- <h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
+ <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
- <div id="cellphoneLinks" class="data_field">
+ <div class="table_data_field">
<ul class="mini_nav">
<li class="mini_link">
<h:link outcome="admin_unlink_contact_cellphone">
<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="delete_button" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
</div>
</div>
<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
- <div class="table">
+ <div class="table_medium">
<div class="table_header">
<h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
<f:param value="#{beanHelper.contact.contactId}" />
</ui:include>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
</div>
</div>
<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
</div>
</h:form>
<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
</div>
</div>
<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
</div>
</div>
</ui:include>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
</div>
</div>
</div>
<div class="para">
- <fieldset id="user_contact">
+ <fieldset class="fieldset" id="user_contact">
<legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
<h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
</legend>
<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
</div>
</h:form>
</div>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
</div>
</f:facet>
<h:column>
- <h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_USER_ID}" />
+ <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
- <h:outputText id="userId" styleClass="data_field" value="#{beanHelper.user.userId}" />
+ <h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
</h:column>
<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
<h:column>
- <h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_USER_NAME}" />
+ <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
- <h:outputText id="userName" styleClass="data_field" value="#{beanHelper.user.userName}" />
+ <h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
</h:column>
</ui:fragment>
<h:column>
- <h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CREATED}" />
+ <h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
- <h:outputText id="userCreated" styleClass="data_field" value="#{beanHelper.user.userCreated.time}">
+ <h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
<f:convertDateTime for="userCreated" type="both" />
</h:outputText>
</h:column>
<h:column>
- <h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_UPDATED}" />
+ <h:outputLabel for="userUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_UPDATED}" />
- <h:outputText id="userUpdated" styleClass="data_field" value="#{beanHelper.user.userUpdated.time}">
+ <h:outputText id="userUpdated" styleClass="table_data_field" value="#{beanHelper.user.userUpdated.time}">
<f:convertDateTime for="userUpdated" type="both" />
</h:outputText>
</h:column>
<h:column>
- <h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+ <h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
<h:outputText id="userAccountStatus" styleClass="data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
</h:column>
<h:column>
- <h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+ <h:outputLabel for="userProfileMode" styleClass="table_data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
- <h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
+ <h:outputText id="userProfileMode" styleClass="table_data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
</h:column>
<h:column>
- <h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+ <h:outputLabel for="userLastLocked" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
- <h:outputText id="userLastLocked" styleClass="data_field" value="#{beanHelper.user.userLastLocked.time}">
+ <h:outputText id="userLastLocked" styleClass="table_data_field" value="#{beanHelper.user.userLastLocked.time}">
<f:convertDateTime for="userLastLocked" type="both" />
</h:outputText>
</h:column>
<h:column>
- <h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+ <h:outputLabel for="lastLockedReason" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
- <h:outputText id="lastLockedReason" styleClass="data_field" value="#{beanHelper.user.userLastLockedReason}" />
+ <h:outputText id="lastLockedReason" styleClass="table_data_field" value="#{beanHelper.user.userLastLockedReason}" />
</h:column>
<h:column>
- <h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
+ <h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
- <h:outputText id="contactCreated" styleClass="data_field" value="#{beanHelper.user.userContact.contactCreated.time}">
+ <h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactCreated.time}">
<f:convertDateTime for="contactCreated" type="both" />
</h:outputText>
</h:column>
<h:column>
- <h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
+ <h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
- <h:outputText id="contactUpdated" styleClass="data_field" value="#{beanHelper.user.userContact.contactUpdated.time}">
+ <h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactUpdated.time}">
<f:convertDateTime for="contactUpdated" type="both" />
</h:outputText>
</h:column>
<h:column>
- <h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+ <h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
- <h:outputText id="isOwnContact" styleClass="data_field" value="#{beanHelper.user.userContact.isOwnContact()}" />
+ <h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.user.userContact.isOwnContact()}" />
</h:column>
<h:column>
- <h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+ <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
- <h:outputText id="contactGender" styleClass="data_field" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+ <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
</h:column>
<h:column>
- <h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+ <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
- <h:outputText id="contactTitle" styleClass="data_field" value="#{beanHelper.user.userContact.contactTitle}" />
+ <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactTitle}" />
</h:column>
<h:column>
- <h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+ <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
- <h:outputText id="contactFirstName" styleClass="data_field" value="#{beanHelper.user.userContact.contactFirstName}" />
+ <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactFirstName}" />
</h:column>
<h:column>
- <h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+ <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
- <h:outputText id="contactFamilyName" styleClass="data_field" value="#{beanHelper.user.userContact.contactFamilyName}" />
+ <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactFamilyName}" />
</h:column>
<h:column>
- <h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+ <h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
- <h:outputText id="contactStreet" styleClass="data_field" value="#{beanHelper.user.userContact.contactStreet}" />
+ <h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactStreet}" />
</h:column>
<h:column>
- <h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+ <h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
- <h:outputText id="contactHouseNumber" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
+ <h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
</h:column>
<h:column>
- <h:outputLabel for="contactHouseNumberExtension" styleClass="data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+ <h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
- <h:outputText id="contactHouseNumberExtension" styleClass="data_field" value="#{beanHelper.user.userContact.contactHouseNumberExtension}" />
+ <h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactHouseNumberExtension}" />
</h:column>
<h:column>
- <h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+ <h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
- <h:outputText id="contactZipCode" styleClass="data_field" value="#{beanHelper.user.userContact.contactZipCode}" />
+ <h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactZipCode}" />
</h:column>
<h:column>
- <h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+ <h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
- <h:outputText id="contactCity" styleClass="data_field" value="#{beanHelper.user.userContact.contactCity}" />
+ <h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactCity}" />
</h:column>
<h:column>
- <h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+ <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
- <h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{beanHelper.user.userContact.contactEmailAddress}">
+ <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.user.userContact.contactEmailAddress}">
<h:outputText value="#{beanHelper.user.userContact.contactEmailAddress}" />
</h:outputLink>
</h:column>
<h:column>
- <h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+ <h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
- <h:outputText id="contactBirthday" styleClass="data_field" value="#{beanHelper.user.userContact.contactBirthday.time}">
+ <h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactBirthday.time}">
<f:convertDateTime for="contactBirthday" type="date" />
</h:outputText>
</h:column>
<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
</div>
- <div class="table_data_value">
+ <div class="table_data_field">
<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
<f:param name="userId" value="#{beanHelper.user.userId}" />
</h:link>
<h:outputLabel for="contactGender" value="#{msg.PERSONAL_DATA_GENDER}" />
</div>
- <div class="table_data_value">
+ <div class="table_data_field">
<h:outputText id="contactGender" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
</div>
</div>
<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
</div>
- <div class="table_data_value">
+ <div class="table_data_field">
<h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
</div>
</div>
<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
</div>
- <div class="table_data_value">
+ <div class="table_data_field">
<h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
</div>
</div>
<h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
</div>
- <div class="table_data_value">
+ <div class="table_data_field">
<h:outputText id="userLockReason" value="#{adminUserController.userLockReason}" />
</div>
</div>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
</div>
<h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
</div>
- <fieldset id="login_data">
+ <fieldset class="fieldset" id="login_data">
<legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
<h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
</legend>
</fieldset>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
</div>
</div>
<h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
</div>
- <fieldset id="email_address_notice">
+ <fieldset class="fieldset" id="email_address_notice">
<legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
<h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
</legend>
</div>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{resendController.doResendLink()}" />
</div>
</div>
width: 500px;
}
+.table_footer {
+ margin: 2px;
+}
+
.table_medium {
width: 650px;
}
.table_row {
width: 100%;
min-height: 20px;
+ margin: 2px;
}
.table_left {
float: right;
}
+.table_left25_medium {
+ width: 30px;
+ min-height: 20px;
+ float: left;
+}
+
+.table_right75_medium {
+ width: 570px;
+ min-height: 20px;
+ float: right;
+}
+
.para {
padding: 5px 5px 5px 5px;
}
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);
- border: 1px solid #aaaaaa;
height: 16px;
padding-left: 2px;
}
-.table_data_value {
- border: 1px solid #aaaaaa;
+.table_data_field {
+ background-color: #f5f5f5;
+ vertical-align: top;
padding-top: 1px;
padding-bottom: 1px;
padding-left: 2px;
}
#content_header {
- background-color: #dddddd;
+ border-color: #888888;
+ background-image: linear-gradient(#eeeeee, #aaaaaa);
font-weight: bold;
font-size: 18px;
margin-bottom: 20px;
+ padding-left: 5px;
}
.table_header_column {
color: #aa0000;
}
-.data_label, .data_field {
- display: block;
- width: 100%;
- height: 14px;
- padding: 1px;
- margin: 1px;
- border: 1px solid #aaaaaa;
- vertical-align: top;
-}
-
-.data_label {
- font-weight: bold;
- background-color: #dddddd;
-}
-
.unlink_link {
color: #aaaa00;
}
color: #aa0000;
}
+.right_space {
+ margin-right: 2px;
+}
+
+#content_header, .input, .select, .submit, .reset, .delete_button, .unlink_button, .fieldset {
+ border-style: groove;
+ border-width: 1px;
+ border-top-right-radius: 8px;
+ border-bottom-left-radius: 8px;
+ border-color: #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: #ee0000 1px groove;
+ border-color: #ee0000;
background-color: #880000;
color: #ffffff;
}
.unlink_button {
- border: #eeee00 1px groove;
+ border-color: #eeee00;
background-color: #aaaa00;
color: #ffffff;
}
+
+.fieldset {
+ padding: 5px;
+}
<h:form id="form_login_change_email_address">
<div class="para">
- <fieldset id="change_email">
+ <fieldset class="fieldset" id="change_email">
<legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
</legend>
<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
<div class="table_footer">
- <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
</div>
</h:form>
<h:form id="form_user_change_password">
<div class="para">
- <fieldset id="change_password">
+ <fieldset class="fieldset" id="change_password">
<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
</legend>
</div>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
</div>
</h:form>
<ui:define name="content">
<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
- <div class="table">
+ <div class="table_medium">
<div class="table_header">
<h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
</div>
<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+ <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
</div>
</h:form>
</div>
<div class="table_footer">
- <h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
</div>
</div>
projects / jjobs-war.git / commitdiff