From 04226fb43732a1df2c1c281848ba36aafc57788d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 2 Sep 2015 09:51:07 +0200 Subject: [PATCH] Continued with project: - converted single tables per row into one table with header and body - added column for showing total price for item (price * amount) - added mime-type for tpl extension - renamed CSS id to make it more clear - updated jshop.jar MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit NOTE: Please note that this change won't fully work as the product instance needs to be set in item instance now (see jshop.jar, method calculateTotalPrice()) Signed-off-by:Roland Häder --- lib/jshop.jar | Bin 86227 -> 87929 bytes web/WEB-INF/templates/base.tpl | 2 +- web/WEB-INF/web.xml | 4 + web/index.xhtml | 137 +++++++++++++++++--------------- web/resources/css/cssLayout.css | 4 + 5 files changed, 82 insertions(+), 65 deletions(-) diff --git a/lib/jshop.jar b/lib/jshop.jar index 7040946feab7661900cc9e1bd2142b172f8b7f66..c1ba5b8538395604c0abf9702302f1818be99371 100644 GIT binary patch delta 4216 zcmZ`+3viUx6+UPG-TgP4KiNDtkYvLqn?SM~@*t2v2qYnI0!bh!gd(_v0D*;&7Zs@u zD@sd!K)m8bl%k#BsN+~VkpyI<+S*z>j-}J-*s;}?sqNTmwK^kJ5U1z-|L!JB)1A5Z z`|rKyb#T7hY>b+kg7==+MB`_Bug7cMMjXv1=b zBe;~|=eUUBI#w|(HZ5itFx42NJn@tg6D3`IVyfk}Ql**Upt6$T4W)%4$y~|MW;QgK zm-FbC<_3m1%R+`Dm?w_gE%Hnrs?mZESt^*|qNO@E9NJgLoPtI3R(E>ARSa z=`7xtz;up2OfbbfcShz!ND478Cu(vcSiQdUVERdfdzD?EE+Qj~brDX3ETo@pW5Zc< zvd)w;JW`G%IS`2T#S^xiJHRpn2}s;0U$IS%cBg_fp88dH-uT}fZ^u!{j-PkUw=#a-<{-J@RB44v8}7=~%8Tf^u=y?Tnm{5=wos;TWY9EI+ZK zSKPSXAda0Y5>38x>2aY)Dn;n2q>H$tXQ*SKx0{lxgD-V)z`u7#abuv*KSUXAJLB#C zz%VT<`2~##>V6)zZxYYCJR3Bm$;Fo=M@d-SYKdBHmYrZ*t&5-43s=1H*p zlqRebpdRIgi(o^TfS6quz|PrMfg)WMr=fC6k&7V_mQfN7r*JPAnilG`IFd-($fqHl zS14U^KJF*cu}PZw6^QFne4Q5{{vtRiyZN38*^v;kBQ`0~q7xBAQfHUhcM*~i42BdF z@T@U)0a70ai}C``knP6g1fVMR+>tg?2To|Dr>2Qq*h+mHtcMQhf;DtKI-!q7yaVGA z=nw6Htb_{M9|G^i0!m(4Ds7gcHME)OFO$=FnbQ0_XZ`!STw@=p_QM-I*wQ0Ai-A!r((|lnCacPS^mgA0X zpnD}2ZO)y&Z$>3GP$dR7=UIkH$bPmxmgAH8YGH-AOni6G$X5sT;s)`J5Z@ub<%Y~76DxC685?vsm6yv1yG6x=@n0#0_ z#%+j?oOuOB$B37#o&&R>8CuAWmHMfeDR5T7Y6=~Mb_yQDz5^lqigg3Bj9B$ipiUW~ z+gLaOb95579_UkkH|%;8(kV}Q;1u1iC!mvq(J-tyVpuU5#&&T<6m1t<)e3D1wX~@< zM8TJP8QI4dEynA66|yHFM`Zc)GuG06xQ^(g6%(wR{yR{3kOsyhQ10V6xGLNjQ0XDIVuHdGf<@?A0IN&PsfmXXLeNTtfA^EUiH< zvgKe6mN1^Jp?Si;)L=DZb}cqC_SRx6<3ufT9W8Ix;wr}0704C1Jh1{hLgP%S)FGDu zva}A@Fy2>(8yMfO!;OrU_1MLDq8_82P}Ai<_}0SDKcYgA8@~nN-&pYDY@ND9)8vUJOk(SwYr;%ZMt(?& zRV3u5PD%Q5&+G4eMwKE}US9$r;_0X~_!nS5LW-2~JF=|N> zSvMER{5I6GIn3U(e4(UJp5zv-`K&oi9xI0t-SXUOOwxIt`FhjMKa;b$Me}6XbRHRR z#!`7ItRqr6lWRFag@0qgO=*S>uBIE>L*l3E-CHB`q4Y4hMd~Fm^YDpwwbTCA7EGk`llx9cYU$qnhbpBEW|YoPPfc(G7+S delta 3259 zcmZ`*3rw8H5uUlb|Ngu40e3tO38-N91uHmFT-|%|F$$&6Wd%?@~Kl7>9(y@pk zh~*3?a5KYuSjKPzs~9Q_6%6BsTD_O8oi$pctZUyG>UgZ!*urqk*v9aov6Ug-w22{T z(mj~AaPI?CBSVZ*%5Va+wS_`O1Ut}bi;&i)lmHLEq0~6%8rC)MfANFLiDUpSel28h zXpyv} zknzJC5AgVW0PztvF#nnfACiq+3)aL*UYjpo|K$Y(0GA@U1q+2P@w0r4i%C-DzG_HE# zE*snp_t@ZG*kPrCom}nWYKW`d7T9Bf`*_N*1@5=N2sigyV4n*6xjCxB0Tsp&#NjlY z6~9QqYH`kuW!jbcSh-a3R5~8EJ)put6%MKJpyoS~EOwP(pE#0%4of!V*kK$d#Mc?< zkA27vhvA3{58L4ps1na)V5atoGtQVzol*~G6$YTh4o9I%h40zn7(A-NaXWk;Chgz@ zuN^#Gt>Y>avc#hv%rj0wNE^Cm^P0!taRjAtduyLhD{4*Cp3QVBb|{4PBEw5TPBAG) zy!f0Lbl{uX=^f+q4dob*W$Co3NPA_XgCXnkV91q3awL&_5yp@nt%mAc;mJZ*ZXOBE z)CDq;PqkgP74Sm=^^ko_<%Iwq9X8CEW=LuTo|OYus>{IzmE?L8ncV`-PzM804};JE zW6%T#p-ozK5ix)Vm#lJY0~C?nJ4mX4F?(YYIH4Fyq^t84=$ef1>RN@D6E;FAE7SZf zWSgy<{ROXs<27m-BtM&!_L2Sm6&%dV9L#(gWWxz%x?`HjoOmykN&iJ~URbuJ@6h0? zOv+bh;=Gl~4q~$NHca@?m+Tpuc9Sh9Fftym{mPAIqK+Uwh}w$ zRZaX1UDUAp3*LsbIdJnW)o;PdyRF|s>#`Rs-Of6)fzU4XJ68V7=Xd1eqA8Xi&Y9e- zAGFX*))K2-2&|o-+JIMAeZs^}FP@G1H@zrdq_3)QpL~dVYw;YvS>k#lR#HMCikpzL z0x{8qcQC%xL~_C}ny`k^*Njb!`QmY~nmk@$i)H%4EkuqXxukK;~TUNr%Ss$ zY8F54LAzv-ae7fKDgaz+qZrixRL=PL`NW9!Q?K^jI7rumOGlLU3onSe9z6zr-b4Nl zzt8;&O}!E;r!&#GUK;r86*8MECfm@e9s2SXHhDMWsvTwkF8sF$f77Ak*H=z6YcY$u zUAc&tFKzu@GX34SG=}F8PKUn!w|K{dUQu8~pZKUx-;n)%=r)c3YA2OM;WgqK@p2!Q zFvHJz -
+
Default menu
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index da05191b..185adda9 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -70,6 +70,10 @@ Faces Servlet /faces/* + + tpl + text/plain + 30 diff --git a/web/index.xhtml b/web/index.xhtml index 958400df..84ab5058 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -41,65 +41,70 @@ //--> - - - - - - - - - - - - - - - -
- Folgendes kann bestellt werden: -
- Bestellen? - - Anzahl: - - Produkt: - - Einzelpreis: -
- - - - - - - - - - - - - - - - - -
- Warenkorb - - #{controller.basket.item.amount} - - #{product.title} - - - - -
- - - - - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
+ Folgendes kann bestellt werden: +
+ Bestellen? + + Anzahl: + + Produkt: + + Einzelpreis: + + Zwischensumme: +
+ Warenkorb + + #{controller.basket.item.amount} + + #{product.title} + + + + + + + + +
@@ -120,12 +125,16 @@ + - +
- - - + + + + + diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 3d3b2cb1..bbc4cead 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -72,6 +72,10 @@ table, .table { width: 500px; } +.basket_item_table { + width: 600px; +} + .table_row { width: 100%; } -- 2.39.5