mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-19 23:11:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added Chartist js plugin and regen dist (#342)

Browse Source
This commit is contained in:
FrancescoUK committed 2016-05-21 12:07:50 +01:00
1 parent 35b12df144
commit fa84adc536
9 files changed
+43 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

application/views/login.php
+1 -1
View File
@@ -6,7 +6,7 @@
<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<!-- end css template tags -->
application/views/partial/header.php
+5 -3
View File
@@ -15,6 +15,7 @@
<link rel="stylesheet" href="bower_components/bootstrap-select/dist/css/bootstrap-select.css" />
<link rel="stylesheet" href="bower_components/bootstrap-table/src/bootstrap-table.css" />
<link rel="stylesheet" href="bower_components/bootstrap-daterangepicker/daterangepicker.css" />
<link rel="stylesheet" href="bower_components/chartist/dist/chartist.min.css" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/barcode_font.css"/>
@@ -46,6 +47,7 @@
<script src="bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<script src="bower_components/table-export/tableExport.js"></script>
<script src="bower_components/jquery.base64/index.js"></script>
<script src="bower_components/chartist/dist/chartist.min.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/common.js" language="javascript"></script>
@@ -59,12 +61,12 @@
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=709203adf0"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=feb26bc97a"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=086db78c1a" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=e9ecd30fd8" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
bower.json
+2 -1
View File
@@ -37,7 +37,8 @@
"bootstrap-table": "^1.10.1",
"bootstrap-daterangepicker": "^2.1.19",
"table-export": "*",
"jquery.base64": "https://raw.githubusercontent.com/carlo/jquery-base64/master/jquery.base64.js"
"jquery.base64": "https://raw.githubusercontent.com/carlo/jquery-base64/master/jquery.base64.js",
"chartist": "^0.9.7"
},
"overrides": {
"bootswatch-dist": {
dist/bootstrap.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.js
Vendored
+10
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.css
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.js
Vendored
+16 -12
View File
File diff suppressed because one or more lines are too long.
templates/spacelab/views/login.php
+1 -1
View File
@@ -6,7 +6,7 @@
<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- end css template tags -->
templates/spacelab/views/partial/header.php
+3 -3
View File
@@ -58,14 +58,14 @@
<!--[if lte IE 8]>
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=709203adf0"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=feb26bc97a"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=086db78c1a" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=e9ecd30fd8" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>