From 4fd7948987ef1a1ae42cb65a1aad8874eef7d1b0 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 24 Jan 2016 20:05:36 +0000 Subject: [PATCH] Made flatly as default, various header adjustments, added login with bootstrap (#116) --- application/config/theme.php | 3 +- application/core/MY_Loader.php | 3 + application/views/login.php | 54 ++++++++-------- application/views/partial/header.php | 70 ++++++++++---------- templates/flatly/views/login.php | 53 +++++++++++++++ templates/flatly/views/partial/header.php | 71 +++++++++++---------- templates/spacelab/views/login.php | 53 +++++++++++++++ templates/spacelab/views/partial/header.php | 71 +++++++++++---------- 8 files changed, 249 insertions(+), 129 deletions(-) create mode 100644 templates/flatly/views/login.php create mode 100644 templates/spacelab/views/login.php diff --git a/application/config/theme.php b/application/config/theme.php index 4b697841c..ca7d36a85 100644 --- a/application/config/theme.php +++ b/application/config/theme.php @@ -9,4 +9,5 @@ | | */ -$config['theme_name'] = 'spacelab'; +$config['theme_name'] = 'flatly'; +//$config['theme_name'] = 'spacelab'; diff --git a/application/core/MY_Loader.php b/application/core/MY_Loader.php index 67525fa0b..5fbf21da4 100644 --- a/application/core/MY_Loader.php +++ b/application/core/MY_Loader.php @@ -5,6 +5,7 @@ class MY_Loader extends CI_Loader { public function __construct() { parent::__construct(); + log_message('debug', "MY_Loader Class Initialized"); } @@ -14,7 +15,9 @@ class MY_Loader extends CI_Loader { // 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); + } return $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_object_to_array($vars), '_ci_return' => $return)); } diff --git a/application/views/login.php b/application/views/login.php index 1e153dbc6..a6d04e1a0 100644 --- a/application/views/login.php +++ b/application/views/login.php @@ -2,11 +2,11 @@ - - + Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?> - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/flatly/views/login.php b/templates/flatly/views/login.php new file mode 100644 index 000000000..a97179df9 --- /dev/null +++ b/templates/flatly/views/login.php @@ -0,0 +1,53 @@ + + + + + + Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?> + + + + + + + + + +
/images/logo.gif>
+ +
+ + +
+ + +
+
lang->line('login_username'); ?>:
+
+ 'username', + 'id'=>'username', + 'size'=>'20')); ?> +
+ +
lang->line('login_password'); ?>:
+
+ 'password', + 'id' => 'password', + 'size'=>'20')); ?> +
+ + +
+
+ +

Open Source Point Of Sale config->item('application_version'); ?>

+
+ + diff --git a/templates/flatly/views/partial/header.php b/templates/flatly/views/partial/header.php index 632856b3b..b6ba09d92 100644 --- a/templates/flatly/views/partial/header.php +++ b/templates/flatly/views/partial/header.php @@ -4,40 +4,42 @@ <?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?> - + + - + input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/spacelab/views/login.php b/templates/spacelab/views/login.php new file mode 100644 index 000000000..fb92c93d3 --- /dev/null +++ b/templates/spacelab/views/login.php @@ -0,0 +1,53 @@ + + + + + + Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?> + + + + + + + + + +
/images/logo.gif>
+ +
+ + +
+ + +
+
lang->line('login_username'); ?>:
+
+ 'username', + 'id'=>'username', + 'size'=>'20')); ?> +
+ +
lang->line('login_password'); ?>:
+
+ 'password', + 'id' => 'password', + 'size'=>'20')); ?> +
+ + +
+
+ +

Open Source Point Of Sale config->item('application_version'); ?>

+
+ + diff --git a/templates/spacelab/views/partial/header.php b/templates/spacelab/views/partial/header.php index 70a1311fd..248f9fdf2 100644 --- a/templates/spacelab/views/partial/header.php +++ b/templates/spacelab/views/partial/header.php @@ -4,40 +4,42 @@ <?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?> - + + - + input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +