]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Wed, 17 May 2023 00:41:26 +0000 (02:41 +0200)
committerRoland Häder <roland@mxchange.org>
Wed, 17 May 2023 00:45:48 +0000 (02:45 +0200)
- also synchronized project from jfinancials
- ops, no "dynamic" here

91 files changed:
web/WEB-INF/templates/admin/admin_base.tpl
web/WEB-INF/templates/admin/admin_footer.tpl
web/WEB-INF/templates/admin/admin_menu.tpl
web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl [deleted file]
web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl [deleted file]
web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl [new file with mode: 0644]
web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl [new file with mode: 0644]
web/WEB-INF/templates/admin/generic_product/admin_product_price_input_panel_grid.tpl [new file with mode: 0644]
web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
web/WEB-INF/templates/admin/menu/project.tpl [new file with mode: 0644]
web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl
web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
web/WEB-INF/templates/admin/product_category/admin_form_product_category_data.tpl [new file with mode: 0644]
web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
web/WEB-INF/templates/base.tpl [deleted file]
web/WEB-INF/templates/contact/form_contact_data.tpl
web/WEB-INF/templates/guest/guest_base.tpl
web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
web/WEB-INF/templates/guest/guest_footer.tpl
web/WEB-INF/templates/guest/guest_index.tpl
web/WEB-INF/templates/guest/guest_menu.tpl
web/WEB-INF/templates/guest/guest_privacy_terms.tpl
web/WEB-INF/templates/guest/user/guest_login_form.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
web/WEB-INF/templates/login/user/user_base.tpl
web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
web/WEB-INF/templates/login/user/user_enter_current_password.tpl
web/WEB-INF/templates/login/user/user_footer.tpl
web/WEB-INF/templates/login/user/user_menu.tpl
web/WEB-INF/templates/master.tpl [new file with mode: 0644]
web/WEB-INF/templates/widgets/locale_change_widget.tpl
web/admin/admin_logout.xhtml
web/admin/basic_company_data/admin_basic_company_data_list.xhtml [deleted file]
web/admin/branch_offices/admin_branch_offices_list.xhtml [deleted file]
web/admin/contact/admin_contact_delete.xhtml
web/admin/contact/admin_contact_edit.xhtml
web/admin/contact/admin_contact_export.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/contact/admin_contact_show.xhtml
web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
web/admin/country/admin_country_delete.xhtml
web/admin/country/admin_country_edit.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/fax/admin_fax_delete.xhtml
web/admin/fax/admin_fax_edit.xhtml
web/admin/fax/admin_fax_list.xhtml
web/admin/fax/admin_fax_show.xhtml
web/admin/generic_product/admin_generic_product_delete.xhtml [new file with mode: 0644]
web/admin/generic_product/admin_generic_product_edit.xhtml [new file with mode: 0644]
web/admin/generic_product/admin_generic_product_list.xhtml [new file with mode: 0644]
web/admin/generic_product/admin_generic_product_show.xhtml [new file with mode: 0644]
web/admin/index.xhtml
web/admin/landline/admin_landline_delete.xhtml
web/admin/landline/admin_landline_edit.xhtml
web/admin/landline/admin_landline_list.xhtml
web/admin/landline/admin_landline_show.xhtml
web/admin/product_category/admin_product_category_edit.xhtml [new file with mode: 0644]
web/admin/product_category/admin_product_category_list.xhtml [new file with mode: 0644]
web/guest/user/user_confirm_account.xhtml
web/guest/user/user_list.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_profile.xhtml
web/guest/user/user_register.xhtml
web/guest/user/user_register_done.xhtml
web/guest/user/user_register_page2.xhtml
web/guest/user/user_resend_done.xhtml
web/guest/user/user_resend_link.xhtml
web/user/login_contact_data_saved.xhtml
web/user/login_data_saved.xhtml
web/user/login_edit_user_data.xhtml
web/user/login_index.xhtml
web/user/login_logout.xhtml
web/user/login_user_change_email_address.xhtml
web/user/login_user_change_password.xhtml
web/user/login_user_change_personal_data.xhtml
web/user/login_user_contact_data_saved.xhtml
web/user/login_user_data_saved.xhtml

index 2aedc46a4128d9889d38648b60a50163ac800a64..64e9523e1751b5b9c8b9f32baeb77e9b073f9f14 100644 (file)
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-TODO: Add something here that should be displayed on all admin pages
+@TODO: Add something here that should be displayed on all administrative pages
 //-->
 <ui:composition
-       template="/WEB-INF/templates/base.tpl"
+       template="/WEB-INF/templates/master.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">
+       <ui:define name="document_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_AREA} - " />
-               <ui:insert name="admin_title">
+
+               <ui:insert name="document_admin_title">
                        <h:outputText value="Default admin title" />
                </ui:insert>
        </ui:define>
index ff9b5c83ea364b7139e0246451ae49b1e2e994b1..3ec61fd8ae51eb8acb44eb6b520b853538d9665b 100644 (file)
@@ -1,15 +1,18 @@
 <?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"
        xmlns:p="http://primefaces.org/ui"
-       xmlns:pm="http://primefaces.org/mobile">
+       >
 
-       <pm:footer id="footer" fixed="true" tapToggle="false">
-               <ul class="navbar-horizontal">
-                       <li><p:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
-               </ul>
-       </pm:footer>
+       <h:form>
+               <p:menubar>
+                       <p:menuitem
+                               outcome="index"
+                               value="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE}"
+                               title="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE_TITLE}"
+                               />
+               </p:menubar>
+       </h:form>
 </ui:composition>
index 268b12dfde060151adeffd3d7c6d5c06d6dca0c6..b0740af66ba265b86e78009f68c9547a6c95fb55 100644 (file)
@@ -1,55 +1,68 @@
 <?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"
        xmlns:p="http://primefaces.org/ui"
-       xmlns:pm="http://primefaces.org/mobile">
+       >
 
-       <div id="menu" data-role="panel" class="menu_outer" data-position="left" data-display="overlay" data-theme="a">
-               <h:form>
-                       <p:menu>
+       <h:form>
+               <p:sidebar baseZIndex="100000" blockScroll="true" widgetVar="menuSidebar">
+                       <p:slideMenu backLabel="#{msg.BACK}">
                                <p:submenu label="#{msg.ADMIN_MENU_MAIN_TITLE}">
-                                       <p:menuitem title="#{msg.LINK_ADMIN_INDEX_TITLE}" outcome="admin_index" value="#{msg.LINK_ADMIN_INDEX}" />
-                                       <p:menuitem title="#{msg.LINK_ADMIN_CATEGORY_TITLE}" outcome="admin_category" value="#{msg.LINK_ADMIN_CATEGORY}" />
-                                       <p:menuitem title="#{msg.LINK_ADMIN_PRODUCT_TITLE}" outcome="admin_product" value="#{msg.LINK_ADMIN_PRODUCT}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_INDEX_TITLE}" outcome="admin_index" value="#{msg.ADMIN_LINK_INDEX}" />
                                </p:submenu>
 
-                               <p:submenu label="#{msg.ADMIN_MENU_USER_TITLE}">
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_USER_TITLE}" outcome="admin_list_user" value="#{msg.LINK_ADMIN_LIST_USER}" />
-                                       <p:menuitem title="#{msg.LINK_ADMIN_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.LINK_ADMIN_EXPORT_USER}" />
+                               <ui:include src="/WEB-INF/templates/admin/menu/project.tpl" />
+
+                               <p:submenu label="#{msg.ADMIN_MENU_USER_TITLE}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_USER_TITLE}" outcome="admin_list_users" value="#{msg.ADMIN_LINK_LIST_USER}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.ADMIN_LINK_EXPORT_USER}" />
                                </p:submenu>
 
-                               <p:submenu label="#{msg.ADMIN_MENU_CONTACT_TITLE}">
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_CONTACT_TITLE}" outcome="admin_list_contact" value="#{msg.LINK_ADMIN_LIST_CONTACT}" />
-                                       <p:menuitem title="#{msg.LINK_ADMIN_EXPORT_CONTACT_TITLE}" outcome="admin_export_contact" value="#{msg.LINK_ADMIN_EXPORT_CONTACT}" />
+                               <p:submenu label="#{msg.ADMIN_MENU_CONTACT_TITLE}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_CONTACT_TITLE}" outcome="admin_list_contacts" value="#{msg.ADMIN_LINK_LIST_CONTACT}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_EXPORT_CONTACT_TITLE}" outcome="admin_export_contacts" value="#{msg.ADMIN_LINK_EXPORT_CONTACT}" />
                                </p:submenu>
 
-                               <p:submenu label="#{msg.ADMIN_MENU_BUSINESS_CONTACTS_TITLE}" rendered="#{featureController.isFeatureEnabled('basic_company_data')}">
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_BASIC_COMPANY_DATA_TITLE}" outcome="admin_list_basic_company_data" value="#{msg.LINK_ADMIN_LIST_BASIC_COMPANY_DATA}" />
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_offices" value="#{msg.LINK_ADMIN_LIST_BRANCH_OFFICES}" />
+                               <p:submenu label="#{msg.ADMIN_MENU_BUSINESS_CONTACT_TITLE}" rendered="#{featureController.isFeatureEnabled('basic_data')}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_BASIC_DATA_TITLE}" outcome="admin_list_basic_data" value="#{msg.ADMIN_LINK_LIST_BASIC_DATA}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_HEADQUARTER_TITLE}" outcome="admin_list_headquarters" value="#{msg.ADMIN_LINK_LIST_HEADQUARTER}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_offices" value="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_DEPARTMENTS_TITLE}" outcome="admin_list_departments" value="#{msg.ADMIN_LINK_LIST_DEPARTMENTS}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_OPENING_TIMES_TITLE}" outcome="admin_list_opening_times" value="#{msg.ADMIN_LINK_LIST_OPENING_TIMES}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_EMPLOYEES_TITLE}" outcome="admin_list_employees" value="#{msg.ADMIN_LINK_LIST_EMPLOYEES}" rendered="#{featureController.isFeatureEnabled('company_employee')}" />
                                </p:submenu>
 
-                               <p:submenu label="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}">
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landline" value="#{msg.LINK_ADMIN_LIST_LAND_LINE_PHONE_NUMBERS}" />
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.LINK_ADMIN_LIST_MOBILE_PHONE_NUMBERS}" />
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS}" />
+                               <p:submenu label="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landlines" value="#{msg.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobiles" value="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_faxes" value="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS}" />
                                </p:submenu>
 
-                               <p:submenu label="#{msg.ADMIN_MENU_COUNTRY_TITLE}">
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_COUNTRIES_TITLE}" outcome="admin_list_countries" value="#{msg.LINK_ADMIN_LIST_COUNTRIES}" />
+                               <p:submenu label="#{msg.ADMIN_MENU_COUNTRY_TITLE}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_COUNTRIES_TITLE}" outcome="admin_list_countries" value="#{msg.ADMIN_LINK_LIST_COUNTRIES}" />
                                </p:submenu>
 
-                               <p:submenu label="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}">
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER}" />
+                               <p:submenu label="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_providers" value="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER}" />
                                </p:submenu>
 
-                               <p:submenu label="#{msg.ADMIN_MENU_LOGOUT_TITLE}">
-                                       <p:menuitem title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.LINK_ADMIN_LOGOUT}" />
-                                       <p:menuitem title="#{msg.LINK_ADMIN_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.LINK_ADMIN_TO_WEBPAGE}" />
+                               <p:submenu label="#{msg.ADMIN_MENU_LOGOUT_TITLE}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.ADMIN_LINK_LOGOUT}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.ADMIN_LINK_TO_WEBPAGE}" />
                                </p:submenu>
-                       </p:menu>
-               </h:form>
-       </div>
+                       </p:slideMenu>
+
+                       <p:commandButton
+                               oncomplete="PF('menuSidebar').hide()"
+                               value="Hide!"
+                               />
+               </p:sidebar>
+
+               <p:commandButton
+                       oncomplete="PF('menuSidebar').show()"
+                       value="Show!"
+                       />
+       </h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl b/web/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl
deleted file mode 100644 (file)
index 3c71f18..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
-
-       <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="basic_company_data">
-                       <legend title="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyName" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}">
-                                               <f:validator validatorId="CompanyNameValidator" />
-                                               <f:attribute name="checkExisting" value="false" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyName" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_EMAIL_ADDRESS}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="companyEmailAddress" size="20" maxlength="255" value="#{adminCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                                               <f:validator validatorId="EmailAddressValidator" />
-                                               <f:attribute name="allowEmptyValue" value="true" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyEmailAddress" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_LOGO}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <widgets:outputMessageBox id="companyLogo" message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyLogo" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_TAX_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminCompanyDataController.companyTaxNumber}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyTaxNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_WEBSITE_URL}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
-                                               <f:validator validatorId="UrlValidator" />
-                                               <f:attribute name="allowEmptyValue" value="true" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyWebsiteUrl" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_USER_OWNER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu id="companyUserOwner" value="#{adminCompanyDataController.companyUserOwner}">
-                                               <f:converter converterId="UserConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{userController.allUsers()}" var="companyUserOwner" itemValue="#{companyUserOwner}" itemLabel="#{companyUserOwner.userContact.contactFirstName} #{companyUserOwner.userContact.contactFamilyName} (#{companyUserOwner.userName})" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyUserOwner" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_CONTACT_EMPLOYEE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu id="companyContactEmployee" value="#{adminCompanyDataController.companyContactEmployee}">
-                                               <f:converter converterId="CompanyEmployeeConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyContactEmployee" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu id="companyFounder" value="#{adminCompanyDataController.companyFounder}">
-                                               <f:converter converterId="CompanyEmployeeConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyFounder" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BASIC_COMPANY_DATA_COMPANY_HEADQUARTERS}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu id="companyHeadQuarters" value="#{adminCompanyDataController.companyHeadQuarters}">
-                                               <f:converter converterId="CompanyHeadquartersConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{companyHeadquartersController.allCompanyHeadquarters()}" var="companyHeadQuarters" itemValue="#{companyHeadQuarters}" itemLabel="#{companyHeadQuarters.foo}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="companyHeadQuarters" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_PHONE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminCompanyDataController.landLineCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
-
-                                       <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
-                                               <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-
-                                       <p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminCompanyDataController.landLineNumber}">
-                                               <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineCountry" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineAreaCode" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="faxCountry" value="#{msg.ADMIN_BASIC_COMPANY_DATA_FAX_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminCompanyDataController.faxCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
-
-                                       <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
-                                               <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-
-                                       <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminCompanyDataController.faxNumber}">
-                                               <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxCountry" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxAreaCode" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="companyComments" value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_COMMENTS}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputTextarea styleClass="input" id="companyComments" rows="7" cols="25" value="#{adminCompanyDataController.companyComments}" />
-                               </div>
-                       </h:panelGroup>
-               </fieldset>
-       </h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl b/web/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl
deleted file mode 100644 (file)
index 48dd6e5..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
-
-       <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="admin_branch_office_basic">
-                       <legend title="#{msg.ADMIN_BRANCH_OFFICE_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchCompany" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_COMPANY}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu id="branchCompany" value="#{adminBranchOfficeController.branchCompany}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_COMPANY_REQUIRED}">
-                                               <f:converter converterId="BasicCompanyDataConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" itemDisabled="true" />
-                                               <f:selectItems value="#{basicDataController.allCompanyBasicData()}" var="basicData" itemValue="#{basicData}" itemLabel="#{basicData.companyName}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchCompany" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchContactEmployee" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_CONTACT_EMPLOYEE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu id="branchContactEmployee" value="#{adminBranchOfficeController.branchContactEmployee}">
-                                               <f:converter converterId="CompanyEmployeeConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchContactEmployee" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchUserOwner" value="#{msg.ADMIN_SELECT_BRANCH_OFFICE_USER_OWNER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu id="branchUserOwner" value="#{adminBranchOfficeController.branchUserOwner}">
-                                               <f:converter converterId="UserConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{userController.allUsers()}" var="branchUserOwner" itemValue="#{branchUserOwner}" itemLabel="#{branchUserOwner.userContact.contactFirstName} #{branchUserOwner.userContact.contactFamilyName} (#{branchUserOwner.userName})" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchUserOwner" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchEmailAddress" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_EMAIL_ADDRESS}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchEmailAddress" size="20" maxlength="255" value="#{adminBranchOfficeController.branchEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                                               <f:validator validatorId="EmailAddressValidator" />
-                                               <f:attribute name="allowEmptyValue" value="true" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchEmailAddress" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_PHONE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{adminBranchOfficeController.landLineCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
-
-                                       <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.landLineAreaCode}">
-                                               <f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-
-                                       <p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.landLineNumber}">
-                                               <f:validator for="landLineNumber" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineCountry" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineAreaCode" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="landLineNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="faxCountry" value="#{msg.ADMIN_ENTER_BRANCH_OFFICE_FAX_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{adminBranchOfficeController.faxCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
-
-                                       <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminBranchOfficeController.faxAreaCode}">
-                                               <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-
-                                       <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminBranchOfficeController.faxNumber}">
-                                               <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxCountry" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxAreaCode" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="faxNumber" />
-                       </h:panelGroup>
-               </fieldset>
-
-               <fieldset class="fieldset" id="admin_branch_office_address">
-                       <legend title="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND_TITLE}">
-                               <h:outputText value="#{msg.ADMIN_BRANCH_OFFICE_ADDRESS_LEGEND}" />
-                       </legend>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchStreet" value="#{msg.ADMIN_DATA_STREET_NAME}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchStreet" size="20" maxlength="255" value="#{adminBranchOfficeController.branchStreet}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_STREET_NAME_REQUIRED}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchStreet" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchHouseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchHouseNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchHouseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_HOUSE_NUMBER_REQUIRED}">
-                                               <f:validateLongRange for="branchHouseNumber" minimum="1" maximum="500" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchHouseNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchStore" value="#{msg.ADMIN_ENTER_DATA_STORE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchStore" size="3" maxlength="5" value="#{adminBranchOfficeController.branchStore}" validatorMessage="#{msg.ENTERED_STORE_INVALID}">
-                                               <f:validateLongRange for="branchStore" minimum="-5" maximum="200" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchStore" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchSuiteNumber" value="#{msg.ADMIN_ENTER_DATA_SUITE_NUMBER}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchSuiteNumber" size="3" maxlength="5" value="#{adminBranchOfficeController.branchSuiteNumber}" validatorMessage="#{msg.ENTERED_SUITE_NUMBER_INVALID}">
-                                               <f:validateLongRange for="branchSuiteNumber" minimum="1" maximum="500" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchSuiteNumber" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchZipCode" value="#{msg.ADMIN_DATA_ZIP_CODE}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchZipCode" size="5" maxlength="6" value="#{adminBranchOfficeController.branchZipCode}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_ZIP_CODE_REQUIRED}">
-                                               <f:validateLongRange for="branchZipCode" minimum="1" maximum="99999" />
-                                       </p:inputText>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchZipCode" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchCity" value="#{msg.ADMIN_DATA_CITY}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="branchCity" size="20" maxlength="255" value="#{adminBranchOfficeController.branchCity}" required="true" requiredMessage="#{msg.ADMIN_BRANCH_OFFICE_CITY_REQUIRED}" />
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchCity" />
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="branchCountry" value="#{msg.ADMIN_SELECT_COUNTRY}" />
-                               </div>
-
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu id="branchCountry" value="#{adminBranchOfficeController.branchCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:message for="branchCountry" />
-                       </h:panelGroup>
-               </fieldset>
-       </h:panelGroup>
-</ui:composition>
index c8c9f0994b872252d6cb6c9d28b7e2fd3c133223..de37ded7ad106d0299b0297c396ae869dd1cf2f3 100644 (file)
@@ -1,34 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}"
+-->
 <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"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
+       <p:panelGrid
+               id="show_contact"
+               columns="3"
+               rendered="#{not empty beanHelper.contact}"
+               >
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_CONTACT_HEADER}">
                                <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>
                </f:facet>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
                        <h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
                        <h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
                        <h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
-               </h:column>
-       </h:panelGrid>
+               </p:column>
+       </p:panelGrid>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
new file mode 100644 (file)
index 0000000..568fcf7
--- /dev/null
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:validator="http://mxchange.org/jsf/core/validators"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       >
+       <p:fieldset
+               legend="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}"
+               title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}"
+               >
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
+                       <p:outputLabel for="personalTitle" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+                       <core:outputPersonalTitleSelectionBox targetController="#{adminContactController}" />
+
+                       <p:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
+                       <p:inputText
+                               id="firstName"
+                               size="10"
+                               maxlength="255"
+                               value="#{adminContactController.firstName}"
+                               required="true"
+                               requiredMessage="#{msg.ADMIN_CONTACT_DATA_FIRST_NAME_REQUIRED}"
+                               />
+
+                       <p:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
+                       <p:inputText
+                               id="title"
+                               size="5"
+                               maxlength="255"
+                               value="#{adminContactController.academicTitle}"
+                               />
+
+                       <p:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
+                       <p:inputText
+                               id="familyName"
+                               size="10"
+                               maxlength="255"
+                               value="#{adminContactController.familyName}"
+                               required="true"
+                               requiredMessage="#{msg.ADMIN_CONTACT_DATA_FAMILY_NAME_REQUIRED}"
+                               />
+
+                       <p:outputLabel for="street" value="#{msg.ADMIN_DATA_STREET_NAME}" />
+                       <p:inputText
+                               id="street"
+                               size="20"
+                               maxlength="255"
+                               value="#{adminContactController.street}"
+                               />
+
+                       <p:outputLabel for="houseNumber" value="#{msg.ADMIN_DATA_HOUSE_NUMBER}" />
+                       <p:inputText
+                               id="houseNumber"
+                               size="3"
+                               maxlength="5"
+                               value="#{adminContactController.houseNumber}"
+                               validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}"
+                               >
+                               <f:validateLongRange minimum="1" maximum="500" />
+                       </p:inputText>
+
+                       <p:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_DATA_HOUSE_NUMBER_EXTENSION}" />
+                       <p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
+
+                       <p:outputLabel for="zipCode" value="#{msg.DATA_ZIP_CODE}" />
+                       <p:inputText id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                               <f:validateLongRange minimum="1" maximum="99999" />
+                       </p:inputText>
+
+                       <p:outputLabel for="city" value="#{msg.ADMIN_DATA_CITY}" />
+                       <p:inputText id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
+
+                       <p:outputLabel for="country" value="#{msg.ADMIN_SELECT_COUNTRY}" />
+                       <core:outputCountrySelector
+                               id="country"
+                               value="#{adminContactController.contactCountry}"
+                               required="true"
+                               requiredMessage="#{msg.ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED}"
+                               />
+
+                       <p:outputLabel for="landLineCountry" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
+                       <core:inputLandLineNumberPanelGrid targetController="#{adminContactController}" />
+
+                       <p:outputLabel for="faxCountry" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+                       <core:inputFaxNumberPanelGrid targetController="#{adminContactController}" />
+
+                       <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+                       <core:inputMobileNumberPanelGrid targetController="#{adminContactController}" />
+
+                       <p:outputLabel for="emailAddress" value="#{msg.DATA_EMAIL_ADDRESS}" />
+                       <p:inputText id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                               <validator:emailAddressValidator allowEmptyRequiredData="true" />
+                       </p:inputText>
+
+                       <p:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
+                       <p:calendar
+                               id="contactBirthday"
+                               value="#{contactController.birthday}"
+                               title="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE}"
+                               pattern="#{msg.DATE_PATTERN}"
+                               navigator="true"
+                               />
+
+                       <p:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
+                       <p:inputTextarea id="contactComment" value="#{adminContactController.comment}" rows="7" cols="35" />
+               </p:panelGrid>
+       </p:fieldset>
+
+       <h:panelGroup styleClass="para notice" layout="block">
+               <ul>
+                       <li>
+                               <h:outputText value="#{msg.ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE}" />
+                       </li>
+               </ul>
+       </h:panelGroup>
+</ui:composition>
index 7b1b357e9ea6e71810109ddc970f96083783dd63..e8d7d88f27581c61bd743d6f1c17b78a961d36f6 100644 (file)
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.contact}">
+       <!--
+       @TOD summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}"
+       -->
+       <p:panelGrid
+               columns="3"
+               rendered="#{not empty beanHelper.contact}"
+               >
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_CONTACT_HEADER}">
                                <f:param value="#{beanHelper.contact.contactId}" />
                        </h:outputFormat>
                </f:facet>
 
-               <widgets:outputContactDataGridColumns />
-       </h:panelGrid>
+               <core:outputContactDataGridColumns />
+       </p:panelGrid>
 </ui:composition>
index 8c51d7c1c58c2fc81b1e636e30e1dc88a94cdc3f..980adb56c37217b7101152a15d8550aed33c21e1 100644 (file)
@@ -4,14 +4,15 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para notice" layout="block">
                <h:outputText value="#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}" />
        </h:panelGroup>
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="country_data">
+               <fieldset class="fieldset">
                        <legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
                        </legend>
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
+                                       <p:inputText
+                                               id="countryAbroadDialPrefix"
+                                               size="2"
+                                               maxlength="10"
+                                               value="#{adminCountryController.countryAbroadDialPrefix}"
+                                               required="true"
+                                               requiredMessage="#{msg.ADMIN_COUNTRY_ABROAD_DIAL_PREFIX_REQUIRED}"
+                                               >
                                                <f:validator validatorId="AbroadDialValidator" />
                                        </p:inputText>
                                </div>
@@ -38,7 +46,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+                                       <p:inputText id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
                                                <f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
                                        </p:inputText>
 
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+                                       <p:inputText
+                                               id="countryI18nKey"
+                                               maxlength="100"
+                                               value="#{adminCountryController.countryI18nKey}"
+                                               required="true"
+                                               requiredMessage="#{msg.ADMIN_COUNTRY_I18N_KEY_REQUIRED}"
+                                               >
                                                <f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
                                        </p:inputText>
                                </div>
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
-                                               <f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
+                                       <p:inputText id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
+                                               <f:validateLongRange minimum="0" maximum="99" />
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
index 2492f9daed47e01ac749beadc43145302bdfbd18..0ac5df69b12f2b22baee0a23b7155e6a3e8768b8 100644 (file)
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox id="error-helper-contact-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox
+               panelGroupId="errorHelperAddFax"
+               message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}"
+               messageStyleClass="alert-danger"
+               rendered="#{empty beanHelper.contact}"
+               />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />
        </ui:fragment>
 
-       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.contact.contactFaxNumber}" rendered="#{not empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}" />
+       <core:outputAdminFaxPanelGrid
+               faxNumber="#{beanHelper.contact.contactFaxNumber}"
+               rendered="#{not empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}"
+               />
 </ui:composition>
index 6ad0222f23f96bae6f14cb15c1c6de0b78e71669..fd30eb7d3eb3087cf6b266928717f56ba082477d 100644 (file)
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <widgets:outputMessageBox id="error-helper-contact-add-fax" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox
+               panelGroupId="errorHelperContactAddFax"
+               message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}"
+               messageStyleClass="alert-danger"
+               rendered="#{empty beanHelper.contact}"
+               />
 
-       <h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table table-medium" layout="block">
+       <h:form rendered="#{not empty beanHelper.contact}">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE}" />
                        </div>
                                                value="#{adminPhoneController.faxNumber}"
                                                >
                                                <f:converter converterId="FaxNumberConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+
+                                               <f:selectItem
+                                                       itemValue="#{null}"
+                                                       itemLabel="#{msg.NONE_SELECTED}"
+                                                       />
+
+                                               <f:selectItems
+                                                       value="#{adminPhoneController.allNonLinkedFaxNumbers}"
+                                                       var="faxNumber"
+                                                       itemValue="#{faxNumber}"
+                                                       itemLabel="#{beanHelper.renderPhoneNumber(faxNumber)}"
+                                                       />
                                        </p:selectOneMenu>
                                </div>
                        </h:panelGroup>
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA}" />
                        </div>
 
-                       <widgets:outputFaxInputTableRow targetController="#{adminContactPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+                       <core:outputFaxInputTableRow targetController="#{adminContactPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
 
-                               <p:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
-                       </div>
+                               <p:commandButton
+                                       type="submit"
+                                       action="#{adminContactPhoneController.doLinkMainFaxNumber()}"
+                                       value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}"
+                                       />
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl
new file mode 100644 (file)
index 0000000..c1e24f4
--- /dev/null
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       xmlns:validator="http://mxchange.org/jsf/product/validators"
+       >
+
+       <p:fieldset
+               legend="#{product.ADMIN_GENERIC_PRODUCT_DATA_LEGEND}"
+               title="#{product.ADMIN_GENERIC_PRODUCT_DATA_LEGEND_TITLE}"
+               >
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
+                       <p:outputLabel for="productCategory" value="#{product.ADMIN_ASSIGN_PRODUCT_CATEGORY}" />
+                       <p:selectOneMenu
+                               id="productCategory"
+                               value="#{adminGenericProductActionController.productCategory}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               dynamic="true"
+                               required="true"
+                               requiredMessage="#{product.ADMIN_PRODUCT_CATEGORY_REQUIRED}"
+                               title="#{product.ADMIN_ASSIGN_PRODUCT_CATEGORY_TITLE}"
+                               >
+
+                               <f:converter converterId="ProductCategoryConverter" />
+
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.PLEASE_SELECT}"
+                                       noSelectionOption="true"
+                                       itemDisabled="true"
+                                       />
+
+                               <f:selectItems
+                                       value="#{productCategoryListController.allProductCategories}"
+                                       var="category"
+                                       itemValue="#{category}"
+                                       itemLabel="#{productBeanHelper.renderProductCategory(category)}"
+                                       />
+                       </p:selectOneMenu>
+
+                       <p:outputLabel for="productI18nKey" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_I18N_KEY}" />
+                       <p:inputText
+                               id="productI18nKey"
+                               value="#{adminGenericProductActionController.productI18nKey}"
+                               maxlength="255"
+                               required="true"
+                               requiredMessage="#{product.ADMIN_PRODUCT_I18N_KEY_REQUIRED}"
+                               title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_I18N_KEY_TITLE}"
+                               validatorMessage="#{product.ADMIN_ENTERED_PRODUCT_I18N_KEY_ALREADY_ADDED}"
+                               >
+                               <validator:genericProductValidator bypassDuplicateI18nKey="#{bypassDuplicateI18nKey}" />
+                       </p:inputText>
+
+                       <p:outputLabel for="productNumber" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_NUMBER}" />
+                       <p:inputText
+                               id="productNumber"
+                               value="#{adminGenericProductActionController.productNumber}"
+                               size="20"
+                               maxlength="20"
+                               title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE}"
+                               />
+
+                       <p:outputLabel for="productFscNumber" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_FSC_NUMBER}" />
+                       <p:inputText
+                               id="productFscNumber"
+                               value="#{adminGenericProductActionController.productFscNumber}"
+                               size="7"
+                               maxlength="7"
+                               title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_FSC_NUMBER_TITLE}"
+                               validatorMessage="#{product.ERROR_PRODUCT_FSC_NUMBER_NOT_VALID}"
+                               >
+                               <f:validateRegex pattern="C[0-9]{6}" />
+                       </p:inputText>
+
+                       <p:outputLabel for="productBarCodeNumber" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER}" />
+                       <p:inputText
+                               id="productBarCodeNumber"
+                               value="#{adminGenericProductActionController.productBarCodeNumber}"
+                               size="30"
+                               maxlength="255"
+                               title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER_TITLE}"
+                               />
+
+                       <p:outputLabel for="productAgeGroup" value="#{product.ADMIN_SELECT_PRODUCT_AGE_GROUP}" />
+                       <p:selectOneMenu
+                               id="productAgeGroup"
+                               value="#{adminGenericProductActionController.productAgeGroup}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               dynamic="true"
+                               title="#{product.ADMIN_SELECT_PRODUCT_AGE_GROUP_TITLE}"
+                               >
+
+                               <f:converter converterId="AgeGroupConverter" />
+
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.NONE_SELECTED}"
+                                       />
+
+                               <f:selectItems
+                                       value="#{dataController.ageGroups}"
+                                       var="ageGroup"
+                                       itemValue="#{ageGroup}"
+                                       itemLabel="#{project[ageGroup.messageKey]}"
+                                       />
+                       </p:selectOneMenu>
+
+                       <p:outputLabel for="productSize" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_SIZE}" />
+                       <p:inputText
+                               id="productSize"
+                               value="#{adminGenericProductActionController.productSize}"
+                               size="5"
+                               maxlength="10"
+                               title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_SIZE_TITLE}"
+                               />
+
+                       <p:outputLabel for="productManufacturer" value="#{product.ADMIN_ASSIGN_PRODUCT_MANUFACTURER}" />
+                       <p:selectOneMenu
+                               id="productManufacturer"
+                               value="#{adminGenericProductActionController.productManufacturer}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               dynamic="true"
+                               title="#{product.ADMIN_ASSIGN_PRODUCT_MANUFACTURER_TITLE}"
+                               >
+
+                               <f:converter converterId="BasicCompanyDataConverter" />
+
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.NONE_SELECTED}"
+                                       />
+
+                               <f:selectItems
+                                       value="#{basicDataListController.allBasicData}"
+                                       var="basicData"
+                                       itemValue="#{basicData}"
+                                       itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
+                                       />
+                       </p:selectOneMenu>
+
+                       <p:outputLabel for="productAvailability" value="#{product.ADMIN_ENABLE_PRODUCT_AVAILABILITY}" />
+                       <p:selectBooleanCheckbox
+                               id="productAvailability"
+                               value="#{adminGenericProductActionController.productAvailability}"
+                               required="true"
+                               requiredMessage="#{product.ADMIN_GENERIC_PRODUCT_AVAILABILITY_REQUIRED}"
+                               title="#{product.ADMIN_ENABLE_PRODUCT_AVAILABILITY_TITLE}"
+                               />
+
+                       <p:outputLabel value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_PRICE}" />
+                       <ui:include src="/WEB-INF/templates/admin/generic_product/admin_product_price_input_panel_grid.tpl" />
+
+                       <p:outputLabel for="productCurrencyCode" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE}" />
+                       <p:inputText
+                               id="productCurrencyCode"
+                               value="#{adminGenericProductActionController.productCurrencyCode}"
+                               size="3"
+                               maxlength="3"
+                               title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_CURRENCY_CODE_TITLE}"
+                               required="true"
+                               requiredMessage="#{product.ADMIN_PRODUCT_CURRENCY_CODE_REQUIRED}"
+                               />
+
+                       <p:outputLabel for="productUnitAmount" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_AMOUNT}" />
+                       <p:inputNumber
+                               id="productUnitAmount"
+                               value="#{adminGenericProductActionController.productUnitAmount}"
+                               size="20"
+                               minValue="0.001"
+                               maxValue="20000.000"
+                               title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_AMOUNT_TITLE}"
+                               required="true"
+                               requiredMessage="#{product.ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED}"
+                               />
+
+                       <p:outputLabel for="productUnitI18nKey" value="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY}" />
+                       <p:inputText
+                               id="productUnitI18nKey"
+                               value="#{adminGenericProductActionController.productUnitI18nKey}"
+                               size="20"
+                               maxlength="255"
+                               title="#{product.ADMIN_ENTER_GENERIC_PRODUCT_UNIT_I18N_KEY_TITLE}"
+                               required="true"
+                               requiredMessage="#{product.ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED}"
+                               />
+               </p:panelGrid>
+       </p:fieldset>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/generic_product/admin_product_price_input_panel_grid.tpl b/web/WEB-INF/templates/admin/generic_product/admin_product_price_input_panel_grid.tpl
new file mode 100644 (file)
index 0000000..5e11965
--- /dev/null
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <p:panelGrid
+               layout="grid"
+               columns="3"
+               columnClasses="ui-grid-col-3,ui-grid-col-2,ui-grid-col-3"
+               styleClass="ui-noborder"
+               rendered="#{empty rendered or rendered == true}"
+               >
+               <p:outputLabel for="productNetPrice" value="#{product.ENTER_NET_PRICE}" />
+
+               <p:outputLabel for="productTaxRate" value="#{product.ENTER_TAX_RATE}" />
+
+               <p:outputLabel for="productGrossPrice" value="#{product.ENTER_GROSS_PRICE}" />
+
+               <p:inputNumber
+                       id="productNetPrice"
+                       title="#{product.ENTER_PRODUCT_NET_PRICE_TITLE}"
+                       value="#{adminGenericProductActionController.productNetPrice}"
+                       symbol=" EUR"
+                       symbolPosition="s"
+                       />
+
+               <p:inputNumber
+                       id="productTaxRate"
+                       title="#{product.ENTER_PRODUCT_TAX_RATE_TITLE}"
+                       value="#{adminGenericProductActionController.productTaxRate}"
+                       symbol="%"
+                       symbolPosition="s"
+                       emptyValue="focus"
+                       minValue="0"
+                       maxValue="100"
+                       />
+
+               <p:inputNumber
+                       id="productGrossPrice"
+                       title="#{product.ENTER_PRODUCT_GROSS_PRICE_TITLE}"
+                       value="#{adminGenericProductActionController.productGrossPrice}"
+                       symbol=" EUR"
+                       symbolPosition="s"
+                       required="true"
+                       requiredMessage="#{product.PRODUCT_GROSS_PRICE_REQUIRED}"
+                       />
+       </p:panelGrid>
+</ui:composition>
index d2357275f8d4d25a221593f0d37b7a3fa4625919..651763e377dee8e612832fd0b73a000d33b34597 100644 (file)
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <widgets:outputMessageBox id="error-helper-contact-add-landline" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox
+               panelGroupId="errorHelperContactAddLandline"
+               message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}"
+               messageStyleClass="alert-danger"
+               rendered="#{empty beanHelper.contact}"
+               />
 
-       <h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table table-medium" layout="block">
+       <h:form rendered="#{not empty beanHelper.contact}">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
                        </div>
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
-                               </div>
+                       <p:panelGrid
+                               layout="grid"
+                               columns="2"
+                               >
+                               <p:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
+                               <p:selectOneMenu
+                                       id="landLineNumber"
+                                       styleClass="select"
+                                       value="#{adminPhoneController.landLineNumber}"
+                                       >
+                                       <f:converter converterId="LandLineNumberConverter" />
 
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
-                                               <f:converter converterId="LandLineNumberConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
+                                       <f:selectItem
+                                               itemValue="#{null}"
+                                               itemLabel="#{msg.NONE_SELECTED}"
+                                               />
+
+                                       <f:selectItems
+                                               value="#{adminPhoneController.allNonLinkedLandLineNumbers}"
+                                               var="landlineNumber"
+                                               itemValue="#{landlineNumber}"
+                                               itemLabel="#{beanHelper.renderPhoneNumber(landlineNumber)}"
+                                               />
+                               </p:selectOneMenu>
+                       </p:panelGrid>
 
                        <div class="para">
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
                        </div>
 
-                       <widgets:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
+                       <core:outputLandLineInputTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
 
-                               <p:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
+                               <p:commandButton
+                                       type="submit"
+                                       action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}"
+                                       value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}"
+                                       >
                                        <f:param name="contactId" value="#{param.contactId}" />
                                </p:commandButton>
-                       </div>
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index 4b0d7b4046495a75b78b8fc79cfa854a4c329a48..9998fb116417881211fa1c5024924f3d18a677be 100644 (file)
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox
+               panelGroupId="errorHandlerAddLandLine"
+               message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}"
+               messageStyleClass="alert-danger"
+               rendered="#{empty beanHelper.contact}"
+               />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />
        </ui:fragment>
 
-       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.contact.contactLandLineNumber}" rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}" />
+       <core:outputAdminLandLinePanelGrid
+               landLineNumber="#{beanHelper.contact.contactLandLineNumber}"
+               rendered="#{not empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}"
+               />
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/menu/project.tpl b/web/WEB-INF/templates/admin/menu/project.tpl
new file mode 100644 (file)
index 0000000..44874c3
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <p:submenu label="#{project.ADMIN_MENU_RECEIPTS_TITLE}" expanded="false">
+               <p:menuitem title="#{project.ADMIN_LINK_LIST_RECEIPTS_TITLE}" outcome="admin_list_receipts" value="#{project.ADMIN_LINK_LIST_RECEIPTS}" />
+               <p:menuitem title="#{project.ADMIN_LINK_LIST_RECEIPT_ITEMS_TITLE}" outcome="admin_list_receipt_items" value="#{project.ADMIN_LINK_LIST_RECEIPT_ITEMS}" />
+       </p:submenu>
+
+       <p:submenu label="#{product.ADMIN_MENU_PRODUCTS_CATEGORIES_TITLE}" expanded="false">
+               <p:menuitem title="#{product.ADMIN_LINK_LIST_GENERIC_PRODUCTS_TITLE}" outcome="admin_list_generic_products" value="#{product.ADMIN_LINK_LIST_GENERIC_PRODUCTS}" />
+               <p:menuitem title="#{product.ADMIN_LINK_LIST_PRODUCT_CATEGORIES_TITLE}" outcome="admin_list_product_categories" value="#{product.ADMIN_LINK_LIST_PRODUCT_CATEGORIES}" />
+       </p:submenu>
+</ui:composition>
index 3c78b68350d54cc712ab66c58e13d0a3a50a106e..81871788350a9e8ab735f749de7e68887f105b60 100644 (file)
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox
+               panelGroupId="errorHandlerAddMobileContact"
+               message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}"
+               messageStyleClass="alert-danger"
+               rendered="#{empty beanHelper.contact}"
+               />
 
-       <h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
-               <h:panelGroup styleClass="table table-medium" layout="block">
+       <h:form rendered="#{not empty beanHelper.contact}">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE}" />
                        </div>
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
                        </div>
 
-<<<<<<< HEAD
-                       <h:panelGroup styleClass="table-row" layout="block">
-                               <div class="table-left-medium">
-                                       <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
-                               </div>
-=======
                        <p:panelGrid
                                layout="grid"
                                columns="2"
                                        id="mobileNumber"
                                        value="#{adminMobileController.mobileNumber}"
                                        >
->>>>>>> 6774350c5 (Please cherry-pick:)
 
-                               <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
-                                               <f:converter converterId="MobileNumberConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
-                                       </p:selectOneMenu>
-                               </div>
-                       </h:panelGroup>
+                                       <f:converter converterId="MobileNumberConverter" />
+
+                                       <f:selectItem
+                                               itemValue="#{null}"
+                                               itemLabel="#{msg.NONE_SELECTED}"
+                                               />
+
+                                       <f:selectItems
+                                               value="#{adminMobileController.allNonLinkedMobileNumbers}"
+                                               var="mobileNumber"
+                                               itemValue="#{mobileNumber}"
+                                               itemLabel="#{beanHelper.renderMobileNumber(mobileNumber)}"
+                                               />
+                               </p:selectOneMenu>
+                       </p:panelGrid>
 
                        <div class="para">
                                <h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_MOBILE_DATA}" />
                        </div>
 
-                       <widgets:outputMobileNumberTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+                       <p:outputLabel for="mobileNumber" value="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
+                       <core:inputMobileNumberPanelGrid targetController="#{adminMobileController}" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                       <p:panelGrid
+                               layout="grid"
+                               columns="2"
+                               >
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
 
-                               <p:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
+                               <p:commandButton
+                                       type="submit"
+                                       action="#{adminContactMobileController.doLinkAddMobileNumber(beanHelper.contact)}"
+                                       value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}"
+                                       >
                                        <f:param name="contactId" value="#{param.contactId}" />
                                </p:commandButton>
-                       </div>
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index ef10a6516184f8290dc48ce34eb7311563ee6d90..428320aafbb6111f4f8a3a17d1fd1306685b5f77 100644 (file)
@@ -7,6 +7,6 @@
 
        <h:outputText styleClass="alert-danger" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
 
-       <h:form id="form_add_contact_mobile">
+       <h:form>
        </h:form>
 </ui:composition>
index 14306965a75f3ea4c0baa4cf56e436276ebb043e..b3a3865ea6618a0707f4d44ef9f8d8f73e650110 100644 (file)
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+       <core:outputMessageBox
+               panelGroupId="errorHandlerAddMobile"
+               message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}"
+               messageStyleClass="alert-danger"
+               rendered="#{empty beanHelper.contact}"
+               />
 
        <ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
                <ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
        </ui:fragment>
 
-       <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.contact.contactMobileNumber}" rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}" />
+       <core:outputAdminMobilePanelGrid
+               mobileNumber="#{beanHelper.contact.contactMobileNumber}"
+               rendered="#{not empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}"
+               />
 </ui:composition>
index 156b795db513a22ba1f59d24ad73ec4a03e12290..607d1b716da85388965791056ed47451a73a4e66 100644 (file)
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para notice" layout="block">
                <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}" />
        </h:panelGroup>
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="mobile_provider">
+               <fieldset class="fieldset">
                        <legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
                        </legend>
@@ -22,8 +24,8 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
-                                               <f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
+                                       <p:inputText id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
+                                               <f:validateLongRange minimum="0" maximum="9999" />
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
@@ -38,7 +40,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
+                                       <p:inputText id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
 
                                        <h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
                                </div>
@@ -50,7 +52,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
+                                       <p:inputText id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
                                </div>
                        </h:panelGroup>
 
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-                                       </p:selectOneMenu>
+                                       <core:outputCountrySelector id="providerCountry" value="#{adminMobileProviderController.providerCountry}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_COUNTRY_REQUIRED}" allowNone="false" />
                                </div>
                        </h:panelGroup>
                </fieldset>
diff --git a/web/WEB-INF/templates/admin/product_category/admin_form_product_category_data.tpl b/web/WEB-INF/templates/admin/product_category/admin_form_product_category_data.tpl
new file mode 100644 (file)
index 0000000..256751d
--- /dev/null
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:p="http://primefaces.org/ui"
+       xmlns:validator="http://mxchange.org/jsf/product/validators"
+       >
+
+       <p:fieldset legend="#{product.ADMIN_PRODUCT_CATEGORY_DATA_LEGEND}">
+               <p:panelGrid
+                       layout="grid"
+                       columns="2"
+                       columnClasses="ui-grid-col-4,ui-grid-col-8"
+                       styleClass="ui-noborder"
+                       >
+                       <p:outputLabel for="parentCategory" value="#{product.ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY}" />
+                       <p:selectOneMenu
+                               id="parentCategory"
+                               value="#{adminProductCategoryActionController.parentCategory}"
+                               filter="true"
+                               filterMatchMode="contains"
+                               dynamic="true"
+                               title="#{product.ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY_TITLE}"
+                               >
+
+                               <f:converter converterId="ProductCategoryConverter" />
+
+                               <f:selectItem
+                                       itemValue="#{null}"
+                                       itemLabel="#{msg.NONE_SELECTED}"
+                                       />
+
+                               <f:selectItems
+                                       value="#{productCategoryListController.allProductCategories}"
+                                       var="category"
+                                       itemValue="#{category}"
+                                       itemLabel="#{productBeanHelper.renderProductCategory(category)}"
+                                       />
+                       </p:selectOneMenu>
+
+                       <p:outputLabel for="categoryI18nKey" value="#{product.ADMIN_ENTER_CATEGORY_I18N_KEY}" />
+                       <p:inputText
+                               id="categoryI18nKey"
+                               value="#{adminProductCategoryActionController.categoryI18nKey}"
+                               maxlength="255"
+                               required="true"
+                               requiredMessage="#{product.ADMIN_CATEGORY_I18N_KEY_REQUIRED}"
+                               title="#{product.ADMIN_ENTER_CATEGORY_I18N_KEY_TITLE}"
+                               validatorMessage="#{product.ADMIN_ENTERED_CATEGORY_I18N_KEY_ALREADY_ADDED}"
+                               >
+                               <validator:genericProductValidator bypassDuplicateI18nKey="#{bypassDuplicateI18nKey}" />
+                       </p:inputText>
+
+                       <p:outputLabel for="categoryShownInStatistics" value="#{product.ADMIN_ENABLE_CATEGORY_IN_STATISTICS}" />
+                       <p:selectBooleanCheckbox
+                               id="categoryShownInStatistics"
+                               value="#{adminProductCategoryActionController.categoryShownInStatistics}"
+                               required="true"
+                               requiredMessage="#{product.ADMIN_ENABLE_CATEGORY_IN_STATISTICS_REQUIRED}"
+                               title="#{product.ADMIN_ENABLE_CATEGORY_IN_STATISTICS_TITLE}"
+                               />
+               </p:panelGrid>
+       </p:fieldset>
+</ui:composition>
index 7f5d92f5098149cccd439021004db488d803d469..e114c2d9dbe04f604374f2f2bdda3df4058943db 100644 (file)
@@ -1,76 +1,83 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
+       <p:panelGrid
+               columns="3"
+               rendered="#{not empty beanHelper.user}"
+               >
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
                                <f:param value="#{beanHelper.user.userName}" />
                                <f:param value="#{beanHelper.user.userId}" />
                        </h:outputFormat>
                </f:facet>
 
-               <h:column>
-                       <p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
+               <p:column>
+                       <p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.DATA_USER_ID}" />
 
                        <h:outputText id="userId" styleClass="table-data-field" value="#{beanHelper.user.userId}" />
-               </h:column>
+               </p:column>
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                       <h:column>
-                               <p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
+                       <p:column>
+                               <p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.DATA_USER_NAME}" />
 
                                <h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
-                       </h:column>
+                       </p:column>
                </ui:fragment>
 
-               <h:column>
-                       <p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
+               <p:column>
+                       <p:outputLabel for="userEntryCreated" 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 id="userEntryCreated" styleClass="table-data-field" value="#{beanHelper.user.userEntryCreated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
-                       <p:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
+               <p:column>
+                       <p:outputLabel for="userEntryUpdated" 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 id="userEntryUpdated" styleClass="table-data-field" value="#{beanHelper.user.userEntryUpdated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p: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>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p: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>
+               </p:column>
 
-               <h:column>
-                       <p:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+               <p:column>
+                       <p:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.DATA_USER_LAST_LOCKED}" />
 
-                       <h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked.time}">
-                               <f:convertDateTime for="userLastLocked" type="both" />
+                       <h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
-                       <p:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+               <p:column>
+                       <p:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.DATA_USER_LAST_LOCKED_REASON}" />
 
                        <h:outputText id="userLastLockedReason" styleClass="table-data-field" value="#{beanHelper.user.userLastLockedReason}" />
-               </h:column>
+               </p:column>
 
-               <widgets:outputContactDataGridColumns />
-       </h:panelGrid>
+               <core:outputContactDataGridColumns />
+       </p:panelGrid>
 </ui:composition>
index ef3e1c957572a299db7da13280e1da140f0a730e..b6a0db4d9117e3a50bc6f9160dfde91428f77cf4 100644 (file)
@@ -1,52 +1,64 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+@TODO summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}"
+-->
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table table-full" columns="3" rendered="#{not empty beanHelper.user}">
+       <p:panelGrid
+               columns="2"
+               rendered="#{not empty beanHelper.user}"
+               >
                <f:facet name="header">
-                       <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+                       <h:outputFormat value="#{msg.ADMIN_SHOW_USER_HEADER}">
                                <f:param value="#{beanHelper.user.userName}" />
                                <f:param value="#{beanHelper.user.userId}" />
                        </h:outputFormat>
                </f:facet>
 
-               <h:column>
-                       <p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
+               <p:column>
+                       <p:outputLabel for="userId" styleClass="table-data-label" value="#{msg.DATA_USER_ID}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <p:link id="userId" outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+                               <p:link
+                                       id="userId"
+                                       outcome="admin_show_user"
+                                       title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}"
+                                       value="#{beanHelper.user.userId}"
+                                       >
                                        <f:param name="userId" value="#{beanHelper.user.userId}" />
                                </p:link>
                        </h:panelGroup>
-               </h:column>
+               </p:column>
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-                       <h:column>
-                               <p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
+                       <p:column>
+                               <p:outputLabel for="userName" styleClass="table-data-label" value="#{msg.DATA_USER_NAME}" />
 
                                <h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
-                       </h:column>
+                       </p:column>
                </ui:fragment>
 
-               <h:column>
-                       <p:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
+               <p:column>
+                       <p:outputLabel for="userEntryCreated" 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 id="userEntryCreated" styleClass="table-data-field" value="#{beanHelper.user.userEntryCreated}">
+                               <f:convertDateTime type="both" />
                        </h:outputText>
-               </h:column>
+               </p:column>
 
-               <h:column>
+               <p:column>
                        <p: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>
+               </p:column>
 
-               <widgets:outputContactDataGridColumns />
-       </h:panelGrid>
+               <core:outputContactDataGridColumns />
+       </p:panelGrid>
 </ui:composition>
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
deleted file mode 100644 (file)
index 83ab95d..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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"
-                               xmlns:p="http://primefaces.org/ui"
-                               xmlns:pm="http://primefaces.org/mobile">
-
-       <h:doctype rootElement="html" public="-//W3C//DTD XHTML 1.0 Transitional//EN" system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-       <html lang="#{localizationController.locale.language}" xml:lang="#{localizationController.locale.language}" xmlns="http://www.w3.org/1999/xhtml">
-               <f:view locale="#{localizationController.locale}" contentType="text/html" />
-
-               <h:head>
-                       <f:facet name="first">
-                               <ui:insert name="metadata" />
-
-                               <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-                               <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-                               <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
-                               <meta name="apple-mobile-web-app-capable" content="yes" />
-                       </f:facet>
-
-                       <f:loadBundle var="msg" basename="org.mxchange.localization.bundle" />
-
-                       <h:outputStylesheet name="/css/default.css" />
-                       <h:outputStylesheet name="/css/layout.css" />
-
-                       <title>
-                               <h:outputText value="#{initParam['project_title']}" />
-                               <h:outputText value=" - " />
-                               <ui:insert name="title">
-                                       <h:outputText value="Default title" />
-                               </ui:insert>
-                       </title>
-               </h:head>
-
-               <h:body>
-                       <pm:header>
-                               <div id="page-header">
-                                       <h1>
-                                               <h:outputText value="#{initParam['project_title']} - " />
-
-                                               <ui:insert name="title">
-                                                       <h:outputText value="Default title" />
-                                               </ui:insert>
-                                       </h1>
-                               </div>
-                       </pm:header>
-
-                       <h:panelGroup id="menu-content-wrapper" layout="block">
-                               <div id="left-menu-container">
-                                       <ui:insert name="menu">
-                                               <h:outputText value="Default menu" />
-                                       </ui:insert>
-
-                                       <ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
-                               </div>
-
-                               <h:panelGroup id="content_outer" class="content-container" layout="block">
-                                       <div id="content-header">
-                                               <ui:insert name="content_header">
-                                                       <h:outputText value="Default content header" />
-                                               </ui:insert>
-                                       </div>
-
-                                       <div id="content">
-                                               <ui:insert name="content">
-                                                       <h:outputText value="Default content" />
-                                               </ui:insert>
-                                       </div>
-                               </h:panelGroup>
-                       </h:panelGroup>
-
-                       <h:panelGroup id="page-footer" layout="block">
-                               <ui:insert name="footer">
-                                       <h:outputText value="Default footer" />
-                               </ui:insert>
-                       </h:panelGroup>
-
-                       <h:panelGroup styleClass="error-container" layout="block">
-                               <p:growl autoUpdate="true" showDetail="true" sticky="true" />
-
-                               <p:ajaxExceptionHandler type="javax.faces.application.ViewExpiredException"
-                                                                               update="exceptionDialog"
-                                                                               onexception="PF('exceptionDialog').show();" />
-
-                               <p:dialog id="exceptionDialog" closable="true" closeOnEscape="true" header="Exception '#{pfExceptionHandler.type}' occured!" widgetVar="exceptionDialog"
-                                                 height="500px">
-                                       <div class="para">
-                                               <h:outputText value="#{msg.EXCEPTION_MESSAGE}:" />
-                                               <h:outputText value="#{pfExceptionHandler.message}" />
-                                       </div>
-
-                                       <div class="para">
-                                               <h:outputText value="#{msg.EXCEPTION_STACK_TRACE}:" />
-                                               <h:outputText value="#{pfExceptionHandler.formattedStackTrace}" escape="false" />
-                                       </div>
-
-                                       <div class="para">
-                                               <p:button onclick="window.location.href = document.location.href;"
-                                                                 value="#{msg.RELOAD_PAGE}"
-                                                                 rendered="#{pfExceptionHandler.type == 'javax.faces.application.ViewExpiredException'}" />
-                                       </div>
-                               </p:dialog>
-                       </h:panelGroup>
-               </h:body>
-       </html>
-</ui:composition>
index 124066046b31fbdbfa8a343a53ec0fa351642224..05aab6b4dfc9ff46e760ab96ea2c3bef537e333d 100644 (file)
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para notice" layout="block">
                <h:outputText value="#{msg.PERSONAL_DATA_MINIMUM_NOTICE}" />
        </h:panelGroup>
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="personal_data">
+               <fieldset class="fieldset">
                        <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
                        </legend>
 
-                       <widgets:outputPersonalTitleTableRow targetController="#{contactController}" />
+                       <core:outputPersonalTitleSelectionBox targetController="#{contactController}" />
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
@@ -25,7 +26,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
+                                       <p:inputText id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
@@ -41,7 +42,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
+                                       <p:inputText id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
                                                <f:validator for="familyName" validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
@@ -57,7 +58,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
+                                       <p:inputText id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
@@ -73,8 +74,8 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-                                               <f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+                                       <p:inputText id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+                                               <f:validateLongRange minimum="1" maximum="500" />
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
@@ -89,7 +90,7 @@
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
+                                       <p:inputText id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
                                </div>
                        </h:panelGroup>
 
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+                                       <p:inputText id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
                                                <f:validateLongRange minimum="1" maximum="99999" />
                                        </p:inputText>
                                </div>
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
+                                       <p:inputText id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
                                                <f:validator validatorId="NameValidator" />
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="city" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="city" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:inputText styleClass="input" id="birthday" value="#{contactController.birthday}" required="true" size="10" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" converterMessage="#{msg.INVALID_BIRTHDAY}">
-                                               <f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
-                                       </p:inputText>
+                                       <p:calendar
+                                               id="birthday"
+                                               value="#{contactController.birthday}"
+                                               pattern="#{msg.DATE_PATTERN}"
+                                               navigator="true"
+                                               required="true"
+                                               requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}"
+                                               />
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="birthday" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="birthday" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
-                                       <p:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
+                                       <p:outputLabel for="country" value="#{msg.DATA_COUNTRY_CODE}" />
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu id="country" value="#{contactController.country}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
-                                       </p:selectOneMenu>
+                                       <core:outputCountrySelector id="country" value="#{contactController.country}" />
                                </div>
                        </h:panelGroup>
 
-                               <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="country" />
-                               </h:panelGroup>
+                       <h:panelGroup styleClass="error-container" layout="block">
+                               <p:message for="country" />
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="table-left-medium">
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{contactController.landLineCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
+                                       <core:outputCountrySelector styleClass="select" id="landLineCountry" value="#{contactController.landLineCountry}" />
 
-                                       <p:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
+                                       <p:inputText id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </p:inputText>
 
-                                       <p:inputText styleClass="input" id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
+                                       <p:inputText id="landLineNumber" size="10" maxlength="20" value="#{contactController.landLineNumber}">
                                                <f:validator validatorId="PhoneNumberValidator" />
                                        </p:inputText>
                                </div>
                                </div>
 
                                <div class="table-right-medium">
-                                       <p:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{contactController.faxCountry}">
-                                               <f:converter converterId="CountryConverter" />
-                                               <f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
-                                       </p:selectOneMenu>
+                                       <core:outputCountrySelector styleClass="select" id="faxCountry" value="#{contactController.faxCountry}" />
 
-                                       <p:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+                                       <p:inputText id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
                                                <f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
                                        </p:inputText>
 
-                                       <p:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+                                       <p:inputText id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
                                                <f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
                                        </p:inputText>
                                </div>
                                <p:message for="faxNumber" />
                        </h:panelGroup>
 
-                       <widgets:outputMobileNumberTableRow targetController="#{contactController}" labelMessage="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
+                       <p:outputLabel for="mobileNumber" value="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
+                       <core:inputMobileNumberPanelGrid targetController="#{contactController}" />
                </fieldset>
        </h:panelGroup>
 
-       <h:panelGroup styleClass="para" layout="block" rendered="#{userController.isPublicUserProfileEnabled()}">
-               <fieldset class="fieldset" id="profile_mode">
+       <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('public_user_profile')}">
+               <fieldset class="fieldset">
                        <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
                                <h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
                        </legend>
 
-                       <widgets:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
+                       <h:panelGroup styleClass="table-row" layout="block">
+                               <p:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
+
+                               <p:selectOneMenu
+                                       id="profileMode"
+                                       value="#{targetController.userProfileMode}"
+                                       filter="true"
+                                       filterMatchMode="contains"
+                                       >
+
+                                       <f:selectItem itemValue="#{null}" itemLabel="#{msg.PLEASE_SELECT}" noSelectionOption="true" itemDisabled="true" />
+
+                                       <f:selectItems
+                                               value="#{dataController.profileModes}"
+                                               var="profileMode"
+                                               itemValue="#{profileMode}"
+                                               itemLabel="#{msg[profileMode.messageKey]}"
+                                               />
+                               </p:selectOneMenu>
+                       </h:panelGroup>
 
                        <h:panelGroup styleClass="table-row" layout="block">
                                <div class="para notice">
index 9d18548288f61be36f9cb76d8fcb6241dc48a20f..93d35583189ebc0ece8174c31ced1612f462df35 100644 (file)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
-       template="/WEB-INF/templates/base.tpl"
+       template="/WEB-INF/templates/master.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">
-               <ui:insert name="guest_title">
+       <ui:define name="document_title">
+               <ui:insert name="document_guest_title">
                        <h:outputText value="Default guest title" />
                </ui:insert>
        </ui:define>
                </ui:fragment>
        </ui:define>
 
-       <!--
-       Show basket if it contains items, else show an empty basket.
-       //-->
-       <ui:define name="basket">
-               <ui:fragment rendered="#{basketController.isEmpty()}">
-                       <!-- Empty basket //-->
-                       <ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
-                               <ui:param name="message" value="#{msg.MINI_BASKET_IS_EMPTY}" />
-                       </ui:include>
-                       <ui:include src="/WEB-INF/templates/basket/mini_basket_empty.tpl" />
-               </ui:fragment>
-
-               <ui:fragment rendered="#{basketController.hasItems()}">
-                       <!-- At least one item is there //-->
-                       <ui:include src="/WEB-INF/templates/basket/mini_basket.tpl" />
-               </ui:fragment>
-       </ui:define>
-
        <ui:define name="footer">
                <ui:include src="/WEB-INF/templates/guest/guest_footer.tpl" />
        </ui:define>
index da53f249881326424fce7bd7d8083aa0d4b11132..f463d49729dcce18ee4a5f051ff9921fb144ede5 100644 (file)
@@ -2,9 +2,11 @@
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:validator="http://mxchange.org/jsf/core/validators"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="table-row" layout="block">
                <div class="table-left-medium">
@@ -12,8 +14,8 @@
                </div>
 
                <div class="table-right-medium">
-                       <p:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                               <f:validator validatorId="EmailAddressValidator" />
+                       <p:inputText id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+                               <validator:emailAddressValidator />
                        </p:inputText>
                </div>
        </h:panelGroup>
@@ -28,7 +30,7 @@
                </div>
 
                <div class="table-right-medium">
-                       <p:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
+                       <p:inputText id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
                </div>
        </h:panelGroup>
 
index 5c3306cb2318a1e2cc44745b8aa8eadcb1033b05..079611b61bcf109b2ef2bee7a3ee84b8b2438933 100644 (file)
@@ -4,35 +4,56 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <div class="footer">
                <ul class="navbar-horizontal">
                        <li class="navlink-horizontal">
-                               <p:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
+                               <p:link
+                                       outcome="index"
+                                       value="#{msg.GUEST_LINK_HOME}"
+                                       title="#{msg.GUEST_LINK_HOME_TITLE}"
+                                       />
                        </li>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="user_resend_link" title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" value="#{msg.LINK_GUEST_RESEND_LINK}" />
+                                       <p:link
+                                               outcome="user_resend_link"
+                                               value="#{msg.GUEST_LINK_RESEND_LINK}"
+                                               title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+                                       <p:link
+                                               outcome="imprint"
+                                               value="#{msg.GUEST_LINK_IMPRINT}"
+                                               title="#{msg.GUEST_LINK_IMPRINT_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+                                       <p:link
+                                               outcome="terms"
+                                               value="#{msg.GUEST_LINK_TERMS}"
+                                               title="#{msg.GUEST_LINK_TERMS_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+                                       <p:link
+                                               outcome="privacy"
+                                               value="#{msg.GUEST_LINK_PRIVACY}"
+                                               title="#{msg.GUEST_LINK_PRIVACY_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
index d4d0ddebacfab0532e02f35dcd5af698ea170946..d2310a442adf628682c388156fcb8a19b018c432 100644 (file)
@@ -1,82 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
-       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://java.sun.com/jsf/core"
+       xmlns:h="http://java.sun.com/jsf/html"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <div class="table">
-               <div class="table_header">
-                       <h:outputText value="#{msg.FOLLOWING_PRODUCTS_ARE_AVAILABLE}" />
-               </div>
-       </div>
-
-       <h:dataTable id="table_show_available_products" var="product" value="#{productController.availableProducts}" styleClass="table" summary="#{msg.TABLE_SUMMARY_INDEX_PRODUCTS}">
-               <h:column>
-                       <div id="main_item_container">
-                               <div class="item_title">
-                                       <h:outputText value="#{product.productTitle}" />
-                               </div>
-
-                               <div class="item_content">
-                                       <div class="table_left">
-                                               <div class="item_actions">
-                                                       <ui:fragment rendered="#{!basketController.isProductAdded(product)}">
-                                                               <h:form id="add_item">
-                                                                       <h:commandButton class="submit" id="add" value="#{msg.USER_ADD_ITEM_TO_BASKET}" action="#{basketController.addItem(product)}" title="#{msg.BUTTON_TITLE_ADD_ITEM_TO_BASKET}" />
-
-                                                                       <h:inputText class="input" id="amount" size="3" maxlength="20" value="#{basketController.orderedAmount}" title="#{msg.INPUT_TITLE_ENTER_ITEM_AMOUNT}">
-                                                                               <!--
-                                                                               If the customer wants to order more, he need to call in.
-                                                                               //-->
-                                                                               <f:validator for="amount" validatorId="ItemAmountValidator" />
-                                                                       </h:inputText>
-                                                               </h:form>
-                                                       </ui:fragment>
-
-                                                       <ui:fragment rendered="#{basketController.isProductAdded(product)}">
-                                                               <div class="item_amount">
-                                                                       <h:outputText value="#{msg.ITEM_ORDER_AMOUNT}" />
-                                                                       <h:outputText value="#{basketController.getItemAmount(product)}" />
-                                                               </div>
-
-                                                               <div class="item_basket_link">
-                                                                       <h:link outcome="basket" title="#{msg.LINK_TO_BASKET_TITLE}" value="#{msg.LINK_CHANGE_IN_BASKET}" />
-                                                               </div>
-
-                                                               <div class="clear"></div>
-                                                       </ui:fragment>
-                                               </div>
-                                       </div>
-
-                                       <div class="table_right">
-                                               <div class="item_price">
-                                                       <h:outputText value="#{msg.SINGLE_PRODUCT_PRICE}" />
-                                                       <h:outputText styleClass="price" value="#{product.productPrice}">
-                                                               <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
-                                                       </h:outputText>
-                                               </div>
-
-                                               <div class="item_total_price">
-                                                       <h:outputText value="#{msg.TOTAL_ITEM_PRICE}" />
-                                                       <h:outputText styleClass="price" value="#{msg.ITEM_NOT_ORDERED}" rendered="#{!basketController.isProductAdded(product)}" />
-                                                       <h:outputText styleClass="price" value="#{basketController.calculateCurrentItemPrice()}" rendered="#{basketController.isProductAdded(product)}">
-                                                               <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
-                                                       </h:outputText>
-                                               </div>
-                                       </div>
-
-                                       <div class="clear"></div>
-                               </div>
-                       </div>
-               </h:column>
-       </h:dataTable>
-
-       <div id="totals_container">
-               <h:outputText value="#{msg.TOTAL_ORDER_PRICE}" />
-               <h:outputText styleClass="price" id="total_sum" value="#{basketController.calculateTotalPrice()}">
-                       <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
-               </h:outputText>
-       </div>
+       <!-- @TODO Here goes your content. //-->
 </ui:composition>
index 90a009b4f80427dd0895b6e276031c0351ebfe84..61136ff466f7c0a7db5ebfd7876246f8ecd6724c 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <div class="menu_outer">
                <h:panelGroup styleClass="menu" layout="block">
 
                        <ul>
                                <li>
-                                       <p:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
+                                       <p:link
+                                               outcome="index"
+                                               value="#{msg.GUEST_LINK_HOME}"
+                                               title="#{msg.GUEST_LINK_HOME_TITLE}"
+                                               />
                                </li>
                        </ul>
 
                        <ul>
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                        <li>
-                                               <p:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" />
+                                               <p:link
+                                                       outcome="user_login"
+                                                       value="#{msg.GUEST_LINK_LOGIN}"
+                                                       title="#{msg.GUEST_LOGIN_LINK_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
                                        <li>
-                                               <p:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" />
+                                               <p:link
+                                                       outcome="user_register"
+                                                       value="#{msg.GUEST_LINK_REGISTER}"
+                                                       title="#{msg.GUEST_LINK_REGISTER_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
                                        <li>
-                                               <p:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_password" value="#{msg.LINK_GUEST_PASSWORD}" />
+                                               <p:link
+                                                       outcome="user_lost_password"
+                                                       value="#{msg.GUEST_LINK_PASSWORD}"
+                                                       title="#{msg.GUEST_LINK_PASSWORD_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
                                        <li>
-                                               <p:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_resend_link" value="#{msg.LINK_GUEST_RESEND_LINK}" />
+                                               <p:link
+                                                       outcome="user_resend_link"
+                                                       value="#{msg.GUEST_LINK_RESEND_LINK}"
+                                                       title="#{msg.GUEST_LINK_RESEND_LINK_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
                        </ul>
index 69651c92d3337fa7ed4012ab306a58ae1daa1338..f57ca4a74e55a6fba9ec9121d77fc781374382fc 100644 (file)
@@ -4,10 +4,11 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="terms_privacy">
+               <fieldset class="fieldset">
                        <legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">
                                <h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
                        </legend>
                                        <!-- @TODO Find something better //-->
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
                                        <h:outputText value="&#160;" />
-                                       <p:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
+                                       <p:link
+                                               outcome="privacy"
+                                               target="_blank"
+                                               value="#{msg.GUEST_LINK_PRIVACY_STATEMENTS}"
+                                               />
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
                                </div>
                        </h:panelGroup>
                                        <!-- @TODO Find something better //-->
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
                                        <h:outputText value="&#160;" />
-                                       <p:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
+                                       <p:link
+                                               outcome="terms"
+                                               target="_blank"
+                                               value="#{msg.GUEST_LINK_TERMS_CONDITIONS}"
+                                               />
                                        <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
                                </div>
                        </h:panelGroup>
index 59511d9aca458e892342a0861b6a45b38735e85b..ce1f7f28831934569ddc5147e58e8a8e117f0cd6 100644 (file)
@@ -4,16 +4,17 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-               <h:form id="form_user_login">
+               <h:form>
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
                                </div>
 
-                               <fieldset class="fieldset" id="login_data">
+                               <fieldset class="fieldset">
                                        <legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">
                                                <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}" />
                                        </legend>
@@ -24,7 +25,7 @@
                                                </div>
 
                                                <div class="table-right">
-                                                       <p:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
+                                                       <p:inputText id="userName" value="#{userLoginController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
                                                </div>
                                        </h:panelGroup>
 
@@ -38,7 +39,7 @@
                                                </div>
 
                                                <div class="table-right">
-                                                       <p:inputText type="secret" styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+                                                       <p:inputText type="secret" id="userPassword" value="#{userLoginController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
                                                </div>
                                        </h:panelGroup>
 
                                        </h:panelGroup>
                                </fieldset>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               action="#{userLoginController.doUserLogin()}"
+                                               value="#{msg.BUTTON_USER_LOGIN}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
index cc803e85855ba36da7601c2d3c4152bffdeb506a..23c7b37edca56f443739dd98e4dff0ca89233f48 100644 (file)
@@ -4,16 +4,17 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table table-medium" layout="block">
+       <h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
                        </div>
 
                        <div class="para">
-                               <fieldset class="fieldset" id="login_data">
+                               <fieldset class="fieldset">
                                        <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
                                                <h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
                                        </legend>
                                                        </div>
 
                                                        <div class="table-right-medium">
-                                                               <p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+                                                               <p:inputText
+                                                                       id="userName"
+                                                                       size="20"
+                                                                       maxlength="255"
+                                                                       value="#{userRegistrationController.userName}"
+                                                                       required="true"
+                                                                       requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}"
+                                                                       />
                                                        </div>
                                                </h:panelGroup>
 
@@ -45,7 +53,7 @@
                                                        </div>
 
                                                        <div class="table-right-medium">
-                                                               <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
+                                                               <p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{userRegistrationController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
                                                        </div>
                                                </h:panelGroup>
 
@@ -59,7 +67,7 @@
                                                        </div>
 
                                                        <div class="table-right-medium">
-                                                               <p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
+                                                               <p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{userRegistrationController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
                                                        </div>
                                                </h:panelGroup>
 
 
                        <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <p:commandButton styleClass="submit" type="submit" id="button_continue_register_page1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
-                       </div>
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}"
+                                       action="#{userRegistrationController.doRegisterMultiPage1()}"
+                                       />
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index 547442b8abec46b97b2636717911eaf399785b93..5bdccf1b7cc219ad6c86f26b370f9574171a7662 100644 (file)
@@ -4,20 +4,31 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table table-medium" layout="block">
+       <h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
                        </div>
 
-                       <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+                       <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl">
+                               <ui:param name="targetController" value="#{userRegistrationController}" />
+                       </ui:include>
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
-                       </div>
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_FINISH_REGISTRATION}"
+                                       action="#{userRegistrationController.doFinishRegistration()}"
+                                       />
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index 6dff4156963dc12623df41dd115fd7a972d08d91..98cec7716a4999cc005824df683f7545b30f9e76 100644 (file)
@@ -4,18 +4,21 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-               <h:panelGroup styleClass="table table-medium" layout="block">
+       <h:form rendered="#{featureController.isFeatureEnabled('user_registration')}">
+               <h:panelGroup layout="block">
                        <div class="table-header">
                                <h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
                        </div>
 
-                       <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+                       <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl">
+                               <ui:param name="targetController" value="#{userRegistrationController}" />
+                       </ui:include>
 
                        <div class="para">
-                               <fieldset class="fieldset" id="login_data">
+                               <fieldset class="fieldset">
                                        <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
                                                <h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
                                        </legend>
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
+                                                               <p:inputText
+                                                                       id="userName"
+                                                                       size="20"
+                                                                       maxlength="255"
+                                                                       value="#{userRegistrationController.userName}"
+                                                                       required="true"
+                                                                       requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}"
+                                                                       />
                                                        </div>
                                                </h:panelGroup>
 
@@ -47,7 +57,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
+                                                               <p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{userRegistrationController.userPassword}" />
                                                        </div>
                                                </h:panelGroup>
 
@@ -61,7 +71,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
+                                                               <p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{userRegistrationController.userPasswordRepeat}" />
                                                        </div>
                                                </h:panelGroup>
 
 
                        <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                       <div class="table-footer">
-                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                               <p:commandButton styleClass="submit" type="submit" id="button_finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
-                       </div>
+                       <p:panelGrid columns="2" layout="grid">
+                               <p:commandButton
+                                       type="reset"
+                                       value="#{msg.BUTTON_RESET_FORM}"
+                                       />
+
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_FINISH_REGISTRATION}"
+                                       action="#{userRegistrationController.doFinishRegistration()}"
+                                       />
+                       </p:panelGrid>
                </h:panelGroup>
        </h:form>
 </ui:composition>
index 510d485edb80f88fffa01fa9adb0666d884afd10..faab2b412a8dfc4d7949a834e595c7b858eebc13 100644 (file)
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
-       template="/WEB-INF/templates/base.tpl"
+       template="/WEB-INF/templates/master.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:widgets="http://mxchange.org/jsf/core/widgets"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-       <ui:define name="title">
+       <ui:define name="document_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA} - " />
 
-               <ui:insert name="login_title">
+               <ui:insert name="document_login_title">
                        <h:outputText value="Default login title" />
                </ui:insert>
        </ui:define>
 
        <ui:define name="menu">
-               <widgets:outputMessageBox id="error-guest-forbidden" message="#{msg.USER_NOT_LOGGED_IN}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{not userLoginController.isUserLoggedIn()}" />
+               <core:outputMessageBox
+                       panelGroupId="errorGuestForbidden"
+                       message="#{msg.USER_NOT_LOGGED_IN}"
+                       boxStyleClass="message-full"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not userLoginController.isUserLoggedIn()}"
+                       />
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
index 1ba2c6ea6ffb0b21946bd680244372faf716cdc4..069004db25c9433314c40c629be145d40a8339ea 100644 (file)
@@ -2,10 +2,11 @@
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:validator="http://mxchange.org/jsf/core/validators"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
-
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="table-row" layout="block">
                <div class="table-left">
@@ -14,7 +15,7 @@
 
                <div class="table-right">
                        <p:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{userEmailChangeController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-                               <f:validator validatorId="EmailAddressValidator" />
+                               <validator:emailAddressValidator />
                        </p:inputText>
                </div>
        </h:panelGroup>
index 09d9e825574405606d0ed019e056bbf493c927cb..81ad613f04b86a20707ac339c2efff28b436fa44 100644 (file)
@@ -4,10 +4,11 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:panelGroup styleClass="para" layout="block">
-               <fieldset class="fieldset" id="current_password">
+               <fieldset class="fieldset">
                        <legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">
                                <h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
                        </legend>
@@ -18,8 +19,8 @@
                                </div>
 
                                <div class="table-right">
-                                       <p:inputText type="secret" styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
-                                               <!-- <f:validator for="currentPassword" validatorId="PizzaUserPasswordValidator" /> //-->
+                                       <p:inputText type="secret" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
+                                               <!-- <f:validator for="currentPassword" validatorId="FinancialsUserPasswordValidator" /> //-->
                                        </p:inputText>
                                </div>
                        </h:panelGroup>
index 652bae5b68ad8678fce6ee31852c0fe3d31f273c..0ae95d583da6bb7ac901b63faa16f01b2bf36ab1 100644 (file)
@@ -4,29 +4,46 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <div class="footer">
                <ul class="navbar-horizontal">
                        <li class="navlink-horizontal">
-                               <p:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
+                               <p:link
+                                       outcome="login_index"
+                                       value="#{msg.LOGIN_LINK_HOME}"
+                                       title="#{msg.LOGIN_LINK_HOME_TITLE}"
+                                       />
                        </li>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+                                       <p:link
+                                               outcome="imprint"
+                                               value="#{msg.GUEST_LINK_IMPRINT}"
+                                               title="#{msg.GUEST_LINK_IMPRINT_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+                                       <p:link
+                                               outcome="terms"
+                                               value="#{msg.GUEST_LINK_TERMS}"
+                                               title="#{msg.GUEST_LINK_TERMS_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
                                <li class="navlink-horizontal">
-                                       <p:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+                                       <p:link
+                                               outcome="privacy"
+                                               value="#{msg.GUEST_LINK_PRIVACY}"
+                                               title="#{msg.GUEST_LINK_PRIVACY_TITLE}"
+                                               />
                                </li>
                        </ui:fragment>
 
index b29e1adb79b196cccb4a7dc69df1fab72c6cc7ab..43e4cb62371e3907ca16d6635e27bb793cbbd450 100644 (file)
@@ -4,7 +4,8 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <div class="menu_outer">
                <h:panelGroup styleClass="menu" layout="block">
 
                        <ul>
                                <li>
-                                       <p:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="user_index" value="#{msg.LINK_LOGIN_HOME}" />
+                                       <p:link
+                                               outcome="user_index"
+                                               value="#{msg.LOGIN_LINK_HOME}"
+                                               title="#{msg.LOGIN_LINK_HOME_TITLE}"
+                                               />
                                </li>
 
                                <li>
-                                       <p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+                                       <p:link
+                                               outcome="user_list"
+                                               value="#{msg.LINK_USER_LIST}"
+                                               title="#{msg.LINK_USER_LIST_TITLE}"
+                                               />
                                </li>
 
                                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_list')}">
                                        <li>
-                                               <p:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
+                                               <p:link
+                                                       outcome="user_list"
+                                                       value="#{msg.LINK_USER_LIST}"
+                                                       title="#{msg.LINK_USER_LIST_TITLE}"
+                                                       />
                                        </li>
                                </ui:fragment>
                        </ul>
                                <ul>
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data')}">
                                                <li>
-                                                       <p:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
+                                                       <p:link
+                                                               outcome="login_change_personal_data"
+                                                               value="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA}"
+                                                               title="#{msg.LOGIN_LINK_CHANGE_PERSONAL_DATA_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_change_email_address')}">
                                                <li>
-                                                       <p:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+                                                       <p:link
+                                                               outcome="login_change_email_address"
+                                                               value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}"
+                                                               title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword() or featureController.isFeatureEnabled('change_user_password')}">
                                                <li>
-                                                       <p:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="user_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+                                                       <p:link
+                                                               outcome="user_change_password"
+                                                               value="#{msg.LOGIN_LINK_CHANGE_PASSWORD}"
+                                                               title="#{msg.LOGIN_LINK_CHANGE_PASSWORD_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
                                </ul>
 
                        <ul>
                                <li>
-                                       <p:link title="#{msg.LINK_LOGIN_ALL_APPLICATIONS_TITLE}" outcome="user_all_applications" value="#{msg.LINK_LOGIN_ALL_APPLICATIONS}" />
+                                       <p:link
+                                               outcome="user_all_applications"
+                                               value="#{msg.LOGIN_LINK_ALL_APPLICATIONS}"
+                                               title="#{msg.LOGIN_LINK_ALL_APPLICATIONS_TITLE}"
+                                               />
                                </li>
                        </ul>
 
 
                        <ul>
                                <li>
-                                       <p:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" />
+                                       <p:link
+                                               outcome="index"
+                                               value="#{msg.GUEST_LINK_HOME}"
+                                               title="#{msg.GUEST_LINK_HOME_TITLE}"
+                                               />
                                </li>
 
                                <li>
-                                       <p:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" />
+                                       <p:link
+                                               outcome="logout"
+                                               value="#{msg.LINK_CLOSE_SESSION}"
+                                               title="#{msg.LINK_CLOSE_SESSION_TITLE}"
+                                               />
                                </li>
                        </ul>
                </h:panelGroup>
diff --git a/web/WEB-INF/templates/master.tpl b/web/WEB-INF/templates/master.tpl
new file mode 100644 (file)
index 0000000..9575f14
--- /dev/null
@@ -0,0 +1,133 @@
+<?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"
+       xmlns:p="http://primefaces.org/ui"
+       >
+       <h:doctype
+               rootElement="html"
+               public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+               system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+               />
+
+       <html
+               lang="#{localizationController.locale.language}"
+               xml:lang="#{localizationController.locale.language}"
+               xmlns="http://www.w3.org/1999/xhtml"
+               >
+               <ui:insert name="metadata" />
+
+               <f:view locale="#{localizationController.locale}" />
+
+               <h:head>
+                       <f:facet name="first">
+                               <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+                               <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                               <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"/>
+                               <meta name="apple-mobile-web-app-capable" content="yes" />
+                       </f:facet>
+
+                       <f:loadBundle var="msg" basename="org.mxchange.localization.generic" />
+                       <f:loadBundle var="product" basename="org.mxchange.localization.product" />
+                       <f:loadBundle var="project" basename="org.mxchange.localization.project" />
+                       <f:loadBundle var="local" basename="org.mxchange.localization.local" />
+
+                       <h:outputStylesheet name="/css/custom.css" />
+
+                       <title>
+                               <h:outputText value="#{initParam['project_title']} - " />
+
+                               <ui:insert name="document_title">
+                                       <h:outputText value="Default document title" />
+                               </ui:insert>
+                       </title>
+               </h:head>
+
+               <h:body>
+                       <h:panelGroup styleClass="ui-fluid" layout="block">
+                               <h:panelGroup styleClass="page-header" layout="block">
+                                       <p:outputPanel styleClass="ui-g">
+                                               <p:outputPanel styleClass="ui-g-12 ui-md-9 ui-g-nopad">
+                                                       <h1>
+                                                               <h:outputText value="#{initParam['project_title']} - " />
+
+                                                               <ui:insert name="content_header">
+                                                                       <h:outputText value="Default header title" />
+                                                               </ui:insert>
+                                                       </h1>
+                                               </p:outputPanel>
+
+                                               <p:outputPanel styleClass="ui-g-12 ui-md-3">
+                                                       <ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
+                                               </p:outputPanel>
+                                       </p:outputPanel>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="page-content-gap" layout="block">
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="ui-g" layout="block">
+                                       <h:panelGroup styleClass="ui-g-12 ui-md-12" layout="block">
+                                               <ui:insert name="menu">
+                                                       <h:outputText value="Default menu" />
+                                               </ui:insert>
+                                       </h:panelGroup>
+
+                                       <h:panelGroup styleClass="ui-g-12 ui-md-12 ui-g-nopad" layout="block">
+                                               <h:panelGroup styleClass="ui-g-12">
+                                                       <ui:insert name="content">
+                                                               <h:outputText value="Default content" />
+                                                       </ui:insert>
+                                               </h:panelGroup>
+                                       </h:panelGroup>
+
+                                       <h:panelGroup styleClass="ui-g-12 page-footer" layout="block">
+                                               <ui:insert name="footer">
+                                                       <h:outputText value="Default footer" />
+                                               </ui:insert>
+                                       </h:panelGroup>
+                               </h:panelGroup>
+
+                               <h:panelGroup styleClass="error-container" layout="block">
+                                       <p:growl showDetail="true" sticky="true">
+                                               <p:autoUpdate />
+                                       </p:growl>
+
+                                       <p:ajaxExceptionHandler
+                                               type="java.lang.Throwable"
+                                               update="exceptionDialog"
+                                               onexception="PF('master:exception-dialog-form:exceptionDialog').show();"
+                                               />
+
+                                       <h:form id="exception-dialog-form">
+                                               <p:dialog
+                                                       id="exceptionDialog"
+                                                       closable="true"
+                                                       closeOnEscape="true"
+                                                       header="Exception '#{pfExceptionHandler.type}' occured!"
+                                                       widgetVar="exceptionDialog"
+                                                       height="500px">
+                                                       <div class="para">
+                                                               <h:outputText value="#{msg.EXCEPTION_MESSAGE}:" />
+                                                               <h:outputText value="#{pfExceptionHandler.message}" />
+                                                       </div>
+
+                                                       <div class="para">
+                                                               <h:outputText value="#{msg.EXCEPTION_STACK_TRACE}:" />
+                                                               <h:outputText value="#{pfExceptionHandler.formattedStackTrace}" escape="false" />
+                                                       </div>
+
+                                                       <div class="para">
+                                                               <p:button onclick="window.location.href = document.location.href;"
+                                                                                 value="#{msg.RELOAD_PAGE}"
+                                                                                 rendered="#{pfExceptionHandler.type == 'javax.faces.application.ViewExpiredException'}" />
+                                                       </div>
+                                               </p:dialog>
+                                       </h:form>
+                               </h:panelGroup>
+                       </h:panelGroup>
+               </h:body>
+       </html>
+</ui:composition>
index e883f74db7fbf38312287930e2b237ec352227b9..f9ca568d6c2847c519d80dace9a7b222ef929f2b 100644 (file)
@@ -4,18 +4,37 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui">
+       xmlns:p="http://primefaces.org/ui"
+       >
 
        <h:form>
-               <h:panelGroup layout="block" styleClass="locale_selection_container">
-                       <h:panelGroup layout="block">
-                               <p:selectOneMenu value="#{localizationController.localeCode}" onchange="submit()">
-                                       <f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" itemDisabled="true" />
-                                       <f:selectItems value="#{localizationController.supportedLocales}" var="locale" itemValue="#{locale}" itemLabel="#{msg[locale.toString().toUpperCase()]}" />
+               <p:outputPanel styleClass="ui-g">
+                       <p:outputPanel styleClass="ui-g-12 ui-md-6">
+                               <p:selectOneMenu value="#{localizationController.localeCode}">
+                                       <f:selectItem
+                                               itemLabel="#{msg.SELECT_LANGUAGE}"
+                                               noSelectionOption="true"
+                                               itemDisabled="true"
+                                               />
+
+                                       <f:selectItems
+                                               value="#{localizationController.supportedLocales}"
+                                               var="locale"
+                                               itemValue="#{locale}"
+                                               itemLabel="#{msg[locale.toString().toUpperCase()]}"
+                                               />
                                </p:selectOneMenu>
-                       </h:panelGroup>
+                       </p:outputPanel>
 
-                       <p:commandButton styleClass="submit" type="submit" actionListener="#{localizationController.doChangeLocale()}" value="#{msg.BUTTON_CHANGE_LOCALE}" title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}" />
-               </h:panelGroup>
+                       <p:outputPanel styleClass="ui-g-12 ui-md-6">
+                               <p:commandButton
+                                       type="submit"
+                                       actionListener="#{localizationController.doChangeLocale()}"
+                                       value="#{msg.BUTTON_CHANGE_LOCALE}"
+                                       title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}"
+                                       update="@all"
+                                       />
+                       </p:outputPanel>
+               </p:outputPanel>
        </h:form>
 </ui:composition>
index 7393774d4c71fee90c3d3d8e29c48c45ea3bf9de..6fd0bf4fb62a79d85f2be90d81229abc4fa2d8b8 100644 (file)
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
        </ui:define>
 
@@ -15,7 +17,7 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:form id="form_admin_logout">
+               <h:form>
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
                                        <h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="submit"
+                                               action="#{userLoginController.doAdminLogout()}"
+                                               value="#{msg.BUTTON_USER_LOGOUT}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
diff --git a/web/admin/basic_company_data/admin_basic_company_data_list.xhtml b/web/admin/basic_company_data/admin_basic_company_data_list.xhtml
deleted file mode 100644 (file)
index 4c703de..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
-               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA}" />
-       </ui:define>
-
-       <ui:define name="content_header">
-               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_BASIC_COMPANY_DATA}" />
-       </ui:define>
-
-       <ui:define name="content">
-               <p:dataTable id="table_list_basic_company_data" var="basicData" value="#{basicDataController.allCompanyBasicData()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BASIC_COMPANY_DATA}" emptyMessage="#{msg.ADMIN_BASIC_COMPANY_DATA_LIST_EMPTY}">
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_ID}" />
-                               </f:facet>
-
-                               <p:link outcome="admin_show_basic_data" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMAPNY_DATA_TITLE}" value="#{basicData.basicDataId}">
-                                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
-                               </p:link>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ASSIGNED_USER_ID}" />
-                               </f:facet>
-
-                               <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{basicData.companyUserOwner.userId}" rendered="#{not empty basicData.companyUserOwner}">
-                                       <f:param name="userId" value="#{basicData.companyUserOwner.userId}" />
-                               </p:link>
-
-                               <p:link outcome="admin_assign_basic_company_data_owner" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyUserOwner}">
-                                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
-                               </p:link>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
-                               </f:facet>
-
-                               <h:outputLink value="#{basicData.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty basicData.companyWebsiteUrl}">
-                                       <h:outputText value="#{basicData.companyName}" />
-                               </h:outputLink>
-
-                               <h:outputText value="#{basicData.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty basicData.companyWebsiteUrl}" />
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
-                               </f:facet>
-
-                               <p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{basicData.companyContactEmployee.employeeId}" rendered="#{not empty basicData.companyContactEmployee}">
-                                       <f:param name="employeeId" value="#{basicData.companyContactEmployee.employeeId}" />
-                               </p:link>
-
-                               <p:link outcome="admin_assign_basic_company_data_employee" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_CONTACT_PERSON}" rendered="#{empty basicData.companyContactEmployee}">
-                                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
-                               </p:link>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_FOUNDER}" />
-                               </f:facet>
-
-                               <p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{basicData.companyFounder.employeeId}" rendered="#{not empty basicData.companyFounder}">
-                                       <f:param name="employeeId" value="#{basicData.companyFounder.employeeId}" />
-                               </p:link>
-
-                               <p:link outcome="admin_assign_basic_company_data_contact" title="#{msg.ADMIN_LINK_ASSIGN_BASIC_COMPANY_DATA_COMPANY_FOUNDER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty basicData.companyFounder}">
-                                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
-                               </p:link>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_CREATED}" />
-                               </f:facet>
-
-                               <h:outputText id="companyCreated" value="#{basicData.companyCreated.time}">
-                                       <f:convertDateTime for="companyCreated" type="both" timeStyle="short" dateStyle="short" />
-                               </h:outputText>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-                               </f:facet>
-
-                               <links:outputBasicDataAdminMiniLinks basicData="#{basicData}" />
-                       </p:column>
-               </p:dataTable>
-
-               <h:form id="form_admin_add_basic_company_data">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
-                               <div class="table-header">
-                                       <h:outputText value="#{msg.ADMIN_ADD_BASIC_COMPANY_DATA_TITLE}" />
-                               </div>
-
-                               <div class="para">
-                                       <h:outputText value="#{msg.ADMIN_ADD_BASIC_COMPANY_DATA_MINIMUM_DATA}" />
-                               </div>
-
-                               <ui:include src="/WEB-INF/templates/admin/basic_company_data/admin_form_basic_company_data.tpl" />
-
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_add_basic_company_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminCompanyDataController.addBusinessBasicData()}" />
-                               </div>
-                       </h:panelGroup>
-               </h:form>
-       </ui:define>
-</ui:composition>
diff --git a/web/admin/branch_offices/admin_branch_offices_list.xhtml b/web/admin/branch_offices/admin_branch_offices_list.xhtml
deleted file mode 100644 (file)
index d284853..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
-               <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
-       </ui:define>
-
-       <ui:define name="content_header">
-               <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_BRANCH_OFFICES}" />
-       </ui:define>
-
-       <ui:define name="content">
-               <p:dataTable id="table_list_branch_offices" var="branchOffice" value="#{branchOfficeController.allBranchOffices()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BRANCH_OFFICES}" emptyMessage="#{msg.ADMIN_BRANCH_OFFICES_LIST_EMPTY}">
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
-                               </f:facet>
-
-                               <p:link outcome="admin_show_branch_office" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" value="#{branchOffice.branchId}">
-                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
-                               </p:link>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ASSIGNED_USER_ID}" />
-                               </f:facet>
-
-                               <p:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{branchOffice.branchUserOwner.userId}" rendered="#{not empty branchOffice.branchUserOwner}">
-                                       <f:param name="userId" value="#{branchOffice.branchUserOwner.userId}" />
-                               </p:link>
-
-                               <p:link outcome="admin_assign_branch_office_owner" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_OWNER_USER_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchUserOwner}">
-                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
-                               </p:link>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_BASIC_COMPANY_DATA_COMPANY_NAME}" />
-                               </f:facet>
-
-                               <h:outputLink value="#{branchOffice.branchCompany.companyWebsiteUrl}" target="_blank" title="#{msg.LINK_COMPANY_WEBSITE_URL_TITLE}" rel="external" rendered="#{not empty branchOffice.branchCompany.companyWebsiteUrl}">
-                                       <h:outputText value="#{branchOffice.branchCompany.companyName}" />
-                               </h:outputLink>
-
-                               <h:outputText value="#{branchOffice.branchCompany.companyName}" title="#{msg.NO_WEBSITE_URL_ENTERED}" rendered="#{empty branchOffice.branchCompany.companyWebsiteUrl}" />
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.DATA_EMAIL_ADDRESS}" />
-                               </f:facet>
-
-                               <h:outputLink value="mailto:#{branchOffice.branchEmailAddress}" rendered="#{not empty branchOffice.branchEmailAddress}" />
-
-                               <h:outputText value="#{msg.NO_EMAIL_ADDRESS_ENTERED}" rendered="#{empty branchOffice.branchEmailAddress}" />
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.DATA_ADDRESS}" />
-                               </f:facet>
-
-                               <h:outputText value="#{branchOffice.branchZipCode} #{branchOffice.branchCity}" title="#{branchOffice.branchStreet} #{branchOffice.branchHouseNumber} (#{msg.DATA_STORE} #{branchOffice.branchStore}, #{msg.DATA_SUITE_NUMBER} #{branchOffice.branchSuiteNumber})" />
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSON}" />
-                               </f:facet>
-
-                               <p:link outcome="admin_show_business_employee" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{branchOffice.branchContactEmployee.employeeId}" rendered="#{not empty branchOffice.branchContactEmployee}">
-                                       <f:param name="employeeId" value="#{branchOffice.branchContactEmployee.employeeId}" />
-                               </p:link>
-
-                               <p:link outcome="admin_assign_branch_office_employee" title="#{msg.ADMIN_LINK_ASSIGN_BRANCH_OFFICES_CONTACT_PERSON_TITLE}" value="#{msg.ADMIN_LINK_ASSIGN}" rendered="#{empty branchOffice.branchContactEmployee}">
-                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
-                               </p:link>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
-                               </f:facet>
-
-                               <h:outputText id="branchCreated" value="#{branchOffice.branchCreated.time}">
-                                       <f:convertDateTime for="branchCreated" type="both" timeStyle="short" dateStyle="short" />
-                               </h:outputText>
-                       </p:column>
-
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-                               </f:facet>
-
-                               <links:outputBranchOfficeAdminMiniLinks branchOffice="#{branchOffice}" />
-                       </p:column>
-               </p:dataTable>
-
-               <h:form id="form_admin_add_branch_office">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
-                               <div class="table-header">
-                                       <h:outputText value="#{msg.ADMIN_ADD_BRANCH_OFFICE_TITLE}" />
-                               </div>
-
-                               <div class="para">
-                                       <h:outputText value="#{msg.ADMIN_ADD_BRANCH_OFFICE_MINIMUM_DATA}" />
-                               </div>
-
-                               <ui:include src="/WEB-INF/templates/admin/branch_offices/admin_form_branch_offices_data.tpl" />
-
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_add_branch_office" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminBranchOfficeController.addBranchOffice()}" />
-                               </div>
-                       </h:panelGroup>
-               </h:form>
-       </ui:define>
-</ui:composition>
index fef9073c7ec4159d2def19fe7f4085dd98a1054b..ed461dee2292c046816b0b6ec3c4f2974113b70d 100644 (file)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{adminContactController.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
        </ui:define>
 
@@ -23,9 +31,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <h:form rendered="#{not empty beanHelper.contact}">
+                       <h:inputHidden value="#{adminContactController.contactId}" />
 
-               <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
 
                                <ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="button-danger" type="submit" id="button_delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
-                               </div>
-                       </h:panelGroup>
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}"
+                                       action="#{adminContactController.deleteContactData()}"
+                                       />
+                               </p:panelGrid>
                </h:form>
        </ui:define>
 </ui:composition>
index efa24b549771b31962c2ef1d2e88b83079c1f87c..0dc8a1a3b738ce7d14a66c443b72cf4a785e5b55 100644 (file)
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <h:form rendered="#{not empty beanHelper.contact}">
+                       <h:inputHidden value="#{adminContactController.contactId}" />
 
-               <h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
                                                <f:param value="#{beanHelper.contact.contactId}" />
                                        <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                </div>
 
-                               <widgets:outputAdminContactDataFormFields />
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}"
+                                               action="#{adminContactController.editContactData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index e534c5a7e0d50ddf571aaf34648ee120597b4b84..bb35042bb188de3e8ec08bdc7388d6231d48958d 100644 (file)
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
-                       <p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table table-full" paginator="true" rows="10" emptyMessage="#{msg.ADMIN_CONTACT_LIST_EMPTY}" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
-                               <p:column exportable="false">
+               <h:form rendered="#{not contactListController.allContacts.isEmpty()}">
+                       <p:dataTable
+                               id="table_export_contacts"
+                               var="contact"
+                               value="#{contactListController.allContacts}"
+                               paginator="true"
+                               rows="10"
+                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
+                               summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}"
+                               >
+                               <p:column
+                                       exportable="false"
+                                       >
                                        <f:facet name="header">
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
                                        </f:facet>
 
-                                       <p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
+                                       <p:link
+                                               outcome="admin_show_contact"
+                                               value="#{contact.contactId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{contact.contactId}" />
                                        </p:link>
                                </p:column>
                                        </f:facet>
 
                                        <h:outputText id="contactBirthday" value="#{contact.contactBirthday}">
-                                               <f:convertDateTime for="contactBirthday" type="date" dateStyle="medium" />
+                                               <f:convertDateTime type="date" dateStyle="medium" />
                                        </h:outputText>
                                </p:column>
 
 
                                <p:column>
                                        <f:facet name="header">
-                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LANDLINE_NUMBER}" />
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_LAND_LINE_NUMBER}" />
                                        </f:facet>
 
                                        <h:outputText value="#{adminContactController.generatePhoneNumber(contact.contactLandLineNumber)}" />
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
                                        </f:facet>
 
-                                       <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-                                               <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                       <h:outputText value="#{contact.contactEntryCreated}">
+                                               <f:convertDateTime
+                                                       type="both"
+                                                       timeStyle="short"
+                                                       dateStyle="short"
+                                                       locale="#{localizationController.locale}"
+                                                       />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_UPDATED}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactEntryUpdated}">
+                                               <f:convertDateTime
+                                                       type="both"
+                                                       timeStyle="short"
+                                                       dateStyle="short"
+                                                       locale="#{localizationController.locale}"
+                                                       />
                                        </h:outputText>
                                </p:column>
                        </p:dataTable>
 
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
                                </div>
                                        <h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" id="button_export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
-                                               <p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               ajax="false"
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}"
+                                               >
+
+                                               <p:dataExporter
+                                                       type="xls"
+                                                       target="table_export_contacts"
+                                                       fileName="all_contacts"
+                                                       />
                                        </p:commandButton>
-                               </div>
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 405d97d550739286a7375a388e43e0212f0489bf..decc2a8a1dee2b542483835aee743485e49a20d1 100644 (file)
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <p:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" emptyMessage="#{msg.ADMIN_CONTACT_LIST_EMPTY}">
-                       <p:column>
+               <h:form id="form-list-contacts">
+                       <p:dataTable
+                               id="contactList"
+                               var="contact"
+                               value="#{contactListController.allContacts}"
+                               paginator="true"
+                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                               filteredValue="#{contactListController.filteredContacts}"
+                               rows="10"
+                               rowKey="#{contact.contactId}"
+                               reflow="true"
+                               resizableColumns="true"
+                               rowsPerPageTemplate="5,10,20,50,100"
+                               sortMode="multiple"
+                               summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}"
+                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
+                               widgetVar="contactList"
+                               selectionMode="single"
+                               selection="#{contactListController.selectedContact}"
+                               skipChildren="true"
+                               >
+
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
-                               </f:facet>
+                                       <p:panelGrid
+                                               columns="3"
+                                               layout="grid"
+                                               columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+                                               >
+                                               <p:spacer />
 
-                               <p:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}" value="#{contact.contactId}">
-                                       <f:param name="contactId" value="#{contact.contactId}" />
-                               </p:link>
-                       </p:column>
+                                               <p:panelGrid
+                                                       columns="2"
+                                                       columnClasses="ui-grid-4,ui-grid-8"
+                                                       layout="grid"
+                                                       styleClass="ui-noborder"
+                                                       >
+                                                       <p:outputLabel
+                                                               for="globalFilter"
+                                                               value="#{msg.SEARCH_ALL_FIELDS}"
+                                                               style="float: right"
+                                                               />
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
-                               </f:facet>
+                                                       <p:inputText
+                                                               id="globalFilter"
+                                                               onkeyup="PF('contactList').filter()"
+                                                               placeholder="#{msg.ENTER_KEYWORD}"
+                                                               />
+                                               </p:panelGrid>
 
-                               <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
-                       </p:column>
+                                               <p:outputPanel>
+                                                       <p:spacer height="4" />
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
+                                                       <p:columnToggler datasource="contactList" trigger="toggler" />
+                                               </p:outputPanel>
+                                       </p:panelGrid>
                                </f:facet>
 
-                               <h:outputText value="#{contact.contactFirstName}" />
-                       </p:column>
+                               <p:ajax
+                                       event="rowSelect"
+                                       update="form-list-contacts:contact-details"
+                                       oncomplete="PF('contactDialog').show()"
+                                       />
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{contact.contactId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_contact"
+                                               value="#{contact.contactId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_CONTACT_DATA_TITLE}"
+                                               >
+                                               <f:param name="contactId" value="#{contact.contactId}" />
+                                       </p:link>
+                               </p:column>
 
-                               <h:outputText value="#{contact.contactFamilyName}" />
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}"
+                                       sortBy="#{contact.contactPersonalTitle}"
+                                       filterBy="#{contact.contactPersonalTitle}"
+                                       filterMatchMode="exact"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu onchange="PF('contactList').filter()">
+                                                       <f:converter converterId="PersonalTitleConverter" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+                                                       <f:selectItems
+                                                               value="#{dataController.personalTitles}"
+                                                               var="personalTitle"
+                                                               itemValue="#{personalTitle}"
+                                                               itemLabel="#{msg[personalTitle.messageKey]}"
+                                                               />
+                                               </p:selectOneMenu>
+                                       </f:facet>
+                                       <h:outputText value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+                               </p:column>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_CONTACT_USAGE}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_FIRST_NAME}"
+                                       sortBy="#{contact.contactFirstName}"
+                                       filterBy="#{contact.contactFirstName}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{contact.contactFirstName}" />
+                               </p:column>
 
-                               <h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_FAMILY_NAME}"
+                                       sortBy="#{contact.contactFamilyName}"
+                                       filterBy="#{contact.contactFamilyName}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{contact.contactFamilyName}" />
+                               </p:column>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_ENTRY_CREATED}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{contact.contactEntryCreated}"
+                                       filterBy="#{contact.contactEntryCreated}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{contact.contactEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
 
-                               <h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
-                                       <f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
-                               </h:outputText>
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{contact.contactEntryUpdated}"
+                                       filterBy="#{contact.contactEntryUpdated}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{contact.contactEntryUpdated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ADMIN_CONTACT_USAGE}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
+                                       <p:menuButton value="#{msg.OPTIONS}">
+                                               <p:menuitem outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                                                       <f:param name="contactId" value="#{contact.contactId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+                                                       <f:param name="contactId" value="#{contact.contactId}" />
+                                               </p:menuitem>
 
-                               <links:outputContactAdminMiniLinks contact="#{contact}" />
-                       </p:column>
-               </p:dataTable>
+                                               <p:menuitem outcome="admin_delete_contact">
+                                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}" />
+                                                       <f:param name="contactId" value="#{contact.contactId}" />
+                                               </p:menuitem>
+                                       </p:menuButton>
+                               </p:column>
+                       </p:dataTable>
 
-               <h:form id="form_admin_add_contact">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
-                               <div class="table-header">
+                       <p:dialog
+                               dynamic="true"
+                               modal="true"
+                               resizable="false"
+                               header="#{msg.ADMIN_SINGLE_CONTACT_DETAILS_HEADER}"
+                               hideEffect="fade"
+                               showEffect="fade"
+                               widgetVar="contactDialog"
+                               position="top"
+                               responsive="true"
+                               closeOnEscape="true"
+                               >
+                               <p:outputPanel id="contact-details">
+                                       <p:panelGrid columns="2" rendered="#{not empty contactListController.selectedContact}">
+                                               <f:facet name="header">
+                                                       <h:outputFormat value="#{msg.ADMIN_CONTACT_DETAILS_HEADER}">
+                                                               <f:param value="#{msg[contactListController.selectedContact.contactPersonalTitle.messageKey]}" />
+                                                               <f:param value="#{contactListController.selectedContact.contactFirstName}" />
+                                                               <f:param value="#{contactListController.selectedContact.contactFamilyName}" />
+                                                               <f:param value="#{contactListController.selectedContact.contactId}" />
+                                                       </h:outputFormat>
+                                               </f:facet>
+
+                                               <p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.CONTACT_ID_NUMBER_TITLE}" />
+                                               <h:outputText value="#{contactListController.selectedContact.contactId}" />
+                                       </p:panelGrid>
+                               </p:outputPanel>
+                       </p:dialog>
+               </h:form>
+
+               <h:form>
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
+                               <f:facet name="header">
                                        <h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
-                               </div>
+                               </f:facet>
 
-                               <div class="para">
-                                       <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
-                               </div>
+                               <h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
 
-                               <widgets:outputAdminContactDataFormFields />
+                               <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 
                                <f:facet name="footer">
                                        <p:panelGrid columns="2" layout="grid">
index 6e0efd048c4dc1e2388227d2a76159e53006a0e3..c7e2215b41a70b4a4fb7217dc3afee4a7c6601e1 100644 (file)
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-handler-contact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <core:outputMessageBox
+                       panelGroupId="errorHandlerShowContact"
+                       message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{empty beanHelper.contact}"
+                       />
 
                <ui:fragment rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="para" layout="block">
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">
-                               <links:outputContactAdminMiniLinks contact="#{beanHelper.contact}" renderShowLink="false" />
+                               <p:menuButton value="#{msg.OPTIONS}">
+                                       <p:menuitem
+                                               outcome="admin_edit_contact"
+                                               value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                               title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}"
+                                               >
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </p:menuitem>
+
+                                       <p:menuitem outcome="admin_delete_contact">
+                                               <h:outputText
+                                                       styleClass="link-danger"
+                                                       value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}"
+                                                       />
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </p:menuitem>
+                               </p:menuButton>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">
index 6dd9cb18dd6aec75667577598ce1deb01fb7dc8d..3d26ed8d032912ff2449eff2e790503a69b88966 100644 (file)
@@ -1,22 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerContactConverted()}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+               <h:form
+                       rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}"
+                       >
+                       <h:inputHidden value="#{adminContactPhoneController.contact}" />
+                       <h:inputHidden value="#{adminContactPhoneController.phoneId}" />
 
-               <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_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
                                </div>
 
                                <div class="para">
-                                       <p: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}"
+                                               title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{adminContactPhoneController.contact.contactId}" />
                                        </p:link>
                                </div>
 
                                <div class="para">
-                                       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminFaxPanelGrid
+                                               faxNumber="#{beanHelper.faxNumber}"
+                                               contact="#{beanHelper.contact}"
+                                               renderShowLink="false"
+                                               showAdminDropdownMenu="false"
+                                               />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-warning" type="submit" id="button_unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}"
+                                               action="#{adminContactPhoneController.unlinkFaxContactData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}"
+                       rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}"
+                       >
                        <f:param value="#{adminContactPhoneController.phoneId}" />
                        <f:param value="#{adminContactPhoneController.contact.contactId}" />
                </h:outputFormat>
index 9848232e77bbf294beef9e6be9715d331957ba68..d1d29d3ecb745901b85b8d7ebeefda5debfa8f3d 100644 (file)
@@ -1,20 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                </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>
 
        </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:form 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">
                                        <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
                                </div>
 
                                <div class="para">
-                                       <p: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}"
+                                               title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </p:link>
                                </div>
 
                                <div class="para">
-                                       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminLandLinePanelGrid
+                                               landLineNumber="#{beanHelper.landLineNumber}"
+                                               contact="#{beanHelper.contact}"
+                                               renderShowLink="false"
+                                               showAdminDropdownMenu="false"
+                                               />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-warning" type="submit" id="button_unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}"
+                                               action="#{adminContactPhoneController.unlinkLandLineContactData()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
 
-               <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}">
+               <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>
index a06815a072cdd623b3fadee4ebb599d603f83d19..2bde48f875de32ee21942892c0b3c3e70eb4e271 100644 (file)
@@ -1,20 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="mobileId"
+                               value="#{beanHelper.mobileNumber}"
+                               converter="MobileNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-handler-mobile-number" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-               <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_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
+               <h:form rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE}" />
                                </div>
 
                                <div class="para">
-                                       <p:link outcome="admin_show_contact" title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}" value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}">
+                                       <p:link
+                                               outcome="admin_show_contact"
+                                               value="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA}"
+                                               title="#{msg.ADMIN_SHOW_FULL_CONTACT_DATA_TITLE}"
+                                               >
                                                <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
                                        </p:link>
                                </div>
 
                                <div class="para">
-                                       <widgets:outputAdminMobilePanelGrid mobileNumber="#{beanHelper.mobileNumber}" contact="#{beanHelper.contact}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminMobilePanelGrid
+                                               mobileNumber="#{beanHelper.mobileNumber}"
+                                               contact="#{beanHelper.contact}"
+                                               renderShowLink="false"
+                                               showAdminDropdownMenu="false"
+                                               />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-warning" type="submit" id="button_unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
-                               </div>
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}"
+                                       action="#{adminContactMobileController.unlinkMobileContactData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
 
-               <h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
-                       <f:param value="#{beanHelper.mobileNumber.phoneId}" />
+               <h:outputFormat
+                       styleClass="alert-danger"
+                       value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}"
+                       rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}"
+                       >
+                       <f:param value="#{beanHelper.mobileNumber.mobileId}" />
                        <f:param value="#{beanHelper.contact.contactId}" />
                </h:outputFormat>
        </ui:define>
index d4acc07a1e323c244ce373e5517c32fc16e1a078..a700c29038aaa5a398d0cd7c1f9cff79a818b40d 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}" />
        </ui:define>
 
index e1977eca00abb16f018ab4132fa7d3c636f9ad1e..051b7ce224dcff0b6f5e11dbf6e67c7dcd4b1575 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}" />
        </ui:define>
 
index 2de78e11665d0b1d04235a40462e6c76bd19e440..9cb7b3b93abc8bfc04e446a7bf9ad238608225e5 100644 (file)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <p:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" tableStyleClass="table table-medium" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" emptyMessage="#{msg.ADMIN_COUNTRY_LIST_EMPTY}">
-                       <p:column>
+               <h:form id="form-list-countries">
+                       <p:dataTable
+                               id="countryList"
+                               var="country"
+                               value="#{countryListController.allCountries}"
+                               paginator="true"
+                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                               filteredValue="#{countryListController.filteredCountries}"
+                               rows="10"
+                               rowKey="#{country.countryId}"
+                               reflow="true"
+                               resizableColumns="true"
+                               rowsPerPageTemplate="5,10,20,50,100"
+                               sortMode="multiple"
+                               summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRY}"
+                               emptyMessage="#{msg.ADMIN_EMPTY_LIST_COUNTRY}"
+                               widgetVar="countryList"
+                               selectionMode="single"
+                               selection="#{countryListController.selectedCountry}"
+                               skipChildren="true"
+                               >
+
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
-                               </f:facet>
+                                       <p:panelGrid
+                                               columns="3"
+                                               layout="grid"
+                                               columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+                                               >
+                                               <p:spacer />
 
-                               <p:link outcome="admin_show_country" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}" value="#{country.countryId}">
-                                       <f:param name="countryId" value="#{country.countryId}" />
-                               </p:link>
-                       </p:column>
+                                               <p:panelGrid
+                                                       columns="2"
+                                                       columnClasses="ui-grid-4,ui-grid-8"
+                                                       layout="grid"
+                                                       styleClass="ui-noborder"
+                                                       >
+                                                       <p:outputLabel
+                                                               for="globalFilter"
+                                                               value="#{msg.SEARCH_ALL_FIELDS}"
+                                                               style="float: right"
+                                                               />
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}" />
-                               </f:facet>
+                                                       <p:inputText
+                                                               id="globalFilter"
+                                                               onkeyup="PF('countryList').filter()"
+                                                               placeholder="#{msg.ENTER_KEYWORD}"
+                                                               />
+                                               </p:panelGrid>
 
-                               <h:outputText value="#{country.countryCode}" />
-                       </p:column>
+                                               <p:outputPanel>
+                                                       <p:spacer height="4" />
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
+                                                       <p:columnToggler datasource="countryList" trigger="toggler" />
+                                               </p:outputPanel>
+                                       </p:panelGrid>
                                </f:facet>
 
-                               <h:outputText value="#{country.countryExternalDialPrefix}" />
-                       </p:column>
+                               <p:ajax
+                                       event="rowSelect"
+                                       update="form-list-countries:country-details"
+                                       oncomplete="PF('countryDialog').show()"
+                                       />
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
-                               </f:facet>
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{country.countryId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_country"
+                                               value="#{country.countryId}"
+                                               title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}"
+                                               >
+                                               <f:param name="countryId" value="#{country.countryId}" />
+                                       </p:link>
+                               </p:column>
 
-                               <h:outputText value="#{msg[country.countryI18nKey]}" />
-                       </p:column>
+                               <p:column
+                                       headerText="#{msg.DATA_COUNTRY_CODE}"
+                                       sortBy="#{country.countryCode}"
+                                       filterBy="#{country.countryCode}"
+                                       filterMatchMode="contains"
+                                       >
 
-                       <p:column>
-                               <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ACTION_LINKS}" />
-                               </f:facet>
+                                       <h:outputText value="#{country.countryCode}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.DATA_COUNTRY_NAME}"
+                                       sortBy="#{msg[country.countryI18nKey]}"
+                                       filterBy="#{msg[country.countryI18nKey]}"
+                                       filterMatchMode="contains"
+                                       >
+
+                                       <h:outputText value="#{msg[country.countryI18nKey]}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}"
+                                       sortBy="#{country.countryExternalDialPrefix}"
+                                       filterBy="#{country.countryExternalDialPrefix}"
+                                       filterMatchMode="contains"
+                                       >
+
+                                       <h:outputText value="#{country.countryExternalDialPrefix}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.DATA_COUNTRY_ABROAD_DIAL_PREFIX}"
+                                       sortBy="#{country.countryAbroadDialPrefix}"
+                                       filterBy="#{country.countryAbroadDialPrefix}"
+                                       filterMatchMode="contains"
+                                       >
 
-                               <links:outputCountryAdminMiniLinks country="#{country}" />
-                       </p:column>
-               </p:dataTable>
+                                       <h:outputText value="#{country.countryAbroadDialPrefix}" />
+                               </p:column>
 
-               <h:form id="form_add_country">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+                               <p:column
+                                       headerText="#{msg.DATA_IS_REQUIRED}"
+                                       sortBy="#{country.countryIsLocalPrefixRequired}"
+                                       filterBy="#{country.countryIsLocalPrefixRequired}"
+                                       filterMatchMode="contains"
+                                       >
+
+                                       <h:outputText value="#{country.countryIsLocalPrefixRequired ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.DATA_COUNTRY_PHONE_CODE}"
+                                       sortBy="#{country.countryPhoneCode}"
+                                       filterBy="#{country.countryPhoneCode}"
+                                       filterMatchMode="contains"
+                                       >
+
+                                       <h:outputText value="#{country.countryPhoneCode}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{country.countryEntryCreated}"
+                                       filterBy="#{country.countryEntryCreated}"
+                                       filterMatchMode="contains"
+                                       >
+
+                                       <h:outputText value="#{country.countryEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{country.countryEntryUpdated}"
+                                       filterBy="#{country.countryEntryUpdated}"
+                                       filterMatchMode="contains"
+                                       >
+
+                                       <h:outputText value="#{country.countryEntryUpdated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       filterable="false"
+                                       sortable="false"
+                                       >
+                                       <p:menuButton value="#{msg.OPTIONS}">
+                                               <p:menuitem
+                                                       outcome="admin_show_country"
+                                                       value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}"
+                                                       >
+                                                       <f:param name="countryId" value="#{country.countryId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem
+                                                       outcome="admin_edit_country"
+                                                       value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_EDIT_COUNTRY_TITLE}"
+                                                       >
+                                                       <f:param name="countryId" value="#{country.countryId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem outcome="admin_delete_country">
+                                                       <h:outputText
+                                                               styleClass="link-danger"
+                                                               value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                               title="#{msg.ADMIN_LINK_DELETE_COUNTRY_TITLE}"
+                                                               />
+                                                       <f:param name="countryId" value="#{country.countryId}" />
+                                               </p:menuitem>
+                                       </p:menuButton>
+                               </p:column>
+                       </p:dataTable>
+
+                       <p:dialog
+                               dynamic="true"
+                               modal="true"
+                               resizable="false"
+                               header="#{msg.ADMIN_SINGLE_COUNTRY_DETAILS_HEADER}"
+                               hideEffect="fade"
+                               showEffect="fade"
+                               widgetVar="countryDialog"
+                               position="top"
+                               responsive="true"
+                               closeOnEscape="true"
+                               >
+                               <p:outputPanel id="country-details">
+                                       <p:panelGrid columns="2" rendered="#{not empty countryListController.selectedCountry}">
+                                               <f:facet name="header">
+                                                       <h:outputFormat value="#{msg.ADMIN_COUNTRY_DETAILS_HEADER}">
+                                                               <f:param value="#{msg[countryListController.selectedCountry.countryI18nKey]}" />
+                                                               <f:param value="#{countryListController.selectedCountry.countryId}" />
+                                                       </h:outputFormat>
+                                               </f:facet>
+
+                                               <p:outputLabel value="#{msg.ID_HEADER}" title="#{msg.COUNTRY_ID_NUMBER_TITLE}" />
+                                               <h:outputText value="#{countryListController.selectedCountry.countryId}" />
+                                       </p:panelGrid>
+                               </p:outputPanel>
+                       </p:dialog>
+               </h:form>
+
+               <h:form>
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
                                </div>
 
                                <ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}"
+                                               action="#{adminCountryController.addCountry()}"
+                                               update="form-list-countries:countryList"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
 
                        <div class="para notice">
index bc93bad29993d9867265093d74f4a0bcb8c8e761..2c98a7d1d6e3924c5356766fcf43663176e265c7 100644 (file)
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+               <h:form rendered="#{not empty beanHelper.faxNumber}">
+                       <h:inputHidden value="#{adminPhoneController.phoneId}" />
 
-               <h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
                                </div>
 
                                <div class="para">
-                                       <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminFaxPanelGrid
+                                               faxNumber="#{beanHelper.faxNumber}"
+                                               renderShowLink="false"
+                                               showAdminDropdownMenu="false"
+                                               />
                                </div>
 
                                <div class="para">
                                        <h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-danger" type="submit" id="button_delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
-                               </div>
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_FAX}"
+                                       action="#{adminPhoneController.deleteFaxData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
        </ui:define>
index a1fea62fa9260538ab433149144269346f1b52f3..6dec4e53b351ded3273260a0dba043f534b03331 100644 (file)
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX_NUMBER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-handler-fax-number" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
+               <h:form rendered="#{not empty beanHelper.faxNumber}">
+                       <h:inputHidden value="#{adminPhoneController.phoneId}" />
 
-               <h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
                                                <f:param value="#{beanHelper.faxNumber.phoneId}" />
                                        </h:outputFormat>
                                </div>
 
-                               <widgets:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
+                               <core:outputAdminFaxDataFormFields faxNumber="#{beanHelper.faxNumber}" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.doChangeFaxNumber()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}"
+                                               action="#{adminPhoneController.doChangeFaxNumber()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 325e20c30353fbdf2f9e1bbf04b8fff1a6fa9269..4ab4c338776eb11ecbe65b88fb22c3bcb07da471 100644 (file)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX_NUMBER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <p:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" emptyMessage="#{msg.ADMIN_FAX_NUMBER_LIST_EMPTY}">
+               <p:dataTable
+                       id="faxList"
+                       var="faxNumber"
+                       value="#{phoneListController.allFaxNumbers}"
+                       paginator="true"
+                       rows="10"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}"
+                       emptyMessage="#{msg.ADMIN_EMPTY_LIST_FAX_NUMBER}"
+                       >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ID_HEADER}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_fax" value="#{faxNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
-                                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                               <p:link
+                                       outcome="admin_show_fax"
+                                       value="#{faxNumber.phoneId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
+                                       >
+                                       <f:param name="faxId" value="#{faxNumber.phoneId}" />
                                </p:link>
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <p:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+                                       <p:outputLabel for="faxNumber" value="#{msg.ADMIN_SHOW_FAX_NUMBER}" />
                                </f:facet>
 
-                               <h:outputText id="faxNumber" value="#{faxNumber.phoneCountry.countryAbroadDialPrefix}#{faxNumber.phoneCountry.countryPhoneCode} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
+                               <h:outputText id="faxNumber" value="#{beanHelper.renderPhoneNumber(faxNumber)}" />
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                                       <h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
                                </f:facet>
 
-                               <h:outputText value="#{faxNumber.phoneEntryCreated.time}">
+                               <h:outputText value="#{faxNumber.phoneEntryCreated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                                       <h:outputText value="#{msg.ENTRY_UPDATED_HEADER}" />
                                </f:facet>
 
-                               <h:outputText value="#{faxNumber.phoneEntryUpdated.time}">
+                               <h:outputText value="#{faxNumber.phoneEntryUpdated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
index 70570c4ee5e7cb20522630194a7228ca2ea90b43..5720b52368cacd72017f69e8e7f4c0511557216e 100644 (file)
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX_NUMBER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
-
-               <p:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+               <core:outputAdminFaxPanelGrid faxNumber="#{beanHelper.faxNumber}" />
+
+               <p:dataTable
+                       id="contact_fax_link"
+                       var="contact"
+                       value="#{contactPhoneController.allCurrentFaxNumberContacts()}"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+                       >
                        <f:facet name="header">
-                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
+                               <h:outputFormat value="#{msg.ADMIN_SHOW_FAX_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.faxNumber.phoneId}" />
                                </h:outputFormat>
                        </f:facet>
                        <p:column>
                                <p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <p:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
+                               <p:link
+                                       id="contactId"
+                                       styleClass="table-data-field"
+                                       outcome="admin_show_contact"
+                                       value="#{contact.contactId}"
+                                       >
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </p:link>
                        </p:column>
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link
+                                       id="contactEmailAddress"
+                                       styleClass="table-data-field"
+                                       href="mailto:#{contact.contactEmailAddress}"
+                                       >
                                        <h:outputText value="#{contact.contactEmailAddress}" />
-                               </h:outputLink>
+                               </p:link>
                        </p:column>
 
                        <p:column>
                                <div class="table-data-field">
                                        <ul class="navbar-mini">
                                                <li class="navlink-mini">
-                                                       <p:link outcome="admin_unlink_contact_fax">
+                                                       <p:link
+                                                               outcome="admin_unlink_contact_fax"
+                                                               >
                                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
-                                                               <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                                                               <f:param name="faxId" value="#{beanHelper.faxNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </p:link>
                                                </li>
diff --git a/web/admin/generic_product/admin_generic_product_delete.xhtml b/web/admin/generic_product/admin_generic_product_delete.xhtml
new file mode 100644 (file)
index 0000000..a19da9e
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam
+                               name="productId"
+                               value="#{adminGenericProductActionController.currentProduct}"
+                               converter="GenericProductConverter"
+                               required="true"
+                               requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
+                               converterMessage="#{product.PARAMETER_PRODUCT_ID_INVALID}"
+                               />
+
+                       <f:viewAction
+                               action="#{adminGenericProductActionController.copyAllProductProperties()}"
+                               />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{product.PAGE_TITLE_ADMIN_GENERIC_PRODUCT_DELETE}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{product.CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_DELETE}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
diff --git a/web/admin/generic_product/admin_generic_product_edit.xhtml b/web/admin/generic_product/admin_generic_product_edit.xhtml
new file mode 100644 (file)
index 0000000..90a562c
--- /dev/null
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam
+                               name="productId"
+                               value="#{adminGenericProductActionController.currentProduct}"
+                               converter="GenericProductConverter"
+                               required="true"
+                               requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
+                               converterMessage="#{product.PARAMETER_PRODUCT_ID_INVALID}"
+                               />
+
+                       <f:viewAction
+                               action="#{adminGenericProductActionController.copyAllProductProperties()}"
+                               />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{product.PAGE_TITLE_ADMIN_GENERIC_PRODUCT_EDIT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{product.CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_EDIT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form
+                       id="admin-form-edit-generic-product"
+                       rendered="#{not empty adminGenericProductActionController.currentProduct}"
+                       >
+                       <h:inputHidden value="#{adminGenericProductActionController.productId}" />
+
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
+                               <f:facet name="header">
+                                       <h:outputFormat
+                                               value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_TITLE}"
+                                               title="#{local[adminGenericProductActionController.productI18nKey]}"
+                                               >
+                                               <f:param value="#{adminGenericProductActionController.productId}" />
+                                       </h:outputFormat>
+                               </f:facet>
+
+                               <h:panelGroup styleClass="para" layout="block">
+                                       <h:outputText value="#{product.ADMIN_EDIT_GENERIC_PRODUCT_MINIMUM_DATA}" />
+                               </h:panelGroup>
+
+                               <ui:include src="/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl">
+                                       <ui:param name="bypassDuplicateI18nKey" value="true" />
+                               </ui:include>
+
+                               <f:facet name="footer">
+                                       <p:panelGrid columns="2" layout="grid">
+                                               <p:commandButton
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
+
+                                               <p:commandButton
+                                                       type="submit"
+                                                       value="#{product.BUTTON_ADMIN_EDIT_GENERIC_PRODUCT}"
+                                                       action="#{adminGenericProductActionController.updateProduct()}"
+                                                       />
+                                       </p:panelGrid>
+                               </f:facet>
+                       </p:panelGrid>
+               </h:form>
+       </ui:define>
+</ui:composition>
diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
new file mode 100644 (file)
index 0000000..23c686e
--- /dev/null
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{product.PAGE_TITLE_ADMIN_LIST_GENERIC_PRODUCT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{product.CONTENT_TITLE_ADMIN_LIST_GENERIC_PRODUCT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form id="form-list-products">
+                       <p:dataTable
+                               id="productList"
+                               var="genericProduct"
+                               value="#{productListController.allProducts}"
+                               paginator="true"
+                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                               filteredValue="#{productListController.filteredProducts}"
+                               rows="10"
+                               rowKey="#{genericProduct.productId}"
+                               reflow="true"
+                               resizableColumns="true"
+                               rowsPerPageTemplate="5,10,20,50,100"
+                               sortMode="multiple"
+                               summary="#{product.TABLE_SUMMARY_ADMIN_LIST_GENERIC_PRODUCTS}"
+                               emptyMessage="#{product.ADMIN_EMPTY_LIST_GENERIC_PRODUCTS}"
+                               widgetVar="productList"
+                               selectionMode="single"
+                               selection="#{productListController.selectedProduct}"
+                               skipChildren="true"
+                               >
+
+                               <f:facet name="header">
+                                       <p:panelGrid
+                                               columns="3"
+                                               layout="grid"
+                                               columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+                                               >
+                                               <p:spacer />
+
+                                               <p:panelGrid
+                                                       columns="2"
+                                                       columnClasses="ui-grid-4,ui-grid-8"
+                                                       layout="grid"
+                                                       styleClass="ui-noborder"
+                                                       >
+                                                       <p:outputLabel
+                                                               for="globalFilter"
+                                                               value="#{msg.SEARCH_ALL_FIELDS}"
+                                                               style="float: right"
+                                                               />
+
+                                                       <p:inputText
+                                                               id="globalFilter"
+                                                               onkeyup="PF('productList').filter()"
+                                                               placeholder="#{msg.ENTER_KEYWORD}"
+                                                               />
+                                               </p:panelGrid>
+
+                                               <p:outputPanel>
+                                                       <p:spacer height="4" />
+
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
+                                                       <p:columnToggler datasource="productList" trigger="toggler" />
+                                               </p:outputPanel>
+                                       </p:panelGrid>
+                               </f:facet>
+
+                               <p:ajax
+                                       event="rowSelect"
+                                       update="form-list-products:product-details"
+                                       oncomplete="PF('productDialog').show()"
+                                       />
+
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{genericProduct.productId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_generic_product"
+                                               title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}"
+                                               value="#{genericProduct.productId}"
+                                               >
+                                               <f:param name="productId" value="#{genericProduct.productId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_I18N_KEY_HEADER}"
+                                       sortBy="#{local[genericProduct.productI18nKey]}"
+                                       filterBy="#{local[genericProduct.productI18nKey]}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{local[genericProduct.productI18nKey]}" title="#{genericProduct.productI18nKey}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{product.ADMIN_PRODUCT_NUMBER_HEADER}"
+                                       sortBy="#{genericProduct.productNumber}"
+                                       filterBy="#{genericProduct.productNumber}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{genericProduct.productNumber}" rendered="#{not empty genericProduct.productNumber}" />
+                                       <h:outputText value="-" rendered="#{empty genericProduct.productNumber}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{product.ADMIN_PRODUCT_FSC_NUMBER_HEADER}"
+                                       sortBy="#{genericProduct.productFscNumber}"
+                                       filterBy="#{genericProduct.productFscNumber}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{genericProduct.productFscNumber}" rendered="#{not empty genericProduct.productFscNumber}" />
+                                       <h:outputText value="-" rendered="#{empty genericProduct.productFscNumber}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{product.ADMIN_PRODUCT_BARCODE_HEADER}"
+                                       sortBy="#{genericProduct.productBarCodeNumber}"
+                                       filterBy="#{genericProduct.productBarCodeNumber}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{genericProduct.productBarCodeNumber}" rendered="#{not empty genericProduct.productBarCodeNumber}" />
+                                       <h:outputText value="-" rendered="#{empty genericProduct.productBarCodeNumber}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{product.ADMIN_PRODUCT_CATEGORY_HEADER}"
+                                       sortBy="#{genericProduct.productCategory}"
+                                       filterBy="#{genericProduct.productCategory}"
+                                       filterMatchMode="in"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       dynamic="true"
+                                                       label="#{product.LABEL_PRODUCT_CATEGORIES}"
+                                                       onchange="PF('productList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{product.FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE}"
+                                                       >
+                                                       <f:converter converterId="ProductCategoryConverter" />
+
+                                                       <f:selectItems
+                                                               value="#{productCategoryListController.allProductCategories}"
+                                                               var="category"
+                                                               itemValue="#{category}"
+                                                               itemLabel="#{productBeanHelper.renderProductCategory(category)}"
+                                                               />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link
+                                               outcome="admin_show_product_category"
+                                               title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE}"
+                                               value="#{local[genericProduct.productCategory.categoryI18nKey]}"
+                                               >
+                                               <f:param name="categoryId" value="#{genericProduct.productCategory.categoryId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{product.GROSS_PRICE_HEADER}"
+                                       sortBy="#{genericProduct.productGrossPrice}"
+                                       filterBy="#{genericProduct.productGrossPrice}"
+                                       filterFunction="#{productListController.filterByPrice}"
+                                       >
+                                       <h:outputText value="#{genericProduct.productGrossPrice}">
+                                               <!-- @TODO Hard-coded EUR again -->
+                                               <f:convertNumber type="currency" currencyCode="EUR" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.AVAILABLE_HEADER}"
+                                       sortBy="#{genericProduct.productAvailability}"
+                                       filterBy="#{genericProduct.productAvailability}"
+                                       filterMatchMode="exact"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu onchange="PF('productList').filter()">
+                                                       <f:converter converterId="javax.faces.Boolean" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+                                               </p:selectOneMenu>
+                                       </f:facet>
+
+                                       <h:outputText value="#{genericProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_MANUFACTURER_HEADER}"
+                                       sortBy="#{genericProduct.productManufacturer}"
+                                       filterBy="#{genericProduct.productManufacturer}"
+                                       filterMatchMode="in"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       dynamic="true"
+                                                       label="#{msg.LABEL_COMPANIES}"
+                                                       onchange="PF('productList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{msg.FILTER_BY_MULTIPLE_COMPANIES_TITLE}"
+                                                       >
+                                                       <f:converter converterId="BasicCompanyDataConverter" />
+
+                                                       <f:selectItems
+                                                               value="#{basicDataListController.allBasicData}"
+                                                               var="basicData"
+                                                               itemValue="#{basicData}"
+                                                               itemLabel="#{beanHelper.renderBasicData(basicData, true, false)}"
+                                                               />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link
+                                               outcome="admin_show_basic_data"
+                                               value="#{beanHelper.renderBasicData(genericProduct.productManufacturer, true, false)}"
+                                               title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+                                               rendered="#{not empty genericProduct.productManufacturer}"
+                                               >
+                                               <f:param name="basicDataId" value="#{genericProduct.productManufacturer.basicDataId}" />
+                                       </p:link>
+
+                                       <h:outputText
+                                               value="#{msg.ADMIN_NOT_ASSIGNED}"
+                                               title="#{product.ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE}"
+                                               rendered="#{empty genericProduct.productManufacturer}"
+                                               />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{genericProduct.productEntryCreated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{genericProduct.productEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{genericProduct.productEntryUpdated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{genericProduct.productEntryUpdated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
+                                       <p:menuButton value="#{msg.OPTIONS}">
+                                               <p:menuitem
+                                                       outcome="admin_show_generic_product"
+                                                       value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+                                                       title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}"
+                                                       >
+                                                       <f:param name="productId" value="#{genericProduct.productId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem
+                                                       outcome="admin_edit_generic_product"
+                                                       value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                                       title="#{product.ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE}"
+                                                       >
+                                                       <f:param name="productId" value="#{genericProduct.productId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem outcome="admin_delete_generic_product">
+                                                       <h:outputText
+                                                               styleClass="link-danger"
+                                                               value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                               title="#{product.ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE}"
+                                                               />
+                                                       <f:param name="productId" value="#{genericProduct.productId}" />
+                                               </p:menuitem>
+                                       </p:menuButton>
+                               </p:column>
+                       </p:dataTable>
+
+                       <p:dialog
+                               dynamic="true"
+                               modal="true"
+                               resizable="false"
+                               header="#{product.ADMIN_SINGLE_PRODUCT_DETAILS_HEADER}"
+                               hideEffect="fade"
+                               showEffect="fade"
+                               widgetVar="productDialog"
+                               position="top"
+                               responsive="true"
+                               closeOnEscape="true"
+                               >
+                               <p:outputPanel id="product-details">
+                                       <p:panelGrid columns="2" rendered="#{not empty productListController.selectedProduct}">
+                                               <f:facet name="header">
+                                                       <h:outputFormat value="#{product.ADMIN_PRODUCT_DETAILS_HEADER}">
+                                                               <f:param value="#{local[productListController.selectedProduct.productI18nKey]}" />
+                                                               <f:param value="#{productListController.selectedProduct.productId}" />
+                                                       </h:outputFormat>
+                                               </f:facet>
+
+                                               <p:outputLabel value="#{msg.ID_HEADER}" title="#{product.PRODUCT_ID_NUMBER_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productId}" />
+
+                                               <p:outputLabel value="#{msg.ADMIN_I18N_KEY_HEADER}" title="#{product.PRODUCT_I18N_KEY_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productI18nKey}" title="#{local[productListController.selectedProduct.productI18nKey]}" />
+
+                                               <p:outputLabel value="#{product.PRODUCT_NUMBER_HEADER}" title="#{product.PRODUCT_NUMBER_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productNumber}" rendered="#{not empty productListController.selectedProduct.productNumber}" />
+                                               <h:outputText value="#{product.ADMIN_NO_PRODUCT_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productNumber}" />
+
+                                               <p:outputLabel value="#{project.BARCODE_HEADER}" title="#{product.PRODUCT_BARCODE_NUMBER_TITLE}" />
+                                               <h:outputText value="#{product.PRODUCT_NO_BARCODE_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productBarCodeNumber}" />
+                                               <p:barcode
+                                                       width="100%"
+                                                       type="#{initParam['product_barcode_type']}"
+                                                       value="#{productListController.selectedProduct.productBarCodeNumber}"
+                                                       rendered="#{not empty productListController.selectedProduct.productBarCodeNumber}"
+                                                       />
+
+                                               <p:outputLabel value="#{product.ADMIN_PRODUCT_FSC_NUMBER_HEADER}" title="#{product.PRODUCT_FSC_NUMBER_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productFscNumber}" rendered="#{not empty productListController.selectedProduct.productFscNumber}" />
+                                               <h:outputText value="#{product.ADMIN_NO_PRODUCT_FSC_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productFscNumber}" />
+
+                                               <p:outputLabel value="#{msg.AVAILABLE_HEADER}" title="#{product.PRODUCT_AVAILABILITY_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+
+                                               <p:outputLabel value="#{product.AGE_GROUP_HEADER}" title="#{product.PRODUCT_AGE_GROUP_TITLE}" />
+                                               <h:outputText value="#{project[productListController.selectedProduct.productAgeGroup.messageKey]}" title="#{productListController.selectedProduct.productAgeGroup.messageKey}" rendered="#{not empty productListController.selectedProduct.productAgeGroup.messageKey}" />
+                                               <h:outputText value="#{product.PRODUCT_HAS_NO_AGE_GROUP}" rendered="#{empty productListController.selectedProduct.productAgeGroup.messageKey}" />
+
+                                               <p:outputLabel value="#{product.CURRENCY_CODE_HEADER}" title="#{product.PRODUCT_CURRENCY_CODE_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productCurrencyCode}" />
+
+                                               <p:outputLabel value="#{product.GROSS_PRICE_HEADER}" title="#{product.PRODUCT_GROSS_PRICE_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productGrossPrice}">
+                                                       <!-- @TODO Hard-coded EUR again -->
+                                                       <f:convertNumber type="currency" currencyCode="EUR" />
+                                               </h:outputText>
+
+                                               <p:outputLabel value="#{product.NET_PRICE_HEADER}" title="#{product.PRODUCT_NET_PRICE_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productNetPrice}">
+                                                       <!-- @TODO Hard-coded EUR again -->
+                                                       <f:convertNumber type="currency" currencyCode="EUR" />
+                                               </h:outputText>
+
+                                               <p:outputLabel value="#{product.TAX_RATE_HEADER}" title="#{product.PRODUCT_TAX_RATE_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productTaxRate}">
+                                                       <!-- @TODO No real percentage number, 7.0 means 7.0%, not 700% -->
+                                                       <f:convertNumber type="number" />
+                                               </h:outputText>
+
+                                               <p:outputLabel value="#{product.PRODUCT_SIZE_HEADER}" title="#{product.PRODUCT_SIZE_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productSize}" />
+
+                                               <p:outputLabel value="#{product.PRODUCT_UNIT_AMOUNT_HEADER}" title="#{product.PRODUCT_UNIT_AMOUNT_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productUnitAmount}">
+                                                       <f:convertNumber type="number" />
+                                               </h:outputText>
+
+                                               <p:outputLabel value="#{product.PRODUCT_UNIT_I18N_KEY_HEADER}" title="#{product.PRODUCT_UNIT_I18N_KEY_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productUnitI18nKey}" title="#{local[productListController.selectedProduct.productUnitI18nKey]}" />
+
+                                               <p:outputLabel value="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL}" title="#{product.ADMIN_ASSIGNED_PRODUCT_CATEGORY_TITLE}" />
+                                               <p:link
+                                                       outcome="admin_show_product_category"
+                                                       value="#{local[productListController.selectedProduct.productCategory.categoryI18nKey]}"
+                                                       title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE}"
+                                                       >
+                                                       <f:param name="categoryId" value="#{productListController.selectedProduct.productCategory.categoryId}" />
+                                               </p:link>
+
+                                               <p:outputLabel value="#{msg.ADMIN_ASSIGNED_MANUFACTURER_LABEL}" title="#{product.ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE}" />
+                                               <p:link
+                                                       outcome="admin_show_basic_data"
+                                                       title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}"
+                                                       rendered="#{not empty productListController.selectedProduct.productManufacturer}"
+                                                       >
+                                                       <h:outputFormat value="#{msg.BASIC_DATA_LINK_MASK}">
+                                                               <f:param value="#{productListController.selectedProduct.productManufacturer.companyName}" />
+                                                               <f:param value="#{productListController.selectedProduct.productManufacturer.basicDataId}" />
+                                                       </h:outputFormat>
+                                                       <f:param name="basicDataId" value="#{productListController.selectedProduct.productManufacturer.basicDataId}" />
+                                               </p:link>
+                                               <h:outputText value="#{product.PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productManufacturer}" />
+
+                                               <p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{product.ADMIN_PRODUCT_ENTRY_CREATED_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productEntryCreated}">
+                                                       <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                               </h:outputText>
+
+                                               <p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{product.ADMIN_PRODUCT_ENTRY_UPDATED_TITLE}" />
+                                               <h:outputText value="#{productListController.selectedProduct.productEntryUpdated}">
+                                                       <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                               </h:outputText>
+                                       </p:panelGrid>
+                               </p:outputPanel>
+                       </p:dialog>
+               </h:form>
+
+               <h:form>
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
+                               <f:facet name="header">
+                                       <h:outputText value="#{product.ADMIN_ADD_GENERIC_PRODUCT_TITLE}" />
+                               </f:facet>
+
+                               <h:panelGroup styleClass="para" layout="block">
+                                       <h:outputText value="#{product.ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA}" />
+                               </h:panelGroup>
+
+                               <ui:include src="/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl" />
+
+                               <f:facet name="footer">
+                                       <p:panelGrid columns="2" layout="grid">
+                                               <p:commandButton
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
+
+                                               <p:commandButton
+                                                       type="submit"
+                                                       value="#{product.BUTTON_ADMIN_ADD_GENERIC_PRODUCT}"
+                                                       action="#{adminGenericProductActionController.addProduct()}"
+                                                       update="form-list-products:productList"
+                                                       />
+                                       </p:panelGrid>
+                               </f:facet>
+                       </p:panelGrid>
+               </h:form>
+       </ui:define>
+</ui:composition>
diff --git a/web/admin/generic_product/admin_generic_product_show.xhtml b/web/admin/generic_product/admin_generic_product_show.xhtml
new file mode 100644 (file)
index 0000000..e0e8fc3
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam
+                               name="productId"
+                               value="#{adminGenericProductActionController.currentProduct}"
+                               converter="GenericProductConverter"
+                               required="true"
+                               requiredMessage="#{product.ERROR_PARAMETER_PRODUCT_ID_NOT_SET}"
+                               converterMessage="#{product.PARAMETER_PRODUCT_ID_INVALID}"
+                               />
+
+                       <f:viewAction
+                               action="#{adminGenericProductActionController.copyAllProductProperties()}"
+                               />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{product.PAGE_TITLE_ADMIN_SHOW_GENERIC_PRODUCT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{product.CONTENT_TITLE_ADMIN_SHOW_GENERIC_PRODUCT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <!-- @TODO Here goes your content. //-->
+       </ui:define>
+</ui:composition>
index 55ae806681345a3220d2e29dbb5a6600f1c367a1..be454f8c22c62c91f52d77a26a5441e8337c87aa 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                               xmlns:h="http://xmlns.jcp.org/jsf/html"
-                               xmlns:f="http://xmlns.jcp.org/jsf/core">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_WELCOME}" />
        </ui:define>
 
index 96c7dfb354b841408eb743e433325744655fd45e..37d4d2b168c60fbb4cb019dc821ffbf8bae8ab3b 100644 (file)
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
        </ui:define>
 
        </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}" />
-
-               <h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
+               <h:form rendered="#{not empty beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_TITLE}" />
                                </div>
 
                                <div class="para">
-                                       <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" renderShowLink="false" showAdminMiniLinks="false" />
+                                       <core:outputAdminLandLinePanelGrid
+                                               landLineNumber="#{beanHelper.landLineNumber}"
+                                               renderShowLink="false"
+                                               showAdminDropdownMenu="false"
+                                               />
                                </div>
 
                                <div class="para">
                                        <h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_DATA_NOTICE}" />
                                </div>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="button-danger" type="submit" id="button_delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
-                               </div>
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}"
+                                       action="#{adminPhoneController.deleteLandLineData()}"
+                                       />
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 31ddae831a88aebd6c6b816ee5732075e76afec6..d2b7dd85df084914e565627bcaad1e016fb6143f 100644 (file)
@@ -1,20 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
        </ui:define>
 
        </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}" />
-
-               <h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
-                       <h:panelGroup styleClass="table table-medium" layout="block">
+               <h:form rendered="#{not empty beanHelper.landLineNumber}">
+                       <h:panelGroup layout="block">
                                <div class="table-header">
                                        <h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
                                                <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                                        </h:outputFormat>
                                </div>
 
-                               <widgets:outputAdminLandLineDataFormFields landLineNumber="#{beanHelper.landLineNumber}" />
+                               <core:outputAdminLandLineDataFormFields landLineNumber="#{beanHelper.landLineNumber}" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.doChangeLandLineNumber()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}"
+                                               action="#{adminPhoneController.doChangeLandLineNumber()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index c93a80a00b4c8c0c2e961eff95e95e8cdefb588a..18d06c54b8bbbaccd116e94c90fe8f5da7450623 100644 (file)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="admin_title">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE_NUMBER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <p:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" tableStyleClass="table table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" emptyMessage="#{msg.ADMIN_LANDLINE_NUMBER_LIST_EMPTY}">
+               <p:dataTable
+                       id="table_list_landline"
+                       var="landLineNumber"
+                       value="#{phoneListController.allLandLineNumbers}"
+                       paginator="true"
+                       rows="10"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}"
+                       emptyMessage="#{msg.ADMIN_EMPTY_LIST_LAND_LINE_NUMBER}"
+                       >
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_ID_NUMBER}" />
+                                       <h:outputText value="#{msg.ID_HEADER}" />
                                </f:facet>
 
-                               <p:link outcome="admin_show_landline" value="#{landLineNumber.phoneId}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
-                                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                               <p:link
+                                       outcome="admin_show_landline"
+                                       value="#{landLineNumber.phoneId}"
+                                       title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+                                       >
+                                       <f:param name="landLineId" value="#{landLineNumber.phoneId}" />
                                </p:link>
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_NUMBER}" />
+                                       <h:outputText value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneCountry.countryAbroadDialPrefix}#{landLineNumber.phoneCountry.countryPhoneCode} (#{landLineNumber.phoneAreaCode}) #{landLineNumber.phoneNumber}" />
+                               <h:outputText value="#{beanHelper.renderPhoneNumber(landLineNumber)}" />
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+                                       <h:outputText value="#{msg.ENTRY_CREATED_HEADER}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneEntryCreated.time}">
+                               <h:outputText value="#{landLineNumber.phoneEntryCreated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
 
                        <p:column>
                                <f:facet name="header">
-                                       <h:outputText value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+                                       <h:outputText value="#{msg.ENTRY_UPDATED_HEADER}" />
                                </f:facet>
 
-                               <h:outputText value="#{landLineNumber.phoneEntryUpdated.time}">
+                               <h:outputText value="#{landLineNumber.phoneEntryUpdated}">
                                        <f:convertDateTime type="both" />
                                </h:outputText>
                        </p:column>
index 7fc7f0919d207a4dd4e48ba9f2783c94c3a4c658..8db777ab849ecb86a82b18ad199189b4064a6e99 100644 (file)
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="admin_title">
+       <ui:define name="document_admin_title">
                <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE_NUMBER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
-
-               <p:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" tableStyleClass="table table-medium">
+               <core:outputAdminLandLinePanelGrid landLineNumber="#{beanHelper.landLineNumber}" />
+
+               <p:dataTable
+                       id="contact_landline_link"
+                       var="contact"
+                       value="#{contactPhoneController.allCurrentLandLineNumberContacts()}"
+                       summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}"
+                       >
                        <f:facet name="header">
-                               <h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
+                               <h:outputFormat value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_LINKS_HEADER}">
                                        <f:param value="#{beanHelper.landLineNumber.phoneId}" />
                                </h:outputFormat>
                        </f:facet>
                        <p:column>
                                <p:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-                               <p:link id="contactId" outcome="admin_show_contact">
+                               <p:link
+                                       id="contactId"
+                                       outcome="admin_show_contact"
+                                       >
                                        <h:outputText styleClass="table-data-field" value="#{contact.contactId}" />
                                        <f:param name="contactId" value="#{contact.contactId}" />
                                </p:link>
                        <p:column>
                                <p:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.DATA_EMAIL_ADDRESS}" />
 
-                               <h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
+                               <p:link
+                                       id="contactEmailAddress"
+                                       styleClass="table-data-field"
+                                       href="mailto:#{contact.contactEmailAddress}"
+                                       >
                                        <h:outputText value="#{contact.contactEmailAddress}" />
-                               </h:outputLink>
+                               </p:link>
                        </p:column>
 
                        <p:column>
                                <div class="table-data-field">
                                        <ul class="navbar-mini">
                                                <li class="navlink-mini">
-                                                       <p:link outcome="admin_unlink_contact_landline">
-                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LANDLINE_NUMBER_CONTACT_TITLE}" />
-                                                               <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                                       <p:link
+                                                               outcome="admin_unlink_contact_landline"
+                                                               >
+                                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
+                                                               <f:param name="landLineId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </p:link>
                                                </li>
diff --git a/web/admin/product_category/admin_product_category_edit.xhtml b/web/admin/product_category/admin_product_category_edit.xhtml
new file mode 100644 (file)
index 0000000..ceeaa0d
--- /dev/null
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="metadata">
+               <f:metadata>
+                       <f:viewParam
+                               name="categoryId"
+                               value="#{adminProductCategoryActionController.currentCategory}"
+                               converter="ProductCategoryConverter"
+                               required="true"
+                               requiredMessage="#{product.ERROR_PARAMETER_CATEGORY_ID_NOT_SET}"
+                               converterMessage="#{product.PARAMETER_CATEGORY_ID_INVALID}"
+                               />
+
+                       <f:viewAction
+                               action="#{adminProductCategoryActionController.copyAllCategoryProperties()}"
+                               />
+               </f:metadata>
+       </ui:define>
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{product.PAGE_TITLE_ADMIN_PRODUCT_CATEGORY_EDIT}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{product.CONTENT_TITLE_ADMIN_PRODUCT_CATEGORY_EDIT}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form
+                       id="admin-form-edit-generic-product"
+                       rendered="#{not empty adminProductCategoryActionController.currentCategory}"
+                       >
+                       <h:inputHidden value="#{adminProductCategoryActionController.categoryId}" />
+
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
+                               <f:facet name="header">
+                                       <h:outputFormat
+                                               value="#{product.ADMIN_EDIT_PRODUCT_CATEGORY_TITLE}"
+                                               title="#{local[adminProductCategoryActionController.categoryI18nKey]}"
+                                               >
+                                               <f:param value="#{adminProductCategoryActionController.categoryId}" />
+                                       </h:outputFormat>
+                               </f:facet>
+
+                               <h:panelGroup styleClass="para" layout="block">
+                                       <h:outputText value="#{product.ADMIN_EDIT_PRODUCT_CATEGORY_MINIMUM_DATA}" />
+                               </h:panelGroup>
+
+                               <ui:include src="/WEB-INF/templates/admin/product_category/admin_form_product_category_data.tpl">
+                                       <ui:param name="bypassDuplicateI18nKey" value="true" />
+                               </ui:include>
+
+                               <f:facet name="footer">
+                                       <p:panelGrid columns="2" layout="grid">
+                                               <p:commandButton
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
+
+                                               <p:commandButton
+                                                       type="submit"
+                                                       value="#{product.BUTTON_ADMIN_EDIT_PRODUCT_CATEGORY}"
+                                                       action="#{adminProductCategoryActionController.updateProductCategory()}"
+                                                       />
+                                       </p:panelGrid>
+                               </f:facet>
+                       </p:panelGrid>
+               </h:form>
+       </ui:define>
+</ui:composition>
diff --git a/web/admin/product_category/admin_product_category_list.xhtml b/web/admin/product_category/admin_product_category_list.xhtml
new file mode 100644 (file)
index 0000000..1f284fd
--- /dev/null
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       template="/WEB-INF/templates/admin/admin_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_admin_title">
+               <h:outputText value="#{product.PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY}" />
+       </ui:define>
+
+       <ui:define name="content_header">
+               <h:outputText value="#{product.CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY}" />
+       </ui:define>
+
+       <ui:define name="content">
+               <h:form id="form-list-categories">
+                       <p:dataTable
+                               id="categoryList"
+                               var="category"
+                               value="#{productCategoryListController.allProductCategories}"
+                               paginator="true"
+                               paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"
+                               filteredValue="#{productCategoryListController.filteredProductCategories}"
+                               rows="10"
+                               rowKey="#{category.categoryId}"
+                               reflow="true"
+                               resizableColumns="true"
+                               rowsPerPageTemplate="5,10,20,50,100"
+                               sortMode="multiple"
+                               summary="#{product.TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES}"
+                               emptyMessage="#{product.ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES}"
+                               widgetVar="categoryList"
+                               selectionMode="single"
+                               selection="#{productCategoryListController.selectedCategory}"
+                               skipChildren="true"
+                               >
+
+                               <f:facet name="header">
+                                       <p:panelGrid
+                                               columns="3"
+                                               layout="grid"
+                                               columnClasses="ui-grid-col-4,ui-grid-col-6,ui-grid-col-2"
+                                               >
+                                               <p:spacer />
+
+                                               <p:panelGrid
+                                                       columns="2"
+                                                       columnClasses="ui-grid-4,ui-grid-8"
+                                                       layout="grid"
+                                                       styleClass="ui-noborder"
+                                                       >
+                                                       <p:outputLabel
+                                                               for="globalFilter"
+                                                               value="#{msg.SEARCH_ALL_FIELDS}"
+                                                               style="float: right"
+                                                               />
+
+                                                       <p:inputText
+                                                               id="globalFilter"
+                                                               onkeyup="PF('departmentList').filter()"
+                                                               placeholder="#{msg.ENTER_KEYWORD}"
+                                                               />
+                                               </p:panelGrid>
+
+                                               <p:outputPanel>
+                                                       <p:spacer height="4" />
+
+                                                       <p:commandButton
+                                                               id="toggler"
+                                                               type="button"
+                                                               value="#{msg.SELECT_SHOWN_COLUMNS}"
+                                                               styleClass="column-selector"
+                                                               />
+
+                                                       <p:columnToggler datasource="categoryList" trigger="toggler" />
+                                               </p:outputPanel>
+                                       </p:panelGrid>
+                               </f:facet>
+
+                               <p:ajax
+                                       event="rowSelect"
+                                       update="form-list-categories:category-details"
+                                       oncomplete="PF('categoryDialog').show()"
+                                       />
+
+                               <p:column
+                                       headerText="#{msg.ID_HEADER}"
+                                       sortBy="#{category.categoryId}"
+                                       filterable="false"
+                                       >
+                                       <p:link
+                                               outcome="admin_show_product_category"
+                                               title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+                                               value="#{category.categoryId}"
+                                               >
+                                               <f:param name="categoryId" value="#{category.categoryId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_I18N_KEY_HEADER}"
+                                       sortBy="#{local[category.categoryI18nKey]}"
+                                       filterBy="#{local[category.categoryI18nKey]}"
+                                       filterMatchMode="contains"
+                                       >
+                                       <h:outputText value="#{local[category.categoryI18nKey]}" title="#{category.categoryI18nKey}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{product.ADMIN_PARENT_PRODUCT_CATEGORY_HEADER}"
+                                       sortBy="#{category.parentCategory}"
+                                       filterBy="#{category.parentCategory}"
+                                       filterMatchMode="in"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectCheckboxMenu
+                                                       filter="true"
+                                                       filterMatchMode="contains"
+                                                       dynamic="true"
+                                                       label="#{product.LABEL_PRODUCT_CATEGORIES}"
+                                                       onchange="PF('categoryList').filter()"
+                                                       updateLabel="true"
+                                                       title="#{product.FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE}"
+                                                       >
+                                                       <f:converter converterId="ProductCategoryConverter" />
+
+                                                       <f:selectItems
+                                                               value="#{productCategoryListController.allProductCategories}"
+                                                               var="category"
+                                                               itemValue="#{category}"
+                                                               itemLabel="#{productBeanHelper.renderProductCategory(category)}"
+                                                               />
+                                               </p:selectCheckboxMenu>
+                                       </f:facet>
+
+                                       <p:link
+                                               outcome="admin_show_product_category"
+                                               value="#{local[category.parentCategory.categoryI18nKey]}"
+                                               title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+                                               rendered="#{not empty category.parentCategory}"
+                                               >
+                                               <f:param name="categoryId" value="#{category.parentCategory.categoryId}" />
+                                       </p:link>
+
+                                       <p:link
+                                               outcome="admin_assign_parent_category"
+                                               value="#{msg.ADMIN_NOT_ASSIGNED}"
+                                               title="#{product.ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE}"
+                                               rendered="#{empty category.parentCategory}"
+                                               >
+                                               <f:param name="categoryId" value="#{category.categoryId}" />
+                                       </p:link>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{product.SHOWN_IN_STATISTICS_HEADER}"
+                                       sortBy="#{category.categoryShownInStatistics}"
+                                       filterBy="#{category.categoryShownInStatistics}"
+                                       filterMatchMode="exact"
+                                       >
+                                       <f:facet name="filter">
+                                               <p:selectOneMenu onchange="PF('categoryList').filter()">
+                                                       <f:converter converterId="javax.faces.Boolean" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_ALL}" itemValue="#{null}" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_YES}" itemValue="true" />
+                                                       <f:selectItem itemLabel="#{msg.CHOICE_NO}" itemValue="false" />
+                                               </p:selectOneMenu>
+                                       </f:facet>
+
+                                       <h:outputText value="#{category.categoryShownInStatistics ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_CREATED_HEADER}"
+                                       sortBy="#{category.categoryEntryCreated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{category.categoryEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{category.categoryEntryUpdated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{category.categoryEntryUpdated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}"
+                                       sortable="false"
+                                       filterable="false"
+                                       >
+                                       <p:menuButton value="#{msg.OPTIONS}">
+                                               <p:menuitem
+                                                       outcome="admin_show_product_category"
+                                                       value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+                                                       title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+                                                       >
+                                                       <f:param name="categoryId" value="#{category.categoryId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem
+                                                       outcome="admin_edit_product_category"
+                                                       value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                                       title="#{product.ADMIN_LINK_EDIT_PRODUCT_CATEGORY_TITLE}"
+                                                       >
+                                                       <f:param name="categoryId" value="#{category.categoryId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem outcome="admin_delete_product_category">
+                                                       <h:outputText
+                                                               styleClass="link-danger"
+                                                               value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                               title="#{product.ADMIN_LINK_DELETE_PRODUCT_CATEGORY_TITLE}"
+                                                               />
+                                                       <f:param name="categoryId" value="#{category.categoryId}" />
+                                               </p:menuitem>
+                                       </p:menuButton>
+                               </p:column>
+                       </p:dataTable>
+
+                       <p:dialog
+                               dynamic="true"
+                               modal="true"
+                               resizable="false"
+                               header="#{product.ADMIN_SINGLE_CATEGORY_DETAILS_HEADER}"
+                               hideEffect="fade"
+                               showEffect="fade"
+                               widgetVar="categoryDialog"
+                               position="top"
+                               responsive="true"
+                               >
+                               <p:outputPanel id="category-details">
+                                       <p:panelGrid columns="2" rendered="#{not empty productCategoryListController.selectedCategory}">
+                                               <f:facet name="header">
+                                                       <h:outputFormat value="#{product.ADMIN_CATEGORY_DETAILS_HEADER}">
+                                                               <f:param value="#{local[productCategoryListController.selectedCategory.categoryI18nKey]}" />
+                                                               <f:param value="#{productCategoryListController.selectedCategory.categoryId}" />
+                                                       </h:outputFormat>
+                                               </f:facet>
+
+                                               <p:outputLabel value="#{msg.ID_HEADER}" title="#{product.CATEGORY_ID_NUMBER_TITLE}" />
+                                               <h:outputText value="#{productCategoryListController.selectedCategory.categoryId}" />
+
+                                               <p:outputLabel value="#{msg.ADMIN_I18N_KEY_HEADER}" title="#{product.CATEGORY_I18N_KEY_TITLE}" />
+                                               <h:outputText value="#{productCategoryListController.selectedCategory.categoryI18nKey}" title="#{local[productCategoryListController.selectedCategory.categoryI18nKey]}" />
+
+                                               <p:outputLabel value="#{product.CATEGORY_IN_STATISTICS_HEADER}" title="#{product.CATEGORY_SHOW_IN_STATISTICS_TITLE}" />
+                                               <h:outputText value="#{productCategoryListController.selectedCategory.categoryShownInStatistics ? msg.CHOICE_YES : msg.CHOICE_NO}" />
+
+                                               <p:outputLabel value="#{product.CATEGORY_PARENT_HEADER}" title="#{product.CATEGORY_PARENT_TITLE}" />
+                                               <p:link
+                                                       outcome="admin_show_product_category"
+                                                       value="#{local[productCategoryListController.selectedCategory.parentCategory.categoryI18nKey]}"
+                                                       title="#{product.ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE}"
+                                                       rendered="#{not empty productCategoryListController.selectedCategory.parentCategory}"
+                                                       >
+                                                       <f:param name="categoryId" value="#{productCategoryListController.selectedCategory.parentCategory.categoryId}" />
+                                               </p:link>
+                                               <h:outputText value="#{product.CATEGORY_HAS_NO_PARENT}" rendered="#{empty productCategoryListController.selectedCategory.parentCategory}" />
+
+                                               <p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{product.ADMIN_CATEGORY_ENTRY_CREATED_TITLE}" />
+                                               <h:outputText value="#{productCategoryListController.selectedCategory.categoryEntryCreated}">
+                                                       <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                               </h:outputText>
+
+                                               <p:outputLabel value="#{msg.ENTRY_UPDATED_HEADER}" title="#{product.ADMIN_CATEGORY_ENTRY_UPDATED_TITLE}" />
+                                               <h:outputText value="#{productCategoryListController.selectedCategory.categoryEntryUpdated}">
+                                                       <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                               </h:outputText>
+                                       </p:panelGrid>
+                               </p:outputPanel>
+                       </p:dialog>
+               </h:form>
+
+               <h:form>
+                       <p:panelGrid
+                               columns="1"
+                               layout="grid"
+                               >
+                               <f:facet name="header">
+                                       <h:outputText value="#{product.ADMIN_ADD_PRODUCT_CATEGORY_TITLE}" />
+                               </f:facet>
+
+                               <h:panelGroup styleClass="para" layout="block">
+                                       <h:outputText value="#{product.ADMIN_ADD_PRODUCT_CATEGORY_MINIMUM_DATA}" />
+                               </h:panelGroup>
+
+                               <ui:include src="/WEB-INF/templates/admin/product_category/admin_form_product_category_data.tpl" />
+
+                               <f:facet name="footer">
+                                       <p:panelGrid columns="2" layout="grid">
+                                               <p:commandButton
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
+
+                                               <p:commandButton
+                                                       type="submit"
+                                                       value="#{product.BUTTON_ADMIN_ADD_PRODUCT_CATEGORY}"
+                                                       action="#{adminProductCategoryActionController.addProductCategory()}"
+                                                       update="form-list-categories:categoryList"
+                                                       />
+                                       </p:panelGrid>
+                               </f:facet>
+                       </p:panelGrid>
+               </h:form>
+       </ui:define>
+</ui:composition>
index 2582c34965a47bc4a219fac60cdbac6ca10e4701..54b4490bb1321faade6d93225db4ee7704ff3ad8 100644 (file)
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
-                       <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
+                       <f:viewParam
+                               name="confirmKey"
+                               value="#{userConfirmationLinkController.confirmationKey}"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONFIRM_KEY_IS_NOT_SET}"
+                               />
+                       <f:viewAction action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
        </ui:define>
 
                                </h:panelGroup>
                        </h:panelGroup>
 
-                       <widgets:outputMessageBox id="error-helper-user" message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
+                       <core:outputMessageBox
+                               panelGroupId="errorHandlerConfirmUser"
+                               message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}"
+                               messageStyleClass="alert-danger"
+                               rendered="#{empty beanHelper.user}"
+                               />
                </ui:fragment>
-
-               <widgets:outputMessageBox id="error-confirmation-key" message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
        </ui:define>
 </ui:composition>
index 2848da6229edf99de49346ab332184e1cf872631..349a5a1cbe99e88deec8a7d73ccb4788625a1cd1 100644 (file)
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               xmlns:widgets="http://mxchange.org/jsf/core/widgets"
-                               xmlns:links="http://mxchange.org/jsf/core/links"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="login_title">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:links="http://mxchange.org/jsf/core/links"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-list-disabled" message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserListDisabled"
+                       message="#{msg.ERROR_USER_LIST_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('user_list')}"
+                       />
 
-               <h:panelGroup styleClass="table table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+               <h:panelGroup
+                       layout="block"
+                       rendered="#{featureController.isFeatureEnabled('user_list')}"
+                       >
                        <div class="table-header">
                                <h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
                        </div>
 
-                       <p:dataTable id="userList" var="user" value="#{userController.allUsers()}" tableStyleClass="table" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.allUsers().size() lt 0}">
+                       <p:dataTable
+                               id="userList"
+                               var="user"
+                               value="#{userListController.allUsers}"
+                               paginator="true"
+                               rows="10"
+                               summary="#{msg.TABLE_SUMMARY_USER_LIST}"
+                               >
                                <ui:fragment rendered="#{profileController.isProfileLinkVisibleByUser(user)}">
                                        <p:column>
                                                <f:facet name="header">
@@ -39,7 +56,7 @@
                                                        <h:outputText value="#{msg.USER_CREATED}" />
                                                </f:facet>
 
-                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
+                                               <h:outputFormat value="#{user.userEntryCreated.time}" title="#{msg.USER_CREATED_TITLE}" />
                                        </p:column>
                                </ui:fragment>
                        </p:dataTable>
index dd47190df76266fa2a1c229acc89c0019a258efc..21bf444ef236535e480017a3c4b0b45db6e946b4 100644 (file)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="guest_title">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-login-disabled" message="#{msg.ERROR_GUEST_USER_LOGIN_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserLoginDisabled"
+                       message="#{msg.ERROR_GUEST_USER_LOGIN_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}"
+                       />
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_registration')}">
 
                                <h:outputText value="&#160;" />
 
-                               <p:link id="user_register" outcome="user_register" title="#{msg.LINK_GUEST_USER_NO_ACCOUNT_TITLE}" value="#{msg.LINK_GUEST_USER_NO_ACCOUNT_YET}" />
+                               <p:link
+                                       outcome="user_register"
+                                       value="#{msg.GUEST_LINK_USER_NO_ACCOUNT_YET}"
+                                       title="#{msg.GUEST_LINK_USER_NO_ACCOUNT_TITLE}"
+                                       />
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
-                               <p:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
+                               <p:link
+                                       outcome="user_lost_password"
+                                       value="#{msg.GUEST_LINK_USER_LOST_PASSWORD}"
+                                       title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}"
+                                       />
                        </h:panelGroup>
                </ui:fragment>
        </ui:define>
index dc0694576303df98201b5d5dfbac1c437a0697ec..a9bb356a88b1cb0ad59f4c7f321713c1c8fe2910 100644 (file)
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-recovery-disabled" message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserRecoveryDisabled"
+                       message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}"
+                       />
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
                        <div id="user_lost_password_content">
-                               <h:form id="form_lost_password">
+                               <h:form>
                                        <h:panelGroup styleClass="table" layout="block">
                                                <div class="table-header">
                                                        <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
                                                </div>
 
-                                               <fieldset class="fieldset" id="login_data">
+                                               <fieldset class="fieldset">
                                                        <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
                                                                <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
                                                        </legend>
@@ -37,7 +44,7 @@
                                                                </div>
 
                                                                <div class="table-right">
-                                                                       <p:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+                                                                       <p:inputText id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
                                                                </div>
                                                        </h:panelGroup>
 
                                                                </div>
 
                                                                <div class="table-right">
-                                                                       <p:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+                                                                       <p:inputText id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
                                                                </div>
                                                        </h:panelGroup>
                                                </fieldset>
 
-                                               <div class="table-footer">
-                                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                                       <p:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
-                                               </div>
+                                               <p:panelGrid columns="2" layout="grid">
+                                                       <p:commandButton
+                                                               type="reset"
+                                                               value="#{msg.BUTTON_RESET_FORM}"
+                                                               />
+
+                                                       <p:commandButton
+                                                               type="submit"
+                                                               value="#{msg.BUTTON_CONTINUE_STEP_2}"
+                                                               action="#{passwordRecoveryController.doLostPasswordStep2()}"
+                                                               />
+                                               </p:panelGrid>
                                        </h:panelGroup>
                                </h:form>
                        </div>
index d490c8ed153d82df6807d53c7d4aa04b0ebec8ce..842434822f6c00e5e18191c72925bf392a170481 100644 (file)
@@ -1,23 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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">
+<ui:composition
+       template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="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:p="http://primefaces.org/ui"
+       >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
-                       <f:viewAction onPostback="true" action="#{beanHelper.notifyControllerUserConverted()}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
+                       <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
        </ui:define>
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_USER_PROFILE}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-profile-disabled" message="#{msg.ERROR_GUEST_USER_PROFILE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
-
-               <widgets:outputMessageBox id="error-user-id-empty" message="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" rendered="#{userController.isUserIdEmpty()}" />
-
-               <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
-                       <widgets:outputMessageBox id="error-user-profile-hidden" message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
-
-                       <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-                               <div align="center">
-                                       <h:panelGrid styleClass="table" headerClass="table-header" footerClass="table-footer">
-                                               <f:facet name="header">
-                                                       <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
-                                               </f:facet>
-                                               <!-- @TODO Unfinished -->
-                                       </h:panelGrid>
-                               </div>
+               <core:outputMessageBox
+                       panelGroupId="errorUserProfileDisabled"
+                       message="#{msg.ERROR_GUEST_USER_PROFILE_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled("public_user_profile")}"
+                       />
+
+               <core:outputMessageBox
+                       panelGroupId="errorUserIdEmpty"
+                       message="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}"
+                       rendered="#{userLoginController.isUserIdEmpty()}"
+                       />
+
+               <ui:fragment rendered="#{featureController.isFeatureEnabled("public_user_profile")}">
+                       <core:outputMessageBox
+                               panelGroupId="errorUserProfileHidden"
+                               message="#{msg.ERROR_PROFILE_NOT_VISIBLE}"
+                               messageStyleClass="alert-danger"
+                               rendered="#{not profileController.isProfileLinkVisibleById(userLoginController.userId)}"
+                               />
+
+                       <ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userLoginController.userId)}">
+                               <p:panelGrid>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
+                                       </f:facet>
+                                       <!-- @TODO Unfinished -->
+                               </p:panelGrid>
                        </ui:fragment>
                </ui:fragment>
        </ui:define>
index 7364c6ab712ebe11996b26b40ed552a3f3f4db8d..aba819190141fc45ac8d3efd900abf554f6c38a8 100644 (file)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-registration-disabled" message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserRegistrationDisabled"
+                       message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('user_registration')}"
+                       />
 
-               <widgets:outputMessageBox id="error-user-registration-index" message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" messageStyleClass="alert-danger" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserRegistrationIndex"
+                       message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}"
+                       />
 
                <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index') and featureController.isFeatureEnabled('user_registration')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1} " />
-                                       <p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                                       <p:link
+                                               outcome="user_login"
+                                               value="#{msg.CLICK_HERE}"
+                                               />
                                        <h:outputText value=" #{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
                                </h:panelGroup>
                        </ui:fragment>
index c34301d4f7af8a1ff4965fb1f9fe6059be0ff95d..849730b407ff8a552f97a647cda3e2ff57735d3d 100644 (file)
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
        </ui:define>
 
        <ui:define name="content_header">
-               <widgets:outputMessageBox id="user-registration-completed" message="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
+               <core:outputMessageBox
+                       panelGroupId="user-registration-completed"
+                       message="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}"
+                       />
        </ui:define>
 
        <ui:define name="content">
                </h:panelGroup>
 
                <h:panelGroup layout="block" styleClass="registration_form">
-                       <p:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESEND_CONFIRMATION_LINK}" outcome="user_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+                       <p:link
+                               outcome="user_resend_link"
+                               value="#{msg.GUEST_LINK_RESEND_CONFIRMATION_LINK}"
+                               rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}"
+                               styleClass="resend_link"
+                               />
                </h:panelGroup>
        </ui:define>
 </ui:composition>
index f8bf7a6be15c493ad80c9fcaca3ab9efdb390703..5b7ee595ce6fa3a26518082d548854efb729d6d1 100644 (file)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-registration-multi-disabled" message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserRegistrationMultiDisabled"
+                       message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}"
+                       />
 
                <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <h:panelGroup styleClass="para" layout="block">
                                        <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
-                                       <p:link outcome="user_login" value="#{msg.CLICK_HERE}" />
+                                       <p:link
+                                               outcome="user_login"
+                                               value="#{msg.CLICK_HERE}"
+                                               />
                                        <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
                                </h:panelGroup>
                        </ui:fragment>
index a0f18d0ff0ede68e9157db1fa40305d96ead8892..2796c0b2b29ec190964c9767777f22fa79ab36c3 100644 (file)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
-       <ui:define name="guest_title">
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
        </ui:define>
 
@@ -15,6 +16,9 @@
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="guest-user-resend-link-completed" message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}" />
+               <core:outputMessageBox
+                       panelGroupId="guest-user-resend-link-completed"
+                       message="#{msg.GUEST_USER_RESEND_LINK_COMPLETED}"
+                       />
        </ui:define>
 </ui:composition>
index faf4f2b7ec75eb216a96f978260737a9c5b8722c..f29ae1b744b4f25ac6006b6c935f62671a1bea76 100644 (file)
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="guest_title">
+<ui:composition
+       template="/WEB-INF/templates/guest/guest_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:validator="http://mxchange.org/jsf/core/validators"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_guest_title">
                <h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
        </ui:define>
 
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-resend-link-disabled" message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserResendLinkDisabled"
+                       message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}"
+                       />
 
-               <h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+               <h:form rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
                                </div>
 
-                               <fieldset class="fieldset" id="email_address_notice">
+                               <fieldset class="fieldset">
                                        <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
                                                <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
                                        </legend>
 
                                        <h:panelGroup styleClass="table-row" layout="block">
                                                <div class="table-left">
-                                                       <p:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
+                                                       <p:outputLabel for="emailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
                                                </div>
 
                                                <div class="table-right">
-                                                       <p:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
-                                                               <f:validator validatorId="EmailAddressValidator" />
+                                                       <p:inputText
+                                                               id="emailAddress"
+                                                               size="20"
+                                                               maxlength="255"
+                                                               value="#{userResendConfirmationController.emailAddress}"
+                                                               required="true"
+                                                               requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}"
+                                                               >
+                                                               <validator:emailAddressValidator />
                                                        </p:inputText>
                                                </div>
                                        </h:panelGroup>
                                </fieldset>
 
                                <h:panelGroup styleClass="error-container" layout="block">
-                                       <p:message for="resendEmailAddress" />
+                                       <p:message for="emailAddress" />
                                </h:panelGroup>
 
                                <h:panelGroup styleClass="table-row" layout="block">
                                        <h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}"
+                                               action="#{userResendConfirmationController.doResendLink()}"
+                                               />
+                               </p:panelGrid>
                        </h:panelGroup>
                </h:form>
        </ui:define>
index 0ce16dad16861a7ba90436b870c55965eedc954b..0c6f662b0e70099680f05aef653d6114b1b6e281 100644 (file)
@@ -1,27 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <core:outputMessageBox
+                       panelGroupId="loginUserDataSaved"
+                       message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+                       rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+                       />
 
-               <widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserEditDataDisabled"
+                       message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('edit_user_data')}"
+                       />
 
                <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       <p:link
+                               outcome="user_change_password"
+                               value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                               />
                </ui:fragment>
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
index 7af8f136ccc8652b89826bff2e7dc6d3a7415cc2..91afff1923ccfd20223ae2bddab51c8ff2d2dc70 100644 (file)
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       >
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn()}" />
+               <core:outputMessageBox
+                       panelGroupId="loginUserDataSaved"
+                       message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+                       rendered="#{userLoginController.isUserLoggedIn()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 8e99559dd6d9812b09e60de803905b7861f48171..1686beddcb6d0afbae3630d8e9079ecd5b288f26 100644 (file)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="login_title">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       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:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}" />
        </ui:define>
 
                                <ul>
                                        <ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
                                                <li>
-                                                       <p:link title="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_user_change_personal_data" value="#{msg.LINK_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
+                                                       <p:link
+                                                               outcome="login_user_change_personal_data"
+                                                               value="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA}"
+                                                               title="#{msg.LOGIN_LINK_USER_CHANGE_PERSONAL_DATA_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
 
                                        <ui:fragment rendered="#{not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password')}">
                                                <li>
-                                                       <p:link title="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_user_change_email_address" value="#{msg.LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
+                                                       <p:link
+                                                               outcome="login_user_change_email_address"
+                                                               value="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS}"
+                                                               title="#{msg.LOGIN_LINK_USER_CHANGE_EMAIL_ADDRESS_TITLE}"
+                                                               />
                                                </li>
                                        </ui:fragment>
 
                                        <li>
-                                               <p:link title="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE}" outcome="login_user_change_password" value="#{msg.LINK_LOGIN_USER_CHANGE_PASSWORD}" />
+                                               <p:link
+                                                       outcome="login_user_change_password"
+                                                       value="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD}"
+                                                       title="#{msg.LOGIN_LINK_USER_CHANGE_PASSWORD_TITLE}"
+                                                       />
                                        </li>
                                </ul>
                        </h:panelGroup>
index 63f89090a2ee540e8390f8de15fea87d08fad659..76e5055eb18b25a69ae9e8d6fe62151ac35023f8 100644 (file)
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_HOME}" />
        </ui:define>
 
                        <!-- @TODO Here goes your content. //-->
                </ui:fragment>
 
-               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-               </ui:fragment>
+               <p:link
+                       outcome="user_change_password"
+                       value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                       rendered="#{userLoginController.ifUserMustChangePassword()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index d0eee5cb63d3b9abe9e1d69ff9dd56160ab949dd..80e839bcc1a39caaf0931cac5ab1a16e21c61e8c 100644 (file)
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}" />
        </ui:define>
 
        <ui:define name="content">
-               <h:form id="form_user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
+               <h:form rendered="#{userLoginController.isUserLoggedIn()}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">
                                        <h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
                                        <h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
                                </h:panelGroup>
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
-                               </div>
+                               <p:commandButton
+                                       type="submit"
+                                       value="#{msg.BUTTON_USER_LOGOUT}"
+                                       action="#{userLoginController.doUserLogout()}"
+                                       />
                        </h:panelGroup>
                </h:form>
 
index 8f0a3bbb93cbc41e6210a82b78f5c24843372835..78d70dd598edf7cb42a926b9dddefb98303f5bb0 100644 (file)
@@ -1,30 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="login_title">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS}" />
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-change-email-disabled" message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserChangeEmailDisabled"
+                       message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}"
+                       />
 
-               <h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
+               <h:panelGroup
+                       styleClass="table"
+                       layout="block"
+                       rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}"
+                       >
                        <div class="table-header">
                                <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                        </div>
 
-                       <h:form id="form_user_change_email_address">
-                               <fieldset class="fieldset" id="change_email">
+                       <h:form>
+                               <fieldset class="fieldset">
                                        <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
                                                <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
                                        </legend>
 
                                <ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton class="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton class="submit" type="submit" id="button_change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               type="submit"
+                                               value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}"
+                                               action="#{userEmailChangeController.doUserChangeEmailAddress()}"
+                                               />
+                               </p:panelGrid>
                        </h:form>
                </h:panelGroup>
 
index caa792126caa4b34c1d6dcbc92fcb4475b62a2c2..f18f7277c9cb237b6641b835118b55379ad80a17 100644 (file)
@@ -1,37 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="login_title">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PASSWORD}" />
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="login-user-must-change-password" message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}" rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}" />
-
-               <widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+               <core:outputMessageBox
+                       panelGroupId="loginUserMustChangePassword"
+                       message="#{msg.USER_MUST_CHANGE_PASSWORD_NOTICE}"
+                       rendered="#{userLoginController.loggedInUser.userMustChangePassword == true}"
+                       />
+
+               <core:outputMessageBox
+                       panelGroupId="errorUserEditDataDisabled"
+                       message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('change_user_password')}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                </ui:fragment>
 
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <h:form id="form_user_change_password">
+                       <h:form>
                                <h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
                                        <div class="table-header">
                                                <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
                                        </div>
 
-                                       <fieldset class="fieldset" id="change_password">
+                                       <fieldset class="fieldset">
                                                <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
                                                        <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
                                                </legend>
@@ -42,7 +52,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText type="secret" styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
+                                                               <p:inputText type="secret" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
                                                        </div>
                                                </h:panelGroup>
 
@@ -56,7 +66,7 @@
                                                        </div>
 
                                                        <div class="table-right">
-                                                               <p:inputText type="secret" styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
+                                                               <p:inputText type="secret" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
                                                        </div>
                                                </h:panelGroup>
 
 
                                        <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-                                       <div class="table-footer">
-                                               <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <p:commandButton styleClass="submit" type="submit" id="button_change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
-                                       </div>
+                                       <p:panelGrid columns="2" layout="grid">
+                                               <p:commandButton
+                                                       type="reset"
+                                                       value="#{msg.BUTTON_RESET_FORM}"
+                                                       />
+
+                                               <p:commandButton
+                                                       type="submit"
+                                                       value="#{msg.BUTTON_USER_CHANGE_PASSWORD}"
+                                                       action="#{userPasswordController.doChangePassword()}"
+                                                       />
+                                       </p:panelGrid>
                                </h:panelGroup>
                        </h:form>
                </ui:fragment>
index b5c1a72e6d543bf7907554dca43d8e157a482bf5..445cf89570e04ecc01bd68e4e7d99c8e9b2c11fd 100644 (file)
@@ -1,47 +1,67 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
-
-       <ui:define name="login_title">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
+
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA}" />
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserEditDataDisabled"
+                       message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}"
+                       />
 
-               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-               </ui:fragment>
+               <p:link
+                       outcome="user_change_password"
+                       value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                       rendered="#{userLoginController.ifUserMustChangePassword()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                </ui:fragment>
 
-               <h:panelGroup styleClass="table table-medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+               <h:panelGroup
+                       layout="block"
+                       rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+                       >
                        <div class="table-header">
                                <h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
                        </div>
 
-                       <h:form id="form_login_change_personal">
-                               <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
+                       <h:form>
+                               <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl">
+                                       <ui:param name="targetController" value="#{userLoginController}" />
+                               </ui:include>
 
                                <ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
                                <ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-                               <div class="table-footer">
-                                       <p:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                       <p:commandButton styleClass="submit" type="submit" id="button_change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
-                               </div>
+                               <p:panelGrid columns="2" layout="grid">
+                                       <p:commandButton
+                                               type="reset"
+                                               value="#{msg.BUTTON_RESET_FORM}"
+                                               />
+
+                                       <p:commandButton
+                                               value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}"
+                                               action="#{userActionController.doChangePersonalData()}"
+                                               />
+                               </p:panelGrid>
                        </h:form>
                </h:panelGroup>
        </ui:define>
index ab88c830476999c5e0bb8679e82128a6731cb3fe..95e19e5226422d7c0e90370928869a9afcdb3bc7 100644 (file)
@@ -1,26 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}" />
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <core:outputMessageBox
+                       panelGroupId="loginUserDataSaved"
+                       message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+                       rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+                       />
 
-               <widgets:outputMessageBox id="error-user-edit-data-disabled" message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+               <core:outputMessageBox
+                       panelGroupId="errorUserEditDataDisabled"
+                       message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}"
+                       />
 
-               <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" rendered="#{userLoginController.ifUserMustChangePassword()}" />
+               <p:link
+                       outcome="user_change_password"
+                       value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                       rendered="#{userLoginController.ifUserMustChangePassword()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
index 531068f43ee0119bca66a1052d0e22c561cbee5a..dd461a19f259cd9c93f9d6753027445f08267c86 100644 (file)
@@ -1,26 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl"
-                               xmlns="http://www.w3.org/1999/xhtml"
-                               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:p="http://primefaces.org/ui">
+<ui:composition
+       template="/WEB-INF/templates/login/user/user_base.tpl"
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:core="http://mxchange.org/jsf/core/widgets"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:p="http://primefaces.org/ui"
+       >
 
-       <ui:define name="login_title">
+       <ui:define name="document_login_title">
                <h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}" />
        </ui:define>
 
-       <ui:define name="content_header">
+       <ui:define name="login_content_header">
                <h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}" />
        </ui:define>
 
        <ui:define name="content">
-               <widgets:outputMessageBox id="login-user-data-saved" message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
+               <core:outputMessageBox
+                       panelGroupId="loginUserDataSaved"
+                       message="#{msg.LOGIN_MESSAGE_DATA_SAVED}"
+                       rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}"
+                       />
 
-               <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
-                       <p:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
-               </ui:fragment>
+               <p:link
+                       outcome="user_change_password"
+                       value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}"
+                       rendered="#{userLoginController.ifUserMustChangePassword()}"
+                       />
 
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />