From 9b5f3b8c03abae5ad6b52e9fdf80bffbf3dcc93c Mon Sep 17 00:00:00 2001 From: vKham Date: Mon, 28 Nov 2011 14:45:31 +0000 Subject: [PATCH] //consistency title page product, description, new form search header, new icon images package fatcow toolbar action git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10709 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/default/admin.css | 27 +++++++++--------- .../themes/default/process-icon-cancel.png | Bin 2342 -> 1713 bytes .../themes/default/process-icon-duplicate.png | Bin 1788 -> 1413 bytes admin-dev/themes/default/process-icon-new.png | Bin 1529 -> 1815 bytes .../themes/default/process-icon-save.png | Bin 3767 -> 1863 bytes .../themes/default/process-icon-stats.png | Bin 2371 -> 1049 bytes admin-dev/themes/template/header.tpl | 4 +-- .../themes/template/products/accounting.tpl | 3 +- .../themes/template/products/combinations.tpl | 15 ++++------ .../themes/template/products/features.tpl | 4 +-- admin-dev/themes/template/products/images.tpl | 9 ++---- .../themes/template/products/informations.tpl | 16 +++++------ admin-dev/themes/template/products/prices.tpl | 9 +++--- .../themes/template/products/quantities.tpl | 21 ++++++-------- .../themes/template/products/suppliers.tpl | 24 +++------------- .../themes/template/products/warehouses.tpl | 12 ++------ controllers/admin/AdminProductsController.php | 17 ++++++----- css/admin.css | 1 + 18 files changed, 63 insertions(+), 99 deletions(-) diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 24c5a5aba..4acb4d5c0 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -47,17 +47,12 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3} #header #header_infos #header_logout a span {color:#fff;} #header #header_infos #header_foaccess{ text-decoration:none; color:#fff;} #header #header_infos #header_foaccess a {color:#fff !important;} -#header #header_search{ float:left; margin-top:15px; } -#header #header_search #bo_query{float:left;background: none repeat scroll 0 0 #fff; border-color: #666666 #CCCCCC #CCCCCC; - border-style:solid dotted solid solid; - border-width: 1px; color: #333; font: 13px Arial,sans-serif; padding: 4px 1px 4px 4px; width: 180px; - box-shadow: 0 1px 0 #444444;} -#header #header_search #bo_search_type{float:left; margin:0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC; - border-style:solid solid solid none; height:25px; - border-width: 1px;} -#header #header_search #bo_search_submit { border-color: #CCCCCC #BBBBBB; float:left; font-weight:normal; margin:0; padding: 4px 8px 3px; cursor:pointer; text-shadow: 0 1px 0 #fff; border-bottom-left-radius: 0; border-left: 0 none; border-top-left-radius: 0; } +#header #header_search{ float:left; margin-top:15px; position:relative; } +#header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 #fff; border:1px solid #000; border-radius:4px; padding: 5px 25px 5px 4px; width: 180px; box-shadow: 0 1px 0 #666;} +#header #header_search #bo_search_type{ font-size:13px; float:left; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;border-style:solid solid solid none; height:27px; border-width: 1px;} +#header #header_search #bo_search_submit { background: transparent url(icon-search.png) no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0; cursor:pointer; text-indent:-9999em; position:absolute; right:0;} #header #header_quick{float:right; display:block; margin-top:15px;} -#header #header_quick #quick_select{margin:0; padding:3px 0 4px; vertical-align:middle;width:140px; height:25px;} +#header #header_quick #quick_select{ font-size:13px; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:140px; height:27px;} #header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;} #header #header_shoplist span { float:left; padding:3px;} #header #header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px} @@ -143,6 +138,10 @@ a.module_toggle_all{color: #268CCD;} .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;} .processing {overflow: auto;} +/*UI ACCORDEON*/ +.ui-accordion-header { background-color: #ccc; color:#000;} + + /*TABLE STATUS COMMANDE*/ .table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;} @@ -152,8 +151,8 @@ a.module_toggle_all{color: #268CCD;} .toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 48px; margin: 0; padding: 0;} .toolbarBox ul.cc_button {float:right;margin:0;padding:0;} .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;} -.toolbarBox a.toolbar_btn { border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;;} -.toolbarBox a.toolbar_btn:hover {} +.toolbarBox a.toolbar_btn { border:1px solid #f8f8f8; border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;} +.toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;} .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;} .toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);} .toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);} @@ -186,8 +185,8 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0 #productBox { position:relative; width:100%; float:left;} /*tab-pane*/ -form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px; margin-left:140px;} -/*form.defaultForm{ background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px;}*/ +form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:350px; padding: 5px 10px 10px; margin-left:140px;} +form#product_form h4 { font-size:18px; font-weight:normal;} .tab-row {} .tab-row .tab {background:#EFEFEF;width:100px;} .tab-row .tab-page.selected {} diff --git a/admin-dev/themes/default/process-icon-cancel.png b/admin-dev/themes/default/process-icon-cancel.png index 3cfadb3e2b64c0d26a9ab178241d0fde5f77bea8..1b20ae0d08f4e2c6c6a57ae830e706e729865b4e 100644 GIT binary patch delta 1660 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 Q82|tP07*qoM6N<$g48FDzyJUM literal 1788 zcmaJ?c~BEq99{(#6^e?=rDX}nsE}ks8Uh)@kxL>589>E@;wD)jg=9mrkbsPGcmNgz zZ%#!mMXB6KiJ%s*3YJlZ4hljAiZF$YR0IlG?FIq+N9oS&zW00cec$hVv#EZ*Ta8v& ztN;MOi0{qu$5&AI8Z5=X%DA|9_+pN6gRlTJ6jQ+p1n?50LImVX;V{G>fyJ>=j}bQj z&?86!gRmgMc7_O*l3*Q%q?XEYHUPMJsO7LI0>MBb5+;!`32$!QA%GGwldzj6fCO?j z5-#zMQy>9xzJa2+2$8Fp;NcFssTsI{6v1FnEsc~Z8EPhBMwfx_b;o1^I0L~Vn1oM3 z1qu8>HmX2C8VMqbAZG}4rjRJqujq8TBj^NCATs1crZ^EPbOzOl0YTvGL%_W$#Gwp- z4sX^MZZQer7$#?s$tsnKq@t2gMHrdl>guY~aB?Ez2%<7phQVs0OldQxz(JHEg+z`? zP#LIGgoS7{#w6g8eo8?qpO=*>XUl{ajI4&`WC{t=r8EZ=2>u@`mCmD;m_PD4-v1O< z2FA(}vOl6kqZJ~&aiKOkS8@hhfxsB52t?7yxhndFqZq0TN97|1Te{caNk+s=A^)CYqI3KP4=$Jk5&158q^hhjcV_4 zL)EQEEgxcD*HTSVDNAi9;}6A2rP_cSyGlG4XW1^#IC;|2!NI|*rKQD}+s>VSYud^x z9QonvGWwovFS@%w$Z}qvumxOF%z)9s!Qz6@QP3dB>{z5qHBlb8WvA6f&$4z=M&HOp zet!NvMV;Hk0bmdl$LDq2{G~%1V|9OOYU+G{f4?eR`MMj>bdl)8)3?icl{GbEHU8J? z>rDa1#s~EDr<#U_hKIw$!zFFNemCY(>-5YC@9~L=9hrH`RAB!L(sXopsK?=ua>y=W z6K0#6n|m=UZzl}E&qW1RwTfWEuI+QU`74vAD z5vbvo4k^Ijjp~bjOMB2e8XgkeMvH1#<=DC8oyT@DHFMWmZqM~0h83AeY$)ATf{xVi z`?3Iqd3wp4gLj3aW;ux!o-KW2tgQYE>E)=<7U&%7X&S#|It2whnHcB{HqEqrSsdO( z!`2mS51lltvR{-?0jML_ng^F94^(zG9re#^YGkJ|syVI8^e)YDF;Z z$D<(Wf}S7SK+ia>LtA93C7pu!2BrLl5R%W|z3JNS{_lh#z1OV(kA0s)KlO1~O1eoBPGu-n$=E1}g{X?h1hpC8lDr5rJ= zG@}#ph8QoY4aElwAYtO_agPx4hNQvGK39`-^J_J!RM`0nJ5kTn7T$ma)?BWOVDp4) zPVGjr)5n1VZzsd#unqAU`ks3-?TUHrsouTWG}!@~ diff --git a/admin-dev/themes/default/process-icon-new.png b/admin-dev/themes/default/process-icon-new.png index a4705a29fbed1d9ce0f601a32f82077516d238b9..60a7a2910eeaefb1c1d3ec231d08ec1312667c73 100644 GIT binary patch delta 1763 zcmV<91|0eM3zrU%NPh;oNklb zBw(ThsW*&1r~zW450V%~iTXkSUyO+_#u#6G@IfN6&;S~NghXQ0fM8pqwzS>tWqa>l z+P%%rjOWbGYdF zD!z@3;hSH-KzJ#7g5~qxjO{z?*M9{VtjxXhv8Wf`TBONIpJH>N^;h{sjK?UojYEW_hkiPGXVaN25cW8@014|UQRARI;D%=_@tPGulgDeMl&9Qhzu9$u=9RJWrB`?6}f*4kMEZ z3{PU@>_M!`HzHq+y!{ybue83f{F%pgA};l#tN%v~jC4Vg08y9+W-wjPB4V~7dis5t zs{!S%&G@tTG<+PA35=dOh`MYeq@0)^##bBa>$kkrya&2-7=QJAkD>8@Ko^1}n&2c9 za-`@VIe!GI31(#iva%wkOw-;7)>LhyF!W+JrWUVgMosSpoVFY$TApa!kNX`i?Az1) zB7~x8boQSl67^(mo_#w8-?hFS2U>JP_%}b(^SI9E!ZAOBvCDY4emiO_$;D3WV=T-2 zmI1P7HBLPB$QBfr0Mn5k_{KWZ;G((J6siHnt$)4cyE8!i+wg>tyO)K}2V=dEYzf?7 zy8$&7Kt%&iFlNSpRZpP8ZpXTHE4?Tx5^=5nctLPvg&==vD7@DQ3F#T1y@0hzCM~Y8VD8*xFY`gs6(rOEDoed6CoiwwioHlv z3x9Umg;(z>al`3!V3Z8VW;KUZ)91xvc%c;3^}M}#_RT5-sPNRm?Ii!Z@hW4}o#7P8 zB_6j3m(z_9kw!3GubG5XwRyKQNTNUtjA!b6nu_N2Y~nnL<4OQEB~69_jLFz+01HxT zEUjEsjDxzFYP%k2hu5?FmQCeQ%R;~SLVqXG@oyVsvv?`=XOkRhzo)m`ESe!kjU}a~ zGP#^#`x3wxTYPpwcH}Wfv?^IF89_=(NJ1jpp~rKt_33W{98v)in$LK*Ow3EE34cSM zWegjjt8w(q#&O?dXoxbQ8j+MgQ%adYHa)i#XXl5)Fbev@)a)tH$b#ax{D zMVPFPRi$Rf&=IAFgrzJ~)QSpATUd?HD8p zTO)*&=dmRBj2q|i)3PQ!H+9BE2L(Oe%K#4p|L=$M-@@|<{&DUl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|80+w{G(j&jGsViy#K6SD&B@r!+{Mk%(AB`g+{w(<(A>$~)XmAs z)y){D*Cju>G&eP`1g19yq1ObbUQklVEdbi=l3J8mmYU*Ll%J~r_OewbZnqfXG!Lpb z1-Dy_aO%|uIz}H9u}BdO69T3l5EGtkfgE_kPt60S_99@i-W7kxpMilX*VDx@q~g|_ z>HE8d9Yv1ce{*KmgZ>2?ixj%JZbf#8U7NS`|BT+M}5MlrwynTk+)V zwk6!=d9nX%KA+3o^kY+gtA@GdUYUJ2qJIB)8Z__nJ)Px;)qmUhN=MnGm0V-?oL^(f zt940v?$foov!-=%T2EV~Ge!6Gu|>xNM4vY?glr8~EZaAW-F;f+C)rOc*D~EuJ-kyj z&7Ajv26O)}l&p$4P**m!9(-(g-o-0_$ z;TYMvknh3KZwI$=nbsYhcit%K_$}=iv6FTie!ZBpzv%6%M*`>B<|uHv2XL|No;vFz zkNk$!cU0uIF5J3|KmUGi{<`<;Z0fc0CvmZ`$9$6#lGiY8=xILvi|bET!&CTY)+J`nA{)h=F&9iLpR@S)N`oVH=7z1oN{5dh*u21Ng7Ty60>`8u0VW4zO7o6>KCStstLc@j zNyWROU9Ue_xdlJ`^ns!2lZB}1oYo&*@dgdELYP`rdYL?4fA+{`4Oz-?{3Sy{$wl== uz83Xum4=KTq{6FD*SmQ)m_6Rkz|62Mzx49_=UmpH!r0T*&t;ucLK6U^!9)H4 diff --git a/admin-dev/themes/default/process-icon-save.png b/admin-dev/themes/default/process-icon-save.png index 05137c83f0d7327e1c606e859c5928aac3f725da..7786ac77ea5918f5ba473c6cc95738ba744572a2 100644 GIT binary patch delta 1848 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 diff --git a/admin-dev/themes/default/process-icon-stats.png b/admin-dev/themes/default/process-icon-stats.png index 0ff815b510269a1ed4ca952b4b08d736d6e0e7bc..a66163a4381f1330ea1c0a01f37073b85cf53076 100644 GIT binary patch delta 990 zcmV<410npw5}62)Nq@UZL_t(|+Qe2di`767p4r_b?|dQ(A{K(bz)sOd1WUa_u(J>g zEfg%o%En$1L{Mz55DNtxtFu!OL5nMGEe}Bj@i_I&d)XalHk*3md*>dxyJR+* zZ)U#vW)Zf&%$t)(UTW(W$#ri)1z@#WKK<_FIle8n^wAjrEPsgeW0x*&x@qOf)3dUd zul4N)Fd!lzYvISUB>*k2VlWYhUclZ9mqGT(-gy8(@~#jtOBq1IPXYjOYL&N9*t_Mr z!pw`^Xw7fxCIE0{CT3i-0YFKEW523o9M(#}_hQ?6?Ejhp#~D!UT&ZRT@a_34=0Oh$>jQw(opSVP1VD9+i3&h!dB=wR4J)4> zH@5M&z<=?sfm5Ze6M#Inn0Gg(4u7^-ila(Zd=$COINv7DK(O^^K+>$c z0eD+kka8HIYUzCa|I}xIVios1sJCJRfW<$)-mNo`DQ$WZZ3h6Fwxc-7n1qHfnxkT) zo)VCpqemqNIx-+OQ+1p+EjnWWRI*(-&;~#i_`VWYokL^~Lm=2fMX@eIlK`fXsn7+w z1Ajno21*X(n{XhX6rdLXVbBTi8HfRRaH1id08pab0O=iy+DD#=jkV1`P+G;@pJpd0 zUdC#v;-Mmk5uT#9R_7@IalEj`b%R#ggoKo?@d;udc)iuS_rQ=z3-Y8N4|n?`S`#8O zU?G8#+0|&@^v1PYxlF-=2ZD3hj!q7|##e%s3$33Co#zF9#qePyDRNMD3`p(soDftA ziB$skA3n;&%aE@_d>s%luro_UFdg?d@XBoVj2wW{ze^B^9Z+DBT8; zilS0U?Yl`t8!EXpbU{R=UCEkptL(HhZQA#bxA#2HIltfc_k2E|@AdgTCo3e_-^^sO z2@D1^3k;xyX;wh{8XIc9l9ZHj&0-5tqoHsi8feco1VlzmB z!Svv~h-fI99z%5l z{|+je9s>9Y#US8?L?f7J92&r3kQh%a9*=hiJkS_43hjZycpxx%qNfKDjRw9vaE&)H zi%krp(7yQ6SUzwr1c`_!lvFB3NE9{vMPFqFk}qY_6bvO}h)@_LTAR`=kWT;qP(J@FS^|ZE z|HS)0g(VTmA`le@N`y&brlxUhC#@?H(N7FAAfY%yC`_2GVhC3V2_;;i2=EK{0_Y4T zPoT9wyxq{j>z-n$174YgbzQa){Z9LQf)vO>)w2LYS7C%_md+@ zWU*&7Z8-86X8H0Ts!lmp95SKA zo%6rjl8;~caUHRn66Km+9^q65C_x&o|PJTBqr@morE@f$U1>;82a93(c*!#*} z!S>d7iLS5&Ps1fUL`A;mUfbNw30#Yh&-pN~Xu*W7|HxMJ0Q?JyOCOyo0Lr-3CTTnU|0G4rdtq+eKT>| z{79r@>4M?a0AfeRzj~CwIy>k6McwST`&T+_5cg&51)$a%XFd|Ntq^|P7kK3q|$Bfq3QeFON zAIsCf+bB>+JvdOid*@XIw={F8WW$rJ(1_l}30v(0gT{HPj$oS!9VPCqbyxdjYltxN zVAbH6ENk@T?CopRlq*Tg>IlK6i%|1>6)}z2D=4=K0_^RJx9i)dD+J^1-9ce?kSx=t z(~i16Yg5B%&UxpWeFwULO>gq7UT zhKR(N5Gjs?9?8GERrUF96T0$pYgc*kXn};y(=9X88G2r`W#Hnw-49e9Dt2h~z(&<= zjE_$D;_qn-6R??zK1xr3(}Mc|<3NbL&4T!wbt9I0hEr;ukM6R+=3SmRP14-mQqwc@ zom<@9PUu&F&r@wb{x-C{inebFKiE``O&rB4&LbYMT|UgjNu}0L6Rhxp9@(6MBc(HA@aII%BvYv-Vs^&3D+pCBh_?Mrhnn+Z6F3~B_oXQUA&0c z?`X3xuJaU0q$b?!6LsmoIEs zMY%MRbB4w_RW`2^shYdBe|p;cBqd!(!L2+R;EW^0g(mwO)G^-%kvG&R5<((L&R0#i z71Z=d*EfWMf9--zPEP8YP>?%LF3+&IwA9cF(c>(V9zA-r!~O>=D=Wj-X$=RMOfM4t2H%d_wuS?uV25GVOrjsm78J}hK&x7W-=09bxhqpySIVYU}Gj(ZMcfP zHAwYQfjYK&>2`_4a%!}1=;Wf9q@*LA_l=>4Ls>zkh1t4Iw};iF dPixY2VAuN>dfnn|xS;*538V&7D#$VEe*yf#>{S2& diff --git a/admin-dev/themes/template/header.tpl b/admin-dev/themes/template/header.tpl index fb1a4e5c2..bf48f9418 100644 --- a/admin-dev/themes/template/header.tpl +++ b/admin-dev/themes/template/header.tpl @@ -151,8 +151,7 @@ diff --git a/admin-dev/themes/template/products/accounting.tpl b/admin-dev/themes/template/products/accounting.tpl index 5db400d44..988471c74 100644 --- a/admin-dev/themes/template/products/accounting.tpl +++ b/admin-dev/themes/template/products/accounting.tpl @@ -23,7 +23,8 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - +

{l s='Accounting'}

+
{if !empty($error)}
{$error}
{else} diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl index 012a757b5..1f44e7c70 100644 --- a/admin-dev/themes/template/products/combinations.tpl +++ b/admin-dev/themes/template/products/combinations.tpl @@ -1,6 +1,3 @@ - - {l s='Add a new combination'} - - - - - -
{l s='Add or modify combinations for this product'} {l s='or go to'} +

{l s='Add or modify combinations for this product'}

{l s='or go to'}  combinations_generator {l s='Product combinations generator'} -
-

+
+ + {l s='Add a new combination'} +