]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 7 Jul 2018 16:24:43 +0000 (18:24 +0200)
committerRoland Häder <roland@mxchange.org>
Mon, 22 Jul 2019 00:23:03 +0000 (02:23 +0200)
- restructed admin menu towards a sidebar and slide menu which is
  finger-friendlier and consumes lesser space
- also this lefts open a top panel for later enhancements
- renamed base.tpl -> master.tpl
- rewrote "mini links" (with custom CSS) to PrimeFaces' p:menuButton and
  p:menuitem, also moved them to proper "dropdown" folder

Signed-off-by: Roland Häder <roland@mxchange.org>
35 files changed:
src/java/org/mxchange/localization/generic_de_DE.properties
src/java/org/mxchange/localization/generic_en_US.properties
web/WEB-INF/links.jsf.taglib.xml
web/WEB-INF/resources/tags/admin/dropdown/basic_data/admin_basic_data_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/branch_office/admin_branch_office_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/country/admin_country_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/department/admin_department_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/employee/admin_employee_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/fax/admin_fax_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/headquarter/admin_headquarter_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/landline/admin_landline_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/mobile/admin_mobile_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/mobile_provider/admin_mobile_provider_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/opening_time/admin_opening_time_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/dropdown/user/admin_user_links.tpl [new file with mode: 0644]
web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl [deleted file]
web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl [deleted file]
web/WEB-INF/templates/admin/admin_base.tpl
web/WEB-INF/templates/admin/admin_menu.tpl
web/WEB-INF/templates/base.tpl [deleted file]
web/WEB-INF/templates/guest/guest_base.tpl
web/WEB-INF/templates/login/user/user_base.tpl
web/WEB-INF/templates/master.tpl [new file with mode: 0644]

index 98abd4d68541c08effa3d6b1eaf78b1c0a43c062..e38106e26f6f71b1a4e24ffdb15916f8172734af 100644 (file)
@@ -1225,3 +1225,7 @@ COUNTRY_OF_BRANCH_OFFICE_TITLE=Land der Filiale
 #@TODO Please fix German umlauts!
 ADMIN_OPENING_TIMES_TAB_TITLE=Oeffnungszeiten
 TAX_NUMBER_HEADER=Steuernummer:
+EMPLOYEE_NUMBER_HEADER=Mitarbeiternummer:
+#@TODO Please fix German umlauts!
+BACK=Zurueck
+OPTIONS=Optionen
index ababf0f1257537b5b0fdd5682d3a5641a8069879..960c9935eff4a1a7b2d2fcd7213827ba9d3d4f78 100644 (file)
@@ -1117,3 +1117,6 @@ COUNTRY_HEADER=Country:
 COUNTRY_OF_BRANCH_OFFICE_TITLE=Country of branch office
 ADMIN_OPENING_TIMES_TAB_TITLE=Opening times
 TAX_NUMBER_HEADER=Tax number:
+EMPLOYEE_NUMBER_HEADER=Employee number:
+BACK=Back
+OPTIONS=Options
index 37501505a9397c2c595a8d4afb7aeeb567cc3357..3999a3feffe7075b23d0d0095ca04b0b35051b62 100644 (file)
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputFaxNumberAdminMiniLinks</tag-name>
                <description>This tag renders a full h:panelGroup for administrative "mini-links" for fax data.</description>
-               <source>resources/tags/admin/links/mini/fax/admin_fax_links.tpl</source>
+               <source>resources/tags/admin/dropdown/fax/admin_fax_links.tpl</source>
                <attribute>
                        <name>faxNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
@@ -71,7 +71,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputLandLineNumberAdminMiniLinks</tag-name>
                <description>This tag renders a full h:panelGroup for administrative "mini-links" for land-line data.</description>
-               <source>resources/tags/admin/links/mini/landline/admin_landline_links.tpl</source>
+               <source>resources/tags/admin/dropdown/landline/admin_landline_links.tpl</source>
                <attribute>
                        <name>landLineNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
@@ -100,7 +100,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputMobileNumberAdminMiniLinks</tag-name>
                <description>This tag renders a full h:panelGroup for administrative "mini-links" for mobile data.</description>
-               <source>resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl</source>
+               <source>resources/tags/admin/dropdown/mobile/admin_mobile_links.tpl</source>
                <attribute>
                        <name>mobileNumber</name>
                        <description>The mobile number instance that provides the data for this tag.</description>
@@ -129,7 +129,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputMobileProviderAdminMiniLinks</tag-name>
                <description>This tag renders a full h:panelGroup for administrative "mini-links" for mobile provider data.</description>
-               <source>resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl</source>
+               <source>resources/tags/admin/dropdown/mobile_provider/admin_mobile_provider_links.tpl</source>
                <attribute>
                        <name>mobileProvider</name>
                        <description>The mobile provider instance that provides the data for this tag.</description>
@@ -152,7 +152,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputBasicDataAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given basic data instance.</description>
-               <source>resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl</source>
+               <source>resources/tags/admin/dropdown/basic_data/admin_basic_data_links.tpl</source>
                <attribute>
                        <name>basicData</name>
                        <description>The basic company data for this tag.</description>
@@ -175,7 +175,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputHeadquarterAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given headquarter instance.</description>
-               <source>resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl</source>
+               <source>resources/tags/admin/dropdown/headquarter/admin_headquarter_links.tpl</source>
                <attribute>
                        <name>headquarter</name>
                        <description>The headquarter instance that provides the data for this tag.</description>
@@ -198,7 +198,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputBranchOfficeAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given branchOffice instance.</description>
-               <source>resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl</source>
+               <source>resources/tags/admin/dropdown/branch_office/admin_branch_office_links.tpl</source>
                <attribute>
                        <name>branchOffice</name>
                        <description>The branch office instance that provides the data for this tag.</description>
@@ -221,7 +221,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputDepartmentAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given department instance.</description>
-               <source>resources/tags/admin/links/mini/department/admin_department_links.tpl</source>
+               <source>resources/tags/admin/dropdown/department/admin_department_links.tpl</source>
                <attribute>
                        <name>department</name>
                        <description>The department instance that provides the data for this tag.</description>
@@ -244,7 +244,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputEmployeeAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given employee instance.</description>
-               <source>resources/tags/admin/links/mini/employee/admin_employee_links.tpl</source>
+               <source>resources/tags/admin/dropdown/employee/admin_employee_links.tpl</source>
                <attribute>
                        <name>employee</name>
                        <description>The employee instance that provides the data for this tag.</description>
@@ -267,7 +267,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputOpeningTimeAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given opening time instance.</description>
-               <source>resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl</source>
+               <source>resources/tags/admin/dropdown/opening_time/admin_opening_time_links.tpl</source>
                <attribute>
                        <name>openingTime</name>
                        <description>The opening time instance that provides the data for this tag.</description>
@@ -290,7 +290,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputContactAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given contact instance.</description>
-               <source>resources/tags/admin/links/mini/contact/admin_contact_links.tpl</source>
+               <source>resources/tags/admin/dropdown/contact/admin_contact_links.tpl</source>
                <attribute>
                        <name>contact</name>
                        <description>The contact instance that provides the data for this tag.</description>
@@ -313,7 +313,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputCountryAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given country instance.</description>
-               <source>resources/tags/admin/links/mini/country/admin_country_links.tpl</source>
+               <source>resources/tags/admin/dropdown/country/admin_country_links.tpl</source>
                <attribute>
                        <name>country</name>
                        <description>The country instance that provides the data for this tag.</description>
@@ -336,7 +336,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
        <tag>
                <tag-name>outputUserAdminMiniLinks</tag-name>
                <description>This tag renders administrative "mini-links" for given user instance.</description>
-               <source>resources/tags/admin/links/mini/user/admin_user_links.tpl</source>
+               <source>resources/tags/admin/dropdown/user/admin_user_links.tpl</source>
                <attribute>
                        <name>user</name>
                        <description>The user instance that provides the data for this tag.</description>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/basic_data/admin_basic_data_links.tpl
new file mode 100644 (file)
index 0000000..8664828
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_basic_data" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_basic_data" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_DATA_TITLE}">
+                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_basic_data">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_DATA_TITLE}" />
+                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/branch_office/admin_branch_office_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/branch_office/admin_branch_office_links.tpl
new file mode 100644 (file)
index 0000000..5967f14
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_branch_office" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="branchId" value="#{branchOffice.branchId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_branch_office" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BRANCH_OFFICE_TITLE}">
+                       <f:param name="branchId" value="#{branchOffice.branchId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_branch_office">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BRANCH_OFFICE_TITLE}" />
+                       <f:param name="branchId" value="#{branchOffice.branchId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl
new file mode 100644 (file)
index 0000000..3000885
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <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>
+
+               <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>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/country/admin_country_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/country/admin_country_links.tpl
new file mode 100644 (file)
index 0000000..869fb57
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_country" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_COUNTRY_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <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>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/department/admin_department_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/department/admin_department_links.tpl
new file mode 100644 (file)
index 0000000..ccc75cf
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_department" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="departmentId" value="#{department.departmentId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_department" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_DEPARTMENT_TITLE}">
+                       <f:param name="departmentId" value="#{department.departmentId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_department">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_DEPARTMENT_TITLE}" />
+                       <f:param name="departmentId" value="#{department.departmentId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/employee/admin_employee_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/employee/admin_employee_links.tpl
new file mode 100644 (file)
index 0000000..fe11cac
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_employee" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="employeeId" value="#{employee.employeeId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_employee" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_EMPLOYEE_TITLE}">
+                       <f:param name="employeeId" value="#{employee.employeeId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_employee">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_EMPLOYEE_TITLE}" />
+                       <f:param name="employeeId" value="#{employee.employeeId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/fax/admin_fax_links.tpl
new file mode 100644 (file)
index 0000000..ab72367
--- /dev/null
@@ -0,0 +1,30 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}">
+                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_unlink_contact_fax" rendered="#{not empty contact}">
+                       <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="#{faxNumber.phoneId}" />
+                       <f:param name="contactId" value="#{contact.contactId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_fax">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}" />
+                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/headquarter/admin_headquarter_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/headquarter/admin_headquarter_links.tpl
new file mode 100644 (file)
index 0000000..3809f0c
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_headquarter" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_headquarter" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_HEADQUARTER_TITLE}">
+                       <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_headquarter">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_HEADQUARTER_TITLE}" />
+                       <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/landline/admin_landline_links.tpl
new file mode 100644 (file)
index 0000000..7743713
--- /dev/null
@@ -0,0 +1,30 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE}">
+                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_unlink_contact_landline" rendered="#{not empty contact}">
+                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
+                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                       <f:param name="contactId" value="#{contact.contactId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_landline">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_LAND_LINE_NUMBER_TITLE}" />
+                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/mobile/admin_mobile_links.tpl
new file mode 100644 (file)
index 0000000..160ef67
--- /dev/null
@@ -0,0 +1,30 @@
+<?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"
+       >
+
+       <p:menuButton rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
+                       <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_unlink_contact_mobile" rendered="#{not empty contact}">
+                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
+                       <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+                       <f:param name="contactId" value="#{contact.contactId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_mobile">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
+                       <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/mobile_provider/admin_mobile_provider_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/mobile_provider/admin_mobile_provider_links.tpl
new file mode 100644 (file)
index 0000000..eba65af
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_mobile_provider" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_mobile_provider" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_PROVIDER_TITLE}">
+                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_mobile_provider">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_PROVIDER_TITLE}" />
+                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/opening_time/admin_opening_time_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/opening_time/admin_opening_time_links.tpl
new file mode 100644 (file)
index 0000000..9a8a733
--- /dev/null
@@ -0,0 +1,24 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_opening_time" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_OPENING_TIME_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="openingId" value="#{openingTime.openingId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_opening_time" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_OPENING_TIME_TITLE}">
+                       <f:param name="openingId" value="#{openingTime.openingId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_opening_time">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_OPENING_TIME_TITLE}" />
+                       <f:param name="openingId" value="#{openingTime.openingId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/dropdown/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/user/admin_user_links.tpl
new file mode 100644 (file)
index 0000000..6e272b2
--- /dev/null
@@ -0,0 +1,37 @@
+<?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"
+       >
+
+       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
+               <p:menuitem outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                       <f:param name="userId" value="#{user.userId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+                       <f:param name="userId" value="#{user.userId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_CONFIRMATION_SHORT}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
+                       <f:param name="userId" value="#{user.userId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_SHORT}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
+                       <f:param name="userId" value="#{user.userId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_lock_user">
+                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_SHORT}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
+                       <f:param name="userId" value="#{user.userId}" />
+               </p:menuitem>
+
+               <p:menuitem outcome="admin_delete_user">
+                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
+                       <f:param name="userId" value="#{user.userId}" />
+               </p:menuitem>
+       </p:menuButton>
+</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl
deleted file mode 100644 (file)
index 0dc520f..0000000
+++ /dev/null
@@ -1,34 +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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_basic_data" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BASIC_DATA_TITLE}">
-                                               <f:param name="basicDataId" value="#{basicData.basicDataId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_basic_data" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BASIC_DATA_TITLE}">
-                                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_basic_data">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BASIC_DATA_TITLE}" />
-                                       <f:param name="basicDataId" value="#{basicData.basicDataId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl
deleted file mode 100644 (file)
index a852220..0000000
+++ /dev/null
@@ -1,34 +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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_branch_office" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_BRANCH_OFFICE_TITLE}">
-                                               <f:param name="branchId" value="#{branchOffice.branchId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_branch_office" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_BRANCH_OFFICE_TITLE}">
-                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_branch_office">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_BRANCH_OFFICE_TITLE}" />
-                                       <f:param name="branchId" value="#{branchOffice.branchId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl
deleted file mode 100644 (file)
index 530852a..0000000
+++ /dev/null
@@ -1,34 +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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
-                                               <f:param name="contactId" value="#{contact.contactId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link 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:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link 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:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl
deleted file mode 100644 (file)
index ba23229..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link 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:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link 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:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link 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:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl
deleted file mode 100644 (file)
index 425dcc8..0000000
+++ /dev/null
@@ -1,34 +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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_department" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_DEPARTMENT_TITLE}">
-                                               <f:param name="departmentId" value="#{department.departmentId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_department" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_DEPARTMENT_TITLE}">
-                                       <f:param name="departmentId" value="#{department.departmentId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_department">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_DEPARTMENT_TITLE}" />
-                                       <f:param name="departmentId" value="#{department.departmentId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl
deleted file mode 100644 (file)
index 40f4e74..0000000
+++ /dev/null
@@ -1,34 +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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_employee" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_EMPLOYEE_TITLE}">
-                                               <f:param name="employeeId" value="#{employee.employeeId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_employee" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_EMPLOYEE_TITLE}">
-                                       <f:param name="employeeId" value="#{employee.employeeId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_employee">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_EMPLOYEE_TITLE}" />
-                                       <f:param name="employeeId" value="#{employee.employeeId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl
deleted file mode 100644 (file)
index 119a1fa..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}">
-                                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}">
-                                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
-                               </p:link>
-                       </li>
-
-                       <ui:fragment rendered="#{not empty contact}">
-                               <li class="navlink-mini">
-                                       <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="#{faxNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{contact.contactId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_fax">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}" />
-                                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl
deleted file mode 100644 (file)
index 3d8b895..0000000
+++ /dev/null
@@ -1,34 +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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_headquarter" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_HEADQUARTER_TITLE}">
-                                               <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_headquarter" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_HEADQUARTER_TITLE}">
-                                       <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_headquarter">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_HEADQUARTER_TITLE}" />
-                                       <f:param name="headquarterId" value="#{headquarter.headquarterId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl
deleted file mode 100644 (file)
index 3f0ad22..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LANDLINE_NUMBER_TITLE}">
-                                               <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_LANDLINE_NUMBER_TITLE}">
-                                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-                               </p:link>
-                       </li>
-
-                       <ui:fragment rendered="#{not empty contact}">
-                               <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="#{landLineNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{contact.contactId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_landline">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_LANDLINE_NUMBER_TITLE}" />
-                                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl
deleted file mode 100644 (file)
index 79af6f0..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}">
-                                               <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
-                                       <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-                               </p:link>
-                       </li>
-
-                       <ui:fragment rendered="#{not empty contact}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_unlink_contact_mobile">
-                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
-                                               <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-                                               <f:param name="contactId" value="#{contact.contactId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_mobile">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
-                                       <f:param name="phoneId" value="#{mobileNumber.phoneId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl
deleted file mode 100644 (file)
index fcce4e8..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_mobile_provider" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_PROVIDER_TITLE}">
-                                               <f:param name="providerId" value="#{mobileProvider.providerId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_mobile_provider" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_PROVIDER_TITLE}">
-                                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_mobile_provider">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_PROVIDER_TITLE}" />
-                                       <f:param name="providerId" value="#{mobileProvider.providerId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl
deleted file mode 100644 (file)
index 25a987c..0000000
+++ /dev/null
@@ -1,34 +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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_opening_time" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_OPENING_TIME_TITLE}">
-                                               <f:param name="openingId" value="#{openingTime.openingId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_opening_time" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_OPENING_TIME_TITLE}">
-                                       <f:param name="openingId" value="#{openingTime.openingId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_opening_time">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_OPENING_TIME_TITLE}" />
-                                       <f:param name="openingId" value="#{openingTime.openingId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl
deleted file mode 100644 (file)
index 1641981..0000000
+++ /dev/null
@@ -1,49 +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"
-       >
-
-       <ui:fragment rendered="#{empty rendered or rendered}">
-               <ul class="navbar-mini">
-                       <ui:fragment rendered="#{empty renderShowLink or renderShowLink}">
-                               <li class="navlink-mini">
-                                       <p:link outcome="admin_show_user" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}">
-                                               <f:param name="userId" value="#{user.userId}" />
-                                       </p:link>
-                               </li>
-                       </ui:fragment>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
-                                       <f:param name="userId" value="#{user.userId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_CONFIRMATION_SHORT}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{user.userAccountStatus == 'UNCONFIRMED'}">
-                                       <f:param name="userId" value="#{user.userId}" />
-                               </p:link>
-
-                               <p:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_SHORT}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'LOCKED'}">
-                                       <f:param name="userId" value="#{user.userId}" />
-                               </p:link>
-
-                               <p:link outcome="admin_lock_user">
-                                       <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_LOCK_SHORT}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{user.userAccountStatus == 'CONFIRMED'}" />
-                                       <f:param name="userId" value="#{user.userId}" />
-                               </p:link>
-                       </li>
-
-                       <li class="navlink-mini">
-                               <p:link outcome="admin_delete_user">
-                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}" />
-                                       <f:param name="userId" value="#{user.userId}" />
-                               </p:link>
-                       </li>
-               </ul>
-       </ui:fragment>
-</ui:composition>
index ebdd14ecd8816afb1bd9a6ef3e2bb3b3e2e27766..64e9523e1751b5b9c8b9f32baeb77e9b073f9f14 100644 (file)
@@ -3,7 +3,7 @@
 @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">
index 9310b72eaab039ec2064415b4e539c8d89171c0d..b6a8bdd9e88f7f37c29fb3df9288255720fe7383 100644 (file)
@@ -7,52 +7,56 @@
        >
 
        <h:form>
-               <p:menubar id="menu-bar">
-                       <p:submenu label="#{msg.ADMIN_MENU_MAIN_TITLE}">
-                               <p:menuitem title="#{msg.ADMIN_LINK_INDEX_TITLE}" outcome="admin_index" value="#{msg.ADMIN_LINK_INDEX}" />
-                       </p:submenu>
-
-                       <ui:include src="/WEB-INF/templates/admin/menu/project.tpl" />
-
-                       <p:submenu label="#{msg.ADMIN_MENU_USER_TITLE}">
-                               <p:menuitem title="#{msg.ADMIN_LINK_LIST_USER_TITLE}" outcome="admin_list_user" 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.ADMIN_LINK_LIST_CONTACT_TITLE}" outcome="admin_list_contact" value="#{msg.ADMIN_LINK_LIST_CONTACT}" />
-                               <p:menuitem title="#{msg.ADMIN_LINK_EXPORT_CONTACT_TITLE}" outcome="admin_export_contact" value="#{msg.ADMIN_LINK_EXPORT_CONTACT}" />
-                       </p:submenu>
-
-                       <p:submenu label="#{msg.ADMIN_MENU_BUSINESS_CONTACT_TITLE}" rendered="#{featureController.isFeatureEnabled('basic_data')}">
-                               <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_headquarter" value="#{msg.ADMIN_LINK_LIST_HEADQUARTER}" />
-                               <p:menuitem title="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_office" value="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES}" />
-                               <p:menuitem title="#{msg.ADMIN_LINK_LIST_DEPARTMENTS_TITLE}" outcome="admin_list_department" value="#{msg.ADMIN_LINK_LIST_DEPARTMENTS}" />
-                               <p:menuitem title="#{msg.ADMIN_LINK_LIST_OPENING_TIMES_TITLE}" outcome="admin_list_opening_time" value="#{msg.ADMIN_LINK_LIST_OPENING_TIMES}" />
-                               <p:menuitem title="#{msg.ADMIN_LINK_LIST_EMPLOYEES_TITLE}" outcome="admin_list_company_employee" 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.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS_TITLE}" outcome="admin_list_landline" value="#{msg.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS}" />
-                               <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS}" />
-                               <p:menuitem title="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS}" />
-                       </p:submenu>
-
-                       <p:submenu label="#{msg.ADMIN_MENU_COUNTRY_TITLE}">
-                               <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.ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER}" />
-                       </p:submenu>
-
-                       <p:submenu label="#{msg.ADMIN_MENU_LOGOUT_TITLE}" style="float: right">
-                               <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:menubar>
-
-               <p:sticky target="menu-bar" />
+               <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.ADMIN_LINK_INDEX_TITLE}" outcome="admin_index" value="#{msg.ADMIN_LINK_INDEX}" />
+                               </p:submenu>
+
+                               <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_user" 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}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_CONTACT_TITLE}" outcome="admin_list_contact" value="#{msg.ADMIN_LINK_LIST_CONTACT}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_EXPORT_CONTACT_TITLE}" outcome="admin_export_contact" value="#{msg.ADMIN_LINK_EXPORT_CONTACT}" />
+                               </p:submenu>
+
+                               <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_headquarter" value="#{msg.ADMIN_LINK_LIST_HEADQUARTER}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES_TITLE}" outcome="admin_list_branch_office" value="#{msg.ADMIN_LINK_LIST_BRANCH_OFFICES}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_DEPARTMENTS_TITLE}" outcome="admin_list_department" value="#{msg.ADMIN_LINK_LIST_DEPARTMENTS}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_OPENING_TIMES_TITLE}" outcome="admin_list_opening_time" value="#{msg.ADMIN_LINK_LIST_OPENING_TIMES}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_EMPLOYEES_TITLE}" outcome="admin_list_company_employee" value="#{msg.ADMIN_LINK_LIST_EMPLOYEES}" rendered="#{featureController.isFeatureEnabled('company_employee')}" />
+                               </p:submenu>
+
+                               <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_landline" value="#{msg.ADMIN_LINK_LIST_LAND_LINE_PHONE_NUMBERS}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS_TITLE}" outcome="admin_list_mobile" value="#{msg.ADMIN_LINK_LIST_MOBILE_PHONE_NUMBERS}" />
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.ADMIN_LINK_LIST_FAX_PHONE_NUMBERS}" />
+                               </p:submenu>
+
+                               <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}" expanded="false">
+                                       <p:menuitem title="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.ADMIN_LINK_LIST_MOBILE_PROVIDER}" />
+                               </p:submenu>
+
+                               <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:slideMenu>
+
+                       <p:commandButton oncomplete="PF('menuSidebar').hide()" value="Hide!" process="@form" />
+               </p:sidebar>
+
+               <p:commandButton oncomplete="PF('menuSidebar').show()" value="Show!" process="@form" />
        </h:form>
 </ui:composition>
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
deleted file mode 100644 (file)
index a9da0c5..0000000
+++ /dev/null
@@ -1,122 +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.generic" />
-                       <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>
-                       <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="page-content-gap" layout="block">
-                                               </h:panelGroup>
-                                       </pm:header>
-
-                                       <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>
-                       </pm:page>
-               </h:body>
-       </html>
-</ui:composition>
index a16aa52579e3df8e9751278577165125e514f573..93d35583189ebc0ece8174c31ced1612f462df35 100644 (file)
@@ -1,6 +1,6 @@
 <?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">
index 8950ed2dc223e5ce23576674337e96f29b3dddb9..f82019a44ecb05a06a612eb15dbe34ac7abfce28 100644 (file)
@@ -1,6 +1,6 @@
 <?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:core="http://mxchange.org/jsf/core/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
diff --git a/web/WEB-INF/templates/master.tpl b/web/WEB-INF/templates/master.tpl
new file mode 100644 (file)
index 0000000..a9da0c5
--- /dev/null
@@ -0,0 +1,122 @@
+<?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.generic" />
+                       <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>
+                       <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="page-content-gap" layout="block">
+                                               </h:panelGroup>
+                                       </pm:header>
+
+                                       <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>
+                       </pm:page>
+               </h:body>
+       </html>
+</ui:composition>