From a6aed9632a75086cef1e15d77794a9654512118b Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Mon, 2 Sep 2013 11:43:50 +0200 Subject: [PATCH] //dashboard data binding first part --- .../themes/default/img/dashboard_loading.gif | Bin 0 -> 723 bytes .../admin/AdminDashboardController.php | 5 +- js/admin-dashboard.js | 23 ++++++++ .../templates/hook/dashboard_zone_one.tpl | 50 +++++++++--------- 4 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 admin-dev/themes/default/img/dashboard_loading.gif create mode 100644 js/admin-dashboard.js diff --git a/admin-dev/themes/default/img/dashboard_loading.gif b/admin-dev/themes/default/img/dashboard_loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..09d621ede9dbe610877292e554c858d60573359e GIT binary patch literal 723 zcmZ?wbhEHb6ky3UH!ouR`=lAT{vl};VeEIUl!ouRtojadCecHBd+kyoPPMtdS z?%g|}ArPSWpWDwhB-q(8z|~04fSC~}s`yXJxhOTUBsE2$JhLQ2Au%hlA}2pFMK3ci zEuTU0CkrPxP?ZiyKgf{`thx#ceJPpqmMq|Ubc$)6gFv&z8PkHx)%R}in9s-lM6i9! zBZm__dd2Imak;LY=7h}zm4rkI)`WR0GG*E)?mKYn(8@QLmiIn?v-kDx2z`w?tc})! zof1sgG@1de?oQNs+@Zp$B*l}wBx#YxN$K-jdS4q!9hlC1plNUP#}nRyjb|@j-XZKa z^H3#V%=s`!CV{ zGZTv~S)?jgU+dnbH8)5Rn@L8H@VK@q;+ad}wo4-xl69peI z>rMAn>7QZ36tBx*W_EhPz6U`Z*qo#fG3yD?Ju5c7TU8{Z8nlJ?f$93++hq!-bARhP dGOMsv=2x69g9)2+addJS(array( __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/d3.js', - __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/nv.d3.js' + __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/js/vendor/nv.d3.js', + _PS_JS_DIR_.'/admin-dashboard.js', )); $this->addCSS(array( - __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/nv.d3.css' + __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/nv.d3.css', )); } diff --git a/js/admin-dashboard.js b/js/admin-dashboard.js new file mode 100644 index 000000000..ada0abf9d --- /dev/null +++ b/js/admin-dashboard.js @@ -0,0 +1,23 @@ +/* +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/osl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ diff --git a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl index 5f01bf973..43b6668a7 100644 --- a/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl +++ b/modules/dashactivity/views/templates/hook/dashboard_zone_one.tpl @@ -27,15 +27,15 @@
{l s='Recent Activity'} - + - +
-
+
  • @@ -43,60 +43,60 @@ {l s='Within the last seven days'} - 365
    - 0.66% +
    + %
-
+
{l s='Pending'}
  • {l s='Pending Orders'} - 120 +
  • {l s='Return/Exchanges'} - 35 +
  • - {l s='Abandonned Carts'} - 12 + {l s='Abandoned Carts'} +
  • {l s='Products Out of Stock'} - 4 +
-
+
{l s='Notification'}
  • {l s='New Messages'} - 42 +
  • {l s='Order Inquires'} - 13 +
  • {l s='Product Reviews'} - 56 +
-
+
{l s='Customers'}
  • {l s='New Customers'} - 42 +
  • {l s='Online Visitor'} - 200 +
  • @@ -105,33 +105,33 @@ {l s='In the last 30 minutes'} - 36 +
-
+
{l s='Newsletter'}
  • {l s='New Registrations'} - 125 +
  • {l s='Total Subscribers'} - 13,500 +
-
+
{l s='Traffic'}
  • {l s='Visits'} - 10,000 +
  • {l s='Unique Visitors'} - 3,500 +
  • {l s='Traffic Sources'}