mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-20 07:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

add bootstrap-table but not used yet (#116 #293)

Browse Source
This commit is contained in:
FrancescoUK committed 2016-02-23 15:50:04 +00:00
1 parent deb4a501d6
commit abdf2a23d0
7 files changed
+2869 -2884
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

application/views/partial/header.php
+4 -2
View File
@@ -13,6 +13,7 @@
<link rel="stylesheet" href="bower_components/bootswatch-dist/css/bootstrap.css" />
<link rel="stylesheet" href="bower_components/smalot-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
<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" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
@@ -42,6 +43,7 @@
<script src="bower_components/bootswatch-dist/js/bootstrap.js"></script>
<script src="bower_components/smalot-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script src="bower_components/bootstrap-select/dist/js/bootstrap-select.js"></script>
<script src="bower_components/bootstrap-table/src/bootstrap-table.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
@@ -60,10 +62,10 @@
<![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/opensourcepos.min.css?rel=1a3aad06c8"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=f8680d8d01"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=ca5e30082f" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=f94af9ca53" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
bower.json
+2 -1
View File
@@ -37,7 +37,8 @@
"jasny-bootstrap": "^3.1.3",
"bootswatch-dist": "3.3.6-flatly",
"smalot-bootstrap-datetimepicker": "^2.3.8",
"bootstrap-select": "^1.10.0"
"bootstrap-select": "^1.10.0",
"bootstrap-table": "^1.10.1"
},
"overrides": {
"bootswatch-dist": {
dist/opensourcepos.js
Vendored
+2810 -2831
View File
File diff suppressed because it is too large. Load diff
dist/opensourcepos.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.js
Vendored
+25 -24
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"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<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
+25 -23
View File
@@ -7,12 +7,13 @@
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/tablesorter/dist/css/theme.blue.min.css" />
<link rel="stylesheet" href="bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css" />
<link rel="stylesheet" href="bower_components/jasny-bootstrap/dist/css/jasny-bootstrap.css" />
<link rel="stylesheet" href="bower_components/bootswatch-dist/css/bootstrap.css" />
<link rel="stylesheet" href="bower_components/smalot-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
<link rel="stylesheet" href="bower_components/bootstrap-select/dist/css/bootstrap-select.css" />
<link rel="stylesheet" href="../bower_components/tablesorter/dist/css/theme.blue.min.css" />
<link rel="stylesheet" href="../bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css" />
<link rel="stylesheet" href="../bower_components/jasny-bootstrap/dist/css/jasny-bootstrap.css" />
<link rel="stylesheet" href="../bower_components/bootswatch-dist/css/bootstrap.css" />
<link rel="stylesheet" href="../bower_components/smalot-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
<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" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
@@ -28,20 +29,21 @@
<link rel="stylesheet" type="text/css" href="css/tables.css"/>
<!-- end css template tags -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/jquery-bgiframe/jquery.bgiframe.js"></script>
<script src="bower_components/jquery-migrate/jquery-migrate.js"></script>
<script src="bower_components/jquery-form/jquery.form.js"></script>
<script src="bower_components/jquery-validate/dist/jquery.validate.js"></script>
<script src="bower_components/jquery-ui/jquery-ui.js"></script>
<script src="bower_components/swfobject/swfobject/swfobject.js"></script>
<script src="bower_components/tablesorter/dist/js/jquery.tablesorter.combined.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js"></script>
<script src="bower_components/jasny-bootstrap/dist/js/jasny-bootstrap.js"></script>
<script src="bower_components/bootswatch-dist/js/bootstrap.js"></script>
<script src="bower_components/smalot-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script src="bower_components/bootstrap-select/dist/js/bootstrap-select.js"></script>
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/jquery-bgiframe/jquery.bgiframe.js"></script>
<script src="../bower_components/jquery-migrate/jquery-migrate.js"></script>
<script src="../bower_components/jquery-form/jquery.form.js"></script>
<script src="../bower_components/jquery-validate/dist/jquery.validate.js"></script>
<script src="../bower_components/jquery-ui/jquery-ui.js"></script>
<script src="../bower_components/swfobject/swfobject/swfobject.js"></script>
<script src="../bower_components/tablesorter/dist/js/jquery.tablesorter.combined.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="../bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js"></script>
<script src="../bower_components/jasny-bootstrap/dist/js/jasny-bootstrap.js"></script>
<script src="../bower_components/bootswatch-dist/js/bootstrap.js"></script>
<script src="../bower_components/smalot-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script src="../bower_components/bootstrap-select/dist/js/bootstrap-select.js"></script>
<script src="../bower_components/bootstrap-table/src/bootstrap-table.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
@@ -58,13 +60,13 @@
<!--[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"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1a3aad06c8"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=f8680d8d01"/>
<!-- 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=ca5e30082f" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=f94af9ca53" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>