mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-14 13:09:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'cpl2015/boostrapUI' into bootstrapUI (#116)

Browse Source
This commit is contained in:
FrancescoUK
2016-01-24 11:33:14 +00:00
parent 946c50b222 3cb0094dde
commit e76833d364
11 changed files with 7323 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/config/theme.php
View File

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

6
application/views/receivings/form.php
View File

@@ -51,7 +51,7 @@
<?php echo form_submit(array(
'name'=>'submit',
'value'=>$this->lang->line('common_submit'),
'class'=> 'submit_button float_right')
'class'=> 'btn btn-xs btn-success float_right')
);
?>
</form>
@@ -61,7 +61,7 @@
<?php echo form_submit(array(
'name'=>'submit',
'value'=>$this->lang->line('recvs_delete_entire_sale'),
'class'=>'delete_button float_right')
'class'=>'btn btn-xs btn-danger float_right')
);
?>
</form>
@@ -183,4 +183,4 @@ $(document).ready(function()
return false;
});
});
</script>
</script>

14
application/views/receivings/receiving.php
View File

@@ -49,7 +49,7 @@ if(isset($error))
<?php echo form_input(array('name'=>'item','id'=>'item','size'=>'40'));?>
<div id="new_item_button_register" >
<?php echo anchor("items/view/-1/width:450",
"<div class='small_button'><span>".$this->lang->line('sales_new_item')."</span></div>",
"<div class='btn btn-sm btn-info'><span>".$this->lang->line('sales_new_item')."</span></div>",
array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item')));
?>
</div>
@@ -204,7 +204,7 @@ else
<div style="margin-top:5px;text-align:center;">
<h3 style="margin: 5px 0 5px 0"><?php echo $this->lang->line('common_or'); ?></h3>
<?php echo anchor("suppliers/view/-1/width:400",
"<div class='small_button' style='margin:0 auto;'><span>".$this->lang->line('recvs_new_supplier')."</span></div>",
"<div class='btn btn-sm btn-info' style='margin:0 auto;'><span>".$this->lang->line('recvs_new_supplier')."</span></div>",
array('class'=>'thickbox none','title'=>$this->lang->line('recvs_new_supplier')));
?>
</div>
@@ -239,12 +239,12 @@ else
<?php echo form_textarea(array('name'=>'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>
<br /><br />
<div class='small_button' id='finish_receiving_button' style='float:right;margin-top:5px;'>
<div class="btn btn-sm btn-success" id='finish_receiving_button' style='float:right;margin-top:5px;'>
<span><?php echo $this->lang->line('recvs_complete_receiving') ?></span>
</div>
</form>
<?php echo form_open("receivings/cancel_receiving",array('id'=>'cancel_receiving_form')); ?>
<div class='small_button' id='cancel_receiving_button' style='float:left;margin-top:5px;'>
<div class="btn btn-sm btn-danger" id='cancel_receiving_button' style='float:left;margin-top:5px;'>
<span><?php echo $this->lang->line('recvs_cancel_receiving')?></span>
</div>
</form>
@@ -330,14 +330,14 @@ else
</table>
<br />
<div class='small_button' id='finish_receiving_button' style='float:right;margin-top:5px;'>
<div class='btn btn-sm btn-success' id='finish_receiving_button' style='float:right;margin-top:5px;'>
<span><?php echo $this->lang->line('recvs_complete_receiving') ?></span>
</div>
</form>
<?php echo form_open("receivings/cancel_receiving",array('id'=>'cancel_receiving_form')); ?>
<div class='small_button' id='cancel_receiving_button' style='float:left;margin-top:5px;'>
<div class='btn btn-sm btn-danger' id='cancel_receiving_button' style='float:left;margin-top:5px;'>
<span><?php echo $this->lang->line('recvs_cancel_receiving')?></span>
</div>
</form>
@@ -476,4 +476,4 @@ function post_person_form_submit(response)
}
</script>
<?php $this->load->view("partial/footer"); ?>
<?php $this->load->view("partial/footer"); ?>

6
application/views/sales/form.php
View File

@@ -57,7 +57,7 @@
<?php echo form_submit(array(
'name'=>'submit',
'value'=>$this->lang->line('common_submit'),
'class'=> 'submit_button float_right')
'class'=> 'btn btn-xs btn-success float_right')
);
?>
</form>
@@ -67,7 +67,7 @@
<?php echo form_submit(array(
'name'=>'submit',
'value'=>$this->lang->line('sales_delete_entire_sale'),
'class'=>'delete_button float_right')
'class'=>'btn btn-xs btn-danger float_right')
);
?>
</form>
@@ -204,4 +204,4 @@ $(document).ready(function()
return false;
});
});
</script>
</script>

4
application/views/sales/manage.php
View File

@@ -170,7 +170,7 @@ function init_table_sorting()
<div id="title_bar">
<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('sales_receipt_number'); ?></div>
<div id="new_button">
<a href="javascript:window.print()"><div class='big_button' style='float: left;'><span><?php echo $this->lang->line('common_print'); ?></span></div></a>
<a href="javascript:window.print()"><div class="btn btn-md btn-primary" style='float: left;'><span><?php echo $this->lang->line('common_print'); ?></span></div></a>
</div>
</div>
<div id="pagination"><?= $links ?></div>
@@ -213,4 +213,4 @@ function init_table_sorting()
</div>
<div id="feedback_bar"></div>
<?php $this->load->view("partial/footer"); ?>
<?php $this->load->view("partial/footer"); ?>

18
application/views/sales/register.php
View File

@@ -38,7 +38,7 @@ if (isset($success))
if ($this->Employee->has_grant('reports_sales', $this->session->userdata('person_id')))
{
?>
<div id="sales_overview" class="small_button">
<div id="sales_overview" class="btn btn-sm btn-primary">
<a href="<?=site_url($controller_name . '/manage')?>"><span><?php echo $this->lang->line('sales_takings'); ?><span></a>
</div>
<?php
@@ -47,7 +47,7 @@ if (isset($success))
<div id="show_suspended_sales_button">
<?php echo anchor("sales/suspended/width:425",
"<div class='small_button'><span style='font-size:73%;'>".$this->lang->line('sales_suspended_sales')."</span></div>",
"<div class='btn btn-sm btn-warning'><span style='font-size:73%;'>".$this->lang->line('sales_suspended_sales')."</span></div>",
array('class'=>'thickbox none','title'=>$this->lang->line('sales_suspended_sales')));
?>
</div>
@@ -62,7 +62,7 @@ if (isset($success))
<?php echo form_input(array('name'=>'item','id'=>'item','size'=>'40','tabindex'=>'1')); ?>
<div id="new_item_button_register" >
<?php echo anchor("items/view/-1/width:450",
"<div class='small_button'><span>".$this->lang->line('sales_new_item')."</span></div>",
"<div class='btn btn-sm btn-info'><span>".$this->lang->line('sales_new_item')."</span></div>",
array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item')));
?>
</div>
@@ -231,7 +231,7 @@ if (isset($success))
<div style="margin-top: 5px; text-align: center;">
<h3 style="margin: 5px 0 5px 0"><?php echo $this->lang->line('common_or'); ?></h3>
<?php echo anchor("customers/view/-1/width:400",
"<div class='small_button' style='margin:0 auto;'><span>".$this->lang->line('sales_new_customer')."</span></div>",
"<div class='btn btn-sm btn-info' style='margin:0 auto;'><span>".$this->lang->line('sales_new_customer')."</span></div>",
array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_customer')));
?>
</div>
@@ -261,11 +261,11 @@ if (isset($success))
?>
<div id="Cancel_sale">
<?php echo form_open("sales/cancel_sale", array('id'=>'cancel_sale_form')); ?>
<div class='small_button' id='cancel_sale_button' style='float:left; margin-top: 5px;'>
<div class='btn btn-sm btn-danger' id='cancel_sale_button' style='float:left; margin-top: 5px;'>
<span><?php echo $this->lang->line('sales_cancel_sale'); ?></span>
</div>
<div class='small_button' id='suspend_sale_button' style='float:right; margin-top: 5px;'>
<div class='btn btn-sm btn-warning' id='suspend_sale_button' style='float:right; margin-top: 5px;'>
<span><?php echo $this->lang->line('sales_suspend_sale'); ?></span>
</div>
</div>
@@ -299,7 +299,7 @@ if (isset($success))
if ($payments_cover_total)
{
echo "<div class='small_button' id='finish_sale_button' style='float:left; margin-top:5px;' tabindex='3'><span>".$this->lang->line('sales_complete_sale')."</span></div>";
echo "<div class='btn btn-sm btn-success' id='finish_sale_button' style='float:left; margin-top:5px;' tabindex='3'><span>".$this->lang->line('sales_complete_sale')."</span></div>";
}
?>
</div>
@@ -392,7 +392,7 @@ if (isset($success))
</tr>
</table>
<div class='small_button' id='add_payment_button' style='float: left; margin-top: 5px;'>
<div class='btn btn-sm btn-primary' id='add_payment_button' style='float: left; margin-top: 5px;'>
<span><?php echo $this->lang->line('sales_add_payment'); ?></span>
</div>
@@ -626,4 +626,4 @@ function check_payment_type_gifcard()
}
</script>
<?php $this->load->view("partial/footer"); ?>
<?php $this->load->view("partial/footer"); ?>

7000
templates/spacelab/css/bootstrap.css vendored Normal file
View File

File diff suppressed because it is too large Load Diff

160
templates/spacelab/css/style.css Normal file
View File

@@ -0,0 +1,160 @@
html, body {
height: 100%;
}
body {
/*padding-top: 80px;*/
}
.wrapper {
min-height: 100%;
margin-bottom: -75px;
}
.navbar {
min-height: 40px;
border-radius: 0;
}
.navbar-brand {
padding: 22px 15px;
height: 40px;
}
.topbar {
color: #eee;
font-size: 12px;
background: #182735;
padding: 5px;
}
.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus {
color: #2C3E50;
background-color: #FFFFFF;
}
table.tablesorter {
border: 0;
}
table.tablesorter tbody td {
padding: 8px;
}
table.tablesorter tbody td.over {
background-color: #F5F5F5;
}
table.tablesorter tbody td.selected {
background-color: #ECECEC;
}
table.tablesorter thead tr th, table.tablesorter tfoot tr th {
padding: 8px;
}
#table_action_header {
height: 35px;
background-color: transparent;
border: 0;
}
table.tablesorter thead tr th, table.tablesorter tfoot tr th {
background-color: #18BC9C;
}
#search_filter_section {
padding: 5px;
margin-bottom: 10px;
}
#titleTextImg {
background-color: transparent !important;
}
#table_action_header ul li span a {
background-color: rgba(0, 0, 0, 0);
border: 0;
color: #aaa;
}
#table_action_header ul li span a:hover {
color: #555;
}
#title,
#page_title {
font-size: 32px;
margin-top: 21px;
margin-bottom: 10.5px;
font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 400;
line-height: 1.1;
color: inherit;
}
#new_button {
bottom: 5px;
}
#new_button > a {
border-width: 2px;
padding: 6px 9px;
font-size: 13px;
line-height: 1.5;
border-radius: 3px;
color: #ffffff;
background-color: #2c3e50;
border-color: #2c3e50;
display: inline-block;
margin-bottom: 0;
font-weight: normal;
text-align: center;
vertical-align: middle;
-ms-touch-action: manipulation;
touch-action: manipulation;
cursor: pointer;
background-image: none;
border: 1px solid transparent;
white-space: nowrap;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
#new_button > a > .big_button {
float: none !important;
position: static;
width: auto;
height: auto;
background: none;
}
#new_button > a > .big_button > span {
position: static;
font-size: 13px;
font-weight: normal;
}
#home_module_list {
padding: 20px 0;
text-align: center;
}
.module_item {
min-width: 105px;
display: inline-block;
text-align: center;
margin-bottom: 3px;
border: 1px solid #ddd;
}
.module_item a {
display: block;
}
.navbar .menu-icon {
text-align: center;
font-size: 11px;
}
.navbar .menu-icon img {
width: 24px;
}
#feedback_bar {
top: 64px;
}
#footer {
height: 35px;
margin: 40px 0 0 0;
background: white;
padding: 10px
}
@media (min-width: 768px){
.navbar-nav > li > a {
padding: 10px 10px 9px;
}
}

18
templates/spacelab/views/home.php Normal file
View File

@@ -0,0 +1,18 @@
<?php $this->load->view("partial/header"); ?>
<h3 class="text-center"><?php echo $this->lang->line('common_welcome_message'); ?></h3>
<div id="home_module_list">
<?php
foreach($allowed_modules->result() as $module)
{
?>
<div class="module_item" title="<?php echo $this->lang->line('module_'.$module->module_id.'_desc');?>">
<a href="<?php echo site_url("$module->module_id");?>"><img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Menubar Image" /></a>
<a href="<?php echo site_url("$module->module_id");?>"><?php echo $this->lang->line("module_".$module->module_id) ?></a>
</div>
<?php
}
?>
</div>
<?php $this->load->view("partial/footer"); ?>

13
templates/spacelab/views/partial/footer.php Normal file
View File

@@ -0,0 +1,13 @@
</div>
</div>
</div>
<div id="footer">
<?php echo $this->lang->line('common_you_are_using_ospos'); ?>
<?php echo $this->config->item('application_version'); ?>.
<?php echo $this->lang->line('common_please_visit_my'); ?>
<a href="https://github.com/jekkos/opensourcepos" target="_blank"><?php echo $this->lang->line('common_website'); ?></a>
<?php echo $this->lang->line('common_learn_about_project'); ?>
</div>
</body>
</html>

107
templates/spacelab/views/partial/header.php Normal file
View File

@@ -0,0 +1,107 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.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><?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="stylesheet" type="text/css" href="css/ospos.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"/>
<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; ?>
<script type="text/javascript">
function logout(logout)
{
logout = logout && <?php echo $backup_allowed;?>;
if (logout && confirm("<?php echo $this->lang->line('config_logout'); ?>"))
{
window.location = "<?php echo site_url('config/backup_db'); ?>";
}
else
{
window.location = "<?php echo site_url('home/logout'); ?>";
}
}
</script>
<style type="text/css">
html {
overflow: auto;
}
</style>
</head>
<body>
<div class="wrapper">
<div class="topbar">
<div class="container">
<div class="navbar-left">
<?php echo date($this->config->item('dateformat').' '.$this->config->item('timeformat')) ?>
</div>
<div class="navbar-right" style="margin:0">
<?php echo $this->lang->line('common_welcome')." $user_info->first_name $user_info->last_name! | "; ?>
<a href="javascript:logout(true);"><?php echo $this->lang->line("common_logout"); ?></a>
</div>
</div>
</div>
<div class="navbar navbar-default" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand hidden-sm" href="<?php echo site_url(); ?>">OSPOS</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<?php foreach($allowed_modules->result() as $module): ?>
<li class="<?php echo $module->module_id == $this->uri->segment(1)? 'active': ''; ?>">
<a href="<?php echo site_url("$module->module_id");?>" title="<?php echo $this->lang->line("module_".$module->module_id) ?>" class="menu-icon">
<img src="<?php echo base_url().'images/menubar/'.$module->module_id.'.png';?>" border="0" alt="Module Icon" /><br />
<?php echo $this->lang->line("module_".$module->module_id) ?>
</a>
</li>
<?php endforeach; ?>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
<div class="container">
<div class="row">