]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Fri, 10 Apr 2020 04:05:27 +0000 (06:05 +0200)
committerRoland Häder <roland@mxchange.org>
Fri, 10 Apr 2020 04:09:06 +0000 (06:09 +0200)
- upgraded PrimeFaces to 8.0
- there is no more pm:x available in latest PrimeFaces, so ":master:foo:bar"
  doesn't work but "foo:bar" does
- also the language selector may work now?

Signed-off-by: Roland Häder <roland@mxchange.org>
15 files changed:
lib/primefaces/primefaces-6.2_LICENSE.txt [deleted file]
lib/primefaces/primefaces-8.0_LICENSE.txt [new file with mode: 0644]
web/WEB-INF/templates/admin/admin_footer.tpl
web/WEB-INF/templates/master.tpl
web/WEB-INF/templates/widgets/locale_change_widget.tpl
web/admin/basic_data/admin_basic_data_list.xhtml
web/admin/branch_office/admin_branch_office_list.xhtml
web/admin/contact/admin_contact_list.xhtml
web/admin/country/admin_country_list.xhtml
web/admin/department/admin_department_list.xhtml
web/admin/employee/admin_employee_list.xhtml
web/admin/headquarter/admin_headquarter_list.xhtml
web/admin/mobile_provider/admin_mobile_provider_list.xhtml
web/admin/opening_time/admin_opening_time_list.xhtml
web/admin/user/admin_user_list.xhtml

diff --git a/lib/primefaces/primefaces-6.2_LICENSE.txt b/lib/primefaces/primefaces-6.2_LICENSE.txt
deleted file mode 100644 (file)
index d645695..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/lib/primefaces/primefaces-8.0_LICENSE.txt b/lib/primefaces/primefaces-8.0_LICENSE.txt
new file mode 100644 (file)
index 0000000..d645695
--- /dev/null
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
index 13b195c02a20734e9673b4e6e514f8dc74d6d3fa..3ec61fd8ae51eb8acb44eb6b520b853538d9665b 100644 (file)
@@ -1,19 +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.ADMIN_LINK_FOOTER_TO_WEBPAGE}"
-                                       title="#{msg.ADMIN_LINK_FOOTER_TO_WEBPAGE_TITLE}"
-                                       /></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 0f8ebc589a758fe02a30ffa771829122a4b1fad6..9575f14648a9e518d3694892e5ecb39c2665ddab 100644 (file)
@@ -5,7 +5,6 @@
        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"
                </h:head>
 
                <h:body>
-                       <pm:page id="master">
-                               <h:panelGroup styleClass="ui-fluid" layout="block">
-                                       <pm:header>
-                                               <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="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>
 
-                                               <h:panelGroup styleClass="page-content-gap" layout="block">
-                                               </h:panelGroup>
-                                       </pm:header>
+                                               <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="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="page-content-gap" layout="block">
+                               </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" 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 page-footer" layout="block">
-                                                       <ui:insert name="footer">
-                                                               <h:outputText value="Default footer" />
+                                       <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="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 styleClass="ui-g-12 page-footer" layout="block">
+                                               <ui:insert name="footer">
+                                                       <h:outputText value="Default footer" />
+                                               </ui:insert>
                                        </h:panelGroup>
                                </h:panelGroup>
-                       </pm:page>
+
+                               <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 f02b18a261955789e99a50bd1e58e3b2b097a8b5..f9ca568d6c2847c519d80dace9a7b222ef929f2b 100644 (file)
                <p:outputPanel styleClass="ui-g">
                        <p:outputPanel styleClass="ui-g-12 ui-md-6">
                                <p:selectOneMenu value="#{localizationController.localeCode}">
-                                       <p:ajax update="master" />
-
-                                       <f:selectItem itemLabel="#{msg.SELECT_LANGUAGE}" noSelectionOption="true" itemDisabled="true" />
+                                       <f:selectItem
+                                               itemLabel="#{msg.SELECT_LANGUAGE}"
+                                               noSelectionOption="true"
+                                               itemDisabled="true"
+                                               />
 
                                        <f:selectItems
                                                value="#{localizationController.supportedLocales}"
@@ -30,6 +32,7 @@
                                        actionListener="#{localizationController.doChangeLocale()}"
                                        value="#{msg.BUTTON_CHANGE_LOCALE}"
                                        title="#{msg.BUTTON_CHANGE_LOCALE_TITLE}"
+                                       update="@all"
                                        />
                        </p:outputPanel>
                </p:outputPanel>
index dc05e52a34a0531841ec8c12b3aed1a78499873a..7eca15cf72004ea9f1abd3bb149942c03a713334 100644 (file)
@@ -84,7 +84,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-basic-data:basic-data-details"
+                                       update="form-list-basic-data:basic-data-details"
                                        oncomplete="PF('basicDataDialog').show()"
                                        />
 
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}"
                                                        action="#{adminBasicCompanyDataController.addBusinessBasicData()}"
-                                                       update=":master:form-list-basic-data:basicDataList"
+                                                       update="form-list-basic-data:basicDataList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
index bbcb089350411b84b77001e536664a6750cbc649..c3a94b05d3f9e1c61b5bb51c578aac1be8399e8c 100644 (file)
@@ -85,7 +85,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-branch-offices:branch-office-details"
+                                       update="form-list-branch-offices:branch-office-details"
                                        oncomplete="PF('branchOfficeDialog').show()"
                                        />
 
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BASIC_DATA}"
                                                        action="#{adminBranchOfficeController.addBranchOffice()}"
-                                                       update=":master:form-list-branch-offices:branchOfficeList"
+                                                       update="form-list-branch-offices:branchOfficeList"
                                                        oncomplete="PF('branchOfficeList').filter()"
                                                        />
                                        </p:panelGrid>
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_BRANCH_OFFICE_OPENING_TIME}"
                                                        action="#{adminBranchOfficeController.addOpeningTime()}"
-                                                       update=":master:form-list-branch-opening-time:branchOpeningTimeList"
+                                                       update="form-list-branch-opening-time:branchOpeningTimeList"
                                                        oncomplete=""
                                                        />
                                        </p:panelGrid>
index f7c2d4ed73ee44b8e3cf7518d6e92d83d3d67350..83bfb78fb29a346b9587c50bfd1d802e5a466d09 100644 (file)
@@ -85,7 +85,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-contacts:contact-details"
+                                       update="form-list-contacts:contact-details"
                                        oncomplete="PF('contactDialog').show()"
                                        />
 
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_CONTACT}"
                                                        action="#{adminContactController.addContact()}"
-                                                       update=":master:form-list-contacts:contactList"
+                                                       update="form-list-contacts:contactList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
index eb34ffc2ffbd4cbfddbbd8beafc6b0c29f341f5f..8f1e91cca9e4370e3215455e91f27fe210582553 100644 (file)
@@ -84,7 +84,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-countries:country-details"
+                                       update="form-list-countries:country-details"
                                        oncomplete="PF('countryDialog').show()"
                                        />
 
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}"
                                                action="#{adminCountryController.addCountry()}"
-                                               update=":master:form-list-countries:countryList"
+                                               update="form-list-countries:countryList"
                                                />
                                </p:panelGrid>
                        </h:panelGroup>
index 70dcbde4e40d59a5e2dbe7d9ea02ef18f212c517..f149368ee4af0b6887ef322230d0c55f0430d49e 100644 (file)
@@ -84,7 +84,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-departments:department-details"
+                                       update="form-list-departments:department-details"
                                        oncomplete="PF('departmentDialog').show()"
                                        />
 
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_DEPARTMENT_DATA}"
                                                        action="#{adminDepartmentController.addDepartment()}"
-                                                       update=":master:form-list-departments:departmentList"
+                                                       update="form-list-departments:departmentList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
index c3aef03fb14ba20a90753f14ce29d1f53c0551c9..79f47baca677554cd422d587204ab1b4fc7c55e8 100644 (file)
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_EMPLOYEE}"
                                                        action="#{adminEmployeeController.addEmployee()}"
-                                                       update=":master:form-list-company-employees:employeeList"
+                                                       update="form-list-company-employees:employeeList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
index 32d08e856d333e0d6c78aaa9f3a88650110c1a32..a31f77d299fe4e6dc298a63bad0d8753de86ad04 100644 (file)
@@ -84,7 +84,7 @@
 
                                <p:ajax
                                        event="rowSelect"
-                                       update=":master:form-list-headquarters:headquarter-details"
+                                       update="form-list-headquarters:headquarter-details"
                                        oncomplete="PF('headquarterDialog').show()"
                                        />
 
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER}"
                                                        action="#{adminHeadquarterController.addHeadquarter()}"
-                                                       update=":master:form-list-headquarters:headquarterList"
+                                                       update="form-list-headquarters:headquarterList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME}"
                                                        action="#{adminHeadquarterController.addOpeningTime()}"
-                                                       update=":master:form-list-headquarter-opening-time:headquarterOpeningTimeList"
+                                                       update="form-list-headquarter-opening-time:headquarterOpeningTimeList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
index f56d61dc68132dd5456e36a095cdcf0b1c8080ee..8487edd6ef780a4060f3083a649ccd00a807283a 100644 (file)
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}"
                                                action="#{adminMobileProviderController.addMobileProvider()}"
-                                               update=":master:form-list-mobile-provider:mobileProviderList"
+                                               update="form-list-mobile-provider:mobileProviderList"
                                                />
                                </p:panelGrid>
                        </h:panelGroup>
index 2e88e35ced72125af3b6ac0470bb208b08b93505..21f9d6d19b0fc3ae6169b99a5990a5878e25f8b7 100644 (file)
                                                        type="submit"
                                                        value="#{msg.BUTTON_ADMIN_ADD_OPENING_TIME}"
                                                        action="#{adminOpeningTimeController.addOpeningTime()}"
-                                                       update=":master:form-list-opening-time:openingTimeList"
+                                                       update="form-list-opening-time:openingTimeList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>
index f99488b072ecd00cce0b679d83093f0dd110b326..71a397255bd87e4af188426d534ddb66a72f471c 100644 (file)
                                                        id="submit_add_user"
                                                        value="#{msg.BUTTON_ADMIN_ADD_USER}"
                                                        action="#{adminUserController.addUser()}"
-                                                       update=":master:form-list-users:userList"
+                                                       update="form-list-users:userList"
                                                        />
                                        </p:panelGrid>
                                </f:facet>