dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// graph update

Browse Source
This commit is contained in:
Kevin Granger
2013-10-16 12:18:27 +02:00
parent f284777fc4
commit bc5b807a7b
5 changed files with 26 additions and 14132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/nv.d3.css
+18 -2
View File
@@ -95,11 +95,12 @@
.nvtooltip table { .nvtooltip table {
margin: 6px; margin: 6px;
border-spacing:0;
} }
.nvtooltip table td { .nvtooltip table td {
padding-right: 9px; padding: 2px 9px 2px 0;
padding-bottom: 3px;
vertical-align: middle; vertical-align: middle;
} }
@@ -111,11 +112,26 @@
font-weight: bold; font-weight: bold;
} }
.nvtooltip table tr.highlight td {
padding: 1px 9px 1px 0;
border-bottom-style: solid;
border-bottom-width: 1px;
border-top-style: solid;
border-top-width: 1px;
}
.nvtooltip table td.legend-color-guide div { .nvtooltip table td.legend-color-guide div {
width: 8px; width: 8px;
height: 8px; height: 8px;
vertical-align: middle; vertical-align: middle;
} }
.nvtooltip .footer {
padding: 3px;
text-align: center;
}
.nvtooltip-pending-removal { .nvtooltip-pending-removal {
position: absolute; position: absolute;
pointer-events: none; pointer-events: none;
admin-dev/themes/default/js/vendor/nv.d3.js
Vendored
-14128
View File
File diff suppressed because it is too large Load Diff
admin-dev/themes/default/js/vendor/nv.d3.min.js
Vendored Executable
+6
View File
File diff suppressed because one or more lines are too long
controllers/admin/AdminDashboardController.php
+1 -1
View File
@@ -45,7 +45,7 @@ class AdminDashboardControllerCore extends AdminController
//$this->addJqueryUI('ui.datepicker'); //$this->addJqueryUI('ui.datepicker');
$this->addJS(array( $this->addJS(array(
_PS_JS_DIR_.'/vendor/d3.js', _PS_JS_DIR_.'/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.min.js',
_PS_JS_DIR_.'/admin-dashboard.js', _PS_JS_DIR_.'/admin-dashboard.js',
)); ));
$this->addCSS(array( $this->addCSS(array(
modules/graphnvd3/graphnvd3.php
+1 -1
View File
@@ -64,7 +64,7 @@ class GraphNvD3 extends ModuleGraphEngine
$this->context->controller->addJS(array( $this->context->controller->addJS(array(
_PS_JS_DIR_.'/vendor/d3.js', _PS_JS_DIR_.'/vendor/d3.js',
__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/js/vendor/nv.d3.js', __PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/js/vendor/nv.d3.min.js',
)); ));
$this->context->controller->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/css/nv.d3.css'); $this->context->controller->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->context->employee->bo_theme.'/css/nv.d3.css');
} }