mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed redundant page titles, moved pagination up, adjusted styles, regen dist (#116)

Browse Source
This commit is contained in:
FrancescoUK
2016-03-26 22:56:51 +00:00
parent 69b3e9db52
commit 7f44d379f5
25 changed files with 51 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/views/configs/barcode_config.php
View File

@@ -1,5 +1,3 @@
<div id="page_title"><?php echo $this->lang->line('config_barcode_configuration'); ?></div>
<?php echo form_open('config/save_barcode/', array('id'=>'barcode_config_form', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
@@ -203,9 +201,7 @@
</div>
<?php echo form_close(); ?>
<script type='text/javascript'>
//validation and submit handling
$(document).ready(function()
{

3
application/views/configs/general_config.php
View File

@@ -1,5 +1,3 @@
<div id="page_title"><?php echo $this->lang->line('config_general_configuration'); ?></div>
<?php echo form_open('config/save/', array('id'=>'config_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
@@ -348,7 +346,6 @@
<?php echo form_close(); ?>
<script type='text/javascript'>
//validation and submit handling
$(document).ready(function()
{

3
application/views/configs/locale_config.php
View File

@@ -1,5 +1,3 @@
<div id="page_title"><?php echo $this->lang->line('config_locale_configuration'); ?></div>
<?php echo form_open('config/save_locale/', array('id'=>'locale_config_form', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
@@ -215,7 +213,6 @@
<?php echo form_close(); ?>
<script type='text/javascript'>
//validation and submit handling
$(document).ready(function()
{

14
application/views/configs/manage.php
View File

@@ -1,24 +1,20 @@
<?php $this->load->view("partial/header"); ?>
<div id="title_bar">
<div id="title" class="float_left"><?php echo $this->lang->line('module_config'); ?></div>
</div>
<ul class="nav nav-tabs" data-tabs="tabs">
<li class="active" role="presentation">
<a data-toggle="tab" href="#general">General</a>
<a data-toggle="tab" href="#general" title="<?php echo $this->lang->line('config_general_configuration'); ?>">General</a>
</li>
<li role="presentation">
<a data-toggle="tab" href="#locale">Locale</a>
<a data-toggle="tab" href="#locale" title="<?php echo $this->lang->line('config_locale_configuration'); ?>">Locale</a>
</li>
<li role="presentation">
<a data-toggle="tab" href="#barcode">Barcode</a>
<a data-toggle="tab" href="#barcode" title="<?php echo $this->lang->line('config_barcode_configuration'); ?>">Barcode</a>
</li>
<li role="presentation">
<a data-toggle="tab" href="#stock">Stock</a>
<a data-toggle="tab" href="#stock" title="<?php echo $this->lang->line('config_location_configuration'); ?>">Stock</a>
</li>
<li role="presentation">
<a data-toggle="tab" href="#receipt">Receipt</a>
<a data-toggle="tab" href="#receipt" title="<?php echo $this->lang->line('config_receipt_configuration'); ?>">Receipt</a>
</li>
</ul>

3
application/views/configs/receipt_config.php
View File

@@ -1,5 +1,3 @@
<div id="page_title"><?php echo $this->lang->line('config_receipt_configuration'); ?></div>
<?php echo form_open('config/save_receipt/', array('id'=>'receipt_config_form', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
@@ -196,7 +194,6 @@
<?php echo form_close(); ?>
<script type='text/javascript'>
//validation and submit handling
$(document).ready(function()
{

4
application/views/configs/stock_config.php
View File

@@ -1,5 +1,3 @@
<div id="page_title"><?php echo $this->lang->line('config_location_configuration'); ?></div>
<?php echo form_open('config/save_locations/', array('id'=>'location_config_form', 'class'=>'form-horizontal')); ?>
<div id="config_wrapper">
<fieldset id="config_info">
@@ -22,9 +20,7 @@
</div>
<?php echo form_close(); ?>
<script type='text/javascript'>
//validation and submit handling
$(document).ready(function()
{

5
application/views/giftcards/manage.php
View File

@@ -57,14 +57,13 @@ function post_giftcard_form_submit(response)
</script>
<div id="title_bar">
<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
<div id="pagination" class="float_left"><?php echo $links; ?></div>
<?php echo anchor("$controller_name/view/-1",
"<div class='btn btn-info btn-sm pull-right'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
array('class'=>'modal-dlg modal-btn-submit', 'title'=>$this->lang->line($controller_name.'_new'))); ?>
</div>
<div id="pagination"><?php echo $links; ?></div>
<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
<fieldset>
<div id="table_action_header" class="form-group">

5
application/views/item_kits/manage.php
View File

@@ -70,14 +70,13 @@ function post_item_kit_form_submit(response)
</script>
<div id="title_bar">
<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
<div id="pagination" class="float_left"><?php echo $links; ?></div>
<?php echo anchor("$controller_name/view/-1",
"<div class='btn btn-info btn-sm pull-right'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
array('class'=>'modal-dlg modal-btn-submit none', 'title'=>$this->lang->line($controller_name . '_new'))); ?>
</div>
<div id="pagination"><?php echo $links; ?></div>
<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
<fieldset>
<div id="table_action_header" class="form-group">

5
application/views/items/manage.php
View File

@@ -153,7 +153,8 @@ function post_bulk_form_submit(response)
</script>
<div id="title_bar">
<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
<div id="pagination" class="float_left"><?php echo $links; ?></div>
<?php echo anchor("$controller_name/excel_import",
"<div class='btn btn-info btn-sm pull-right'><span>" . $this->lang->line('common_import_excel') . "</span></div>",
array('class'=>'modal-dlg modal-btn-submit none', 'title'=>$this->lang->line('items_import_items_excel'))); ?>
@@ -163,8 +164,6 @@ function post_bulk_form_submit(response)
array('class'=>'modal-dlg modal-btn-new modal-btn-submit', 'title'=>$this->lang->line($controller_name . '_new'))); ?>
</div>
<div id="pagination"><?php echo $links; ?></div>
<div id="titleTextImg">
<div style="float:left;vertical-align:text-top;"><?php echo $this->lang->line('common_search_options'). ': '; ?></div>
<a id="imageDivLink" href="javascript:show_hide_search_filter('search_filter_section', 'imageDivLink');" style="outline:none;">

4
application/views/partial/header.php
View File

@@ -63,11 +63,11 @@
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=19fb7e2d85"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=5345485acb"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=130d370bfc" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=94597bdfba" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

5
application/views/people/manage.php
View File

@@ -59,7 +59,8 @@ function post_person_form_submit(response)
</script>
<div id="title_bar">
<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
<div id="pagination" class="float_left"><?php echo $links; ?></div>
<?php
if ($controller_name == 'customers')
{
@@ -84,8 +85,6 @@ function post_person_form_submit(response)
?>
</div>
<div id="pagination"><?php echo $links; ?></div>
<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
<fieldset>
<div id="table_action_header" class="form-group">

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

@@ -1,7 +1,5 @@
<?php $this->load->view("partial/header"); ?>
<div id="page_title"><?php echo $this->lang->line('recvs_register'); ?></div>
<?php
if (isset($error))
{
@@ -464,6 +462,6 @@ function post_person_form_submit(response)
$("#select_supplier_form").submit();
}
}
</script>
<?php $this->load->view("partial/footer"); ?>

2
application/views/reports/excel_export.php
View File

@@ -1,6 +1,6 @@
<?php $this->load->view("partial/header"); ?>
<div id="page_title"<?php echo $this->lang->line('reports_report_input'); ?></div>
<div id="page_title"><?php echo $this->lang->line('reports_report_input'); ?></div>
<?php
if(isset($error))

2
application/views/reports/graphical.php
View File

@@ -19,7 +19,7 @@
foreach($summary_data as $name=>$value)
{
?>
<div class="summary_row"><?php echo $this->lang->line('reports_'.$name). ': '.to_currency($value); ?></div>
<div class="summary_row"><?php echo $this->lang->line('reports_'.$name). ': ' . to_currency($value); ?></div>
<?php
}
?>

6
application/views/reports/inventory_summary_input.php
View File

@@ -10,7 +10,6 @@ if(isset($error))
?>
<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
<div class="col-xs-4">
@@ -37,15 +36,14 @@ if(isset($error))
</div>
</div>
<?php
<?php
echo form_button(array(
'name'=>'generate_report',
'id'=>'generate_report',
'content'=>$this->lang->line('common_submit'),
'class'=>'btn btn-primary btn-sm')
);
?>
?>
<?php echo form_close(); ?>
<?php $this->load->view("partial/footer"); ?>

14
application/views/reports/listing.php
View File

@@ -1,6 +1,11 @@
<?php $this->load->view("partial/header"); ?>
<div id="page_title"><?php echo $this->lang->line('reports_reports'); ?></div>
<?php
if(isset($error))
{
echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
}
?>
<ul id="report_list">
<li><h4><?php echo $this->lang->line('reports_graphical_reports'); ?></h4>
@@ -59,10 +64,5 @@
}
?>
</ul>
<?php
if(isset($error))
{
echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
}
?>
<?php $this->load->view("partial/footer"); ?>

2
application/views/reports/specific_input.php
View File

@@ -45,7 +45,7 @@ if(isset($error))
</div>
</div>
<?php
<?php
echo form_button(array(
'name'=>'generate_report',
'id'=>'generate_report',

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

@@ -199,14 +199,13 @@ function init_table_sorting()
<?php $this->load->view('partial/print_receipt', array('print_after_sale'=>false, 'selected_printer'=>'takings_printer')); ?>
<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>
<a href="javascript:printdoc();"><div class="btn btn-info btn-sm pull-right print_hide"><?php echo $this->lang->line('common_print'); ?></div></a>
<div id="title_bar" class="print_hide">
<div id="pagination" class="float_left"><?php echo $links; ?></div>
<a href="javascript:printdoc();"><div class="btn btn-info btn-sm pull-right"><?php echo $this->lang->line('common_print'); ?></div></a>
</div>
<div class="print_hide" id="pagination"><?php echo $links; ?></div>
<div class="print_hide" id="titleTextImg">
<div id="titleTextImg" class="print_hide">
<div style="float:left; vertical-align:text-top;"><?php echo $this->lang->line('common_search_options') . ': '; ?></div>
<a id="imageDivLink" href="javascript:show_hide_search_filter('search_filter_section', 'imageDivLink');" style="outline:none;">
<img src="<?php echo base_url().'images/plus.png'; ?>" style="border:0;outline:none;padding:0px;margin:0px;position:relative;top:-5px;"></a>

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

@@ -1,7 +1,5 @@
<?php $this->load->view("partial/header"); ?>
<div id="page_title"><?php echo $this->lang->line('sales_register'); ?></div>
<?php
if (isset($error))
{

5
application/views/suppliers/manage.php
View File

@@ -58,14 +58,13 @@ function post_person_form_submit(response)
</script>
<div id="title_bar">
<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
<div id="pagination" class="float_left"><?php echo $links; ?></div>
<?php echo anchor("$controller_name/view/-1",
"<div class='btn btn-info btn-sm pull-right'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
array('class'=>'modal-dlg modal-btn-submit none', 'title'=>$this->lang->line($controller_name . '_new'))); ?>
</div>
<div id="pagination"><?php echo $links; ?></div>
<?php echo form_open("$controller_name/search", array('id'=>'search_form', 'class'=>'form-horizontal')); ?>
<fieldset>
<div id="table_action_header" class="form-group">

7
css/ospos.css
View File

@@ -45,6 +45,11 @@ a.none
font-size: 14px;
}
.pagination
{
margin: 0 !important;
}
#title_bar
{
position: relative;
@@ -52,7 +57,7 @@ a.none
height: 3em;
}
#title, #page_title
#page_title
{
font-size: 22px;
font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;

5
css/reports.css
View File

@@ -2,17 +2,20 @@
{
margin-left: 35px;
}
#report_date_range_simple, #report_date_range_complex
{
margin-bottom: 10px;
}
.report
{
font-size: .85em;
}
#report_summary
{
margin: 0 auto;
margin: 2em 0 auto;
text-align: center;
}

6
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -63,12 +63,12 @@
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=19fb7e2d85"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=5345485acb"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=130d370bfc" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=94597bdfba" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>