From: Roland Haeder Date: Wed, 16 Sep 2015 08:18:46 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=db590822b8cbc4ba960bd5e0d783ed6aa0944957;p=pizzaservice-war.git Continued: - fixed handling of parent categories (zero entry got always added) - internationalized some strings - rewrote admin menu - updated jars Signed-off-by:Roland Häder --- diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index ffdfed6b..eda325ad 100644 Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index 58fc16d3..d3501cbe 100644 Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 90e9b875..55692816 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -158,3 +158,5 @@ PAGE_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen SUB_TITLE_INDEX_TERMS=Allgemeine Gesch\u00e4ftsbedingungen PAGE_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen SUB_TITLE_INDEX_PRIVACY=Datenschutzbestimmungen: +ADMIN_MENU_MAIN_TITLE=Hauptauswahl +ADMIN_MENU_LOGOUT_TITLE=Ausloggen diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 7cc0c26c..eeb3d545 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -156,3 +156,5 @@ PAGE_TITLE_INDEX_TERMS=Terms & Conditions SUB_TITLE_INDEX_TERMS=Terms & Conditions PAGE_TITLE_INDEX_PRIVACY=Privacy SUB_TITLE_INDEX_PRIVACY=Privacy: +ADMIN_MENU_MAIN_TITLE=Main +ADMIN_MENU_LOGOUT_TITLE=Logout diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java index faef17d7..3a37066c 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java @@ -17,6 +17,7 @@ package org.mxchange.pizzaapplication.beans.controller; import java.util.Deque; +import java.util.LinkedList; import java.util.Queue; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; @@ -108,7 +109,7 @@ public class ShopWebBean extends BaseFrameworkBean implements ShopWebController @Override public Deque getAllCategoriesParent () throws FaceletException { // Get regular list - Deque deque = this.getAllCategories(); + Deque deque = new LinkedList<>(this.getAllCategories()); // Create fake entry Category fake = new ProductCategory(0L, this.getMessage("ADMIN_CATEGORY_HAS_NO_PARENT"), 0L); //NOI18N diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl index ab15a72f..0af3c6a3 100644 --- a/web/WEB-INF/templates/admin/admin_menu.tpl +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -4,16 +4,26 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"> -