mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-06 14:54:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

better support of templates in Gruntfile.js and fix glyphicon issue (#409 #448)

Browse Source
This commit is contained in:
FrancescoUK
2016-04-09 22:57:03 +01:00
parent a1311dca4c
commit e2ddb9388a
6 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Gruntfile.js
View File

@@ -5,7 +5,13 @@ module.exports = function(grunt) {
wiredep: {
task: {
ignorePath: '../../../',
src: ['**/header.php']
src: ['application/views/partial/header.php']
}
},
wiredep_templates: {
task: {
ignorePath: '../../../../',
src: ['templates/*/views/partial/header.php']
}
},
bower_concat: {
@@ -71,7 +77,7 @@ module.exports = function(grunt) {
}
},
jshint: {
files: ['Gruntfile.js', 'js/*.js'],
files: [ 'Gruntfile.js', 'js/*.js' ],
options: {
// options here to override JSHint defaults
globals: {
@@ -91,7 +97,8 @@ module.exports = function(grunt) {
absolutePath: true
},
src: [ 'css/*.css', '!css/login.css', '!css/invoice_email.css' ],
dest: 'application/views/partial/header.php'
dest: 'application/views/partial/header.php',
dest: 'templates/spacelab/views/partial/header.php'
},
mincss_header: {
options: {
@@ -101,7 +108,17 @@ module.exports = function(grunt) {
absolutePath: true
},
src: [ 'dist/*.css', '!dist/opensourcepos_bower.css' ],
dest: 'application/views/partial/header.php'
dest: 'application/views/partial/header.php',
},
mincss_header_templates: {
options: {
scriptTemplate: '<rel type="text/css" src="{{ path }}"></rel>',
openTag: '<!-- start mincss template tags -->',
closeTag: '<!-- end mincss template tags -->',
absolutePath: true
},
src: [ 'dist/*.css', '!dist/bootstrap.min.css', '!dist/opensourcepos_bower.css' ],
dest: 'templates/spacelab/views/partial/header.php'
},
css_login: {
options: {
@@ -121,7 +138,8 @@ module.exports = function(grunt) {
absolutePath: true
},
src: [ 'js/jquery*', 'js/*.js' ],
dest: 'application/views/partial/header.php'
dest: 'application/views/partial/header.php',
dest: 'templates/spacelab/views/partial/header.php'
},
minjs: {
options: {
@@ -130,10 +148,9 @@ module.exports = function(grunt) {
closeTag: '<!-- end minjs template tags -->',
absolutePath: true
},
src: [
'dist/*min.js'
],
dest: 'application/views/partial/header.php'
src: [ 'dist/*min.js' ],
dest: 'application/views/partial/header.php',
dest: 'templates/spacelab/views/partial/header.php'
}
},
mochaWebdriver: {
@@ -155,17 +172,15 @@ module.exports = function(grunt) {
cachebreaker: {
dev: {
options: {
match: [
{
match: [ {
'opensourcepos.min.js': 'dist/opensourcepos.min.js',
'opensourcepos.min.css': 'dist/opensourcepos.min.css',
'bootstrap.min.css': 'dist/bootstrap.min.css'
}
],
} ],
replacement: 'md5'
},
files: {
src: ['**/header.php', '**/login.php']
src: [ '**/header.php', '**/login.php' ]
}
}
}

31
application/core/MY_Loader.php
View File

@@ -1,25 +1,24 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
class MY_Loader extends CI_Loader {
class MY_Loader extends CI_Loader
{
public function __construct()
{
parent::__construct();
public function __construct()
{
parent::__construct();
log_message('debug', "MY_Loader Class Initialized");
}
log_message('debug', "MY_Loader Class Initialized");
}
function view($view, $vars = array(), $return = FALSE)
{
include APPPATH . 'config/theme.php';
function view($view, $vars = array(), $return = FALSE)
{
include APPPATH.'config/theme.php';
// add other first view path if exist
if(!empty($config['theme_name']) && file_exists('templates/'.$config['theme_name'].'/views'))
// add other first view path if exist
if(!empty($config['theme_name']) && file_exists('templates/' . $config['theme_name'] . '/views'))
{
$this->_ci_view_paths = array_merge(array('templates/'.$config['theme_name'].'/views'.DIRECTORY_SEPARATOR => 1), $this->_ci_view_paths);
$this->_ci_view_paths = array_merge(array('templates/' . $config['theme_name'] . '/views' . DIRECTORY_SEPARATOR => 1), $this->_ci_view_paths);
}
return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_object_to_array($vars), '_ci_return' => $return));
}
return $this->_ci_load(array('_ci_view'=>$view, '_ci_vars'=>$this->_ci_object_to_array($vars), '_ci_return'=>$return));
}
}

3
package.json
View File

@@ -11,7 +11,8 @@
"url": "https://github.com/jekkos/opensourcepos"
},
"keywords": [
"point-of-sale"
"point-of-sale",
"POS"
],
"author": "jekkos",
"license": "MIT",

5
templates/spacelab/css/style.css
View File

@@ -0,0 +1,5 @@
@font-face
{
font-family: 'Glyphicons Halflings';
src: url('../../../fonts/glyphicons-halflings-regular.woff2');
}

2
templates/spacelab/views/login.php
View File

@@ -20,7 +20,7 @@
</head>
<body>
<div align="center" style="margin-top:10px"><img src=<?php echo base_url();?>/images/logo.gif></div>
<div id="logo" align="center"><img src=<?php echo base_url();?>/images/logo.gif></div>
<div id="login">
<?php echo form_open('login') ?>

52
templates/spacelab/views/partial/header.php
View File

@@ -7,20 +7,19 @@
<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/jquery-ui/themes/base/jquery-ui.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" />
<link rel="stylesheet" href="../bower_components/bootstrap-daterangepicker/daterangepicker.css" />
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.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" />
<link rel="stylesheet" href="bower_components/bootstrap-daterangepicker/daterangepicker.css" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/barcode_font.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap.autocomplete.css"/>
<link rel="stylesheet" type="text/css" href="css/general.css"/>
<link rel="stylesheet" type="text/css" href="css/invoice.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css"/>
@@ -31,24 +30,23 @@
<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-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-bower/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>
<script src="../bower_components/moment/moment.js"></script>
<script src="../bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<script src="bower_components/jquery/dist/jquery.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-bower/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>
<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.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
@@ -74,7 +72,7 @@
<script type="text/javascript">
// live clock
function clockTick(){
function clockTick() {
setInterval('updateClock();', 1000);
}