Please cherry-pick (if needed):

[jjobs-war.git] / web / admin / mobile / admin_contact_mobile_unlink.xhtml

diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index beedcd7b0c29add7a5b8e11ef9f58a672fa5bee5..b2ef4af6af5cbadfd489464d115ecf30248a9969 100644 (file)
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -8,56 +8,21 @@
        >
 
        <f:metadata>
-               <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+               <f:viewParam name="phoneId" value="#{adminPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
                <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
                </ui:define>
 
                <ui:define name="content">
-                       <h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber == beanHelper.mobileNumber}">
-                               <h:panelGroup styleClass="table" layout="block">
-                                       <div class="table_header">
-                                               <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_TITLE}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
-                                       </div>
-
-                                       <div class="para">
-                                               <h:link outcome="admin_show_contact">
-                                                       <h:outputText value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}" />
-                                                       <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
-                                               </h:link>
-                                       </div>
-
-                                       <div class="para">
-                                               <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl">
-                                                       <ui:param name="isShowPage" value="#{false}" />
-                                                       <ui:param name="showAdminLinks" value="#{false}" />
-                                               </ui:include>
-                                       </div>
-
-                                       <div class="table_footer">
-                                               <h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_CONTACT_MOBILE}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-                                       </div>
-                               </h:panelGroup>
-                       </h:form>
-
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
-
-                       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
-
-                       <h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactCellphoneNumber != beanHelper.mobileNumber}">
-                               <f:param value="#{beanHelper.mobileNumber.phoneId}" />
-                               <f:param value="#{beanHelper.contact.contactId}" />
-                       </h:outputFormat>
+                       <!-- @TODO Here goes your content. //-->
                </ui:define>
        </ui:composition>
 </html>