From a97929f2390f122fe72e6097a7bf5bcf22b693eb Mon Sep 17 00:00:00 2001 From: jekkos Date: Tue, 16 Feb 2016 21:41:02 +0100 Subject: [PATCH] Remove thickbox from bower.json (#328) Items edit working now (items module only) (#116) --- application/helpers/table_helper.php | 5 +- application/views/items/form.php | 770 +- application/views/items/manage.php | 31 + application/views/login.php | 2 +- application/views/partial/header.php | 3 +- bower.json | 1 - css/ospos.css | 7 +- css/thickbox.css | 165 - dist/opensourcepos.js | 319 +- dist/opensourcepos.min.js | 44 +- dist/opensourcepos_bower.js | 318 - templates/spacelab/css/bootstrap.css | 6961 ------------------- templates/spacelab/css/style.css | 161 - templates/spacelab/views/partial/header.php | 2 +- 14 files changed, 436 insertions(+), 8353 deletions(-) delete mode 100644 css/thickbox.css delete mode 100644 templates/spacelab/css/bootstrap.css delete mode 100644 templates/spacelab/css/style.css diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index 6387e4559..d76c363d8 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -358,9 +358,8 @@ function get_item_data_row($item,$controller) } } $table_data_row.='' . $image . ''; - $table_data_row.=''.anchor($controller_name."/view/$item->item_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'data-modal','data-toggle'=>'modal','data-target'=>'#ajaxModal','title'=>$CI->lang->line($controller_name.'_update'))).''; - - $table_data_row.=''.anchor($controller_name."/inventory/$item->item_id/width:$width", $CI->lang->line('common_inv'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_count')))./*'';//inventory count + $table_data_row.=''. $CI->lang->line('common_edit').''; + $table_data_row.=''.anchor($controller_name."/inventory/$item->item_id/width:$width", $CI->lang->line('common_inv'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_count')))./*'';//inventory count $table_data_row.=''*/'    '.anchor($controller_name."/count_details/$item->item_id/width:$width", $CI->lang->line('common_det'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_details_count'))).'';//inventory details $table_data_row.=''; diff --git a/application/views/items/form.php b/application/views/items/form.php index 392f00c38..6624cdddd 100644 --- a/application/views/items/form.php +++ b/application/views/items/form.php @@ -1,403 +1,375 @@ -