From ebbfcab754780be27cd6622a19d16e22f6beb939 Mon Sep 17 00:00:00 2001 From: vKham Date: Mon, 5 Dec 2011 17:47:45 +0000 Subject: [PATCH] // add process icon images export csv toolbarstock, new page layout flexible module position, uniformisation stylesheet module git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10957 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/default/admin.css | 20 +++++++++---- .../process-icon-export-csv-details.png | Bin 0 -> 2041 bytes .../default/process-icon-export-csv.png | Bin 0 -> 1176 bytes .../template/addons_my_account/content.tpl | 2 +- .../modules_positions/list_modules.tpl | 27 +++++++++++------- css/admin.css | 9 ++++-- 6 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 admin-dev/themes/default/process-icon-export-csv-details.png create mode 100755 admin-dev/themes/default/process-icon-export-csv.png diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 4d53f16af..0845e3f83 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -177,6 +177,8 @@ a.module_toggle_all{color: #268CCD;} .toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);} .toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.png);} .toolbarBox .process-icon-save-and-preview { background-image: url(process-icon-preview.png);} +.toolbarBox .process-icon-export-csv-orders { background-image: url(process-icon-export-csv.png);} +.toolbarBox .process-icon-export-csv-details { background-image: url(process-icon-export-csv-details.png);} div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;} @@ -231,7 +233,6 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #addons_login_div input { float:left; margin-right:10px;} #addons_login_div input#addons_login_button { margin-right: 0px; } - /*SIDEBAR*/ .sidebar { position:relative; float:left; width:220px; display:inline;} .sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;} @@ -315,14 +316,10 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #statsContainer .blocStats h2.icon-currency span { background-position : -90px -36px;} #statsContainer .blocStats h2.icon-language span { background-position : -106px -36px;} #statsContainer .blocStats h2.icon-attribute span { background-position : -126px -36px;} - - #statsContainer .blocStats form { position:absolute; top:10px; right:5px;} #statsContainer .blocStats form.checkup { position:relative; top:0; left:0;} #statsContainer .totalStats { font-size:16px; font-weight:bold;} - - /*MODULECONTAINER*/ #moduleContainer { margin-left:220px; padding:13px 0 0 20px;} #moduleContainer .table tr th { height:40px;} @@ -350,6 +347,19 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #moduleContainer .moduleGridDesc h3 { color:#3A6EA7; margin:0;} #moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; } +/*MODULE POSITION*/ +.blocLiveEdit { float:right; clear:right; background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block; width:250px;} +.blocLiveEdit h2 { margin:0; padding: 0 10px;} +.blocLiveEdit p { padding: 0 10px;} +.blocLiveEdit a.button {Êfloat: left; margin:10px; display: inline-block;} + + +#modulePosition { width:100%; float:left; clear:left; margin-right:270px;} +#modulePosition .table tr th { height:40px;} +#modulePosition form{ margin-right:270px;} +#modulePosition .lab_modules_positions h3 { color:#3A6EA7; margin:0 0 0 10px; float:left;} +#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px;} +#modulePosition .lab_modules_positions span { font-size:12px; padding-left:5px;} /*FOOTER*/ #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666} diff --git a/admin-dev/themes/default/process-icon-export-csv-details.png b/admin-dev/themes/default/process-icon-export-csv-details.png new file mode 100644 index 0000000000000000000000000000000000000000..64a18fa4dd225e7ac2458f1db6d970eaa2af8d0c GIT binary patch literal 2041 zcmaJ?X;f2Z8ot1=3MwGexD>9}N^!}`5)ugl2}>A4*+CW|%LM`^H1gMq{3NG|0 zE}$SH7Dp&hP!PdF0c8;stt?>0!rmKcOjBhhFgR|*5p0)z*HY!NpG_Jg^C zq`!B-4gjD92?IjV5RMm}kBA6dHHIJ;Nia45IP8{7xcqn+1$l6cP|Sc-^^FiH6fmG* zTMmgMVZyOO4}}!=S9k~T74dwU0NU*cI>_mmfCxsppj@<1EThXA(0g4vwpSk$A@Dr} zjb}iA6cxhp0hx#t25ku>JfCDo0`15Ivb7DBO5F)kNMsU`L?MzXcrul4O`(%W;D-mo zvPlKebU&8chg?|1fMQWpLMIXv6B7xE)&xWvLnPB^G_?kWg2xbeS&|s#%JE{^mSqJN zEaOXs5>$wYLA4^6ha{j32&?puD~Kc?WyP`&ZNeHxlyfCSGJ&MN(lU_4`TtOn=p$N& z`oVwJ`#*(c0Z9^==m*P?1SuaIT=W)oDhZt_g}Epq4M326%U$$|MNmW*i%3AGzb(k& z@`Yk`{2tHY(Ai=c$`$irHj4pa3Iw50KxewxQe17FZOK%sJ(=uEcD8jTxloxdG^PvH z#>S4k%w-|`1Q9Gom$`yJxppgZ)m9Kmu*@u2D%=kX+@y#Ie1B!SaOGO8SJeB!6|7u~ z&5B$iRt!-+*#8>z@)719_4cD}vEZZeVKL@*DQ4?|(TpAd_=||mat@FW-VUBb`~z`I z`N@jp&QKE@<4_2y%9z*YJVw7KQS^Q7?$w-WYQ>$nvEC%pVqHjH$_bBYizzMN=+?oq zu%XGL*8lpO*X{OjuLo;lZ8RXaUB}PYT^05xr{2Fw+%Jwt`dJs0FNCjB?T_ha}Cr}4BWU`(&<(1|thu&!fnE*xM>?@Dl4(vR0 zd8RfDFduL1)=V3xiVfVJs0yBmY7-d*x1#5M>HGPdn zUSoK0)a;7)*3^S0*-C=n?ibTP0eNe! zwrYU!UGK<8OYmWr36^y?X$V(mFcBeDshLOKN3Kj2~f?m6g|2dgyh@E+?oOhB^Ro zq~3(du{)Pw{FA;u$BG-Zx)*bR!C4hCbg4>6>qXjM#o+2rFLcqi1>OmxYuy>FI9xha za^bftnX3h3sB(H|?Io9)9HQ3C{BOscA|oT6*S2MuGpE*l-ThYOd$Mr6?VE~?K1Q6A zCUmyyg`UZL`<}}?VsE7wOq=9Ffl(K)z5Vs4g~-RG?75M0-y|pl(3@9T`rO!St+ZF9 zum+{+rg|2uXZu>{rzmi`Q|r)RnWSfGDpl#R6`--cVO74~dg!Zija#Xs*TcJ+ZPTL_ zjm@kz=CWRWSG$?LwLWW`3z>(7l(Y2_!}lHp{E&+q!Og$f^o#wRWu0Pnq~qoG+@7-y zxVGN2mHEY)$xRau2l}d0W_+L%S=X;;lvbCTiw~s{h)=w(AHGkr5&!I|pOej=laE?I zU!SrX3LT3tFI0?uy|H5=$Z?_hi-F*(cfWV(20Nyg1pfGR=4sJ+-{}dO`^J;n+q|OR zs4Z$y;jrl!%9Dl^(bI0LyQ{61yyo!CU<+EO|Fa51> z?Aw*evyXams;c7p=K2c{C>>h6FSg!IXTQm>)cEd_?nVz)dwrmpX~Nq*$I7BseXf`G zkNXcl;qm=*nhQI1#`=RcpH{3Y$a8ZFU@l(CwK_f?lv{iH$G~glTIo*G3%G0gX1+Dh zWOe7m=qQ@*h5nau=?y8GeWx8Pl&7i(w!Nq~1Uj{ItM?ZeH!K-P0i_4);a&Xg{_3AG M+tr&@?h=*u9|H|ip#T5? literal 0 HcmV?d00001 diff --git a/admin-dev/themes/default/process-icon-export-csv.png b/admin-dev/themes/default/process-icon-export-csv.png new file mode 100755 index 0000000000000000000000000000000000000000..4ce1583b18cac1bbaf37551c6809eddcc97983d7 GIT binary patch literal 1176 zcmV;J1ZVq+P)@&$RB{`#imN!p3V}%Y523O;gS}4|TtB`W?2SewjF@jQCqu-m?#Qj5dh95tt`587UTlwI?BpyB;xU4JL>D|Hj%)8TMmR? zpr!>3L^Xzd-}|?0!Rf9pu!7`tDWzW|VUpcR9w(n$9zd`KT1fz?H|B3-u)Vrk`BLWQ z7iSh{;1&%;W`O!;{`wR12h%P{ai0$~3E0C~1V2cWUYDp!YAu-ihNenPmO`dM&O8k)Jb z49G0exdGGA7v3f=kj=Sp+$^|ez|iwA6UO?r)qqAqHBB9NA7-%hf3K1(l^<8%6EK9O zNZI@*y{9Wk`u27^9W%;s{;e5$iJKu=Aj0>Q<%v)3|3cjeaswp&RRn7CU7^~~4t%b_ za*e|_Z0tL^8{VaKbCn{bVBTtFpeG-CkOJunz^PZdu=Q<*j{V*Ebo98IPp9hXyDL9p zv@P>UctIjhLan&VQI5!$dvdjB$H!q(HDudyq{iRJ2QPnu11DcVtSpWg)duG;Uy{Lh zPwmKMjM3yp{%@Jxycs*Emz(6dDG4`_b6gNC#6^>1AX5E_4o@ z!pN~3HT2+DUk^TjJLpdp`T7#>V&maTVqZQ9uOu%7 qIqNNUcC`Rj3Nq`hUZvze0t^5FA)nlop3O%90000 +
 
diff --git a/admin-dev/themes/template/modules_positions/list_modules.tpl b/admin-dev/themes/template/modules_positions/list_modules.tpl index 66a5d5d82..e102e98ee 100644 --- a/admin-dev/themes/template/modules_positions/list_modules.tpl +++ b/admin-dev/themes/template/modules_positions/list_modules.tpl @@ -59,16 +59,17 @@ -
{l s='Live edit'} +
+ +
+

{l s='Live edit'}

{if $live_edit}

{l s='You have to select a shop to use live edit'}

{else}

{l s='By clicking here you will be redirected to the front office of your shop to move and delete modules directly.'}

-
{l s='Run LiveEdit'} {/if} -
- +
@@ -78,7 +79,7 @@ {/if} {foreach $hooks as $hook} - +
+ {$module['instance']->name|stripslashes}

{$module['instance']->displayName|stripslashes}

+ {if $module['instance']->version}v{if $module['instance']->version|intval == $module['instance']->version}{sprintf('%.1f', $module['instance']->version)}{else}{$module['instance']->version|floatval}{/if}{/if}

{$module['instance']->description}

+
{$hook['title']} - {$hook['module_count']} {if $hook['module_count'] > 1}{l s='modules'}{else}{l s='module'}{/if} {if $hook['module_count'] && $can_move} @@ -102,13 +103,13 @@ {/if} -
{else} -
{/if} - {$module['instance']->name|stripslashes} {$module['instance']->displayName|stripslashes} - {if $module['instance']->version} v{if $module['instance']->version|intval == $module['instance']->version}{sprintf('%.1f', $module['instance']->version)}{else}{$module['instance']->version|floatval}{/if}{/if}
{$module['instance']->description} -
{l s='Edit'} @@ -125,4 +126,8 @@ {/if}
{/foreach} -
\ No newline at end of file +
+ + + + \ No newline at end of file diff --git a/css/admin.css b/css/admin.css index 7494a9fc8..b6a8ce6ce 100644 --- a/css/admin.css +++ b/css/admin.css @@ -320,6 +320,11 @@ select optgroup option { width: 350px; } +.lab_modules_positions img { + float:left; +} + + /* STRUCTURE */ #container { @@ -428,13 +433,13 @@ select optgroup option { #unhook_button_position_bottom { overflow: hidden; - width: 600px; + width: 100%; padding-top: 10px; } #unhook_button_position_top { overflow: hidden; - width: 600px; + width: 100%; } #content .conf, #content .warn, #content .error {