diff --git a/application/views/login.php b/application/views/login.php index f18784fbe..9b25c243d 100644 --- a/application/views/login.php +++ b/application/views/login.php @@ -6,7 +6,7 @@ Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?> - + diff --git a/application/views/partial/header.php b/application/views/partial/header.php index 3f07cae26..4de28e327 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -62,12 +62,12 @@ - + - + - + diff --git a/application/views/reports/graphs/bar.php b/application/views/reports/graphs/bar.php index 3a8c2ea4c..751537379 100644 --- a/application/views/reports/graphs/bar.php +++ b/application/views/reports/graphs/bar.php @@ -10,6 +10,21 @@ // We are setting a few options for our chart and override the defaults var options = { + + // Specify a fixed width for the chart as a string (i.e. '100px' or '50%') + width: '100%', + + // Specify a fixed height for the chart as a string (i.e. '100px' or '50%') + height: '80%', + + // Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5} + chartPadding: { + top: 10, +// right: 15, +// bottom: 10, +// left: 10 + }, + // X-Axis specific configuration axisX: { // Lets offset the chart a bit from the labels @@ -23,9 +38,6 @@ offset: 60 }, - width: '100%', - height: '75%', - // plugins configuration plugins: [ Chartist.plugins.ctAxisTitle({ @@ -34,7 +46,7 @@ axisClass: 'ct-axis-title', offset: { x: 0, - y: 80 + y: 100 }, textAnchor: 'middle' }, diff --git a/application/views/reports/graphs/hbar.php b/application/views/reports/graphs/hbar.php index f613cba8f..f9c10a30f 100644 --- a/application/views/reports/graphs/hbar.php +++ b/application/views/reports/graphs/hbar.php @@ -10,6 +10,22 @@ // We are setting a few options for our chart and override the defaults var options = { + + // Specify a fixed width for the chart as a string (i.e. '100px' or '50%') + width: '100%', + + // Specify a fixed height for the chart as a string (i.e. '100px' or '50%') + height: '80%', + + // Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5} + chartPadding: { + top: 10, +// right: 15, +// bottom: 10, +// left: 10 + }, + + // Set the bar chart to be horizontal horizontalBars: true, // X-Axis specific configuration @@ -25,9 +41,6 @@ offset: 120 }, - width: '80%', - height: '80%', - // plugins configuration plugins: [ Chartist.plugins.ctAxisTitle({ diff --git a/application/views/reports/graphs/line.php b/application/views/reports/graphs/line.php index 1232257b5..aa01bd0a7 100644 --- a/application/views/reports/graphs/line.php +++ b/application/views/reports/graphs/line.php @@ -1,10 +1,10 @@ +