From bf7acc1d1157609cdd5d19f6eecd1ac08a9eadaf Mon Sep 17 00:00:00 2001 From: vKham Date: Mon, 30 Jan 2012 17:26:28 +0000 Subject: [PATCH] // change layout dashboard flexible, add button change view module list normal favorite --- admin-dev/themes/default/css/admin.css | 27 +++- .../img/modules_view_layout_sidebar.png | Bin 998 -> 515 bytes .../img/modules_view_table_select_row.png | Bin 998 -> 489 bytes admin-dev/themes/default/img/play.png | Bin 0 -> 2805 bytes .../template/controllers/home/content.tpl | 72 ++++++++--- .../controllers/modules/favorites.tpl | 16 ++- .../template/controllers/modules/page.tpl | 8 +- controllers/admin/AdminHomeController.php | 71 +++++++--- css/admin.css | 121 +++++++++++------- img/admin/advertising.png | Bin 0 -> 1937 bytes img/admin/book.png | Bin 0 -> 858 bytes img/admin/cart_add.png | Bin 0 -> 1851 bytes img/admin/cart_remove.png | Bin 0 -> 1787 bytes img/admin/cross.png | Bin 0 -> 473 bytes img/admin/error.png | Bin 741 -> 543 bytes img/admin/package_go.png | Bin 0 -> 1410 bytes img/admin/page_white_add.png | Bin 0 -> 1272 bytes img/admin/play.png | Bin 0 -> 2055 bytes img/admin/plugin_add.png | Bin 0 -> 1919 bytes img/admin/tick.png | Bin 0 -> 451 bytes .../plugins/fancybox/jquery.fancybox.css | 6 +- 21 files changed, 230 insertions(+), 91 deletions(-) create mode 100644 admin-dev/themes/default/img/play.png create mode 100755 img/admin/advertising.png create mode 100755 img/admin/book.png create mode 100755 img/admin/cart_add.png create mode 100755 img/admin/cart_remove.png create mode 100755 img/admin/cross.png create mode 100755 img/admin/package_go.png create mode 100755 img/admin/page_white_add.png create mode 100644 img/admin/play.png create mode 100755 img/admin/plugin_add.png create mode 100755 img/admin/tick.png diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 299f96678..419324ec5 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -393,7 +393,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;} #moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;} #moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;} #moduleContainer .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic; font-size:12px; display:block; clear:both;} -#moduleContainer .setup {background-color:#6db300;font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;} +#moduleContainer .setup {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;} #moduleContainer .setup.non-install { background-color:#ec7000;} #moduleContainer .setup.off{ background-color:#ccc;} #moduleContainer .row-actions-module span { padding-right:5px;} @@ -436,3 +436,28 @@ ul.listForm li {padding-bottom:3px;} #footer .footerRight {float:right; margin-right:10px;} #footer .footer_link, #footer .footer_link:hover { color:#268CCD;} +/*DASHBOARD*/ +.pageTitleHome { font-size: 1.6em; font-weight: normal; margin:0; padding:10px 0;} +.pageTitleHome h3 { font-weight: normal; margin:0;} +#dashboard { background-color: #EBEDF4; border: 1px solid #C2C4D9; display: block; padding: 10px; position: relative; min-width:1200px;} +#dashboard h2 {font-size: 1.4em; font-weight:normal; margin:0 0 15px 0;} +#iframe {} +#iframe #video-content { float:left;} +#iframe {position:relative; display:block; min-height:180px;} +#adminpresentation #video { float:left; padding-right:15px; min-height:150px;} +#adminpresentation #video a { position:relative; height:128px; width:220px; display:block; padding:6px; } +#adminpresentation #video a img { } +#adminpresentation #video a span {background: transparent url("../img/play.png") no-repeat scroll left top; height:128px; width:220px; position:absolute; top:0; left:0; z-index:1; display:block; border:6px solid #fff; border-radius:3px; } +#adminpresentation #video a span:hover {background-position:left bottom;border:6px solid #C2C4D9; transition:background 0.5s;} +#adminpresentation #video-content { padding-left:10px; min-height:150px; } +#adminpresentation #video-content p { font-size:20px; line-height: 26px; color:#585A69; text-shadow: 0 1px 0 #fff;} + +.view-modules { float:right; margin: 10px 0;} +.view-modules li { float:left;} +.view-modules li img { padding-right:5px;} +.view-modules li.normal-view-disabled { background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-right-radius: 0; border-right: 1px solid #ccc; border-top-right-radius: 0; color:#999; } +.view-modules li.favorites-view-disabled { background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-left-radius: 0; border-left: 1px solid #fff; border-top-left-radius: 0; color:#999; } +.view-modules li.normal-view-disabled:hover, +.view-modules li.favorites-view-disabled:hover {border-color: #CCCCCC #BBBBBB #A0A0A0;} +.view-modules li.favorites-view {border-bottom-left-radius: 0;border-left: 1px solid #fff; border-top-left-radius: 0;} +.view-modules li.normal-view {border-bottom-right-radius: 0;border-right: 1px solid #ccc; border-top-right-radius: 0;} diff --git a/admin-dev/themes/default/img/modules_view_layout_sidebar.png b/admin-dev/themes/default/img/modules_view_layout_sidebar.png index fff8da0fb2d7b27954463824904d17ec4e92da51..c333e7b6b485eaa470559c08ebe5e803d0b4c09e 100755 GIT binary patch delta 488 zcmV=klfX;q6$l}I1#`}k&7AnQ)_9>*egoCS z8vLHGJE{l#et=|h0B6}VFvffUq^xSJx_NC*B$9qq&GSx9Od~bbrUG#1L`Vy^tdNEp zlwvB6ZTU$wxEV7Kd$=v+!CA-w%?vFdrLW`prJz6}KqcN2QxzwJ6z-l(e{62d1A>Ev zBo2;Dj93N?!+_;xBq56VoaySSsmyPe%B;Xw_czYYluc(emB*)oznm#a{4fQ@uTSsw zFL?LD;qW&zaRW%#kg93m0*QDGjN48Vi90p5BN7R`gTNR)0&`=l*grg0oMb_u5!Bqpah~0tGnTr{73eIvQ0= eM{`p85?}z5JmnO6-c!2(0000*hW!}vo~V#LIXON?50w>!?8nVs7^_ik^GgSqVGZhz+c-uJ%uW)=Z}@4371 z^pB5I#Xx`%u%!bLz-0*Sj#&6He>-)B&UJR(c_y}d5GG-B`IVu_X}o#$8kpk%G6pC= ztsH_rK>&g8!>Kc;!C+>H0EV)2&x4h>EAV}NU8X{`SbBv1fdLpjHmV8f>5)fo;@p+s z-(Y(BrefME3Zx||J2&?bP8=VrxK=^HahQtSm*DR|thQ8vBZm*Fxe22-e*xy$D(LF! zw9;)V_mNc6Pr|54fGP8l5)SnC_O?_3niCC1O#&3`$jE+}pPP^Iuns|(oHjFtheycr zbre7b=f=;&#feKsdNl9>_(2IuK@ltkOjU#Gi@fC*i?s>3+=It29>L2m%W{4v^1Kgc z_m9K1@f)!A^)nO-8>!2bf8y!x?t%WkzBmGUGEWj%{e*@5gSJnImR$WGuCrBRf@%=KqXBY z(v|8`Yc8w8jC{hV(P)=M)cXuNSYir71*G9Lfj}>%X052`nhg?&R!sdAI4l%El_UaF zO-NW!wAM~fz?e6-e-(==hspr^N|m}NPNS)~A4xn1c2pz=du zjR~xB>27LKit~WY5Gywimzs_tP|g8F44IyQYDCs&F$#nPC|X(0cEA3i4PZB|x%s2dzKboQ1#g`2A0S0RU1&D4FL)!L$GX002ovPDHLkV1kTs!=(TK diff --git a/admin-dev/themes/default/img/modules_view_table_select_row.png b/admin-dev/themes/default/img/modules_view_table_select_row.png index 7ae398042bccb77f53e71053f527ae05466d5f28..8a7c0436ff5f79212b7e553f797d06598ee41442 100755 GIT binary patch delta 462 zcmV;<0WtpO2k8SLiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyxe*ue0 zL_t(|+N6^|OT$1I#-F=OlVU+<7Y7Ha;3sesTmO9l5l6p(vqjsXpFt=tPIb_3T2b0g zRvld=1-BwDinWM~X>z`oT$;2fVtwJrFPD4Yd!F|$Y_fRK{P=X|9S`s%z@UOa(=ao} zkl;Yd6c10ir5TLxRplt5^S~Xof31qEEO5OB+^is9eFSco{V~92ZJ@c}FAwt!==|N+ z61WgBNM4dVD0WKze4I_*L!onkLg-8tkeW6#)8J$^A%IG)g^f(wpFfH5G4Xmft-BE_ z(2=B_RRN{I;1U+sI}EVruZu^&K&5sMK^27HFlkiktw461xgbS0wpVAPe+tRmso&LS zN6MF;lyAiQm$vNEv-=Hqyx|uLbdFU$(XNE;!A)507U-T(jq delta 975 zcmV;=12FvQ1Lg-IiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPae*=g~ zL_t(|+Qe5ePZU8Eelt6VcZVW0XkkNV)E}UUg)!PdFf@pXorOQZP6UYot&EkG9U2q0 zAS8I07{P`Fe}ID8&`?N4qH-X6JL7vZv%52U7ZQdOCz;#ZZ+7N=``-87%rXEFCm+;i z>j@i(C4f}mHKu=+{-@f2aRf^of1nzv+K-8WA;OMz-Je&7-N+`{7Wh-9H`i@x5Gj_C zFt-3bvkRk}&)`wdZT#P1@jy)BdU6Ng;v86;Wg@_o>z{}_1f>4oA@H8MV%E2Tn8s~j zj7>&&y_I{ljrvqSjL)qB=OvuSYz!4dOoCtv8aO#ohFB;jNnG|qGp?Tt z#H6IPO&C&}!cDm-Gn`*38qCVWMkXA~C6G1YBrFPsq5D}*fJjA%BeNs;q_6{_m_*k~ zzrYv*DXE!-&n5{VXAp6Ye+zMp--{Q@} z3S7T(1{%r1Fp9hKB$$T4-l@bW)zyHs<-iCjs}4aJIVO9#mLlX{c=W@RN)alEuGyqO zOcn%~Yrqb4RdIq#0L*=GUC}bK{!s=LUV{5V>f7p##C`I|sWm1Xh zw@5HH(k5>RrYsg?Jy5TPpmTg4>QlB7rff>+tCx4qqhL(YU^WYuzpTTBv!^_D?-wId z0$=XtlTV%pJPi=X7;ENkBPW1sz#qhRaQl*W;Sh{Gpp@_3CIU1{lgKdRc@>LnB~wm? z+c#zj6&ZL0$Z#p*e|i^mLqJ<<8ILiEgv_=3#nKS4R;4)I7-DqQ$m3;a$1-Weu|Ivk zuEi9JrNT@a$~_P0hUbB|dmf)&FMV$-MvZKeZO;SSg+nQ~h3MB#17f^)_xTWv)}}Qp z9Q^HALF<;CZk2z3P^@V$NOjS{{Rg@25pL5Zr&NbxvQTB4f6fEbA6Cqbdmca~3!MG@ z<2SFsgkZ+)3U1-<=pIaZ%cFaX@WtY4TQO>6GZ&%bc3Jo;qMoLZ`^6K2Daa4Jo(4Gc z<6dlO0c8io82A~Mh2TGanwb!E3iy3|;@#00YiP@lQ)Yao+JJFe?#bp)JKT-E4|`AZ xq4}RR;(PGX4E}tT%Vm{zf zkh$tN9)teiA_%2oJ{IN8*oC%(cp!QUj(}wmNCY$qzyW6F78Vw!Xd(e1;0Z)LK*RzT z6f+`)KtRuZ7$h4nD460#v!Ba_tf-g}fdHo9@gk83Co;o9ynT3pOeU)^h(s*nf#pYV z1xzuP%U?H-Km++K9vc?0Aud{l$P9$S1yl@D>BlW_;7_nz{@gJk2Zk3jVLX5%sJ1lk z$YA_`R}SZsH(%feF4X&3V7^BL4C38DJ`~PlAr}|CPL&F#*zrK70OEN-(1H0=+!X=| zAbto0qwUZ?*GbNLp_~PUoz`hr>G*Z_ zJ-Zac?!bSS(c2G|V_xq%-WPfN=f3Tn{%vRD)z`>LX%`!6cQ!Y#KT)#c#7uyhn*ZhZ z>tlk0qq6j-ypNZSAL<=%f*woESd2|6d9G^Un2|Foc9BeN&VKAe$v)av_=mm)LtAcz zKiX15wB>?n>Mk|>XzEKebr&plk@}JkcBod|w%nr%)F(-rYQ`vdKlB|`7 zB;c}^5xr_LH6fdjYg*VRCY6egb+C{9cFEweeonr%=-d4IQ~lhl{|vz2v=Le!?FhB? z=_d!@9WNRvtufid0j}}l{6iZSOJB=J;x2a`cu>r$FFh4%qds|glndRCwDtBX3+%la zB_XCZ@6}yveNCvwzsZ)a@N=tNHhD{_RL&+3G)X(QSXj)Cwq#mW*}{Fdy3d`F)(yx+ zU|sZA1Ty(ut6$7xxm#3b$(h$jG!3ai87Gwo`H*m5!9|Z>yhta?>Pd zxMYwGL3cB)BVI8{>6tsuKQQw5_c!unz}ERoCnGm?%M`rf_JZOE=Uw&mbahwS+uN5H z`d7T^(thmJ(sHbC`G)kP@4Wklt$O4Yq76PiKE!XX9VyC>T08T{9!;EA^$ks2m`1;b zMMX{A1+5J(89PKmp-Vz?^5o%{-4co9k3j$*>l_3_^<;vy39L>cMJVr|^UL1#d$>qc z*0RoAw)=GbKT`CgT(Rwg---_U#u8iUVF&RgMZLKR0qe@syHa0`i+9)fHx3P)Z&~aRS3RB_p{ctu zrQ+n@qWgl9REqj*HSI`BQ!3f{DB<7H)L$oAkgH0zOAU*D4=7Pjad&rLF<8`1AjK7v z5{wTQ2PUzI%&E-@R?ME$XU??v$~RF5pFH!98~O^THPTVnx!+mbwXt*!bIM;FyDk8J zR1;zfT)kdxW!&<@WHZ)Mp^MWx0EKz^nznK$kH}r%m9t%aIi0%kV>KqH^Y95(M=!nV zId^fbM7pumV=R2qCr}1Fou)^xAxjxdhp1jRZJaXa(NrRsmJiU%s(;nSH3ZhZdHJM9 zFUgSn%JaIy4#p3UzH!M|hRp8t9O)~3g~zdBC)-C2iZ zg}sBrtQC>?>ctYhwNv$Zno0Wx^dqU^1C1$#Y3b=#rl+S}dDs17APDLhf9zzl1(8a| z3_&rW{3YE2vayMtdfVBS?`52vn5gq+Vj_I-&~gPGKEglyu8Tvoq6c#x)u6*NWn;Ci*c7?F+4w z4+Epl@SfgId~`TIK2k$NWtx)cDFv_pSWM=g!J9@nIr$;u%0srgn}eT|U<;KD3O_bRtzp`dlaaNbPxfE_5PQM_TAa4P&-y8mNr& WNR&h4H$v4z)RFE&yR`lL*gpYtA({LD literal 0 HcmV?d00001 diff --git a/admin-dev/themes/default/template/controllers/home/content.tpl b/admin-dev/themes/default/template/controllers/home/content.tpl index e46f60923..6c49cb70d 100644 --- a/admin-dev/themes/default/template/controllers/home/content.tpl +++ b/admin-dev/themes/default/template/controllers/home/content.tpl @@ -24,12 +24,15 @@ * International Registered Trademark & Property of PrestaShop SA *} -
-
+

{l s='Dashboard'}
-
- {if $upgrade} +
+
+ + +
+ {if $upgrade}
{if $upgrade->need_upgrade}

{l s ='New PrestaShop version available'} : {l s ='Download'} {$upgrade->version_name} !

@@ -42,13 +45,20 @@

{l s ='If you don\'t know how to do that, please contact your host administrator !'}


{/if} {if $employee->bo_show_screencast} -
- +
+

{l s ='Video'}

+
+ +
+
+

{l s ='Start now with PrestaShop and all new features to help you sell more and simplify management of your shop'}

+
+
-
{/if} -
-
+

{l s='Quick link'}

    {foreach from=$quick_links key=k item=link}
  • @@ -99,20 +107,32 @@ $(document).ready(function() {
    • {/foreach}
+
+

{l s='Your Required'}

+
+
+ + {$tips_optimization} +

{l s='Loading...'}

+ + + +
+ + +
+

{l s='Your Indicators'}

{$monthly_statistics} {$customers_service} {$stats_sales} {$last_orders} - - -
- {$tips_optimization} -

{l s='Loading...'}

-

{l s='Loading...'}

{hook h="displayBackOfficeHome"}
 
+ +
+ diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl index d4f26f938..26fcc5307 100755 --- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl +++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl @@ -1,23 +1,25 @@
{include file='controllers/modules/header.tpl'} + - {l s='Normal view'} - {l s='Favorites view'}
- + + + + - - - - + diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index e1c21ddfb..412945a90 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -29,9 +29,11 @@ {include file='controllers/modules/header.tpl'} {include file='controllers/modules/filters.tpl'} -
- {l s='Normal view'} - {l s='Favorites view'}
+
diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index bb1393892..50490c44e 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -89,9 +89,9 @@ class AdminHomeControllerCore extends AdminController $shopEnabled = (Configuration::get('PS_SHOP_ENABLE') ? 2 : 1); $lights = array( - 0 => array('image'=>'bullet_red.png','color'=>'red'), - 1 => array('image'=>'bullet_orange.png','color'=>'orange'), - 2 => array('image'=>'bullet_green.png','color'=>'green')); + 0 => array('image'=>'cross.png','color'=>'red'), + 1 => array('image'=>'error.png','color'=>'orange'), + 2 => array('image'=>'tick.png','color'=>'green')); if ($rewrite + $htaccessOptimized + $smartyOptimized + $cccOptimized + $shopEnabled + $htaccessAfterUpdate + $indexRebuiltAfterUpdate != 14) @@ -158,6 +158,7 @@ class AdminHomeControllerCore extends AdminController if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) $this->addJqueryPlugin('excanvas'); $this->addJqueryPlugin('flot'); + $this->addJqueryPlugin('fancybox'); } protected function warnDomainName() @@ -172,26 +173,50 @@ class AdminHomeControllerCore extends AdminController protected function getQuickLinks() { $quick_links['first'] = array( - 'href' => $this->context->link->getAdminLink('AdminCategories').'&addcategory', - 'title' => $this->l('New category'), + 'href' => $this->context->link->getAdminLink('AdminStats'), + 'title' => $this->l('Product sold recently'), 'description' => $this->l('Create a new category and organize your products.'), ); $quick_links['second'] = array( - 'href' => $this->context->link->getAdminLink('AdminProducts').'&addproduct', - 'title' => $this->l('New product'), + 'href' => $this->context->link->getAdminLink('AdminOrders').'&addorder', + 'title' => $this->l('New order'), 'description' => $this->l('Fill up your catalog with new articles and attributes.'), ); $quick_links['third'] = array( - 'href' => $this->context->link->getAdminLink('AdminStats'), - 'title' => $this->l('Statistics'), + 'href' => $this->context->link->getAdminLink('AdminSpecificPriceRule').'&addspecific_price_rule', + 'title' => $this->l('New Specific Price'), 'description' => $this->l('Manage your activity with a thorough analysis of your e-shop.'), ); $quick_links['fourth'] = array( - 'href' => $this->context->link->getAdminLink('AdminEmployees').'&addemployee', - 'title' => $this->l('New employee'), + 'href' => $this->context->link->getAdminLink('AdminProducts').'&addproduct', + 'title' => $this->l('New Product'), + 'description' => $this->l('Add a new employee account and discharge a part of your duties of shop owner.'), + ); + + $quick_links['fifth'] = array( + 'href' => $this->context->link->getAdminLink('AdminModules').'&addcategory', + 'title' => $this->l('New module'), + 'description' => $this->l('Create a new category and organize your products.'), + ); + + $quick_links['sixth'] = array( + 'href' => $this->context->link->getAdminLink('AdminOrders').'&id_order', + 'title' => $this->l('New admin order'), + 'description' => $this->l('Fill up your catalog with new articles and attributes.'), + ); + + $quick_links['seventh'] = array( + 'href' => $this->context->link->getAdminLink('AdminCmsContent').'&addcms', + 'title' => $this->l('New Page CMS'), + 'description' => $this->l('Manage your activity with a thorough analysis of your e-shop.'), + ); + + $quick_links['eighth'] = array( + 'href' => $this->context->link->getAdminLink('AdminCartRules').'&addcart_rule', + 'title' => $this->l('New Cart Rules'), 'description' => $this->l('Add a new employee account and discharge a part of your duties of shop owner.'), ); return $quick_links; @@ -206,7 +231,11 @@ class AdminHomeControllerCore extends AdminController $content = '
'.$this->l('View more').' '.$this->l('Customers service').'
-
+
+ + + +
'.$this->l('Thread unread').' @@ -269,7 +298,11 @@ class AdminHomeControllerCore extends AdminController $content = '
'.$this->l('View more').' '.$this->l('Monthly Statistics').'
- +
+ + + +
'.$this->l('Sales').' @@ -337,7 +370,7 @@ class AdminHomeControllerCore extends AdminController public function getLastOrders() { $content = ' - +
@@ -371,7 +404,7 @@ class AdminHomeControllerCore extends AdminController $content .= '
'.$this->l('ID').'
- '; + '; return $content; } @@ -437,16 +470,16 @@ class AdminHomeControllerCore extends AdminController $result['discover_prestashop'] = '
'.$this->getBlockDiscover().'
'; if (@fsockopen('api.prestashop.com', 80, $errno, $errst, AdminHomeController::TIPS_TIMEOUT)) - $result['discover_prestashop'] .= '
'; + $result['discover_prestashop'] .= '
'; else $result['discover_prestashop'] .= ''; // SHOW PAYPAL TIPS $content = ''; - $content = @file_get_contents($protocol.'://api.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); + $content = @file_get_contents($protocol.'://www.dev.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); $content = explode('|', $content); if ($content[0] == 'OK' && Validate::isCleanHtml($content[1])) - $result['discover_prestashop'] .= '
'.$content[1].'
'; + $result['discover_prestashop'] .= '
'.$content[1].'
'; $this->content = Tools::jsonEncode($result); } @@ -514,7 +547,7 @@ class AdminHomeControllerCore extends AdminController $isoUser = Context::getContext()->language->iso_code; $isoCountry = Context::getContext()->country->iso_code; - $content = @file_get_contents($protocol.'://api.prestashop.com/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); + $content = @file_get_contents($protocol.'://localhost:8888/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context); if (!$content) return ''; // NOK diff --git a/css/admin.css b/css/admin.css index c159fc35e..0b77eeec7 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1105,13 +1105,8 @@ html[xmlns] .clearfix { margin-top: 5px; } #adminpresentation{ - width: 902px; - border:1px solid #cccccc; - background-color: #F8F8F8; - float: left; - margin: 0 0 15px; - padding: 10px; position:relative; + width:100%; } #listpresentation{ @@ -1160,14 +1155,14 @@ html[xmlns] .clearfix { #footer_iframe_home{ position:absolute; - top:379px; - left:675px; + top:0; + right:0; } #footer_iframe_home label{ float: none; - padding-left: 10px; - color: #903E5B; + color: #585A69; + font-weight:normal; line-height: 15px; } @@ -1183,19 +1178,27 @@ html[xmlns] .clearfix { } #column_left{ - width: 610px; + width: 49.1%; float: left; padding-top: 5px; } #column_right{ - width: 315px; + width: 49.1%; float: right; - padding-top: 5px; + padding:0; +} + +#column_right .table_info { + width:48.1%; + float:left; +} + +#column_right #table_info_last.table_info { + width:48.1%; + float:right; } -/*homepage*/ -#homepage { width:925px;} .F_list{ list-style: none; @@ -1204,46 +1207,64 @@ html[xmlns] .clearfix { } -#first_block a, #second_block a, #third_block a, #fourth_block a{ background: #F8F8F8 none no-repeat scroll center 6px;} +#first_block a, #second_block a, #third_block a, #fourth_block a, +#fifth_block a, #sixth_block a, #seventh_block a, #eighth_block a{ background: #F8F8F8 none no-repeat scroll center 25px;} #first_block a{ - background-image: url('../img/admin/folder_add.png'); - margin-left:0; + background-image: url('../img/admin/package_go.png'); } #second_block a{ - background-image: url('../img/admin/package_add.png'); + background-image: url('../img/admin/cart_add.png'); } #third_block a { - background-image: url('../img/admin/chart_bar.png'); + background-image: url('../img/admin/book.png'); } #fourth_block a{ - background-image: url('../img/admin/user_add.png'); + background-image: url('../img/admin/package_add.png'); +} + +#fifth_block a{ + background-image: url('../img/admin/plugin_add.png'); +} + +#sixth_block a{ + background-image: url('../img/admin/cart_remove.png'); +} + +#seventh_block a { + background-image: url('../img/admin/page_white_add.png'); +} + +#eighth_block a{ + background-image: url('../img/admin/advertising.png'); } .F_list li{ float: left; + margin-right:15px; + margin-bottom:15px; + display: block; } .F_list li h4{ - width: 115px; - font-size: 14px; - font-weight:bold; - margin-top: 35px; + width: 95px; + font-size: 11px; + font-weight:normal; + margin-top: 55px; margin-bottom: 0; - line-height: 14px; + line-height: 16px; } .F_list a{ float:left; color: #333; - width: 125px; - margin-left: 14px; + width: 95px; border: 1px solid #ccc; padding: 5px; - height: 120px; + height: 95px; text-align:center; border-radius:3px; } @@ -1254,16 +1275,16 @@ html[xmlns] .clearfix { .F_list li p{ font-size: 8pt; + display:none; } .table_info{ - width: 283px; float: left; - padding: 0; + padding:0; + margin:0; border: 1px solid #ccc; - margin-right: 15px; - margin-top: 20px; border-radius:3px; + background-color:#fff; } .table_info h5{ @@ -1310,7 +1331,6 @@ html[xmlns] .clearfix { .table_info_details{ border-collapse: collapse; - width: 283px; border: none; } @@ -1334,8 +1354,7 @@ html[xmlns] .clearfix { font-weight:normal; text-align: left; padding-left: 10px; - width: 150px; - font-size:12px; + font-size:13px; } .table_info_details tr td{ @@ -1347,11 +1366,12 @@ html[xmlns] .clearfix { #table_info_large{ margin-top: 20px; margin-bottom: 20px; - width: 586px; + width: 100%; float: left; padding: 0; border: 1px solid #ccc; border-radius:3px; + background-color:#fff; } #table_info_large h5{ @@ -1379,11 +1399,13 @@ html[xmlns] .clearfix { width: 586px; height: 175px; background-color: #fff; + margin: 15px auto; + text-align: center; } .admin-box1{ background-color:#F8F8F8; - width: 310px; + width: 48.1%; float: left; padding: 0; border: 1px solid #ccc; @@ -1407,14 +1429,14 @@ html[xmlns] .clearfix { } .admin-box2{ - width: 310px; - float: left; + float: right; padding: 0; border: 1px solid #CCCCCC; font-size: 8pt; margin-bottom: 20px; background-color: #f2f2f2; border-radius:3px; + width:100%; } .admin-box2 h5{ @@ -1430,6 +1452,7 @@ html[xmlns] .clearfix { font-weight:normal; } +#discover_prestashop { width:48.1% !important; float:right !important;} .admin-home-box-list li img{ margin: 0 5px; @@ -1481,10 +1504,10 @@ html[xmlns] .clearfix { #table_customer{ border:1px solid #ccc; - width: 590px; cellpadding: 0; cellspacing: 0; border-radius:3px; + background-color:#fff; } #table_customer thead span{ @@ -1494,13 +1517,13 @@ html[xmlns] .clearfix { text-shadow: 0 1px 0 #fff; line-height: 35px; display: block; - text-align: center; - height: 30px; + height: 39px; border-left: none; border-right: none; } #table_customer thead span.first{ +text-align: center; } #table_customer thead span.last{ @@ -1547,8 +1570,8 @@ html[xmlns] .clearfix { #table_customer tbody tr td{ border: none; - padding-left: 10px; height: 35px; + font-size:12px; } #table_info_news{ @@ -2246,6 +2269,7 @@ margin-bottom:7px; width: 300px; } + #container_category_tree { border: 1px solid #ccc; border-radius: 3px; @@ -2258,4 +2282,11 @@ margin-bottom:7px; #container_category_tree a input{ margin-right: 3px; -} \ No newline at end of file +} + + +#block_tips {float:right; width:48.1%} +#block_discover {float:left; width:48.1%} +#block_partner_tips {float:right; width:48.1%} +.row-news { width:100%;float:left;} +#table_info_news { border:1px solid #ccc;} \ No newline at end of file diff --git a/img/admin/advertising.png b/img/admin/advertising.png new file mode 100755 index 0000000000000000000000000000000000000000..300fc6fdc4951ec4d8ceedd3b6e94d53949a395d GIT binary patch literal 1937 zcmV;C2X6R@P)+6Mh^;Pk0Rh4+2sD_Eh%;PoQ^Iw7KpAdb7TfOrh(M^~e zZxKB|wqu9*$>$TXty{(Mb?a;<9y5>Ecn|O8Gklh1u&loW(JrDu;4{n$&4?uQ#1?)9fqm3@2nQsv^sw798B@4{GDjvk3dC3)0*w6Bj=wY2Ek=qUAn z`6Zb?A59v@@H?^CZY-zgYJu|aYHH$j)zvg~?AY{1&Et_In-GebUloocNsd94D_7FM z$Ovs17+8pDVm1(ChR;7R4P!M-H<=k9Z(Ouu1!Yd3CZiBkE6`b+p}!8>sC}$RZfc6E zAmfM-ac?l#9_#Kd&f4~GTZrz$mK@D^GCp?F<{dj4metiY)`i2Qojpqv!^5OO@H8o9 z{+0^%@>x1_hFI3J+S*2ztpdR}n*}^S5Pfn(XXhQsBS*-wZ7GCrsq?KgZH{k9CjlAb zu%O80$buq>2V#uEix*1uf-XH)U*BC73{t$KL*7XGlu6xAD#E^J9(o}?q5W0C!nl9} z3$MD0hAfMky1JHv-4Dvlbb<3G(L)oKWrq;)QUDI>MMV_cxKZ{z*BCULB`1@i9QU9c z#?FNcBtULYuHsl@1wshs$?22F2??fOV&Nnql48~$i*8s(z5~T#PSTr0K zCjcBNE*25=ECAZ)5zzBIVi6YHCtiC^SO*V^RBNl~U}Zt6{rkma zTbmr8z*)v%EXHJPRv-vkbEvdbB$}H=XHk*pgtigW6y2*UoU%}M>I_elU8}* z1#yA}g9aXWK=RIR*&=(_0^A0-Z$L5$(v|xmHmRvnmSd2n< z-YF@UOi~VKSpim_F&IlJkeyCKhe9DSvVOhjg88E`|KRPni`m)$g6MZ;+T=?wiIW&J zji_MdwfLitPVbLD{=H9-Y%HXcV(@)FHHu=?8(@$*jzyZ>|UYX387=y7s&09cz)C6B4 zdgc4_a&aEoB@t*nh*oZ6ufHyOV2xgA&b;wGdnEtVEYENhFQ5lE?JX%0-39AB?nTh` zA^MZ6S4#}WVob)?)KjPdRXJe2VC8EDeGN+?Xm-&#~&qii-9X z3m1}g?p(eCx@nfvuUmdqDHduzor+yj=~u4l`A?3LiV8XzkJH*%tP#^8&^TzyqtfC8 zDE=4}C||IEGPo5#Ee{ls#Bsqr^ISq<;mBs;TT2%v zCg!I=aWVbe-%lH-rf%dHsX&t|04HZ!03j|jR6+%2IBOUuOglolhGB%ENDa=i3>jW z9<|r2&KA%2*KF3mCG}DQs+`6Yze16vBK%)Jo4G2$ufwlylrE^}rsC%m|6lw34*>=M XYTNdCR}mvy00000NkvXXu0mjf$-c5F literal 0 HcmV?d00001 diff --git a/img/admin/book.png b/img/admin/book.png new file mode 100755 index 0000000000000000000000000000000000000000..45c9edfe2f2a3900725b169c7bd3ce6783197e3c GIT binary patch literal 858 zcmV-g1Eu_lP)om4) zJagQ!nLWLC1vKJ~M{nWT{TVn%pbMB0JiQ`p*aB`pem~P#GJol66TlWR!F=xF<<|r7 z-Us`|mmgp-p8+8fu3tO@8bf1s0YHW7JWFtrl&DR>vVoVcadhg{k!;qqs^0}2Y1nq6 zoIs^uVz511O7kk)aTO#|p_kV%S?L4J|fpTPT`x(OzUgeid{jyPsS>JBoq3 zANF9&Vn~7dYiHB8Hz-QSOIwk98lQXhrBeY^ex1D*11Jwk>G`O7)q|FyisR<%T}cBC zmV)lzEDW67l-(3H;DlOiaj?cfpq*n1s$`Ss;Q7^aqZqjJZZERP(I51tAiQ-AMv#kb z1of>q--DB*FrXq-7Su;%pf3foA*wy5pp@j1*xCoIc(Y@g5Q;yD49vwJVy_5St0340 zMt4F^tf?P2CsorNMzx8%q_X@N25L4qaLDMqO(a}uTVN~a=qDcu@VfWt}Xml&@|Az*++ny!` zy~nX!pD7+hdY=#W6m2k-qNnwiX4@YT9t*%iI-z{WMO)T69|5axDAI>YHvlGI?e6b< zIv*||g@yf{&oIrW>GIYsVScZyHNK8d$N&Wqy-+ps||(Hst4oUgsxl kKV74g`A4fLiNFjQ!Cxm6~Ofxo6Ix88c})R;W3q<2dG|Hdd2lF1ZVc8?LM( z$&MkLvLtVRoqNCUy}mJ@MWyd?xZL&p&N;t(&PBkJ`)CfV7`0X_V2Q(KgUM>mnEu(d z_r)g&z@QgwOU6y>kMS=Xp%a{o*w~W-p!?*I~|VyRlC#aL`-xvDyynsGFvbsb?OKju2%q`b?u|D}O8A231`ObBSNo+mZa{PyL&9`C?89$?gOoFb8jVCE zl4u}G@&(aqwX#KB?Xxq;5UbhDl{-A}O93D+kR-C4Ar}Q0W1{(j;^Jc7cDZki;qAqX zd2s3Q2!L^*^L{7%{r$m0$y_EXF;$v>)o16h(2@)2$Fm2VfdK*86;;)VefoxD#PcK3 zX)>X>sE9K;#uzJGR#3p(f7~xDzLCHg@Jf6ocaRj)|`NWwo{m7WnD9i5n%m;f8q zZaZbj0wu;qqfxe8)n{ZYDlCCc^oA7NjLiIxakes#A1;#`i1LocwW~!5*S|q78>s*W4PtT*SZkBJ$S@W{&J(}a^9>G&XZEzZ?^iH7!Cn2A{%C(E9m ze?Wj2aWL373~}KLv0?uz)K_$j&iWiVk1BgE5WSVw)8j=NwiGMhNqsfWBwj{sTM2jW zeJijbSq8A+pg@F_{T=2v5I)XP*mH7w?$I=i^K_`Nc`|fA5!0<-%U<8T zYiBmgtg5xX-T{aU?dgxK$`aUUt(|5qsuk>S4HF_{O?xrMMkGOy5XYVZY5>xAKkWNS zulJgC@7_I>P);8jI|xBRJ@{l(Q?uS`G40*CYY$J^cDfw`IZ3bSjy3u5xYL=(xv_4- zUlYz(Q~n%Veq7*d71!(301RzyZIhBG&A^(~YY`O{g?eIs?)h_kvR`CBK2}z#aZ$nfD{V>X)=%a$&BiH5AM&?Tl} zbxR9|1^1LKWE>Dx-tZ=+jD&1XB5F6#bJThtSJ)+117J0wngOwxELOYCuJ!ZvMdFw- z$}>?wI{~nmElhERlD>K9?p(#D@?h-f-HQ~HB61GAR0n&}m{yXN3*?krw7c#y)-zq| zOvrd^;V1fdH(AY=iM=T61qKE}uh(Uh!;(7gvG?AiS{+{S9QkzaP0>PcL4boNkF$xN@Cd$yGR* zwGL^n=egjaLVA;gko1zD?d}jYC>!rTkPDb0tlWi0jYoX=NX*swVUWAzkQPfD@~bak zOW84;VK$PqJ}MP65MGLM7f);o2=fEV)gXLG0!e~Mx~YmCdy01`VQW!BXMY_3nz8e= p3UHn3e5b;%PUZHvGt(ae3;+zn(*@m=Ycc=;002ovPDHLkV1mq?eANH| literal 0 HcmV?d00001 diff --git a/img/admin/cart_remove.png b/img/admin/cart_remove.png new file mode 100755 index 0000000000000000000000000000000000000000..071bdcf87c0deab4c04b4709921c4e8de35c361b GIT binary patch literal 1787 zcmVJNRCwB)S9?%YWfVVmUn~$I=%BDF z@v?XfD6r}U5d?jNd{nDXu zS*0I7I!0j&xY0O|2&;q-W*uOHJtuSER@bmVXpgT=-=gPWxg-c+cRIH%*jlwhGg9Z_ z;gyj4auJ-U%3(y$B%?W6<3r!y$O+45y*UM5eaj36PR=KpW<<_S=zLZYlvHN}=ztMD zlZ@tkfH0K)b-ouw9&}?(pbeb}vLZKXhU?rESqY0@Dumyy*}&-mGzNv}nPfCaYdnB3 zl>Sl9$3;y7A$lH^?Jj}R?@mDbUB{u})BtlH8CMB!r*DG48`gj*4K5zpm0;Y;i&Hki z;mS48+Bi@XP+C^b$HqiKL(@%YZomC!UhX@aQQVL84^ju&(H%bW<1vj^n9fJU*n(|;-;f?`R0@CV)GT_BtNKA}}o2{*2=N+(U;r!`1 zbz22sr#sp9N6oBxuV;ZIimG=G=+baHcq2<@yF)zi!Uhidq$U9U;4qPlfSmmt|Dy?t zk|2v9$pVrDv9Zx`toT<@o!MnZ#zYJtNj*mTXH3v^39r^slI)uZqM;lQ#L_RzXmR>?9Ng`;q zIwTE}7Bo5~^Lo9Wk^!<-grqUkVEg{dh#395iV*`Pb2c_dYiJWPuGf$a+=!FsnRCgl zzB~X>7U*=ib3%@&%}I$$SZiw7Jt;96%;sZmibl2I>;p1EvV+BXojse)N$h^%!bNcT z@Ctxxpx@RH!NI{msdujd= z{n-~TnEzozLqkPleIr92X!KXA3lr?RSh7dJa~zSDIhJM4X9}n(+*+EOlmE^39ou-G z&rC^4fwZ(~;B*RLu~aiGB%@JnQF1&KpPZb`Hq+kGK^5RN1sb(+-9u{o_@li1YKx`f z;-yQhnhkyib_Cg_9?yYmn7k-Tte1$sicoD11Oirnwj%$Fb?dibW6I3T%z)IXsc1xm zYBk5nDN2rq;w@MM>`0P#{F6lQ5rD@)w0*gLT|P#kqP+Yh7z~C%4a&V!4#iVHq5dMX zbKyAx+Q)cVZI_O-XHK6BpExPLx3@PkF)s_BV1`xNG9YXkTe=CXmyWxnkO=u zOpGpHse)v4B3P}pQ1aXHt<=pur2src0>0f|kiU4z(t@6z-V7M!U`LTsAc;O}z$=LT zg?sbx7UE;Auc6<$tFVM6K$b@Yfcxarm9v9_o}}JuP<8E1HyX1K9W1I~=gLDpz58Bv zW=w2c5xrr_sZ(%vKeRnm-^qYJC{(Wq@H82$`dfd3NY_hxiU!&7u zKT>q?2iCGhL3k8qEYhBy9;ic|Y0oM;gt_ZZ*SIIf1mg!u8v$?*1;GEog9mf7<}QLw z8@E7QTpZl)>Vh-pl<)tT=olueudRbst5#x@aw;DSxHEcVZr=R$|8%0GqTw!X#$vI8 z!@+Mr(VopGn@4onCSgXZQI$jF$%CQqF@4bjn2(1i|m?cNIlMu754 zp`~L=^6>ES9(8Os8|>M=^QhW&z5Xx>LYj;e@qSKjS?rWJbRxo4?20r})6&q97H%{& z!uJREy@n$9km^yV#FLI5!C~#d{(Xfe^^;8U76C%nMm@k`cQ{2s)IS*%1er5u4ipjg z1aR;Ua@^uNCF%$vxpy6>poU-a)rch5Pb>exfNm%6m=iXBJcNdZg3)MXhOSptL32y< z%FfP?vs9OAQz4T51H9;5tAeKHrWL4j#ZwAA9mD<$=g$@McHYp}*SEn9q}bWnx%S$% ztHmA+4W;voC+FUNn9%zn0BHhJnDW^^kfJU%kG99cIT{_GzmCbEpK8bzB|$aFduv3a d(1HI17yy=IFGw#iqLTms002ovPDHLkV1m4TR#5-| literal 0 HcmV?d00001 diff --git a/img/admin/cross.png b/img/admin/cross.png new file mode 100755 index 0000000000000000000000000000000000000000..33a383748bca465d6d0e7be4fa2ce83c861e36ba GIT binary patch literal 473 zcmV;~0Ve*5P)1Bai@#8xK6ALSt`Ds!U zgJE$w!x4r~upuBeNDL+qQVRo&AX69_8I6G^o-xSIWB9ggCR~y$DjiIti(QyHiNWT; z1rwm&voHfda$rLYlhYZ#Z(52q5IOy#8P3n03Dykco(1bgG5}#nY&^ryJ)2N8v%B~) zoL{^Ut{E1HENGU1B^ZDHMEDoxSD+ZO8uT!Lhqh5*5X0XKC$V~g*}$CP-1>DOS1`g{ z05<@n+1SUM;or?Ga1BiAI$#=I?Ch4UU_;fHo8W8^o&;cN2@GxNd{hQ%GD^#sypjxcyz{1W3 zEO_G35tPt|#SXeWC><~$WhP^!%wmis3^C+UG80S@4$WBQ;juso00=MutP2U)_A3w6 P00000NkvXXu0mjf8D7L! literal 0 HcmV?d00001 diff --git a/img/admin/error.png b/img/admin/error.png index 3c19c0ba122c7852afb4b4dcc069d758297416c5..dbfda229750f238e5ea15ea9c6de43b9630a5e57 100644 GIT binary patch literal 543 zcmV+)0^t3LP)b-Q zag`tu6obp!L~)B0F04hs!e-fWL9np!FIZTLT3Lt|f`$77+}0w6){1Cgk(Djfu;K@q znfLacmk$ORL`dN9PR=>^<=&eap|wUkpV-OjRHUJl8gxYMiagMXAt_}gDkq~vtrP;U zc9@+hfgq>$t_wJl4*aF=-Vgb%v1t(G)S||f5x?FkocMZf?mH@HmlovI=)HLX+f=@H zJW%)wxc{)Sd1^sUjo#}~WT*kxgpDQf_ z=WBp>izV$c&8R?krb){CiP!g!m=3GV{oeqv0>Jz|F2%SjxZ@ zxGsL|j9QS_wUo`+tf^tGR7!93O%@RMewtR3tzslx+}~C$$Xl0~4703ZtvFdN=!tK= zjZKRB$-`mmjcxlz2)L}~=IZ2h?+;>uuTkE>$Z0P7|I+#dkwB>?;9=iwp%-83EIA^`3v0NgYk{5k;5902qx z0OKP7|11FAApq_t0M{M>-5>zkGaUQr>F_B4^C|$_9{}Ye0Q~Fg{kyl}DFE(JJNn4S z?kE8J=H}|MvFNI(?X$7!C;-($GU#<|`PtavhJxoL0QkGO{NmyENF>@H0PU=)`rX~& zVOag|@b*nE(mE^Sl8^oH@cYot+I@)diq5f^kGo^I|BLL-TC3++Aa_1bZpr$ z7T`N2{My;p9stoD0NF7Z>!_yn%gXmG0Qbwu`z!$afOY010Mj=m>Lmd0Cjk5F?Cv-Q z{V)LNdUE*I*6t_(`{d-+9svB`-TN#6&>aB$?(Y9nJohO8;4~T9DFgFME$}A*?>!dQ z9sum9rs;lm{VxFYy14zQqWMWA+aLhjBLMi&&fZl??L{ooLN)wC8~wGh`iz6mFiz5hrk@sy7Du&v=N0Ms4;>MH>IR#r}7SA>LbA)}m}9Cvmk zH;`g1sD?|Jit;itGPYG}D*`EA(PEf{M!N(P5V$9XrGRLOSRaUls+Ks1goFf#i*Z&e zm?0kQ43@A=sF4MMOhLg+FvG}8w-G3zR_eyX00R7ylKfx>kGF+7P(t3U8v|I`l93ny Xjfn9YSex>Y00000NkvXXu0mjfVCQ7T diff --git a/img/admin/package_go.png b/img/admin/package_go.png new file mode 100755 index 0000000000000000000000000000000000000000..ff6247fb1b3687dc99d6140afbabb0a50a580bd6 GIT binary patch literal 1410 zcmV-|1%3L7P)@GhG z*l3?LRBWX-wg!FDG$th2q^X*K8clrBD77z5v{hbgV^jKSqA4j4R!u4dZ5xf60BsW# zp;Sa|)7T2E?6QFT?Ema|?#%4ME|xBohDpxu%-lQY`|dg4Id_H`hJlSd1Z?oZRv44| zS|9&H5!rKK7SD9FjLc8Ar?fN1>@y<;-9VuBtxHvOl~@e{<(JkSvC8Tln7KKG;B*ot zZV{z!37o@91UPnJDv98fj*?;tMVo3cHr$6toBLE6j^{%_=|5f@+g#TK=08hG63D55 zU?`4%CZZ_ys_>O*i$t&p?5FX-WDMmrUgA+`P6|k+VECTJ^`29x-QT~A1X~7vY-{Yn zh87stKcP_xJp4SQ#KZje`xh`iK1bq7L37CFL(xcrt^`z6xZv{@n5iOMD`lL7kp$cP z8h-CMgxUjxStM9C_#?5JSK5&p`H)M1Rxcv55JzZo4s)|HM5A#y3p5maoG2}IAzeUb z*aLHz4uuh3h(gm8xb9Km@w(tBP$&vI%}PRe=pcqpHWG=;84_s%%0O#vZ0p-Sm^$Bt znVA?u!8wG(338yKtkMIow-64eYOcyMWaWS{D?;2N;TR?-=P@xBq6Ng@bjt9QxKLE2 z!oB+x22a#sTeFo8PC&YJ?6EVVtknnnA$WZrc*@-HRh6K?T?i}LX>h%vdyhD+qmC@4{o`J9pvesT@RU_%A z9H{a!+-LGMD6_p-NUa zq=ERqV6p>D)R1mG>wZv07`&Va%U+!zr70TmS%@+zR#fgP0SGA*D;*XoldQxn(UC1q z>qNlRq77u2S|S2WHnD7h*aY|lJq$sn{0qu$wut<}CF&yz6V2`*+ z*SMZ2q7HKXKxrJWUj7oY;)E<~Ce|_nh9035D5ehbHJJc3)k&?l0IF6<=E|6?x~Rws zz$oM|?mURf@;F*X&YSm{5zlPdQo7s)t^qDWlhf@}Admw|kn#SN4s?!=lGB`K$ZSvi zzM!Fg+wq(I%?blIG_ODUkhab`1eH3qUY-WQx$h0+dpnIP> zgf>SZcBNODh0np0z)LS!=QnNu-+yOC~Pd~bK!=L@&`Jloih(~bT-|4)Dc0Nje@781x7 QwEzGB07*qoM6N<$g0j($^8f$< literal 0 HcmV?d00001 diff --git a/img/admin/page_white_add.png b/img/admin/page_white_add.png new file mode 100755 index 0000000000000000000000000000000000000000..d33fc2bd253bb5a67ffbe23a7562423a59dae3ff GIT binary patch literal 1272 zcmV)9TA6+0%)ASnyWsVD;P?5=<0vUE zUP=P*pACe|qNX$k>^6qf+?9oes6BB4%yK!CbfsS=VNzR6<|Df`I{@)cz0M1Nd{U0sk5#TNXVAF1j%_HFRaH!uPVHWmXlG`Z*P92M&MEOBdAZyQb620=h z&P3?cIhSO(Wd$AKX4JJG!1sT&X(VWeNnlnjc@j@lU}Z-QZUE`!#!LW`vna^9438|M zs_7Mc({&s#tl5d9>#LBb__R5RiBWWg+cB(mw*($ZeERJH?6s!pc`?8xm*)I~v!&?h zJBRnnkD@=;jte~pF%VA$rhwmv$AUZX&WqLf`0ICH+j?k_H628y0Yb{80XxQtTbV29 zjI^M&=N#VJ{vm!2A3=Mh7Q+-3k8M{q8yXuyTcid*_8vmzbNi9M$p31|+bA+rB4xS- zseCZENwj-Pe)zm?A9k+Yh0ec^le0cje0pFMeKB@(G=ks%`V7xMRStIn4jb7q_j*87 zLbP~uS1TR}6reA51(PJNf0Mv?^3HmqFUG{XNUR&7#Xc~X#z5YzkTn`dm z6du~od(8|JL`8!B3aYoJw(({YgNMAx7Rq3JH*1DMx0Zs*fqM zI9{OV8qj|k)k2?XN5E7ycDk`~fmS}*Dkek-=0xv8tjgbp)=THH;Tc*`NeT1tMP@P} z00@;{yhO*3+3;!+h#5C%Y%dT+E+-1Fzq|0;LZ>MA0umK=iFmk{+T_ z;Loc>e+1`$_z3%H_&Qlk9D@Ns)~i+}$4o5pZ9(B?tY5YkdzFQF+`LM(o$-Ir8U6*I zT)lvwXhf9gw~bJ20GMy>!SxLkkljb-xBQ?AM{zQeDoBDDu_mLt1;DtNvL4|SYk{l_ iPMrC~^mP2600RIlgrtrC{~uof0000|gQPf!`W zA~&MO7NmlMCx+n=#VVDkkam;-3-(kf1kWluAe=Z9L7Cf#c>Tla&D_rH{$8KY=llH4 z9*&QVa&z%=A(2RKqG&+^F@8e4;Z6?3x4KGNOAMYkEWs1eY&>78K}cLVnuP!&l{5!Q zK%{bg-j7H)iL@kJnIyp_;uy9JRRv3}m|&d>BiMvkgbtI+b|N^Ch2$vJ9LmJi>l8pK z=TJTi5rblkk0_MU1sWu=AT~)>uu~Q$r$l@TgzMOZfC|B-fKHXG*0OaR$~#>)F}H40 zDZo1jzLP^)a7rSM2l%K40YZYoAQ{L60VWg-(HSfjD-fW85J&}SREQP?vDkDP8w7#( z4~4L%k!Q0L1j6^Wh!uyTz;TRCrRL}72j|m+QB4jN3JVLfYS3sw1R_YQSL0G$kXq}# zs31VJGK~_$m8cr9DoV4^T{wqAc)AdR3KNSz2&=X46Gfzqs*_?=C>W%wRMxoOp|yAd z@?SSTiqtKE{PvP#6IR=`fE8K`_J(1NmV> zn86f=2nBqIx5yQ#wYXF*Ll*5S3A+niSonurHeZ8Caa5CpqPdG55U)USRI5NSfS(uw zh@~>6+Pb!uXCYbvqEYTf-CgxXdq?cE@B9<6#N}`uz%#ud+vS*etGDMJN+BhgnDoPm5o{-R_& zoU_<}UxU7!uNW%Yn)Y5k=wEu=bTlLpf5u?3Gi$O#xO^w62`#2a~$Z z7J>5>VA5uEB3dZeAK}J#CLRgk|n4clWg|46mLZ8XDq3OPy{WUHNPy z`h%RN7mK^iEiEn6rKP2THk0^cPRYcSYbA?U+Y7wC+MP|`jpJ`}l}hL(82Oc@iMw*+ z87h_P_@H`XY;5%T^XIc&X7jqW7PC`EtXJoLlO?lm*v;YQp5)}@i6>9a*2vj@$0wa_ zDBou1PxetQSwc zkg~+IIZ|U;J}54@ccOY?eEfA+S63{l!LcbMDk@6t?)ogY<4TIDQ+xdOE(ioO(=sxc zhM2SZ$@@2a%?C#W9`0OUU*C0oeSNFi`gTHpT+`r@zBQoGEzkDM{-4Z^@}K`bZ%&BkT;H4KcKLv7yX25-PjSSyr(003 z7w}c`l<+9yd~M!W+?tW`XsPGF?BLsTr2fCQukNq^cE{s&iuLm`{te}+_HS(hEKiq2 zl^}jmn@@S1$?RC_x7M_y`Er(XYRUR1{_%m9p3`wz%jJ!yhesVi?{rmp$BJ-tT=m6{ zlh(rPdwq^UBYrbjCx5GHADR8N(-;=&f68E>-2#E7Q7Pn#Yex+R!{Gh`QyrB&4T*-Q3!meD9ZE-d1)T+DIN@hce1Oi8kM;edSLsJM_hcq_J&d zQ?HF3+Bg`7`-}Zn+_H;{iJ3`DON*;LIB@AfZsA7kdT-H}5{c8r*4DQnUPo57Jh+x; z!>d%^Z1-wvXuWi4x~Zk5Zws9+Yfil&jBxsAhU!?r+SHMFt+u6b_wJvwFAs=&BiXMX z&wy_@eizT5zfBJh9~&eB`qjDJChAWL(W63<=<%vmW{bM;@*E gRI;5vUTot)y0T_XU}4#&zgvIJA~;rHzBW@fG|Euj4%y79vwS~NE2^4cu1>Bb>Zth-8Nrssp=<#k!&j`=BriHG}N3Od=> z^f2&SlBa(Tt?v|2JW(R8a0`i9bCDFS+eSRgBL(pGWOJV3k zOH8k~dB2Xx^Yo$9`Du||1;FB`zPKvgihwU77;NuNk=FD*;-E4RtM?H>))1^(gvAa* z*)p!0<3nu_<;;zW#HCfQAZ2l}HWY0~0E|p|%EHZnUsRmJwUsH-|BA0E<@EAi#ag`h z_BwhLpXvf4Lo7+X_Ty6IP3|ANrSRUp&H!j6%l$s`T{a0M3%O>ixYkH<#470IwT3&u znQ86wk0}=^B54J1JFFn(O^Oilc>t8d1VA8fsPhXUv{3Be0wWxx%~T@lWz zBj9xg^cXl45koS8+dojA+d{n32>_`x`|)3@fMlz1W$Ol*@7VV5y=Xl+IL?%iHQ4-K z!b_u~`(?ck+}udAgCV)m(T7t+`U!^6WdQ!Y7c6;u&fc#zS37Iyzl)iX4;(056xGkx?=K5UJ&O5#6YYk5Ipt3<@q3c-Pv18eM!S4 zT#?+UG!~{QYVowBoOx4IzDvqZ2P%Ih4t2)>SU;ddz3F&}?baZU-!ntQB1`NnB~!zC z;iE|lkmxqyM&S`u+w0R_Uvs8Jr6{y12@_gZcAn#EBz+u-5QL8NfGMZ_O;^gW*J8u8 zQE%d_v=3p>$X&Y8+lap_OR(U;a^xguVt(#h@bB7H#9F;dQ5<-NO#z*nbIYYg+r0YO z)xgS=a_Gy8#W?TsWBJTYsCAa$XvHE}T@4aTZ<7(jVsen5y9pZ#7J^st$mCQ^nErXA zlusQPnHSbK7VwdSc$MM-v~5yk`AxeOC+$uw$z6lLs#e2VUkwix!scmm6@Fa6;av4j z0#by}vX^7^zAuo-kCYmU)Cn)I$?yaMqP5QLo0qk+eo4g2*k3r9&sf5J=f$&(H%A^clKc#*1+dQ>(ZBZcytGleFOGr5& zN@+-~*l}KoZAjnO#lY)}#?_s_I61UBnKm9qjd#iH_$^C zL~|IG3f=nc%>C02Tm6Fx;eBAGLebI@0}WFXkwMccnLSHuTA9aA(e*XrBD1g+0K055 zU$Ums{HxN#W3e;eu=Z>xdd#kA3bE^$-5u~ho-=qN%oTDdSzR&GhP*AXXSSwcHj(AG z?*g?Ku#s6EGLHR{wQU9{Eo-Co(CXDD`saJ9Q%aqan$?gILy|G8egyWOE61eqvOfRMr(pz9B2naXX02ZtSXCiaKn(-&M7_H3b`(&6+Z4+in&%Iv zTwz#O(sUxkql{}`>%~xdDbaS}-qHLr;a1MKxcXlK1^~9ApNkw%g**TN002ovPDHLk FV1hF8t0({f literal 0 HcmV?d00001 diff --git a/img/admin/tick.png b/img/admin/tick.png new file mode 100755 index 0000000000000000000000000000000000000000..c277e6b4043b2b9a7c7388e076d2c493a23272c7 GIT binary patch literal 451 zcmV;!0X+VRP)vS{GWXg z=jFEi{#(+mPYdl{bJ+sm-!h2X0+2YXqDA3r`Z z{0G?zlwk(Ok%)vW!-P4vv1&#KAea1K`JDUz+#3vF3}U;W`I!(fb_Hr!{gNAuT}jjo tH^dVdGoGE~X@(m@tY$_^vok<|0RUEP!L?xlWyb&j002ovPDHLkV1gj@#Tx(s literal 0 HcmV?d00001 diff --git a/js/jquery/plugins/fancybox/jquery.fancybox.css b/js/jquery/plugins/fancybox/jquery.fancybox.css index 91824bb7e..d5fcf183d 100755 --- a/js/jquery/plugins/fancybox/jquery.fancybox.css +++ b/js/jquery/plugins/fancybox/jquery.fancybox.css @@ -49,6 +49,7 @@ } #fancybox-overlay { + background-color :#000 !important; position: absolute; top: 0; left: 0; @@ -66,13 +67,16 @@ } #fancybox-wrap { + background: none repeat scroll 0 0 rgb(255, 255, 255) !important; + background: none repeat scroll 0 0 rgba(255, 255, 255, 0.3) !important; position: absolute; top: 0; left: 0; - padding: 20px; + padding: 8px; z-index: 1101; outline: none; display: none; + border-radius:8px; } #fancybox-outer {