]> git.mxchange.org Git - jjobs-war.git/commitdiff
Continued with fax, land-line, mobile: (please cherry-pick)
authorRoland Häder <roland@mxchange.org>
Wed, 17 Aug 2016 10:09:28 +0000 (12:09 +0200)
committerRoland Haeder <roland@mxchange.org>
Sun, 21 Aug 2016 18:37:09 +0000 (20:37 +0200)
- added getter/setter for choosen fax/land-line numbers
- added template includes for fax/land-line numbers (admin_show_contact)
- added created/updated timestamp for fax/land-line/mobile data
- added templates for fax/land-line "selection boxes" (input forms, needs renaming)
- introduced template admin_user_data.tpl (similar to admin_contact_data.tpl)
- fixed "add" EL code for fax/land-line numbers
- renamed some i18n strings as they can be combined into a generic "Administrative links" string
- added missing i18n strings
- added suffix _NUMBER to i18n strings as they are about ("phone") numbers ...

Signed-off-by: Roland Häder <roland@mxchange.org>
21 files changed:
src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
web/WEB-INF/templates/admin/user/admin_user_data.tpl [new file with mode: 0644]
web/WEB-INF/templates/generic/fax_selection_box.tpl [new file with mode: 0644]
web/WEB-INF/templates/generic/landline_selection_box.tpl [new file with mode: 0644]
web/admin/contact/admin_contact_show.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/mobile/admin_mobile_show.xhtml
web/admin/user/admin_user_show.xhtml

index 636675a37122377a24b5603bc2035ec185f1eeda..cb6256804be18c95efab921d3ec8d03d5c6c2c28 100644 (file)
@@ -72,6 +72,11 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
        @Inject
        private JobsWebRequestController beanHelper;
 
+       /**
+        * Choosen fax number
+        */
+       private DialableFaxNumber choosenFaxNumber;
+
        /**
         * Choosen land-line number
         */
@@ -306,6 +311,16 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
                return "admin_edit_mobile?faces-redirect=true&includeViewParams=true"; //NOI18N
        }
 
+       @Override
+       public DialableFaxNumber getChoosenFaxNumber () {
+               return this.choosenFaxNumber;
+       }
+
+       @Override
+       public void setChoosenFaxNumber (final DialableFaxNumber choosenFaxNumber) {
+               this.choosenFaxNumber = choosenFaxNumber;
+       }
+
        @Override
        public DialableLandLineNumber getChoosenLandLineNumber () {
                return this.choosenLandLineNumber;
index 194fb02c0a24c65efe07c040b465e45ce9fca4f3..45522ccc02b30d404c306b633fb9a904a933b704 100644 (file)
@@ -84,18 +84,18 @@ public interface JobsAdminPhoneWebRequestController extends Serializable {
        void setMobileProvider (final MobileProvider mobileProvider);
 
        /**
-        * Getter for choosen mobile number
+        * Getter for choosen fax number
         * <p>
-        * @return Choosen mobile number
+        * @return Choosen fax number
         */
-       DialableMobileNumber getChoosenMobileNumber ();
+       DialableFaxNumber getChoosenFaxNumber ();
 
        /**
-        * Setter for choosen mobile number
+        * Setter for choosen fax number
         * <p>
-        * @param choosenMobileNumber Choosen mobile number
+        * @param choosenFaxNumber Choosen fax number
         */
-       void setChoosenMobileNumber (final DialableMobileNumber choosenMobileNumber);
+       void setChoosenFaxNumber (final DialableFaxNumber choosenFaxNumber);
 
        /**
         * Getter for choosen land-line number
@@ -111,6 +111,20 @@ public interface JobsAdminPhoneWebRequestController extends Serializable {
         */
        void setChoosenLandLineNumber (final DialableLandLineNumber choosenLandLineNumber);
 
+       /**
+        * Getter for choosen mobile number
+        * <p>
+        * @return Choosen mobile number
+        */
+       DialableMobileNumber getChoosenMobileNumber ();
+
+       /**
+        * Setter for choosen mobile number
+        * <p>
+        * @param choosenMobileNumber Choosen mobile number
+        */
+       void setChoosenMobileNumber (final DialableMobileNumber choosenMobileNumber);
+
        /**
         * Getter for mobile number
         * <p>
index 241df3059b9d9a05dc367c31c467bb2e6b71dc1a..d8c0bb50cfd237b54bbd62ebe23d2b8cda473de6 100644 (file)
@@ -396,7 +396,7 @@ ADMIN_HEADER_SHOW_MOBILE_DATA=Daten des Mobiltelefons:
 ADMIN_SHOW_PHONE_ID=Id-Nummer:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer:
-ADMIN_SHOW_MOBILE_LINKS=Administrative Links:
+ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative Links:
 ERROR_PARAMETER_USER_NOT_SET=Fehler: Parameter 'user' nicht gesetzt.
 ADMIN_LINK_SHOW_SHORT=Anzeigen
 ADMIN_LINK_SHOW_SHORT_TITLE=Eintrag einzelnt anzeigen.
@@ -418,7 +418,7 @@ ERROR_PARAMETER_PHONE_ID_NOT_SET=Fehler: Parameter 'phoneId' ist nicht gesetzt.
 PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen
 CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Mobilfunkbetreiber anzeigen:
 TABLE_SUMMARY_ADMIN_SHOW_MOBILE=Ein einzelner Mobiletelefoneintrag.
-TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an.
+TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS=Diese Tabelle zeigt Verkn\u00fcpfungen von der Mobilfunknummern zu allen Kontaktdaten an.
 ADMIN_HEADER_SHOW_MOBILE_LINKS=Alle Mobiltelefon-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
 ERROR_PARAMETER_CONTACT_ID_NOT_SET=Fehler: Parameter 'contactId' ist nicht gesetzt.
 ADMIN_SHOW_MOBILE_UNLINK=Trennen:
@@ -641,9 +641,9 @@ ERROR_USER_NAME_ALREADY_USED=Benutzername bereits verwendet. Bitte geben Sie ein
 ERROR_EMAIL_ADDRESSES_MISMATCHING=Die eingegebenen  Email-Addressen stimmen nicht \u00fcberein.
 ERROR_EMAIL_ADDRESS_ALREADY_USED=Die eingegebene Email-Adresse wird bereits verwendet und kann nicht erneut verwendet werden.
 ERROR_MOBILE_CONTACT_NOT_LINKED=Fehler: Mobilfunk-Id {0} ist nicht mit Kontakt-Id {1} verkn\u00fcpft.
-ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE=Mobilfunknummer einem Kontakt hinzuf\u00fcgen
-ADMIN_SELECT_MOBILE=Mobilfunknummer ausw\u00e4hlen:
-BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE=Mobilfunknummer zum Kontakt hinzuf\u00fcgen
+ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE=Mobilfunknummer diesem Kontakt hinzuf\u00fcgen
+ADMIN_SELECT_MOBILE_NUMBER=Mobilfunknummer ausw\u00e4hlen:
+BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER=Mobilfunknummer zum Kontakt hinzuf\u00fcgen
 ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA=... oder neue Mobilfunknummer eingeben:
 ERROR_USER_EMAIL_ADDRESS_NOT_FOUND=Die eingegebene Email-Addresse konnte nicht gefunden werden.
 LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS=Festnetznummern ...
@@ -661,3 +661,15 @@ CONTENT_TITLE_ADMIN_SHOW_LAND_LINE=Festnetznummer anzeigen:
 ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET=Fehler: Instanz 'landLine' nicht in Bean-Helper gesetzt.
 ADMIN_HEADER_SHOW_LAND_LINE_LINKS=Alle Festnetznummer-Verkn\u00fcpfungen f\u00fcr Id-Nummer {0}:
 ADMIN_LIST_LAND_LINE_EMPTY=Es sind keine Festnetznummern gelistet.
+ADMIN_HEADER_SHOW_LAND_LINE_DATA=Daten der Festnetznummer:
+ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE=Vollst\u00e4ndige Festnetznummer:
+ADMIN_HEADER_SHOW_FAX_DATA=Daten der Faxnummer:
+ADMIN_SHOW_FAX_NUMBER_COMPLETE=Komplette Faxnummer:
+ADMIN_SELECT_LAND_LINE_NUMBER=Festnetznummer ausw\u00e4hlen:
+ADMIN_SELECT_FAX_NUMBER=Faxnummer ausw\u00e4hlen:
+ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA=... oder neue Faxnummer eingeben:
+ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA=... oder neue Festznetznummer eingeben:
+BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER=Faxnummer zum Kontakt hinzuf\u00fcgen
+BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER=Festnetznummer zum Kontakt hinzuf\u00fcgen
+ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE=Faxnummer diesem Kontakt hinzuf\u00fcgen
+ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE=Festnetznummer diesem Kontakt hinzuf\u00fcgen
index bdfb5296801bdbd3c66f58d66ba230db4e7eb7cc..ea834155fdc5c0324688befff097d1497d1dc5ac 100644 (file)
@@ -379,7 +379,7 @@ ADMIN_HEADER_SHOW_MOBILE_DATA=Data of mobile phone:
 ADMIN_SHOW_PHONE_ID=Id number:
 ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider:
 ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number:
-ADMIN_SHOW_MOBILE_LINKS=Administrative links:
+ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative links:
 ERROR_PARAMETER_USER_NOT_SET=Error: Parameter 'user' not set.
 ADMIN_LINK_SHOW_SHORT=Show
 ADMIN_LINK_SHOW_SHORT_TITLE=Show single entry.
@@ -401,7 +401,7 @@ ERROR_PARAMETER_PHONE_ID_NOT_SET=Error: Parameter 'phoneId' is not set.
 PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider
 CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider:
 TABLE_SUMMARY_ADMIN_SHOW_MOBILE=A single mobile entry.
-TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS=This table shows links of of this mobile number to all contacts.
+TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS=This table shows links of of this mobile number to all contacts.
 ADMIN_HEADER_SHOW_MOBILE_LINKS=All links for mobile number id {0}:
 ERROR_PARAMETER_CONTACT_ID_NOT_SET=Error: Parameter 'contactId' is not set.
 ADMIN_SHOW_MOBILE_UNLINK=Unlink:
@@ -641,9 +641,9 @@ ERROR_USER_NAME_ALREADY_USED=User name already used. Please enter another name.
 ERROR_EMAIL_ADDRESSES_MISMATCHING=Both entered email addresses are not the same.
 ERROR_EMAIL_ADDRESS_ALREADY_USED=Your entered email address is already used. Please enter another and try again.
 ERROR_MOBILE_CONTACT_NOT_LINKED=Error: Cell phone id {0} is not linked with contact id {1}.
-ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE=Add mobile number to contact
-ADMIN_SELECT_MOBILE=Choose mobile number:
-BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE=Add mobile number to contact
+ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE=Add mobile number to this contact
+ADMIN_SELECT_MOBILE_NUMBER=Choose mobile number:
+BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER=Add mobile number to contact
 ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA=... or add new mobile number:
 ERROR_USER_EMAIL_ADDRESS_NOT_FOUND=Your entered email address could not befound.
 LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS=Land-line numbers ...
@@ -661,3 +661,15 @@ CONTENT_TITLE_ADMIN_SHOW_LAND_LINE=Show land-line number:
 ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET=Error: Instance 'landLine' not set in bean helper.
 ADMIN_HEADER_SHOW_LAND_LINE_LINKS=All links for land-line number id number {0}:
 ADMIN_LIST_LAND_LINE_EMPTY=There are no land-line numbers listed.
+ADMIN_HEADER_SHOW_LAND_LINE_DATA=Data of land-line number:
+ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE=Complete land-line number:
+ADMIN_HEADER_SHOW_FAX_DATA=Data of fax number:
+ADMIN_SHOW_FAX_NUMBER_COMPLETE=Complete fax number:
+ADMIN_SELECT_LAND_LINE_NUMBER=Choose land-line number:
+ADMIN_SELECT_FAX_NUMBER=Choose fax number:
+ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA=... or enter new fax number:
+ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA=... or enter new land-line number:
+BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER=Add fax number to contact
+BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER=Add land-line number to contact
+ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE=Add fax number to this contact
+ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE=Add line-line number to this contact
index b4773515293643fca9c6068d50ed56ea2a2d70fe..b6f7b7381ac26369fce71d7c0eeea31ba0a5e886 100644 (file)
                        </h:outputFormat>
                </f:facet>
 
-               <h:column>
-                       <h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
-
-                       <h:outputText id="contactId" styleClass="table_data_field" value="#{beanHelper.contact.contactId}" />
-               </h:column>
-
                <h:column>
                        <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
 
                        <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactGender.messageKey]}" />
                </h:column>
 
-               <h:column>
-                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
-
-                       <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
-               </h:column>
-
                <h:column>
                        <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
 
                        <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
                </h:column>
-
-               <h:column>
-                       <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-                       <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
-                               <h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
-                       </h:outputLink>
-               </h:column>
        </h:panelGrid>
 </ui:composition>
index c6443840294b61bf6f2b1f56253713e4bdf538be..94f8f4eca812eb5098ec4dba9e490ad5b393d914 100644 (file)
                        <h:outputText id="faxNumber" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.faxNumber.phoneCountry.countryPhoneCode} (#{beanHelper.faxNumber.phoneAreaCode}) #{beanHelper.faxNumber.phoneNumber}" />
                </h:column>
 
+               <h:column>
+                       <h:outputLabel for="faxCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+                       <h:outputText id="faxCreated" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneEntryCreated.time}">
+                               <f:convertDateTime for="contactCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="faxUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+                       <h:outputText id="faxUpdated" styleClass="table_data_field" value="#{beanHelper.faxNumber.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_FAX_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/fax/admin_fax_links.tpl">
index 5b39f4e3df53fe482d3d14674f24c56f2acd8862..8b1cd7a46d612e9237a57514fe35d57e387d412b 100644 (file)
@@ -10,7 +10,7 @@
        <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
-                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_FORM_TITLE}" />
+                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE}" />
                        </div>
 
                        <div class="para">
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="choosenFaxNumber" value="#{msg.ADMIN_SELECT_FAX}" />
+                                       <h:outputLabel for="choosenFaxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
                                        <h:selectOneMenu styleClass="select right_space" id="choosenFaxNumber" value="#{adminPhoneController.choosenFaxNumber}">
                                                <f:converter converterId="FaxConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.faxProvider.providerCountry.countryExternalDialPrefix} (#{faxNumber.faxProvider.providerDialPrefix}) #{faxNumber.phoneNumber}" />
+                                               <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
                        </div>
@@ -49,7 +49,7 @@
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddFax(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX}" />
+                               <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddFaxNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
                        </div>
                </h:panelGroup>
        </h:form>
index 6bfe63d68f1c0626404a6b8b897efc23928bceeb..f281248d1fb724ebe1ecd8efcb576f112f618730 100644 (file)
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{adminPhoneController.phoneCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </h:selectOneMenu>
-
-                                       <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{adminPhoneController.phoneAreaCode}">
-                                               <f:validator validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-
-                                       <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}">
-                                               <f:validator validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
+                                       <ui:include src="/WEB-INF/templates/generic/fax_selection_box.tpl">
+                                               <ui:param name="targetController" value="#{adminPhoneController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>
index 8d5c650fd6b3082bf00573c3616601cc9a230c51..ed187a1a314efbb40c662c3da2c2c102f0be9616 100644 (file)
@@ -10,7 +10,7 @@
        <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
-                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_FORM_TITLE}" />
+                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
                        </div>
 
                        <div class="para">
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="choosenLandLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE}" />
+                                       <h:outputLabel for="choosenLandLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
                                        <h:selectOneMenu styleClass="select right_space" id="choosenLandLineNumber" value="#{adminPhoneController.choosenLandLineNumber}">
                                                <f:converter converterId="LandLineConverter" />
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.landlineProvider.providerCountry.countryExternalDialPrefix} (#{landlineNumber.landlineProvider.providerDialPrefix}) #{landlineNumber.phoneNumber}" />
+                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
                                        </h:selectOneMenu>
                                </div>
                        </div>
@@ -49,7 +49,7 @@
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddLandLine(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE}" />
+                               <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}" />
                        </div>
                </h:panelGroup>
        </h:form>
index cd705113fe7f9d1f2d38c9c2a365fa1568519bc5..cb9c7bf4ae1d1051aabf3d272b3f5b14ee27f3d0 100644 (file)
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{adminPhoneController.phoneCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </h:selectOneMenu>
-
-                                       <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{adminPhoneController.phoneAreaCode}">
-                                               <f:validator validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
-
-                                       <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}">
-                                               <f:validator validatorId="PhoneNumberValidator" />
-                                       </h:inputText>
+                                       <ui:include src="/WEB-INF/templates/generic/landline_selection_box.tpl">
+                                               <ui:param name="targetController" value="#{adminPhoneController}" />
+                                       </ui:include>
                                </div>
 
                                <div class="clear"></div>
index 35ce87e1a9cd12d19013e788ca53686d22b97b5f..5d760a9cc66448ac42fb876ae3ddbe1df69a01f8 100644 (file)
                        <h:outputText id="landLineNumber" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.landLineNumber.phoneCountry.countryPhoneCode} (#{beanHelper.landLineNumber.phoneAreaCode}) #{beanHelper.landLineNumber.phoneNumber}" />
                </h:column>
 
+               <h:column>
+                       <h:outputLabel for="landLineCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+
+                       <h:outputText id="landLineCreated" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneEntryCreated.time}">
+                               <f:convertDateTime for="contactCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="landLineUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+
+                       <h:outputText id="landLineUpdated" styleClass="table_data_field" value="#{beanHelper.landLineNumber.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_LAND_LINE_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/landline/admin_landline_links.tpl">
index 61269e60302a135d0f4695c08b86248cc9dec59b..bb26071e71147f0bad9bffa9ece1e37df33fe7a7 100644 (file)
@@ -10,7 +10,7 @@
        <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
                <h:panelGroup styleClass="table_medium" layout="block">
                        <div class="table_header">
-                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_FORM_TITLE}" />
+                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE}" />
                        </div>
 
                        <div class="para">
@@ -19,7 +19,7 @@
 
                        <div class="table_row">
                                <div class="table_left_medium">
-                                       <h:outputLabel for="choosenCellphoneNumber" value="#{msg.ADMIN_SELECT_MOBILE}" />
+                                       <h:outputLabel for="choosenCellphoneNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
                                </div>
 
                                <div class="table_right_medium">
@@ -49,7 +49,7 @@
 
                        <div class="table_footer">
                                <h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddCellphone(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE}" />
+                               <h:commandButton styleClass="submit" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}" />
                        </div>
                </h:panelGroup>
        </h:form>
index 92027f5f51cb9d7fb6cedb1b6f7024b63622027d..fcdd8c9a706aaa226309a4d3b8bd065e08425990 100644 (file)
                        <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">
diff --git a/web/WEB-INF/templates/admin/user/admin_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_user_data.tpl
new file mode 100644 (file)
index 0000000..16ddc57
--- /dev/null
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.user}">
+               <f:facet name="header">
+                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+                               <f:param value="#{beanHelper.user.userName}" />
+                               <f:param value="#{beanHelper.user.userId}" />
+                       </h:outputFormat>
+               </f:facet>
+
+               <h:column>
+                       <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
+
+                       <h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
+               </h:column>
+
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                       <h:column>
+                               <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
+
+                               <h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
+                       </h:column>
+               </ui:fragment>
+
+               <h:column>
+                       <h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
+
+                       <h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
+                               <f:convertDateTime for="userCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_UPDATED}" />
+
+                       <h:outputText id="userUpdated" styleClass="table_data_field" value="#{beanHelper.user.userUpdated.time}">
+                               <f:convertDateTime for="userUpdated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+
+                       <h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userProfileMode" styleClass="table_data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+
+                       <h:outputText id="userProfileMode" styleClass="table_data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="userLastLocked" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+
+                       <h:outputText id="userLastLocked" styleClass="table_data_field" value="#{beanHelper.user.userLastLocked.time}">
+                               <f:convertDateTime for="userLastLocked" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="lastLockedReason" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+
+                       <h:outputText id="lastLockedReason" styleClass="table_data_field" value="#{beanHelper.user.userLastLockedReason}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
+
+                       <h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactCreated.time}">
+                               <f:convertDateTime for="contactCreated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
+
+                       <h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactUpdated.time}">
+                               <f:convertDateTime for="contactUpdated" type="both" />
+                       </h:outputText>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+
+                       <h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.user.userContact.isOwnContact()}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
+
+                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
+
+                       <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactTitle}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+
+                       <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactFirstName}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+
+                       <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactFamilyName}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+
+                       <h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactStreet}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+
+                       <h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+
+                       <h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactHouseNumberExtension}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+
+                       <h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactZipCode}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+
+                       <h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactCity}" />
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+
+                       <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.user.userContact.contactEmailAddress}">
+                               <h:outputText value="#{beanHelper.user.userContact.contactEmailAddress}" />
+                       </h:outputLink>
+               </h:column>
+
+               <h:column>
+                       <h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+
+                       <h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactBirthday.time}">
+                               <f:convertDateTime for="contactBirthday" type="date" />
+                       </h:outputText>
+               </h:column>
+       </h:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/templates/generic/fax_selection_box.tpl b/web/WEB-INF/templates/generic/fax_selection_box.tpl
new file mode 100644 (file)
index 0000000..27e3a4d
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <ui:fragment rendered="#{not empty targetController}">
+               <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.phoneCountry}">
+                       <f:converter converterId="CountryConverter" />
+                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+               </h:selectOneMenu>
+
+               <h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
+                       <f:validator validatorId="PhoneNumberValidator" />
+               </h:inputText>
+
+               <h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
+                       <f:validator validatorId="PhoneNumberValidator" />
+               </h:inputText>
+       </ui:fragment>
+
+       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
diff --git a/web/WEB-INF/templates/generic/landline_selection_box.tpl b/web/WEB-INF/templates/generic/landline_selection_box.tpl
new file mode 100644 (file)
index 0000000..4ce34ff
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+       <ui:fragment rendered="#{not empty targetController}">
+               <h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.phoneCountry}">
+                       <f:converter converterId="CountryConverter" />
+                       <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                       <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
+               </h:selectOneMenu>
+
+               <h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
+                       <f:validator validatorId="PhoneNumberValidator" />
+               </h:inputText>
+
+               <h:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{targetController.phoneNumber}">
+                       <f:validator validatorId="PhoneNumberValidator" />
+               </h:inputText>
+       </ui:fragment>
+
+       <h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
+</ui:composition>
index fc7b3abe87160064373c66d8c96d9098e0dd5ad5..ff55a4dd2b1f9b0bbd1ed832607793b80d22793a 100644 (file)
 
                        <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
 
-                       <div>
+                       <div class="para">
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl" />
                        </div>
 
-                       <div>
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+                       </div>
+
+                       <div class="para">
                                <ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
                        </div>
+
+                       <div class="para">
+                               <ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+                       </div>
                </ui:define>
        </ui:composition>
 </html>
index 4d47d8fe5f4e6361aaf621413f811c5fddddee34..f8513a3d986a584d7052efa0c6871111249c61ae 100644 (file)
@@ -23,7 +23,7 @@
                                <ui:param name="isShowPage" value="#{true}" />
                        </ui:include>
 
-                       <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_FAX_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+                       <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                <f:facet name="header">
                                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_LINKS}">
                                                <f:param value="#{beanHelper.faxNumber.phoneId}" />
index 4a9e70a7374399f96b7be150b92e4094f24f8523..e3265fe866d2745b91e9407217382eb632e962d2 100644 (file)
@@ -23,7 +23,7 @@
                                <ui:param name="isShowPage" value="#{true}" />
                        </ui:include>
 
-                       <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_LAND_LINE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+                       <h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                <f:facet name="header">
                                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_LINKS}">
                                                <f:param value="#{beanHelper.landLineNumber.phoneId}" />
index 04c37ee3b880f835c80e7906360917c04d805cf6..38b3c982af17ca725a72eb611beff3317ef92981 100644 (file)
@@ -23,7 +23,7 @@
                                <ui:param name="isShowPage" value="#{true}" />
                        </ui:include>
 
-                       <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_MOBILE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+                       <h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
                                <f:facet name="header">
                                        <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_LINKS}">
                                                <f:param value="#{beanHelper.mobileNumber.phoneId}" />
index e41e6f3e673d73a061ab7f9b70d2511c246dbd9b..69379c9b16506aaea826e44440502967a0101178 100644 (file)
                <ui:define name="content">
                        <h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
 
-                       <h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty beanHelper.user}">
-                               <f:facet name="header">
-                                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-                                               <f:param value="#{beanHelper.user.userName}" />
-                                               <f:param value="#{beanHelper.user.userId}" />
-                                       </h:outputFormat>
-                               </f:facet>
-
-                               <h:column>
-                                       <h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
-
-                                       <h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
-                               </h:column>
-
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
-                                       <h:column>
-                                               <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
-
-                                               <h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
-                                       </h:column>
-                               </ui:fragment>
-
-                               <h:column>
-                                       <h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
-
-                                       <h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
-                                               <f:convertDateTime for="userCreated" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_UPDATED}" />
-
-                                       <h:outputText id="userUpdated" styleClass="table_data_field" value="#{beanHelper.user.userUpdated.time}">
-                                               <f:convertDateTime for="userUpdated" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
-
-                                       <h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userProfileMode" styleClass="table_data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
-
-                                       <h:outputText id="userProfileMode" styleClass="table_data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="userLastLocked" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
-
-                                       <h:outputText id="userLastLocked" styleClass="table_data_field" value="#{beanHelper.user.userLastLocked.time}">
-                                               <f:convertDateTime for="userLastLocked" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="lastLockedReason" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
-
-                                       <h:outputText id="lastLockedReason" styleClass="table_data_field" value="#{beanHelper.user.userLastLockedReason}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
-
-                                       <h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
-
-                                       <h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactUpdated.time}">
-                                               <f:convertDateTime for="contactUpdated" type="both" />
-                                       </h:outputText>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
-
-                                       <h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.user.userContact.isOwnContact()}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactGender" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_GENDER}" />
-
-                                       <h:outputText id="contactGender" styleClass="table_data_field" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_TITLE}" />
-
-                                       <h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactTitle}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
-
-                                       <h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactFirstName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-
-                                       <h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactFamilyName}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
-
-                                       <h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactStreet}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
-
-                                       <h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactHouseNumber}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
-
-                                       <h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactHouseNumberExtension}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
-
-                                       <h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactZipCode}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
-
-                                       <h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactCity}" />
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
-
-                                       <h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.user.userContact.contactEmailAddress}">
-                                               <h:outputText value="#{beanHelper.user.userContact.contactEmailAddress}" />
-                                       </h:outputLink>
-                               </h:column>
-
-                               <h:column>
-                                       <h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
-
-                                       <h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.user.userContact.contactBirthday.time}">
-                                               <f:convertDateTime for="contactBirthday" type="date" />
-                                       </h:outputText>
-                               </h:column>
-                       </h:panelGrid>
+                       <ui:include src="/WEB-INF/templates/admin/user/admin_user_data.tpl" />
 
                        <div class="para">
                                <ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl" />