From af2cb4a0f6ff723bd508791aa182cb7f692557e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 7 Jul 2018 18:24:43 +0200 Subject: [PATCH] Please cherry-pick: - 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/generic_de_DE.properties | 3 + .../localization/generic_en_US.properties | 2 + web/WEB-INF/links.jsf.taglib.xml | 26 ++--- .../basic_data/admin_basic_data_links.tpl | 24 +++++ .../admin_branch_office_links.tpl | 24 +++++ .../dropdown/contact/admin_contact_links.tpl | 24 +++++ .../dropdown/country/admin_country_links.tpl | 24 +++++ .../department/admin_department_links.tpl | 24 +++++ .../employee/admin_employee_links.tpl | 24 +++++ .../admin/dropdown/fax/admin_fax_links.tpl | 30 ++++++ .../headquarter/admin_headquarter_links.tpl | 24 +++++ .../landline/admin_landline_links.tpl | 30 ++++++ .../dropdown/mobile/admin_mobile_links.tpl | 30 ++++++ .../admin_mobile_provider_links.tpl | 24 +++++ .../opening_time/admin_opening_time_links.tpl | 24 +++++ .../admin/dropdown/user/admin_user_links.tpl | 37 +++++++ .../basic_data/admin_basic_data_links.tpl | 34 ------- .../admin_branch_office_links.tpl | 34 ------- .../mini/contact/admin_contact_links.tpl | 34 ------- .../mini/country/admin_country_links.tpl | 35 ------- .../department/admin_department_links.tpl | 34 ------- .../mini/employee/admin_employee_links.tpl | 34 ------- .../admin/links/mini/fax/admin_fax_links.tpl | 45 --------- .../headquarter/admin_headquarter_links.tpl | 34 ------- .../mini/landline/admin_landline_links.tpl | 45 --------- .../links/mini/mobile/admin_mobile_links.tpl | 45 --------- .../admin_mobile_provider_links.tpl | 35 ------- .../opening_time/admin_opening_time_links.tpl | 34 ------- .../links/mini/user/admin_user_links.tpl | 49 ---------- web/WEB-INF/templates/admin/admin_base.tpl | 2 +- web/WEB-INF/templates/admin/admin_menu.tpl | 98 ++++++++++--------- web/WEB-INF/templates/guest/guest_base.tpl | 2 +- .../templates/login/user/user_base.tpl | 2 +- .../templates/{base.tpl => master.tpl} | 0 34 files changed, 415 insertions(+), 555 deletions(-) create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/basic_data/admin_basic_data_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/branch_office/admin_branch_office_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/country/admin_country_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/department/admin_department_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/employee/admin_employee_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/fax/admin_fax_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/headquarter/admin_headquarter_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/landline/admin_landline_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/mobile/admin_mobile_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/mobile_provider/admin_mobile_provider_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/opening_time/admin_opening_time_links.tpl create mode 100644 web/WEB-INF/resources/tags/admin/dropdown/user/admin_user_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl delete mode 100644 web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl rename web/WEB-INF/templates/{base.tpl => master.tpl} (100%) diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index 3079d9a1..287389e9 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -1219,3 +1219,6 @@ COUNTRY_OF_BRANCH_OFFICE_TITLE=Land der Filiale ADMIN_OPENING_TIMES_TAB_TITLE=Oeffnungszeiten TAX_NUMBER_HEADER=Steuernummer: EMPLOYEE_NUMBER_HEADER=Mitarbeiternummer: +#@TODO Please fix German umlauts! +BACK=Zurueck +OPTIONS=Optionen diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index 3f5af7e7..d3ce8c8a 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -1105,3 +1105,5 @@ 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 diff --git a/web/WEB-INF/links.jsf.taglib.xml b/web/WEB-INF/links.jsf.taglib.xml index 37501505..3999a3fe 100644 --- a/web/WEB-INF/links.jsf.taglib.xml +++ b/web/WEB-INF/links.jsf.taglib.xml @@ -42,7 +42,7 @@ along with this program. If not, see . outputFaxNumberAdminMiniLinks This tag renders a full h:panelGroup for administrative "mini-links" for fax data. - resources/tags/admin/links/mini/fax/admin_fax_links.tpl + resources/tags/admin/dropdown/fax/admin_fax_links.tpl faxNumber The fax instance that provides the data for this tag. @@ -71,7 +71,7 @@ along with this program. If not, see . outputLandLineNumberAdminMiniLinks This tag renders a full h:panelGroup for administrative "mini-links" for land-line data. - resources/tags/admin/links/mini/landline/admin_landline_links.tpl + resources/tags/admin/dropdown/landline/admin_landline_links.tpl landLineNumber The fax instance that provides the data for this tag. @@ -100,7 +100,7 @@ along with this program. If not, see . outputMobileNumberAdminMiniLinks This tag renders a full h:panelGroup for administrative "mini-links" for mobile data. - resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl + resources/tags/admin/dropdown/mobile/admin_mobile_links.tpl mobileNumber The mobile number instance that provides the data for this tag. @@ -129,7 +129,7 @@ along with this program. If not, see . outputMobileProviderAdminMiniLinks This tag renders a full h:panelGroup for administrative "mini-links" for mobile provider data. - resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl + resources/tags/admin/dropdown/mobile_provider/admin_mobile_provider_links.tpl mobileProvider The mobile provider instance that provides the data for this tag. @@ -152,7 +152,7 @@ along with this program. If not, see . outputBasicDataAdminMiniLinks This tag renders administrative "mini-links" for given basic data instance. - resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl + resources/tags/admin/dropdown/basic_data/admin_basic_data_links.tpl basicData The basic company data for this tag. @@ -175,7 +175,7 @@ along with this program. If not, see . outputHeadquarterAdminMiniLinks This tag renders administrative "mini-links" for given headquarter instance. - resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl + resources/tags/admin/dropdown/headquarter/admin_headquarter_links.tpl headquarter The headquarter instance that provides the data for this tag. @@ -198,7 +198,7 @@ along with this program. If not, see . outputBranchOfficeAdminMiniLinks This tag renders administrative "mini-links" for given branchOffice instance. - resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl + resources/tags/admin/dropdown/branch_office/admin_branch_office_links.tpl branchOffice The branch office instance that provides the data for this tag. @@ -221,7 +221,7 @@ along with this program. If not, see . outputDepartmentAdminMiniLinks This tag renders administrative "mini-links" for given department instance. - resources/tags/admin/links/mini/department/admin_department_links.tpl + resources/tags/admin/dropdown/department/admin_department_links.tpl department The department instance that provides the data for this tag. @@ -244,7 +244,7 @@ along with this program. If not, see . outputEmployeeAdminMiniLinks This tag renders administrative "mini-links" for given employee instance. - resources/tags/admin/links/mini/employee/admin_employee_links.tpl + resources/tags/admin/dropdown/employee/admin_employee_links.tpl employee The employee instance that provides the data for this tag. @@ -267,7 +267,7 @@ along with this program. If not, see . outputOpeningTimeAdminMiniLinks This tag renders administrative "mini-links" for given opening time instance. - resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl + resources/tags/admin/dropdown/opening_time/admin_opening_time_links.tpl openingTime The opening time instance that provides the data for this tag. @@ -290,7 +290,7 @@ along with this program. If not, see . outputContactAdminMiniLinks This tag renders administrative "mini-links" for given contact instance. - resources/tags/admin/links/mini/contact/admin_contact_links.tpl + resources/tags/admin/dropdown/contact/admin_contact_links.tpl contact The contact instance that provides the data for this tag. @@ -313,7 +313,7 @@ along with this program. If not, see . outputCountryAdminMiniLinks This tag renders administrative "mini-links" for given country instance. - resources/tags/admin/links/mini/country/admin_country_links.tpl + resources/tags/admin/dropdown/country/admin_country_links.tpl country The country instance that provides the data for this tag. @@ -336,7 +336,7 @@ along with this program. If not, see . outputUserAdminMiniLinks This tag renders administrative "mini-links" for given user instance. - resources/tags/admin/links/mini/user/admin_user_links.tpl + resources/tags/admin/dropdown/user/admin_user_links.tpl user The user instance that provides the data for this tag. 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 index 00000000..86648287 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/basic_data/admin_basic_data_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..5967f146 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/branch_office/admin_branch_office_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..3000885d --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..869fb578 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/country/admin_country_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..ccc75cf8 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/department/admin_department_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..fe11cac5 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/employee/admin_employee_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..ab723678 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/fax/admin_fax_links.tpl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 index 00000000..3809f0c7 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/headquarter/admin_headquarter_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..77437135 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/landline/admin_landline_links.tpl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 index 00000000..160ef676 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/mobile/admin_mobile_links.tpl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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 index 00000000..eba65afc --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/mobile_provider/admin_mobile_provider_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..9a8a733b --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/opening_time/admin_opening_time_links.tpl @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + 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 index 00000000..6e272b26 --- /dev/null +++ b/web/WEB-INF/resources/tags/admin/dropdown/user/admin_user_links.tpl @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 index 0dc520fa..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/basic_data/admin_basic_data_links.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - 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 index a852220c..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/branch_office/admin_branch_office_links.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - 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 index 530852a9..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/contact/admin_contact_links.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - 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 index ba232292..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/country/admin_country_links.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - 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 index 425dcc8a..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/department/admin_department_links.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - 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 index 40f4e74b..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/employee/admin_employee_links.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - 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 index 119a1fae..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/fax/admin_fax_links.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - 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 index 3d8b895c..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/headquarter/admin_headquarter_links.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - 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 index 5998b7f4..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/landline/admin_landline_links.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - 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 index 79af6f03..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/mobile/admin_mobile_links.tpl +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - 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 index fcce4e89..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/mobile_provider/admin_mobile_provider_links.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - 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 index 25a987cc..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/opening_time/admin_opening_time_links.tpl +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - 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 index 16419815..00000000 --- a/web/WEB-INF/resources/tags/admin/links/mini/user/admin_user_links.tpl +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl index ebdd14ec..64e9523e 100644 --- a/web/WEB-INF/templates/admin/admin_base.tpl +++ b/web/WEB-INF/templates/admin/admin_base.tpl @@ -3,7 +3,7 @@ @TODO: Add something here that should be displayed on all administrative pages //--> diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index 9310b72e..b6a8bdd9 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -7,52 +7,56 @@ > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index a16aa525..93d35583 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -1,6 +1,6 @@ diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl index 8950ed2d..f82019a4 100644 --- a/web/WEB-INF/templates/login/user/user_base.tpl +++ b/web/WEB-INF/templates/login/user/user_base.tpl @@ -1,6 +1,6 @@