Please cherry-pick:

[pizzaservice-war.git] / web / admin / contact / admin_contact_list.xhtml

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 3024149a01020af6d31b8ce228d625a3f83dd195..0644b20ab613d69172bed77f41bbbf502b753c7e 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -15,9 +15,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" styleClass="errors" rendered="#{contactController.allContacts().isEmpty()}" />
+               <widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{contactController.allContacts().isEmpty()}" />
 
-               <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
+               <h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
                        <h:column>
                                <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
@@ -72,8 +72,8 @@
                </h:dataTable>
 
                <h:form id="form_admin_add_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_TITLE}" />
                                </div>
 
@@ -81,12 +81,10 @@
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
                                </div>
 
-                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
-                                       <ui:param name="allowEmptyRequiredData" value="true" />
-                               </ui:include>
+                               <widgets:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 
-                               <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" type="submit" id="add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
                                </div>
                        </h:panelGroup>