Made flatly as default, various header adjustments, added login with bootstrap (#116)

This commit is contained in:
FrancescoUK
2016-01-24 20:05:36 +00:00
parent e76833d364
commit 4fd7948987
8 changed files with 249 additions and 129 deletions

View File

@@ -9,4 +9,5 @@
|
|
*/
$config['theme_name'] = 'spacelab';
$config['theme_name'] = 'flatly';
//$config['theme_name'] = 'spacelab';

View File

@@ -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));
}

View File

@@ -2,11 +2,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/login.css" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<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="<?php echo base_url();?>/images/favicon.ico">
<script src="<?php echo base_url();?>js/jquery-1.8.3.js" type="text/javascript" language="javascript" charset="UTF-8"></script>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<link rel="stylesheet" type="text/css" href="css/login.css" />
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript">
$(document).ready(function()
{
@@ -19,31 +19,33 @@
<div align="center" style="margin-top:10px"><img src=<?php echo base_url();?>/images/logo.gif></div>
<div id="login">
<?php echo form_open('login') ?>
<?php echo form_open('login') ?>
<div id="container">
<?php echo validation_errors(); ?>
<div id="login_form">
<div class="form_field_label"><?php echo $this->lang->line('login_username'); ?>: </div>
<div class="form_field">
<?php echo form_input(array(
'name'=>'username',
'id'=>'username',
'size'=>'20')); ?>
</div>
<div class="form_field_label"><?php echo $this->lang->line('login_password'); ?>: </div>
<div class="form_field">
<?php echo form_password(array(
'name'=>'password',
'id' => 'password',
'size'=>'20')); ?>
</div>
<div id="container">
<?php echo validation_errors(); ?>
<div id="submit_button"><?php echo form_submit('loginButton','Go'); ?> </div>
<div id="login_form">
<div class="form_field_label"><?php echo $this->lang->line('login_username'); ?>: </div>
<div class="form_field">
<?php echo form_input(array(
'name'=>'username',
'id'=>'username',
'size'=>'20')); ?>
</div>
<div class="form_field_label"><?php echo $this->lang->line('login_password'); ?>: </div>
<div class="form_field">
<?php echo form_password(array(
'name'=>'password',
'id' => 'password',
'size'=>'20')); ?>
</div>
<div id="submit_button"><?php echo form_submit('loginButton', 'Go'); ?> </div>
</div>
</div>
<?php echo form_close(); ?><h1>Open Source Point Of Sale <?php echo $this->config->item('application_version'); ?></h1>
</div>
<?php echo form_close(); ?><h1>Open Source Point Of Sale <?php echo $this->config->item('application_version'); ?></h1>
</body>
</html>

View File

@@ -4,39 +4,40 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<base href="<?php echo base_url();?>" />
<title><?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?></title>
<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>/images/favicon.ico">
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-1.11.4.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-timepicker-addon.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter-2.20.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=cb9e5b15ec" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-1.11.4.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-timepicker-addon.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter-2.20.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=cb9e5b15ec" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
<script type="text/javascript">
function logout(logout)
{
@@ -50,11 +51,12 @@
window.location = "<?php echo site_url('home/logout'); ?>";
}
}
</script>
</script>
<style type="text/css">
html {
overflow: auto;
}
html {
overflow: auto;
}
</style>
</head>

View File

@@ -0,0 +1,53 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<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" type="text/css" href="css/login.css" />
<link rel="stylesheet" type="text/css" href="templates/flatly/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="templates/flatly/css/style.css"/>
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript">
$(document).ready(function()
{
$("#login_form input:first").focus();
});
</script>
</head>
<body>
<div align="center" style="margin-top:10px"><img src=<?php echo base_url();?>/images/logo.gif></div>
<div id="login">
<?php echo form_open('login') ?>
<div id="container">
<?php echo validation_errors(); ?>
<div id="login_form">
<div class="form_field_label"><?php echo $this->lang->line('login_username'); ?>: </div>
<div class="form_field">
<?php echo form_input(array(
'name'=>'username',
'id'=>'username',
'size'=>'20')); ?>
</div>
<div class="form_field_label"><?php echo $this->lang->line('login_password'); ?>: </div>
<div class="form_field">
<?php echo form_password(array(
'name'=>'password',
'id' => 'password',
'size'=>'20')); ?>
</div>
<input class="btn btn-primary btn-block" type="submit" name="loginButton" value="Go"/>
</div>
</div>
<?php echo form_close(); ?><h1>Open Source Point Of Sale <?php echo $this->config->item('application_version'); ?></h1>
</div>
</body>
</html>

View File

@@ -4,40 +4,42 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<base href="<?php echo base_url();?>" />
<title><?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?></title>
<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>/images/favicon.ico">
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
<link rel="stylesheet" type="text/css" href="templates/flatly/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="templates/flatly/css/style.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-1.11.4.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-timepicker-addon.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter-2.20.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=cb9e5b15ec" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-1.11.4.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-timepicker-addon.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter-2.20.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=cb9e5b15ec" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
<script type="text/javascript">
function logout(logout)
{
@@ -51,11 +53,12 @@
window.location = "<?php echo site_url('home/logout'); ?>";
}
}
</script>
</script>
<style type="text/css">
html {
overflow: auto;
}
html {
overflow: auto;
}
</style>
</head>

View File

@@ -0,0 +1,53 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<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" type="text/css" href="css/login.css" />
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript">
$(document).ready(function()
{
$("#login_form input:first").focus();
});
</script>
</head>
<body>
<div align="center" style="margin-top:10px"><img src=<?php echo base_url();?>/images/logo.gif></div>
<div id="login">
<?php echo form_open('login') ?>
<div id="container">
<?php echo validation_errors(); ?>
<div id="login_form">
<div class="form_field_label"><?php echo $this->lang->line('login_username'); ?>: </div>
<div class="form_field">
<?php echo form_input(array(
'name'=>'username',
'id'=>'username',
'size'=>'20')); ?>
</div>
<div class="form_field_label"><?php echo $this->lang->line('login_password'); ?>: </div>
<div class="form_field">
<?php echo form_password(array(
'name'=>'password',
'id' => 'password',
'size'=>'20')); ?>
</div>
<input class="btn btn-primary btn-block" type="submit" name="loginButton" value="Go"/>
</div>
</div>
<?php echo form_close(); ?><h1>Open Source Point Of Sale <?php echo $this->config->item('application_version'); ?></h1>
</div>
</body>
</html>

View File

@@ -4,40 +4,42 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<base href="<?php echo base_url();?>" />
<title><?php echo $this->config->item('company').' -- '.$this->lang->line('common_powered_by').' OS Point Of Sale' ?></title>
<link rel="shortcut icon" type="image/x-icon" href="<?php echo base_url();?>/images/favicon.ico">
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css" media="print" />
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-1.11.4.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-timepicker-addon.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter-2.20.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=cb9e5b15ec" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery-1.8.3.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-1.11.4.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery-ui-timepicker-addon.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.bgiframe.min.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.color.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.form-3.51.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.metadata.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter-2.20.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.validate-1.13.1-min.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/date.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
<script type="text/javascript" src="js/nominatim.autocomplete.js" language="javascript"></script>
<script type="text/javascript" src="js/swfobject.js" language="javascript"></script>
<script type="text/javascript" src="js/tabcontent.js" language="javascript"></script>
<script type="text/javascript" src="js/thickbox.js" language="javascript"></script>
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=cb9e5b15ec" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>
<script type="text/javascript">
function logout(logout)
{
@@ -51,11 +53,12 @@
window.location = "<?php echo site_url('home/logout'); ?>";
}
}
</script>
</script>
<style type="text/css">
html {
overflow: auto;
}
html {
overflow: auto;
}
</style>
</head>