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 <roland@mxchange.org>

diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index ffdfed6b8336dff31017701d431501ef76f74c2c..eda325ad96c4276316490de4a45cd21f95ecefb3 100644 (file)
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 58fc16d312005151273711d755ed4ba5887252b3..d3501cbe030e16157805399001c1e3c1908f669b 100644 (file)
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 90e9b8751b3710c8840a80ec371b70ca4ff1b619..55692816e06d1c83ac92376a013143140ef8cd33 100644 (file)
--- 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 7cc0c26c5ab4921270f13aaacc3f623dc4d834fe..eeb3d545546d698d761edd4597f8b5b16e2497be 100644 (file)
--- 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 faef17d7b09f001ad30be562779475bc40381807..3a37066c83c1deac6ab30f63bed167d3b6755dcb 100644 (file)
--- 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<Category> getAllCategoriesParent () throws FaceletException {
                // Get regular list
-               Deque<Category> deque = this.getAllCategories();
+               Deque<Category> 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 ab15a72f486f394a0108e98a83768998aad84aa6..0af3c6a327fd1000bed5ff99a12c9ab92fd08875 100644 (file)
--- 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">
 
-       <div id="menu">
-               <ul>
-                       <li><h:link title="Zur Willkommensseite" outcome="admin_index" value="Home" /></li>
-                       <li><h:link title="Kategorie" outcome="admin_category" value="Kategorie" /></li>
-                       <li><h:link title="Produkt" outcome="admin_product" value="Produkte" /></li>
-               </ul>
+       <div class="menu_outer">
+               <div class="menu">
+                       <div class="menu_header">
+                               #{msg.ADMIN_MENU_MAIN_TITLE}
+                       </div>
 
-               <ul>
-                       <li><h:link title="Ausloggen" outcome="admin_logout" value="Ausloggen" /></li>
-                       <li><h:link title="Zur Webseite, aber eingeloggt bleiben" outcome="index" value="Webseite aufrufen" /></li>
-               </ul>
+                       <ul>
+                               <li><h:link title="Zur Willkommensseite" outcome="admin_index" value="Home" /></li>
+                               <li><h:link title="Kategorie" outcome="admin_category" value="Kategorie" /></li>
+                               <li><h:link title="Produkt" outcome="admin_product" value="Produkte" /></li>
+                       </ul>
+
+                       <div class="menu_header">
+                               #{msg.ADMIN_MENU_LOGOUT_TITLE}
+                       </div>
+
+                       <ul>
+                               <li><h:link title="Ausloggen" outcome="admin_logout" value="Ausloggen" /></li>
+                               <li><h:link title="Zur Webseite, aber eingeloggt bleiben" outcome="index" value="Webseite aufrufen" /></li>
+                       </ul>
+               </div>
        </div>
 </ui:composition>

diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index b36a3a387a71f21f9a1e21eddfbc7c4da3d9ed43..d880f9fee6733aa1e78a74dc5c42a436761cff98 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -4,6 +4,7 @@
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://java.sun.com/jsf/facelets">
+
        <div class="menu_outer">
                <div class="menu">
                        <div class="menu_header">