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

fix issue related to double bootstrap.js in min.js preventing bootstrap-select from functioning properly (#116)

Browse Source
This commit is contained in:
FrancescoUK committed 2016-02-26 22:20:11 +00:00
1 parent 959f7da876
commit e814f8835a
8 files changed
+5217 -2422
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Gruntfile.js
+2 -2
View File
@@ -11,7 +11,7 @@ module.exports = function(grunt) {
bower_concat: {
all: {
mainFiles: {
'bootswatch-dist': ['js/bootstrap.js']
'bootswatch-dist': ['bootstrap/dist/js/bootstrap.js']
},
dest: {
'js': 'dist/opensourcepos_bower.js',
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
},
files: {
'bootstrap.min.css': 'bootswatch-dist/css/bootstrap.min.css'
},
}
}
},
cssmin: {
application/views/partial/header.php
+5 -2
View File
@@ -14,6 +14,7 @@
<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" />
<link rel="stylesheet" href="bower_components/bootstrap-daterangepicker/daterangepicker.css" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
@@ -44,6 +45,8 @@
<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>
<script src="bower_components/moment/moment.js"></script>
<script src="bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
@@ -62,10 +65,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=5fec5e7eed"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=aabc76522f"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=15a523de04" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=dd4a56997a" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
bower.json
+3 -2
View File
@@ -29,7 +29,7 @@
"jquery-color": "~2.1.2",
"jquery-form": "~3.46.0",
"jquery-validate": "~1.13.1",
"jquery": "~1.12.0",
"jquery": "~1.12.1",
"jquery-ui": "1.11.4",
"swfobject": "*",
"tablesorter": "jquery.tablesorter#^2.20.1",
@@ -38,7 +38,8 @@
"bootswatch-dist": "3.3.6-flatly",
"smalot-bootstrap-datetimepicker": "^2.3.8",
"bootstrap-select": "^1.10.0",
"bootstrap-table": "^1.10.1"
"bootstrap-table": "^1.10.1",
"bootstrap-daterangepicker": "^2.1.18"
},
"overrides": {
"bootswatch-dist": {
css/tables.css
-4
View File
@@ -3,8 +3,6 @@
background-color: transparent;
height: 30px;
position: relative;
//background-color: #EEEEEE;
}
#search_filter_section
@@ -13,8 +11,6 @@
margin-bottom: 10px;
background-color: transparent;
position: relative;
//background-color: #EEEEEE;
}
#table_action_header
dist/opensourcepos.js
Vendored
+5166 -2382
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.css
Vendored
+4 -4
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.js
Vendored
+32 -24
View File
File diff suppressed because one or more lines are too long.
templates/spacelab/views/partial/header.php
+5 -2
View File
@@ -14,6 +14,7 @@
<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" />
<link rel="stylesheet" href="../bower_components/bootstrap-daterangepicker/daterangepicker.css" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
@@ -44,6 +45,8 @@
<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>
<script src="../bower_components/moment/moment.js"></script>
<script src="../bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
@@ -62,11 +65,11 @@
<![endif]-->
<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=5fec5e7eed"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=aabc76522f"/>
<!-- 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=15a523de04" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=dd4a56997a" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>