Please cherry-pick:

[pizzaservice-war.git] / web / WEB-INF / templates / admin / landline / admin_form_add_contact_landline.tpl

diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 1c131bdb83aade3a2617f79b0e40fce4b1f6e3aa..22d08e9e8be4a6fefd6e147be8ccf757b7ac3aa5 100644 (file)
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -6,11 +6,11 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+       <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
        <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table_medium" layout="block">
-                       <div class="table_header">
+               <h:panelGroup styleClass="table table-medium" layout="block">
+                       <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
                        </div>
 
@@ -18,50 +18,46 @@
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
+                               <div class="table-right-medium">
+                                       <h:selectOneMenu styleClass="select divider-right" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
                                                <f:converter converterId="LandLineNumberConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
                                                <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">
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
                        </div>
 
-                       <h:panelGroup styleClass="table_row" layout="block">
-                               <div class="table_left_medium">
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <div class="table-left-medium">
                                        <h:outputLabel for="landLineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
                                </div>
 
-                               <div class="table_right_medium">
+                               <div class="table-right-medium">
                                        <ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
                                                <ui:param name="targetController" value="#{adminPhoneController}" />
                                        </ui:include>
                                </div>
-
-                               <div class="clear"></div>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="error_container" layout="block">
-                               <h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+                               <h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
                        </h:panelGroup>
 
-                       <div class="table_footer">
-                               <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <div class="table-footer">
+                               <h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
                                <h:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
                                        <f:param name="contactId" value="#{param.contactId}" />