Please cherry-pick:

[jjobs-war.git] / web / admin / contact / unlink / admin_contact_landline_unlink.xhtml

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index f1189be195964e86ad1e04e6411c0ef7be194305..6401f76401ab95b496275ec2541fbfa9aaa3c47d 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -4,7 +4,8 @@
                                xmlns:widgets="http://mxchange.org/jsf/core/widgets"
                                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                                xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+                               xmlns:f="http://xmlns.jcp.org/jsf/core"
+                               xmlns:p="http://primefaces.org/ui">
 
        <ui:define name="metadata">
                <f:metadata>
@@ -13,7 +14,7 @@
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
        </ui:define>
 
@@ -22,9 +23,13 @@
        </ui:define>
 
        <ui:define name="content">
+               <widgets:outputMessageBox id="error-handler-landline-number" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
+
+               <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+
                <h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
-                               <div class="table_header">
+                               <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
                                </div>
 
@@ -33,29 +38,22 @@
                                </div>
 
                                <div class="para">
-                                       <h:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+                                       <p:link outcome="admin_show_contact" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                       </h:link>
+                                       </p:link>
                                </div>
 
                                <div class="para">
-                                       <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_data.tpl">
-                                               <ui:param name="isShowPage" value="#{false}" />
-                                               <ui:param name="showAdminLinks" value="#{false}" />
-                                       </ui:include>
+                                       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
                                </div>
 
-                               <div class="table_footer">
-                                       <h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
+                               <div class="table-footer">
+                                       <p:commandButton styleClass="button-warning" type="submit" id="submit_unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
                                </div>
                        </h:panelGroup>
                </h:form>
 
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
-
-               <widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
-
-               <h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
+               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
                        <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                        <f:param value="#{beanHelper.contact.contactId}" />
                </h:outputFormat>