From 7d0afde69fd872ab5cf872d2887fc3d1c93b1ee9 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Mon, 10 Dec 2012 08:43:38 +0100 Subject: [PATCH] styling changes --- app/assets/images/icons/list.png | Bin 1002 -> 937 bytes app/assets/images/icons/menu.png | Bin 625 -> 584 bytes app/assets/images/icons/needs-help.png | Bin 353 -> 363 bytes app/assets/images/icons/needs-payment.png | Bin 462 -> 472 bytes app/assets/images/theme1/button-bar-left.png | Bin 0 -> 5015 bytes .../images/theme1/button-bar-middle.png | Bin 0 -> 1491 bytes app/assets/images/theme1/button-bar-right.png | Bin 0 -> 5646 bytes app/assets/images/theme1/button-wood-left.png | Bin 0 -> 1100 bytes .../images/theme1/button-wood-middle.png | Bin 0 -> 655 bytes .../images/theme1/button-wood-right.png | Bin 0 -> 1098 bytes .../javascripts/user/application.js.erb | 3 +- app/assets/stylesheets/_constants.css.sass | 1 + .../stylesheets/user/_constants.css.sass | 78 +++++++++++++++++ .../stylesheets/user/list_products.css.sass | 5 ++ .../stylesheets/user/structure.css.sass | 79 +++++++++--------- app/helpers/application_helper.rb | 12 +++ .../_products_category_for_order.mustache | 2 +- app/views/layouts/phone.html.slim | 24 +++--- app/views/user/active_list.html.slim | 18 ++-- app/views/user/home.html.slim | 4 +- app/views/user/list_products.html.slim | 19 +++-- config/locales/en.yml | 4 +- 22 files changed, 176 insertions(+), 73 deletions(-) create mode 100644 app/assets/images/theme1/button-bar-left.png create mode 100644 app/assets/images/theme1/button-bar-middle.png create mode 100644 app/assets/images/theme1/button-bar-right.png create mode 100644 app/assets/images/theme1/button-wood-left.png create mode 100644 app/assets/images/theme1/button-wood-middle.png create mode 100644 app/assets/images/theme1/button-wood-right.png create mode 100644 app/assets/stylesheets/user/_constants.css.sass create mode 100644 app/assets/stylesheets/user/list_products.css.sass diff --git a/app/assets/images/icons/list.png b/app/assets/images/icons/list.png index 97101a0f47042fc319779aaf274a0eabc6c4eefe..d63c9724ae604af558c20fcbb75f963311559412 100644 GIT binary patch delta 889 zcmV-<1BU$S2dM`kiBL{Q4GJ0x0000DNk~Le0000L0000S2nGNE0FD^+UXdXi3Sj^M z17QJXg*17QMks$KNklZu_XU+B4UBV^2$D z09dK2N4pMhe0*`e|8w6Xl`jMP@7d{=SGGK{Y~`|V5@U(B1MeOf?e6Y2@(t&Y7to#i zS|X=_R=|I&s-K9+g55`+&))j8W=L?h8Z&|GH?0o@mj{RZ3;ipqAFKWfAiwHd2pHYh z68TkCuLC1M6@aRycfW9So{H?ikvIQ_wzah_4F-ZIyq4FWN~F^9bMXxTYRI#Wa7buNFG`!Em)oU}}9VLF-4To}9XT;$Wp z=rmXjisEBv~Z@9nRGHu%q+qPZr^Z9l;jryq+Y z@;!f|>t5W^SU%&;LSDpt6``+m`=L;1!0-33o|u?uip65XGgWopAW7& zm;*2Y#AKT~&Q3RIO)|3xxKu(_7(q4a2IW@8&0_kW&h&m^0)!8}6c*U-26Bx2ioMOf zsS;|Sm5NlmLCcl0V*cQ^-!-tg#lZ==f%5q|UHjL5e656{g*Ae7x+9=?#bU_ia#&ki!`$2)lF1~Z(I~>< zusH5TfbXZ@kxHjTe|UI^a5#*3JdT!@7Vta|yWNhdsVPJv5%~RnBoc|20luAl0~h5G z{2WB)M+ScYFgZDi<>h6l)oM7MPF!DK0|1OhBkJnvFgrU7uh;u$z}J7i;>+O|lnN!F z0O)mkTwPtkU@*XLw?nJd!eX)D_V!ksV=|dAG&F?ce&;fdByD=;#O^KYc_o zUxbhq@b=AHD3waYVlgx~H-qPSab8zf7Yqi2=y`vhhhDEoCX-Px{})T85_~=%lu9LL zW@eDdWT4S#px5j1ZtNYD%Aad#ZEZz79*4%SG92mQtw{Jv=-R5m7pwrkk4^YHMqw^Ye3JSvFBMXa@%e zR4f*s4O$=&Acw<2tE;PYa&khENQ4#^7O1_womiF?gT_?s5rE6(s#cb0VqyaQ{r%Y5 z+CnfGgifbJXJ;qE;jrX>Bmg49#l^)Rn~Q&w83rDY2Of_{tZB7c>6l+lKA%TZQ`3t9 z)f5VaFgQ3^9Z*wKgMonoSpc)yEb$V6N~OZy-kvPLQ&k+1)oPX1aARWwy}iBF0RWK8 zFKE~Ktn^r?*Zj<89O^WvH&9^Ba*OI+`;tpv@C$b;rKm3rBY#KWknXiX0u7W1fWnT z(Ad~03-Ih?S11%DDSVBdee4*9!PwZCEP%ygk@yP0($bPFz*D{Y>-bVJ9LHq=B>zTp dj^ncb0Y5_X#;eePMF0Q*07*qoM6LruV1lW7ytx1X diff --git a/app/assets/images/icons/menu.png b/app/assets/images/icons/menu.png index e4f891e6fd0fa0ccafa0516d688a97e3e90375b7..df9b26c3c0545a7422ea492f6fa07e7b46521c36 100644 GIT binary patch delta 533 zcmV+w0_y$o1jqy-iBL{Q4GJ0x0000DNk~Le0000P0000J2nGNE0A+Hf1(6{e3Pb<^ z0Ym{!47FU5Mks&9Nkl+A;n%87`Veb@6PZ>@;rYD3;;w#w%hG< z5qTZQ@v9_BUWmvurBqbcwX3S?W16O)tEzfqjCq$NiRpj)zTNNl-h2Q3`uh3{@O3mA z{os})&-141x)8^4q_xIcE0f7YthF4gD2lLLE;&CxXEvM3v0s)YtJNwv=R(sov~Ald zrOqN?kR*v(EEe~Q9&0|IOIeo8X0r$VEX&BUOaN(`hRe&#v)yiYxTaHU0Njgx3dqUz zl;ocwC)a-yd&;G83lV~jD3$7A9+ez2D0c^bk}lLkL{~0HqXKYm6~B=lj0Ldrz9CH;`t% zUPl~;@~?xLrs>`oqc)pO@0@$|d&=*Q04^>r1W>-U6RO2p@oNkAeII X^_jD;;eCA$00000NkvXXu0mjfV7>SR delta 575 zcmV-F0>J&q1n~qRiBL{Q4GJ0x0000DNk~Le0000S0000L2nGNE0968xT#+Fg3TprW z0c!!N>N?VqMks&oNklhsN%j@;2FWe& zkY@?A2g$`}$Ys%h(UUsrI6X6+gD9&mWFgsw!2ZyOuI{d{s*CQDIF8=|!UHW9i>7n# zy)ouP5Cm_v)`3z==Xp+&BtJytlXK39$mffTi;gj-EX#k=T5Gd3O@C!s_Dw1Eyot?fgz0oj zmSs5SfZYcih9Os1S9qSsa5yAQQ=D^%2qJ>-`-g5(sZ`Ep?hA4_yE|qKG`t4_EqgKA-!5Vpr3{aL#$BHl@_|^71ke z5f+QZwkQe>l#i9>5jok{=PA0oy9akbVZ0#x*WbjQm1v3IvB4 z1dqjV`16)duROpd#`}McN9WK!uClZ*lrf~INn)p0Zr}m)BWQrV7}C8g9-0{htuX}o z=ss>Uf0wWI>zG-ZBzAh`DH>VtIEM5*ZS*>}GryQ8R)0NH{|3JSbS*x3)+{F300000 LNkvXXu0mjf{%Cuk delta 251 zcmV>5_;Bv0D|vpkTBg zU%QQB76h#Zix{j%tI;Y7hWm<`4q+{~+{d~nzV>GRyqRILdRS~@2b<_&2_wAY78gSN z%<5rL`&+N*=N-k5R;`Eg9B(*9A;c9SF5|cbZ_Hs;h~rk{26UImCVnCBfZ!;B;3=!? z)-6?eh$}Sve>J01=m6JA+Bf!v_&iOl%5^+qegciLE5rv$JnSV93>pa1(Iea?{yyF6 z_c1dxO{~f@^poC+5MR1RuVE|ki)mu}*E98R@CSA!I#gW*8YTb$002ovPDHLkV1k^g Bb<+R< diff --git a/app/assets/images/icons/needs-payment.png b/app/assets/images/icons/needs-payment.png index 8c595c3d405dc08ed58c9f39f667ffcb39d091f9..f0b8109a1e4e4f02dbf67a573ebc62adc8cc76c3 100644 GIT binary patch delta 371 zcmV-(0gV361K0zQZhuutL_t(2k!{kkOIBeN$MMhm`YsX_CFr0g{ydp{nLtBnNDLNfc9`NPm1k^84R{we|&leZ*d#_!T%OEBIW>- zc~Ts8@CsuM1GrwF(B9-paReRA;RBYVpajR!+qaWT2VXGKQ1N#J?&L}FHw2$ywgFs? z{88+N;5fdk6l`)O2;8l!!jC*DR>CadI-X-D_}f;kV=rzcE7QyEz@Nvjz#qawR;D*1 zXaZ}ob1;^4sC}=T)41eB5q)B`l?oChUK3_O+zUO@3-|vTW zK8<#}trmIc!ZSR_FosazC$_NOsDXKSg!dS!cf5%||AToL$A32Zlfny}R?QmFjG!hy zB+wU3A;^kR^kESfw-fU)kBtaA!$VndSQDCup+@_4{{t*z3*Q?r-=>8fOmvudoPbBN;yeZyu-XCKOY%va#NZR` zD;?4s6`oX6;bN<-_#AhMzvCrVqPs)ocbwI<ZCuyE67In(yigi@P-*moO3~ZD#&lvntgjH>00000NkvXX Hu0mjfG)=B~ diff --git a/app/assets/images/theme1/button-bar-left.png b/app/assets/images/theme1/button-bar-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9904d59fedc6492cc913744384b69f773341a551 GIT binary patch literal 5015 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/theme1/button-bar-middle.png b/app/assets/images/theme1/button-bar-middle.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf328fd8f961246c8d6f5f1ecb61e88234d6ae4 GIT binary patch literal 1491 zcmV;^1uXiBP)LMslG?S z*t)F-BmxH21Q8^jJXIwkl>!3ZK`2QPQcSoaLqiE7^`sRLL5zS{9QFb!!+b=AaoskB z!{iP|BP0eiDY8(b777C~;sy^Nv(nBnt!Ayj3R;$g{sdQKNV@^897#Z|pxJ_Qik=L> z39j4nkl>rRBw36Ca5}-<84afvi6Lk^s4JhgalZMbPAP#Zn zyKjPI5ERA+yhSfgz-EYPBOAS1zO>NU6C{5No$kZTBi$zQle>HR!)rMY`;ncEgpV+p z!uFP-8o)snxzU0U;EgrIWCHEBaC2*gj~)zg?{^}1?g)2gIoFdA*9*2+w>cWVVtATp zH6d%ah|@?JMzmUQa5^|(HktC%?{6YUzkE+m`-YG~-dkgOI3U`<*6J!L%Q)EoocsSe z<fV?Dh)oKc2FFO}Mw) zWl$)8eRR(DwVXeHrktbv`0Jk0IG{FTaymi&__MF+&em=EN1tG9L6xA}&FK#>h*Ho^ zhNH7XzOvP3HXRa8o0k!`M2X(w+N-<#^TiX^H#&U!*$|l}^enKx(qVW$Ksyv}W_|A=8_W$;G{@wO$`U08$`mS=Jl&?nk%pp7NdLMkdi=-TVd5reY5tGACjy@Vd zet~ceRx+g5>-`TO+w<)YaJO#VnuoOBHvuDtloDbDL8w3I>z5P-RgAHyDsFFY4^TwR zC6J(+zKG5L2tKO;xIE7ZRlqu1cQ}WgCvP#z zqJ25$y(h+qGse(pHkLBI_W;C{aJGhe@0U4(`pit4Xfzr)YwfaRd7dL8R}y8dMMNly zf|Sw{X4D`EF3Yk@<`6U~);U55SB#To88Jpe2xQ(P^JzL`4Bq>td2D8{lx^XU%RX7S z(tD5d-eW{yE`8y?A}?y+&(}_fVOdI5#W`PBVPTksf<<;~`CGODVY%dXeK0=$r~Ny&?x{{S;l#tPlWFlqn*002ovPDHLkV1k#>tr-9S literal 0 HcmV?d00001 diff --git a/app/assets/images/theme1/button-bar-right.png b/app/assets/images/theme1/button-bar-right.png new file mode 100644 index 0000000000000000000000000000000000000000..357aec82fdacf865cfc4344c3c372240dacbcf6d GIT binary patch literal 5646 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/theme1/button-wood-left.png b/app/assets/images/theme1/button-wood-left.png new file mode 100644 index 0000000000000000000000000000000000000000..aa949d8ac971abdbac32ab5af621ea4a61e2c8c9 GIT binary patch literal 1100 zcmV-S1he~zP)x=o)+5r5d%eKC-Z# zqL*_Oht(G8%&}K-YQO~@kN2@`tKpANo>0Fj=*l~nK9sw~-~6*rom0-8I;tkmyrxj9 z5$0D1<;N7CHa|&}?3E?o`H4B{-cC`QpPN)iEL-8>P=F2URQk7+VP_s65+8l_6X~0K z0;^N1clC0KM1uR27?)la&4Z4ymZ}nmI%GOIfS(bE>-t&Lsm z?n>mqERc>1bp2ft@r6XCyF&u93O^v|wyR->bLtGaOdC}|xI*gy8yM{s1;eB3ibRR= z-C41{ltnibL9|svD?kyjRD|OaQrWVgLM7bVtU|IS6m~M$qydDgE{bLWu?&S42@$K= z0Z-RFH0ljBWf}Rbha=+x%=S=d2GCCL!_WMns%As@DS9;pRBB^6(}tm{n1~RtfQ+gK z@UYJZ;sLAK8n|m>e6SBu+rwhL1h>HvQ!UWezJY>OMXGM%WNZMIS%u-c(20Ts>i~)b z^6}}1#AdOBha)QP@0Bqbm*CfR{GBlnrV=d21AlL36zhK!;eY5_1@wsI!zeLf)PN3^@%_dw#)c1J<3AJI`8HM?9Q4M%jVrAnif#qJuNPruYIyeI z9n5|@kCn|76h^^4vjR~Pm^l&0OV{q=*L!cGe&+%noxg}LUl;@v6kL;hu;nh6a|d`X z(T_LYS^(Cz(4rixO%ENf4C*Qlbl1jTX%~l*0qmrU2#pQk-RF;kxiQ0Fel8ua}{BU6kz(ZarWynFs!3rb{KJ zpww-lWGnF52Ar@4B6Of`fKdhf?P-nQ&$%c!e1cFy`hx*jgrIIPn6iSnD)2vaz0hL8 ST0gx200005{f*1v^ za16ALb`#yKb^VhzX`7^J&hdFz^5Mnj_0^J7wSo1x4{AAz&dyO#QG|{0dOgikqPZhz zFTJsCcYquf?CKGgnFf9A&SfxjRZ=n_7iGAm1*fcjXvvnuffeYViN{p71htZ=*lMh> zN;z-(Q+54o1&WI(^v+|*%7V>$Qj;%0#b{vMYHaECs>}>O#Vih*F{LwKyFu zh2u(23^g(ObA@DD(8GSn^YR@nc1gd7tyt2ZvALPEzgGcx{hrSS6TItIgux6}Z+o1c zw@Yj=kZ^-Js^qc#Z4>nM_dj$;1{@XR%Yq|82)dZ5x8laXzgk=nZjOMz;R6Qid>_25+Wzy@??sd%)s70X=~1G)T|K0*oDFZ^tA24 z*)Y-hvBKj+7xT~n#p4MshZZVj!dY*ECdJ^=ujAmh3zaJz?35wB1}I;QaD2fr)_^~l z;L)Z6-53(j4lP^<3OgR56D~m_i_z(4XclvP>kE*Pfj(Ug22hub=hV-zh5X}pAGIpC{|KqU*yIEUdn pNHPX`xdm9Jfw8SoDKW&U!hiZmzem=zgYj$Pni^JB-vm6%& zrlj5Czjpg^jC}mlN@spyFc`}9GVI;)6PITO+xkEtu6*{x@ABOldpU@)WC^zryj)xNk*+ z{Oq$S*NEF9752MOjX0fJd`G=>VO+cT;w80vls1-r{6zUS>s6yCXS7H4ijj(i8BMlr zb>a0%ZGHbpe}80NdVFg+1Pt}X{s5^g_icfF0Xzuz3zW(66 z$d$^(Bq3*VS~E%d%ABP$ix#q^=P*J~KYxs*Hx3}VTuclHgc*hl z{IR`y9LT`W-{XVFr5*a!Z2hTt4Kr=LQW9{fxkKtMKr{a$(JCRKBR_X@OpC?4;VP_ z)iF992CWkX|2@njZ!x%p;P#UmLcs(M+6*-x$43XM;}59CIh47(26!>gqDS{OwJApFYI7L(VUYlEn z7$3%LB8*$vGTJhrt1@V|(FJw=Sel)LFBQRF<_P^$UfkO6z>gkW$p!iDjdAfpT*se> zJp?rZW>VaISVff*glvJ)uyD!6>9EipAV38|vVxk-5MTtAu0X>fcqOS@oY4S)HmJ`) ziFME{Hc^rcxK0~h#e-{yUCI{{0$EFiE;9r?97@20qdFiQSp>a|Ohje=Ka`u6@ioS8 QSpWb407*qoM6N<$f=FNPp#T5? literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/user/application.js.erb b/app/assets/javascripts/user/application.js.erb index 2be7040a..7cdc271c 100644 --- a/app/assets/javascripts/user/application.js.erb +++ b/app/assets/javascripts/user/application.js.erb @@ -39,7 +39,8 @@ var path_mapping = { list_products: '/user/list_products', active_list: '/user/active_list', history_list: '/user/history_list', - obtain_user_token: '/user/obtain_token' + obtain_user_token: '/user/obtain_token', + lists_history: '/user/list_history' } var $translations = { en: { diff --git a/app/assets/stylesheets/_constants.css.sass b/app/assets/stylesheets/_constants.css.sass index 4f3aade9..1a3502fa 100644 --- a/app/assets/stylesheets/_constants.css.sass +++ b/app/assets/stylesheets/_constants.css.sass @@ -1,6 +1,7 @@ //$qbrown: #634227 $qbrown: #853d15 $qbrown-active: lighten($qbrown, 20%) +$green: #7BB459 //Heineken //$wood: image-url('textures/wood001-vertical.jpg') $wood: image-url('textures/theme1.jpg') $background-brown: #57351f diff --git a/app/assets/stylesheets/user/_constants.css.sass b/app/assets/stylesheets/user/_constants.css.sass new file mode 100644 index 00000000..20088d19 --- /dev/null +++ b/app/assets/stylesheets/user/_constants.css.sass @@ -0,0 +1,78 @@ +$qbrown: #853d15 +$qbrown-active: lighten($qbrown, 20%) +$green: #7BB459 //Heineken +//$wood: image-url('textures/wood001-vertical.jpg') +$wood: image-url('textures/theme1.jpg') +$background-brown: #57351f +$side-spacing: 5px +=wood-button + background-color: transparent + background-repeat: no-repeat, no-repeat, repeat-x + background-position: left center, right center, center center + background-image: url(/assets/theme1/button-wood-left.png), url(/assets/theme1/button-wood-right.png), url(/assets/theme1/button-wood-middle.png) + color: $green + border-width: 0 + border-radius: 0 + height: 31px + //padding-bottom: 18px + +box-shadow(#000 4px 4px 8px) + &:hover + background-color: transparent + background-repeat: no-repeat, no-repeat, repeat-x + background-position: left center, right center, center center + background-image: url(/assets/theme1/button-wood-left.png), url(/assets/theme1/button-wood-right.png), url(/assets/theme1/button-wood-middle.png) + color: blue +=button-bar + background-color: transparent + background-repeat: no-repeat, no-repeat + background-position: left bottom, right bottom + background-image: image-url('theme1/button-bar-left.png'), image-url('theme1/button-bar-right.png') + color: $green + border-width: 0 + border-radius: 0 + min-height: 61px + height: 61px + padding-left: 49px + padding-right: 53px + .button-bar-inner + //+single-box-shadow(#000, 0px, 4px, 8px, 0px, true) + background-color: white + background-repeat: repeat-x + background-position: center bottom + background-image: image-url('theme1/button-bar-middle.png') + //min-height: 61px + height: 100% + .button-bar-content + padding: 8px + .title + margin-top: -10px + margin-right: 5px + margin-left: 5px + margin-bottom: 3px + color: black + float: left + .action-buttons + float: left + width: 150px + //padding-bottom: 18px + //+box-shadow(#000 4px 4px 8px) +=user-button + +wood-button + cursor: pointer + border: 0px solid black + //+border-radius(4px) + //+box-shadow(#000 4px 4px 8px) + width: 30px + //height: 34px + display: inline-block + float: left + margin-right: 15px + background-color: $qbrown + text-align: center + line-height: 34px + text-indent: -5000px + &.active + background-color: $qbrown-active + &.hide + display: none + diff --git a/app/assets/stylesheets/user/list_products.css.sass b/app/assets/stylesheets/user/list_products.css.sass new file mode 100644 index 00000000..71aa35e7 --- /dev/null +++ b/app/assets/stylesheets/user/list_products.css.sass @@ -0,0 +1,5 @@ +@import compass +@import user/constants +#products-table + .order-product-button + +wood-button diff --git a/app/assets/stylesheets/user/structure.css.sass b/app/assets/stylesheets/user/structure.css.sass index 03f83469..e8dc2fe0 100644 --- a/app/assets/stylesheets/user/structure.css.sass +++ b/app/assets/stylesheets/user/structure.css.sass @@ -1,27 +1,5 @@ @import compass -@import constants -$side-spacing: 5px -=user-button - cursor: pointer - border: 2px solid black - +border-radius(4px) - +box-shadow(#000 4px 4px 8px) - width: 34px - height: 34px - display: block - float: left - margin-left: 15px - background-color: $qbrown - text-align: center - line-height: 34px - background-repeat: no-repeat - background-position: center center - text-indent: -5000px - &.active - background-color: $qbrown-active - &.hide - display: none - +@import user/constants html background-image: $wood background-color: $background-brown @@ -58,14 +36,21 @@ body margin-top: 5px margin-left: auto margin-right: auto - background-color: green width: 262px a +user-button + span + display: block + width: 28px + height: 26px + background-repeat: no-repeat + background-position: center center &.home-list-link - background-image: image-url('icons/list.png') + span + background-image: image-url('icons/list.png') &.home-menu-link - background-image: image-url('icons/menu.png') + span + background-image: image-url('icons/menu.png') //padding-top: 50px .navbar-fixed-top margin-left: -$side-spacing @@ -82,11 +67,6 @@ body .order-count-cell white-space: nowrap .page-header - .supplier-name - float: right - margin-right: 8px - .table-number - float: right #list-needs-help-button button margin-left: 5px @@ -99,11 +79,32 @@ body padding-left: 5px .user-top-button +user-button - &#show-active-list - background-image: image-url('icons/list.png') - &#place-order-on-list - background-image: image-url('icons/menu.png') - &#list-needs-payment-button - background-image: image-url('icons/needs-payment.png') - &#list-needs-help-button - background-image: image-url('icons/needs-help.png') + span + display: block + width: 28px + height: 28px + background-position: center center + background-repeat: no-repeat +.top-button-bar + +button-bar + height: 90px + .button-bar-content + padding-top: 10px + .supplier-name + float: right + margin-right: 8px + .table-number + float: right + #show-active-list + span + background-image: image-url('icons/list.png') + #place-order-on-list + span + background-image: image-url('icons/menu.png') + #list-needs-payment-button + span + background-image: image-url('icons/needs-payment.png') + #list-needs-help-button + span + background-image: image-url('icons/needs-help.png') + diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 63895cdf..4c1cde3a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -97,4 +97,16 @@ module ApplicationHelper render(template, handlers: [:mustache]) end + def top_bar(options = {}, &block) + title = options[:title] + title = title.present? ? content_tag(:h3, t("user.#{title}"), class: 'title', data: {t: title}) : '' + content_tag :div, class: 'top-button-bar' do + content_tag :div, class: 'button-bar-inner' do + content_tag :div, class: 'button-bar-content' do + (title + capture(&block)).html_safe + end + end + end + end + end diff --git a/app/templates/user/_products_category_for_order.mustache b/app/templates/user/_products_category_for_order.mustache index eddbf7c6..fb7cf3ff 100644 --- a/app/templates/user/_products_category_for_order.mustache +++ b/app/templates/user/_products_category_for_order.mustache @@ -8,6 +8,6 @@ + {{#currency}}{{price}}{{/currency}} - + {{/products}} diff --git a/app/views/layouts/phone.html.slim b/app/views/layouts/phone.html.slim index 21fd232e..7fcbe663 100644 --- a/app/views/layouts/phone.html.slim +++ b/app/views/layouts/phone.html.slim @@ -57,18 +57,18 @@ html lang="en" QMobile.setAuthToken('#{current_user.authentication_token}');QMobile.setUserId('#{current_user.id}'); body class=action_name - .navbar.navbar-fixed-top - .navbar-inner - .container - a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse" - span.icon-bar - span.icon-bar - span.icon-bar - = link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand - .container.nav-collapse - ul.nav#top-navigation-list - li= link_to 'View history', user_list_history_path - + - unless ENV['QWAITER_MOBILE_EXPORT'] == 'yes' + .navbar.navbar-fixed-top + .navbar-inner + .container + a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse" + span.icon-bar + span.icon-bar + span.icon-bar + = link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand + .container.nav-collapse + ul.nav#top-navigation-list + li= link_to 'View history', user_list_history_path .container .content diff --git a/app/views/user/active_list.html.slim b/app/views/user/active_list.html.slim index 6dad3573..16966741 100644 --- a/app/views/user/active_list.html.slim +++ b/app/views/user/active_list.html.slim @@ -1,11 +1,13 @@ -.page-header - .table-number - .supplier-name - h4 data-t="active_list.title" = t('user.active_list.title', list: List.model_name.human) -.form-actions - = link_to t('helpers.links.place_order'), user_list_products_path, class: ['user-top-button'], id: 'place-order-on-list' - span#list-needs-payment-button.user-top-button - span#list-needs-help-button.user-top-button += top_bar title: 'active_list.title' do + .pull-right + .table-number + .supplier-name + .action-buttons + = link_to content_tag(:span, t('helpers.links.place_order')), user_list_products_path, class: ['user-top-button'], id: 'place-order-on-list' + span#list-needs-payment-button.user-top-button + span + span#list-needs-help-button.user-top-button + span .well table#active-list-table.table thead diff --git a/app/views/user/home.html.slim b/app/views/user/home.html.slim index 13ab7020..3ddfebd9 100644 --- a/app/views/user/home.html.slim +++ b/app/views/user/home.html.slim @@ -4,8 +4,8 @@ a href="#" onClick="QMobile.scanQr()" = image_tag 'scan-logo.png' .home-footer .home-footer-content - = link_to 'P', user_list_products_path, class: [:hide, 'home-link', 'home-menu-link'] - = link_to 'L', user_active_list_path, class: [:hide, 'home-link', 'home-list-link'] + = link_to content_tag(:span, 'P'), user_list_products_path, class: [:hide, 'home-link', 'home-menu-link'] + = link_to content_tag(:span, 'L'), user_active_list_path, class: [:hide, 'home-link', 'home-list-link'] - content_for :footer do javascript: $(function(){ diff --git a/app/views/user/list_products.html.slim b/app/views/user/list_products.html.slim index 0fe08708..336b73d7 100644 --- a/app/views/user/list_products.html.slim +++ b/app/views/user/list_products.html.slim @@ -1,11 +1,14 @@ -.page-header - .table-number - .supplier-name - h4 data-t="show_products.title" = t('user.show_products.title', products: Product.model_name.human_plural) -.form-actions - = link_to t('helpers.links.show_active_list', list: List.model_name.human), user_active_list_path, class: ['user-top-button'], id: 'show-active-list' - span#list-needs-payment-button.user-top-button - span#list-needs-help-button.user-top-button += top_bar title: 'show_products.title' do + .pull-right + .table-number + .supplier-name + .action-buttons + = link_to content_tag(:span, t('helpers.links.show_active_list'), list: List.model_name.human), user_active_list_path, class: ['user-top-button'], id: 'show-active-list' + span#list-needs-payment-button.user-top-button + span + span#list-needs-help-button.user-top-button + span + .well table#products-table.table tbody diff --git a/config/locales/en.yml b/config/locales/en.yml index 293f8b7f..bdcbfae4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -92,9 +92,9 @@ en: closed_at: Closed at supplier: menu: - active_lists: Active %{lists} + active_lists: Active lists active_lists: - title: Active %{lists} + title: Active list price: Price active_orders: title: Active %{orders}