Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / templates / admin / mobile / admin_mobile_data.tpl

diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
index 3735c9057341eea051729aa062f4bcc058ce4201..f7648aab9ca23e87c902ec9fdf67fd36b57124c5 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -5,18 +5,18 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.cellPhoneNumber}" />
+       <h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
 
-       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty beanHelper.cellPhoneNumber}">
+       <h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
                <f:facet name="header">
-                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_DATA}" />
+                       <h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
                </f:facet>
 
                <h:column>
                        <h:panelGroup>
-                               <h:outputLabel for="mobileNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
+                               <h:outputLabel for="mobileNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 
-                               <h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.phoneId}" />
+                               <h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneId}" />
 
                                <h:message for="mobileNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
                        </h:panelGroup>
@@ -26,19 +26,35 @@
                        <h:outputLabel for="mobileProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
                        <h:link outcome="admin_show_mobile_provider">
-                               <f:param name="providerId" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerId}" />
-                               <h:outputText id="mobileProvider" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerName}" />
+                               <f:param name="providerId" value="#{beanHelper.mobileNumber.mobileProvider.providerId}" />
+                               <h:outputText id="mobileProvider" styleClass="table_data_field" value="#{beanHelper.mobileNumber.mobileProvider.providerName}" />
                        </h:link>
                </h:column>
 
                <h:column>
                        <h:outputLabel for="mobileNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 
-                       <h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.cellPhoneNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.cellPhoneNumber.mobileProvider.providerDialPrefix}-#{beanHelper.cellPhoneNumber.phoneNumber}" />
+                       <h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.mobileNumber.mobileProvider.providerDialPrefix}-#{beanHelper.mobileNumber.phoneNumber}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="mobileCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+                       <h:outputText id="mobileCreated" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneEntryCreated.time}">
+                               <f:convertDateTime for="contactCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="mobileUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+                       <h:outputText id="mobileUpdated" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneEntryUpdated.time}">
+                               <f:convertDateTime for="contactUpdated" type="both" />
+                       </h:outputText>
                </h:column>
 
                <h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_LINKS}" />
+                       <h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <div class="table_data_field">
                                <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">