From 7f44d379f562b3b8ca61225da4a3e47485106582 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sat, 26 Mar 2016 22:56:51 +0000 Subject: [PATCH] removed redundant page titles, moved pagination up, adjusted styles, regen dist (#116) --- application/views/configs/barcode_config.php | 4 ---- application/views/configs/general_config.php | 3 --- application/views/configs/locale_config.php | 3 --- application/views/configs/manage.php | 14 +++++--------- application/views/configs/receipt_config.php | 3 --- application/views/configs/stock_config.php | 4 ---- application/views/giftcards/manage.php | 5 ++--- application/views/item_kits/manage.php | 5 ++--- application/views/items/manage.php | 5 ++--- application/views/partial/header.php | 4 ++-- application/views/people/manage.php | 5 ++--- application/views/receivings/receiving.php | 4 +--- application/views/reports/excel_export.php | 2 +- application/views/reports/graphical.php | 2 +- .../views/reports/inventory_summary_input.php | 6 ++---- application/views/reports/listing.php | 14 +++++++------- application/views/reports/specific_input.php | 2 +- application/views/sales/manage.php | 11 +++++------ application/views/sales/register.php | 2 -- application/views/suppliers/manage.php | 5 ++--- css/ospos.css | 7 ++++++- css/reports.css | 5 ++++- dist/opensourcepos.min.css | 6 +++--- dist/opensourcepos.min.js | 2 +- templates/spacelab/views/partial/header.php | 4 ++-- 25 files changed, 51 insertions(+), 76 deletions(-) diff --git a/application/views/configs/barcode_config.php b/application/views/configs/barcode_config.php index 69d9fc1de..2a18efbc7 100644 --- a/application/views/configs/barcode_config.php +++ b/application/views/configs/barcode_config.php @@ -1,5 +1,3 @@ -
lang->line('config_barcode_configuration'); ?>
- 'barcode_config_form', 'class'=>'form-horizontal')); ?>
@@ -203,9 +201,7 @@
-
-
lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?>
+ + " . $this->lang->line($controller_name . '_new') . "
", array('class'=>'modal-dlg modal-btn-submit', 'title'=>$this->lang->line($controller_name.'_new'))); ?> - - 'search_form', 'class'=>'form-horizontal')); ?>
diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php index 55d5ef8c8..f48bae28d 100644 --- a/application/views/item_kits/manage.php +++ b/application/views/item_kits/manage.php @@ -70,14 +70,13 @@ function post_item_kit_form_submit(response)
-
lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?>
+ + " . $this->lang->line($controller_name . '_new') . "
", array('class'=>'modal-dlg modal-btn-submit none', 'title'=>$this->lang->line($controller_name . '_new'))); ?>
- - 'search_form', 'class'=>'form-horizontal')); ?>
diff --git a/application/views/items/manage.php b/application/views/items/manage.php index 9f8b47f58..c25e14abf 100644 --- a/application/views/items/manage.php +++ b/application/views/items/manage.php @@ -153,7 +153,8 @@ function post_bulk_form_submit(response)
-
lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?>
+ + " . $this->lang->line('common_import_excel') . "
", 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'))); ?>
- -
lang->line('common_search_options'). ': '; ?>
diff --git a/application/views/partial/header.php b/application/views/partial/header.php index 501feba6f..68e289cde 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -63,11 +63,11 @@ - + - + diff --git a/application/views/people/manage.php b/application/views/people/manage.php index 922401145..a8797cde0 100644 --- a/application/views/people/manage.php +++ b/application/views/people/manage.php @@ -59,7 +59,8 @@ function post_person_form_submit(response)
-
lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?>
+ +
- - 'search_form', 'class'=>'form-horizontal')); ?>
diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php index e9c7bc5db..b023891fa 100644 --- a/application/views/receivings/receiving.php +++ b/application/views/receivings/receiving.php @@ -1,7 +1,5 @@ load->view("partial/header"); ?> -
lang->line('recvs_register'); ?>
- + load->view("partial/footer"); ?> diff --git a/application/views/reports/excel_export.php b/application/views/reports/excel_export.php index cacdf6bd5..101fd55f8 100644 --- a/application/views/reports/excel_export.php +++ b/application/views/reports/excel_export.php @@ -1,6 +1,6 @@ load->view("partial/header"); ?> -
lang->line('reports_report_input'); ?>
+
lang->line('reports_report_input'); ?>
$value) { ?> -
lang->line('reports_'.$name). ': '.to_currency($value); ?>
+
lang->line('reports_'.$name). ': ' . to_currency($value); ?>
diff --git a/application/views/reports/inventory_summary_input.php b/application/views/reports/inventory_summary_input.php index 9f8437c9c..3588574ee 100644 --- a/application/views/reports/inventory_summary_input.php +++ b/application/views/reports/inventory_summary_input.php @@ -10,7 +10,6 @@ if(isset($error)) ?> 'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?> -
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')); ?>
@@ -37,15 +36,14 @@ if(isset($error))
-'generate_report', 'id'=>'generate_report', 'content'=>$this->lang->line('common_submit'), 'class'=>'btn btn-primary btn-sm') ); -?> - + ?> load->view("partial/footer"); ?> diff --git a/application/views/reports/listing.php b/application/views/reports/listing.php index 26214fc31..e6e5167bb 100644 --- a/application/views/reports/listing.php +++ b/application/views/reports/listing.php @@ -1,6 +1,11 @@ load->view("partial/header"); ?> -
lang->line('reports_reports'); ?>
+".$error."
"; +} +?>
  • lang->line('reports_graphical_reports'); ?>

    @@ -59,10 +64,5 @@ } ?>
-".$error."
"; -} -?> + load->view("partial/footer"); ?> \ No newline at end of file diff --git a/application/views/reports/specific_input.php b/application/views/reports/specific_input.php index 7e95e73cd..3d4e10913 100644 --- a/application/views/reports/specific_input.php +++ b/application/views/reports/specific_input.php @@ -45,7 +45,7 @@ if(isset($error)) - 'generate_report', 'id'=>'generate_report', diff --git a/application/views/sales/manage.php b/application/views/sales/manage.php index 16e174659..4f6490376 100755 --- a/application/views/sales/manage.php +++ b/application/views/sales/manage.php @@ -199,14 +199,13 @@ function init_table_sorting() load->view('partial/print_receipt', array('print_after_sale'=>false, 'selected_printer'=>'takings_printer')); ?> -
-
lang->line('common_list_of').' '.$this->lang->line('sales_receipt_number'); ?>
-
+ - - -