mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-27 18:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix font issue, split bootstrap.min.css out of opensourcepos.min.css, grunt upgrades header.php and login.php (#329, #116)

Browse Source 
requires npm install to install bowercopy
This commit is contained in:
FrancescoUK committed 2016-02-21 19:14:04 +00:00
1 parent 1aa5c72db3
commit 349da7e7ad
10 files changed
+9629 -7852
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Gruntfile.js
+33 -8
View File
@@ -11,7 +11,7 @@ module.exports = function(grunt) {
bower_concat: {
all: {
mainFiles: {
'bootswatch-dist': ['css/bootstrap.css', 'js/bootstrap.js']
'bootswatch-dist': ['js/bootstrap.js']
},
dest: {
'js': 'dist/opensourcepos_bower.js',
@@ -19,6 +19,20 @@ module.exports = function(grunt) {
}
}
},
bowercopy: {
options: {
// Bower components folder will be removed afterwards
// clean: true
},
bootstrap: {
options: {
destPrefix: 'dist'
},
files: {
'bootstrap.min.css': 'bootswatch-dist/css/bootstrap.min.css'
},
}
},
cssmin: {
target: {
files: {
@@ -68,7 +82,7 @@ module.exports = function(grunt) {
}
},
tags: {
css : {
css_header: {
options: {
scriptTemplate: '<rel type="text/css" src="{{ path }}"></rel>',
openTag: '<!-- start css template tags -->',
@@ -78,7 +92,7 @@ module.exports = function(grunt) {
src: [ 'css/*.css', '!css/login.css', '!css/invoice_email.css' ],
dest: 'application/views/partial/header.php'
},
mincss: {
mincss_header: {
options: {
scriptTemplate: '<rel type="text/css" src="{{ path }}"></rel>',
openTag: '<!-- start mincss template tags -->',
@@ -88,7 +102,17 @@ module.exports = function(grunt) {
src: [ 'dist/*min.css' ],
dest: 'application/views/partial/header.php'
},
js : {
css_login: {
options: {
scriptTemplate: '<rel type="text/css" src="{{ path }}"></rel>',
openTag: '<!-- start css template tags -->',
closeTag: '<!-- end css template tags -->',
absolutePath: true
},
src: [ 'dist/bootstrap.min.css', 'css/login.css' ],
dest: 'application/views/login.php'
},
js: {
options: {
scriptTemplate: '<script type="text/javascript" src="{{ path }}" language="javascript"></script>',
openTag: '<!-- start js template tags -->',
@@ -98,7 +122,7 @@ module.exports = function(grunt) {
src: [ 'js/jquery*', 'js/*.js' ],
dest: 'application/views/partial/header.php'
},
minjs : {
minjs: {
options: {
scriptTemplate: '<script type="text/javascript" src="{{ path }}" language="javascript"></script>',
openTag: '<!-- start minjs template tags -->',
@@ -133,13 +157,14 @@ module.exports = function(grunt) {
match: [
{
'opensourcepos.min.js': 'dist/opensourcepos.min.js',
'opensourcepos.min.css': 'dist/opensourcepos.min.css'
'opensourcepos.min.css': 'dist/opensourcepos.min.css',
'bootstrap.min.css': 'dist/bootstrap.min.css'
}
],
replacement: 'md5'
},
files: {
src: ['**/header.php']
src: ['**/header.php', '**/login.php']
}
}
}
@@ -147,6 +172,6 @@ module.exports = function(grunt) {
require('load-grunt-tasks')(grunt);
grunt.registerTask('default', ['wiredep', 'bower_concat', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
};
application/views/login.php
+4 -2
View File
@@ -5,8 +5,10 @@
<base href="<?php echo base_url();?>" />
<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">
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="css/login.css" />
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<!-- end css template tags -->
<script type="text/javascript">
$(document).ready(function()
application/views/partial/header.php
+5 -2
View File
@@ -12,6 +12,7 @@
<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" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
@@ -40,6 +41,7 @@
<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>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
@@ -57,10 +59,11 @@
<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/opensourcepos.min.css?rel=9f2eaa8142"/>
<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"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=077fca2ce1" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=ca5e30082f" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
bower.json
+4 -2
View File
@@ -2,7 +2,8 @@
"name": "opensourcepos",
"version": "2.4.0",
"authors": [
"jekkos <jeroen.peelaerts - at - gmail.com>"
"jekkos <jeroen.peelaerts - at - gmail.com>",
"FrancescoUK <francesco.lodolo.uk - at - gmail.com>"
],
"description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface",
"main": "dist/opensourcepos.js",
@@ -35,7 +36,8 @@
"bootstrap3-dialog": "bootstrap-dialog#^1.34.9",
"jasny-bootstrap": "^3.1.3",
"bootswatch-dist": "3.3.6-flatly",
"smalot-bootstrap-datetimepicker": "^2.3.8"
"smalot-bootstrap-datetimepicker": "^2.3.8",
"bootstrap-select": "^1.10.0"
},
"overrides": {
"bootswatch-dist": {
dist/bootstrap.min.css
Vendored
+11
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.js
Vendored
+9541 -7805
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.css
Vendored
+8 -13
View File
File diff suppressed because one or more lines are too long.
dist/opensourcepos.min.js
Vendored
+21 -19
View File
File diff suppressed because one or more lines are too long.
package.json
+1
View File
@@ -19,6 +19,7 @@
"grunt": "~0.4.5",
"grunt-bower": "^0.21.0",
"grunt-bower-concat": "^1.0.0",
"grunt-bowercopy": "^1.2.4",
"grunt-cache-breaker": "^2.0.1",
"grunt-contrib-concat": "~0.5.1",
"grunt-contrib-cssmin": "^0.14.0",
templates/spacelab/views/partial/header.php
+1 -1
View File
@@ -38,7 +38,7 @@
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=077fca2ce1" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=ca5e30082f" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>