From db590822b8cbc4ba960bd5e0d783ed6aa0944957 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 16 Sep 2015 10:18:46 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20fixed=20handling=20of=20parent?= =?utf8?q?=20categories=20(zero=20entry=20got=20always=20added)=20-=20inte?= =?utf8?q?rnationalized=20some=20strings=20-=20rewrote=20admin=20menu=20-?= =?utf8?q?=20updated=20jars=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jshop-core.jar | Bin 29304 -> 29515 bytes lib/jshop-ee-lib.jar | Bin 6643 -> 7070 bytes .../localization/bundle_de_DE.properties | 2 ++ .../localization/bundle_en_US.properties | 2 ++ .../beans/controller/ShopWebBean.java | 3 +- web/WEB-INF/templates/admin/admin_menu.tpl | 30 ++++++++++++------ web/WEB-INF/templates/guest/guest_menu.tpl | 1 + 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index ffdfed6b8336dff31017701d431501ef76f74c2c..eda325ad96c4276316490de4a45cd21f95ecefb3 100644 GIT binary patch delta 1252 zcmZ{iTS!z<6o%J6XJ*daXB@|D9MdH67BrJe%_w3Q$}lY}!o-*?o14x!<7m$&)l)&# z>iQ5=^biqY7z92@y%=glMbU*Gf-ZzF84*kmMeD3H6+?6mdw*;H>#{d{uk3p<|54bw zw#qs)fDu5q)ql!XBg=%qIaysjDQA4GQGsQmo_Rs4!Nam8KNC>|*!xJdGM&=;9DTSL zG~#i|oXc)uzLeH6y>gSv$vtwVj*T&;TVmstX_sdBtS@9%OwNaz@v?AHbImVt+X^VX z?NjOXleIE{I{bJ=ET42%Zq|Z(svVj!ST|#|tHCcykG)O_fRsRIXc^wK6;F;dj0xW3 zTVqz@AY-j#{{jFk00;T|iqRKvlvxxoDqvE;ETAA79^H6oWHglwXSN+m9tdY}!tKHK z!1+}|CqM^!$`@duSpp^RrrVy?4m>|10jMLO9vD9di||&;uzK$2)HG!@z%nzHSZV?p zJPMR3;8mbhfW1F&M*%LJFu3ulT#ZM9M_vCplhRaSv4P!6hfxI7(`!|sKWN3irv5RR zwh?qziGFg^-X+uzCeo-eNVCuoK-n}qNbwQr_CQ~E7sPE2anfvHu>=apwrT<3fuWo!XCvET;x?Pq zb)V4M342potLQ^lwU`_Imsr8}NI>m&JQmSf_Cds_7QyeNt89#JVA|teJQLNLe>S>> zHFs<~b1LS=@z|Q2y(1Uj$qdE2n78BY%%AZLb7UaNd^eC_?i?It&JK<+TN4rH^~64= zIoZpMCAIZjvY*%fA#HtnC}LCF`cKEAKDB$fs^m2p-SzM9+IV>ozpNc8j$yCVvp45*;NxC{T8mvb$u%D$mj@s3H{!x@1W{JTbRk!*D47VoK delta 1044 zcmY+DUr1AN6vxlK*SovBKRTxsWjRHiGlSU_xjI7=b1Rc9Qx{rM);6beZB`HxCPgn5 z6$hfiJs3Xp7z|Q^eDop3@W};5X@8+0OClkNe)rsIZ1B6E^ZWk3=ePSi=XYm6acdtq zb6bm$VF1tr$ivRNW{03>Q0@upY{5oYb*R96&PBY>JMfBNOwUB*6k46<>WLP9Z;DQ| zDSEuY8&cVOh)KSIm?zY#O!$Q23<^f1E}nu{a=R8dO^X64vSm&Sk~u5d((LA3b0$mo zeA)i^c9{TBCZMIRC}AmX)||&mv$UXp=Zu~LN(BqKuzz)Dc26ONrrq#>yvUAw?o&!*ag5z8PK2c=6aL#IZ@%Py@%cz7c z1`r@e!ncwOmus%#o!Ua30gN2DSjp_TTpPiaG6$|U=2V$kf{y(az&6NaPZPx=WPydv zILKyC9;|7vkPz$2O>~SuO;a6S5x^^Aw5JFwqMH&Iy+=ek>ujq`s7W9(#Ie3V8i>)2) zt4_s-Q~p-s?ob=?TIc|AArvDv_lJp3`v-_61Luij14Be>*iRe|pCrBscN5)%+B`nk zOLHNj&Cf>sX7z4t^cRznjsjIlYa1)-`fpZnOG{qAI@QvB}AL_^FdO&C7b7o~4)n+=bGE*Ua4A z2k++N7w2X~v@o!M6~LqoB%+<$Sdrr-^^>yI)%@PWMDD?LUy6?uo&N4LF8EdQ-}85; z^vXX%_D}y9F&oGemjlzptw5G|Bsf956D$z>LQ(u2Jo)>4iC7O6iSI)7e@B_?)#CgM ze+*x*hynoLQ?R#ImaKOCuEcQBK4AW)kLtw2QDM2VXp+NES2zJ%G(EKKfWjS#ou?E#i!64R;XV)5*229OxFOui6m{c01y5Jk$34b delta 669 zcma)&O(;ZB6vxlK*Sz<<_vX`lF=B|CEJi-c(8Tzd2<1uH2@7S1Qqn|8$;N_PmP$>Q znwqjwSSVQ;C04StLYj?*g?rB!87r?&zjyAr|NndEf6$R{vs)vqOb5^aT9eUTdxW(J z#P*r&a&E`bH-LQcjUwaz3FMx?4|(q&Le>YykjsH_cqU+`2D8kP*ji2fPIYN(;xQYgX>5WB02*Tg# zp#Z%yRUvw3icu}MT#fw6q5OC~4q3*b_!n9IC0=Jv6wElCe6qrgqV14Nx$wwaU-m|g AD*ylh 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"> -