diff --git a/Gruntfile.js b/Gruntfile.js index 0de7df1a3..05f7cdce8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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: '', + openTag: '', + closeTag: '', + 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: '', 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' ] } } } diff --git a/application/core/MY_Loader.php b/application/core/MY_Loader.php index 5fbf21da4..b05fac5ea 100644 --- a/application/core/MY_Loader.php +++ b/application/core/MY_Loader.php @@ -1,25 +1,24 @@ _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)); + } } \ No newline at end of file diff --git a/package.json b/package.json index b11a8a508..07e635981 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "url": "https://github.com/jekkos/opensourcepos" }, "keywords": [ - "point-of-sale" + "point-of-sale", + "POS" ], "author": "jekkos", "license": "MIT", diff --git a/templates/spacelab/css/style.css b/templates/spacelab/css/style.css index e69de29bb..414c93cf4 100644 --- a/templates/spacelab/css/style.css +++ b/templates/spacelab/css/style.css @@ -0,0 +1,5 @@ +@font-face +{ + font-family: 'Glyphicons Halflings'; + src: url('../../../fonts/glyphicons-halflings-regular.woff2'); +} \ No newline at end of file diff --git a/templates/spacelab/views/login.php b/templates/spacelab/views/login.php index 4e90f2f43..586151cce 100644 --- a/templates/spacelab/views/login.php +++ b/templates/spacelab/views/login.php @@ -20,7 +20,7 @@ -
/images/logo.gif>
+
diff --git a/templates/spacelab/views/partial/header.php b/templates/spacelab/views/partial/header.php index 1334d22e1..f9d76df81 100644 --- a/templates/spacelab/views/partial/header.php +++ b/templates/spacelab/views/partial/header.php @@ -7,20 +7,19 @@ input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?> - - - - - - - - - + + + + + + + + + - @@ -31,24 +30,23 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - @@ -74,7 +72,7 @@