From 152f52a40d5421ed2d19839339e2e3a8f7fcff5c Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 2 Sep 2015 15:24:53 +0200 Subject: [PATCH] =?utf8?q?jshop=20now=20no=20longer=20provides=20the=20Bas?= =?utf8?q?ketBean=20instance=20in=20BaseFrameworkBean=20class=20+=20change?= =?utf8?q?d=20links=20to=20=20Signed-off-by:Roland=20H=C3=A4de?= =?utf8?q?r=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jshop.jar | Bin 88347 -> 87862 bytes web/WEB-INF/templates/guest/guest_footer.tpl | 8 ++++---- web/WEB-INF/templates/guest/guest_menu.tpl | 18 ++++++++++++------ web/index.xhtml | 16 ++++++++-------- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/lib/jshop.jar b/lib/jshop.jar index efd0b4a5a26aceeb18a42a069978bb1371574c64..634266a87f064b195a309f34687e998c4305b00d 100644 GIT binary patch delta 2808 zcmZ`*X-rgC6h7z82E&`7pbP~80T*@wW#2*eb=XI+bt@{kv>JaH+91@{bkP)ZYp%Ao zqJbYx8>^zyCDAq}txJqXo3ysJ(WF1LNe!B+4O-K4-Wyh7l6${<&-%Ud?z?9`K4Ch2 z)TBBq3`Q$}2f*Xby=s*5sB>?sRA_xQl;;OgG>c%2XQ;*$hFzG+a1N6hMlg#ZO-W)E$8Va zo?f=V3Ja_h-I0+ZAvQ@a4Z&n#id!iT#wHE6#cjgD;*6b&xSAN?7YR`oSfxS&tXAPg z2;fzsc$S!vvPOkhpv?knRagh>RVaia6-uE@g+Q32LJ$P25CU^m2#0wp%!dUkEQAR0 zeO{30jqw@mTO5NseCU}FeCh25!Yr6gYd-)`z(F!frmZQOh7?dkib-~%v}WHhO-3o6 zlTk)ZM@b32!3gv$WED-jT*`p}OTiXB1Q;Ft6)2~`a9p#Gq1g@wnp?=H0aR#(SlX%V z0XB$(MTAJv;wehBIGj|_%07X_2dE^v&suuec8Gxvs@De1KU9mE==KLlUCi$&MWypEUs6CU7y0aajyY*p~G1gluPuJ_%mOXrT~^QRg?Nbxwk0 zw{s3zD{LJda|*o1%dy$2iQfVfysd?B=w@TjV&-?QWln)qcd&^})TvB%Ps=0?(%D($ zr}%4+tf&2u((aofEguSg;0(x|CarC1+Jn=k&4O&V^LPPvPz7w`70{XV6O(}%nCQn6 zA%_mv^RL1_mB|;=GRcE{w{zJz6=Gta%H$+5IW+?l{bN8Vp!3buJd`@|0G*jOF@3zx zm4NbkPtALt@?MxBuYQ~nilJm`1?2J!v_^~{#B0-%pv!|D<(>@mce1fw^_!IQ_Zf2X zhr{o`Ts!F%6PrbNN!0PMYsctA<`FA;6o(kjHjChVo9IgSw$8Ias0G3-5H8O8CDD!d zNI{#(&R*}Jcp+N6xfA0JUdn#g$TxIT!5RnSx30JBjQQ*48W>l1e5T#(woRejjRxZn zHfuNfJ4b$w;QgwL8%>N?uI!IxY=63$^+Pul+|B`p>dm-KTU_wOTyK_G12A5bWCr0m zPIfv5pD>A`|Kjm|77V?YgYBBh!+bo<@#X#!Os6&}ua_YAI_X!635+GBBqw~c6uA@0 zbER0!=v9UljIJ`|b|w#%VI||=WypVCbTv&lF#_kGiVZ2#^ z%NSEDk=v)-S*a(vREgERpHqd6j9aU)kdcxH$)BpU{w+<_Si-{UYOG;ARE_nF|G4)> zHQ2=aPinA^@qP`qPU)4h#fi>P?w^z1KE2M-Uw_Z7RC&7;9rBhF=WC_|BM(nx8v%GE zjM@?Q_xzfvnTk+F6(7V}rLz`&H5X_4{o+{;03Jz`T-x%+UA`-{%Lh)ki}3j7w+uS~ z4{jl&zy6+!O`>*Pi0EojrM=E=o#kDz=RoqrirUZ99n$ll-oeLUpr6o;xXBAmi=*=qDP3nr{1FL z+6!Zx*e9xy^xH?=`rt9Y10*-x0Tg>pvt@1*ddbU143iyA=*w|)_B z7F~GH6BF&u3RGqrtnNROa+nPQ{89SEV1VeI=Oh1W*5g$*lcqdS*T}QM=ppyGRfk#S z9i^!f!7jdp2Ih;)V3SD|Amy0w9vRD%=dOgkZOb(i5pG)^U%35Qd?swOP LvF3py?%e+a6t`B_ delta 2939 zcmbVOX>3$g6h7z8*6F;i&`v1@hC=ssgcjP;c3Nnsoo>@@T6Wr6DU^LlOhBOtViZjv z*Lc+`R>4H05p+a0MUom9mPkbLR}Dmhs0oTcX zq$>^8v83Bgv)FmmR7&8#X}YQ~UJmI%MtA4|JLA7ov&@VssdEhB#-)kw)0Zc9i!cBY zCe~+^wyzHbGc<=n3$$7x8hoKNw1q&s1?Gps0$6B+MX;ESOL$nyG0S-9;GvU;E*>7` zp__-tEU?@HJz{%ms>sNkX)$+pZ0zmcB!17DB=3b`l(?QbOEk{S6Pv?x#9*dV{H133 zTeDmkW?kOBsay+2$QA?Hv0}T&tmQ-&Ay_w#cyol)67#@oC`$AB*Uo-Q5pm85F&U6) zffXvufR!ptfOx)}DJq?XCA})Fg4GsSqrzHPr$PoJ`@;1(ir&p zSt9rmbkco9x?dyZ?M3=4h7!H}ut3sxgOSn>x`LG-7FfQYls;l53m+g-l6R8P-Vz?D zay+QYT$mS3B|K1NkW@a`o<~2P2o+GNJ&zd5x73a7-RYn*Zm0?-6A>tLo@Bn$Wb_k{ zPz@e^*&+iUXeg)>{R;3UEldQY&DbQYj})Xv`` z;@eCtPIiSPHqwbuplNhxNpvR-Z8%qC1mG)E^eNhF?ZpNhmw4*#u@jUr15zw7-2zD# zNT&DP|9lJjmt-GP#Ers@7$JI!dXkO&#+gFR4e3ZuB^exk+r-hyv0Qvj?2bfn&quIxI&AGbm1G!FZ~r* zKrLEct3d9vGPe?Q89OVtnb_zx`SO;tPp8m+>0 zIz;?75GzkK=@l<%qJY*@qXQ!4ktV%}GwdAvhMnTB!72`3GD}A@CTcaL-iauVq=v^= z`Is6O-yW3_E(eCIe)~xIw{~i)d{vCeIIGA#K8%q=3TDa^Ml{P^EvRZTL#DqC<0*l! zd1I2?<_AeOxz2=+kxYK{ms_a#Ppx{)nHDT&qpg*UcjGjp_@h5oF0+%E&8II$4|{VG zhP@^^(2DV#_6a*~r0ZPtS()%4WrB}9*K^o2N!n(jO?tD5@i;MR<@a59FCmFa=Zn8a jhJX9}o-E-c{(_ZXGs!PyI?2g$jFs_i7;Apk&At9Voy#sm diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index a3c9ec7e..64627481 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -5,10 +5,10 @@ xmlns:ui="http://java.sun.com/jsf/facelets">
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index cf2ebcf8..cfaaae02 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -4,16 +4,22 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
+
+ Home +
+
+ Kundenlogin +
diff --git a/web/index.xhtml b/web/index.xhtml index e87f1813..08cf9c63 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -7,8 +7,6 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - - + - Warenkorb + - #{controller.basket.item.amount} + #{basket.item.amount} @@ -94,16 +93,17 @@ - + + - + -- 2.39.5