Add new dialogs to all pages (use modal-dlg class) #116

Bootstrapify customer edit form (almost done) Bootstrapify item excel impor
2026-05-24 08:20:54 -04:00 · 2016-02-17 23:34:53 +01:00
parent c99ef3f315
commit 82a3f9a3e2
20 changed files with 239 additions and 189 deletions
--- a/application/controllers/Reports.php
+++ b/application/controllers/Reports.php
@@ -61,7 +61,7 @@ class Reports extends Secure_area

 		$summary_data = array(anchor('sales/edit/'.$report_data['sale_id'] . '/width:'.FORM_WIDTH,
 				'POS '.$report_data['sale_id'],
-				array('class' => 'thickbox')),
+				array('class' => 'modal')),
 				$report_data['sale_date'],
 				$report_data['items_purchased'],
 				$report_data['employee_name'],
@@ -85,7 +85,7 @@ class Reports extends Secure_area

 		$summary_data = array(anchor('receivings/edit/'.$report_data['receiving_id'] . '/width:'.FORM_WIDTH,
 				'RECV '.$report_data['receiving_id'],
-				array('class' => 'thickbox')),
+				array('class' => 'modal')),
 				$report_data['receiving_date'],
 				$report_data['items_purchased'],
 				$report_data['employee_name'],
@@ -872,7 +872,7 @@ class Reports extends Secure_area

 		foreach($report_data['summary'] as $key=>$row)
 		{
-			$summary_data[] = array(anchor('sales/edit/'.$row['sale_id'] . '/width:'.FORM_WIDTH, 'POS '.$row['sale_id'], array('class' => 'thickbox')), $row['sale_date'], $row['items_purchased'], $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
+			$summary_data[] = array(anchor('sales/edit/'.$row['sale_id'] . '/width:'.FORM_WIDTH, 'POS '.$row['sale_id'], array('class' => 'modal')), $row['sale_date'], $row['items_purchased'], $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);

 			foreach($report_data['details'][$key] as $drow)
 			{
@@ -915,7 +915,7 @@ class Reports extends Secure_area

 		foreach($report_data['summary'] as $key=>$row)
 		{
-			$summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'].'/width:'.FORM_WIDTH, 'RECV '.$row['receiving_id'], array('class' => 'thickbox')), $row['receiving_date'], $row['items_purchased'], $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);
+			$summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'].'/width:'.FORM_WIDTH, 'RECV '.$row['receiving_id'], array('class' => 'modal')), $row['receiving_date'], $row['items_purchased'], $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);

 			foreach($report_data['details'][$key] as $drow)
 			{
--- a/application/helpers/table_helper.php
+++ b/application/helpers/table_helper.php
@@ -77,7 +77,7 @@ function get_sales_manage_sale_data_row($sale, $controller)
 	$table_data_row.='<td width="12%">'.$sale['payment_type'].'</td>';
 	$table_data_row.='<td width="8%">'.$sale['invoice_number'].'</td>';
 	$table_data_row.='<td width="8%">';
-	$table_data_row.=anchor($controller_name."/edit/" . $sale['sale_id'] . "/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update')));
+	$table_data_row.=anchor($controller_name."/edit/" . $sale['sale_id'] . "/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal','title'=>$CI->lang->line($controller_name.'_update')));
 	$table_data_row.='&nbsp;&nbsp;&nbsp;&nbsp;';
 	$table_data_row.='<a href="'.site_url($controller_name. "/receipt/" . $sale['sale_id']) . '">' . $CI->lang->line('sales_show_receipt') . '</a>';
 	$table_data_row.='&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -174,8 +174,8 @@ function get_person_data_row($person,$controller)
 	$table_data_row.='<td width="20%">'.character_limiter($person->last_name,13).'</td>';
 	$table_data_row.='<td width="20%">'.character_limiter($person->first_name,13).'</td>';
 	$table_data_row.='<td width="30%">'.mailto($person->email,character_limiter($person->email,22)).'</td>';
-	$table_data_row.='<td width="20%">'.character_limiter($person->phone_number,13).'</td>';		
-	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$person->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';		
+	$table_data_row.='<td width="20%">'.character_limiter($person->phone_number,13).'</td>';
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$person->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
 	$table_data_row.='</tr>';
 	
 	return $table_data_row;
@@ -262,7 +262,7 @@ function get_supplier_data_row($supplier,$controller)
 	$table_data_row.='<td width="22%">'.mailto($supplier->email,character_limiter($supplier->email,22)).'</td>';
 	$table_data_row.='<td width="17%">'.character_limiter($supplier->phone_number,13).'</td>';
 	$table_data_row.='<td width="5%">'.character_limiter($supplier->person_id,5).'</td>';
-	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
 	$table_data_row.='</tr>';
 	
 	return $table_data_row;
@@ -358,9 +358,10 @@ function get_item_data_row($item,$controller)
 		}
 	}
 	$table_data_row.='<td align="center" width="55px">' . $image . '</td>';
-	$table_data_row.='<td width="5%"><a onclick="item_details(\''.$controller_name.'/view/'. $item->item_id . '/width:' . $width . '\',\''.$CI->lang->line("items_basic_information").'\')">'. $CI->lang->line('common_edit').'</a>';
-	$table_data_row.='<td width="10%"><a onclick="item_details(\''.$controller_name.'/inventory/' . $item->item_id . '/width:' . $width . '\', \''.$CI->lang->line("items_count"). '\')">'. $CI->lang->line('common_inv'). '</a>'.
-	 '&nbsp;&nbsp;&nbsp;&nbsp;<a onclick="item_details(\''.$controller_name.'/count_details/'. $item->item_id. '/width:' . $width . '\', \''. $CI->lang->line('items_details_count') . '\')">' . $CI->lang->line('common_det'). '</a></td>';//inventory detail_
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$item->item_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
+
+	$table_data_row.='<td width="10%">'.anchor($controller_name."/inventory/$item->item_id/width:$width", $CI->lang->line('common_inv'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_count')))./*'</td>';//inventory count
+	$table_data_row.='<td width="5%">'*/'&nbsp;&nbsp;&nbsp;&nbsp;'.anchor($controller_name."/count_details/$item->item_id/width:$width", $CI->lang->line('common_det'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_details_count'))).'</td>';//inventory details
 	
 	$table_data_row.='</tr>';

@@ -428,7 +429,7 @@ function get_giftcard_data_row($giftcard,$controller)
 	$table_data_row.='<td width="15%">'.$giftcard->first_name.'</td>';
 	$table_data_row.='<td width="15%">'.$giftcard->giftcard_number.'</td>';
 	$table_data_row.='<td width="20%">'.to_currency($giftcard->value).'</td>';
-	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$giftcard->giftcard_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$giftcard->giftcard_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
 	$table_data_row.='</tr>';

 	return $table_data_row;
@@ -497,7 +498,7 @@ function get_item_kit_data_row($item_kit, $controller)
 	$table_data_row.='<td width="20%">'.character_limiter($item_kit->description, 25).'</td>';
 	$table_data_row.='<td width="15%">'.to_currency($item_kit->total_cost_price).'</td>';
 	$table_data_row.='<td width="15%">'.to_currency($item_kit->total_unit_price).'</td>';
-	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$item_kit->item_kit_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
+	$table_data_row.='<td width="5%">'.anchor($controller_name."/view/$item_kit->item_kit_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).'</td>';
 	$table_data_row.='</tr>';

 	return $table_data_row;
--- a/application/views/customers/excel_import.php
+++ b/application/views/customers/excel_import.php
@@ -1,28 +1,22 @@
-<?php echo form_open_multipart('customers/do_excel_import/',array('id'=>'item_form')); ?>
+<?php echo form_open_multipart('customers/do_excel_import/',array('id'=>'item_form', 'class'=>'form-horizontal')); ?>
 	<div id="required_fields_message"><?php echo $this->lang->line('customers_import_items_excel'); ?></div>
 	<ul id="error_message_box" class="error_message_box"></ul>
 	<b><a href="<?php echo site_url('customers/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a></b>
 	<fieldset id="item_basic_info">
 		<legend><?php echo $this->lang->line('common_import'); ?></legend>

-		<div class="field_row clearfix">	
-		<?php echo form_label($this->lang->line('common_import_file_path').':', 'name',array('class'=>'wide')); ?>
-			<div class='form_field'>
+		<div class="form-group">
+		<?php echo form_label($this->lang->line('common_import_file_path').':', 'name',array('class'=>'control-label col-xs-3')); ?>
+			<div class='col-xs-6'>
 			<?php echo form_upload(array(
 				'name'=>'file_path',
 				'id'=>'file_path',
+				'class'=>'form-control',
 				'value'=>'')
 			);?>
 			</div>
 		</div>

-		<?php
-		echo form_submit(array(
-			'name'=>'submitf',
-			'id'=>'submitf',
-			'value'=>$this->lang->line('common_submit'),
-			'class'=>'btn btn-primary btn-sm pull-right')
-		);
 		?>
 	</fieldset>
 <?php echo form_close(); ?>
@@ -37,7 +31,7 @@ $(document).ready(function()
 			$(form).ajaxSubmit({
 			success:function(response)
 			{
-				tb_remove();
+				dialog_support.hide();;
 				post_person_form_submit(response);
 			},
 			dataType:'json'
--- a/application/views/customers/form.php
+++ b/application/views/customers/form.php
@@ -1,48 +1,37 @@
-<?php echo form_open('customers/save/'.$person_info->person_id,array('id'=>'customer_form')); ?>
-	<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
-	<ul id="error_message_box" class="error_message_box"></ul>
-	<fieldset id="customer_basic_info">
-		<legend><?php echo $this->lang->line("customers_basic_information"); ?></legend>
-		<?php $this->load->view("people/form_basic_info"); ?>
+<?php echo form_open('customers/save/'.$person_info->person_id,array('id'=>'customer_form', 'class'=>'form-horizontal')); ?>
+<div id="required_fields_message"><?php echo $this->lang->line('common_fields_required_message'); ?></div>
+<ul id="error_message_box" class="error_message_box"></ul>
+<?php $this->load->view("people/form_basic_info"); ?>

-		<div class="field_row clearfix">	
-		<?php echo form_label($this->lang->line('customers_company_name').':', 'company_name'); ?>
-			<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'company_name',
-				'value'=>$person_info->company_name)
-			);?>
-			</div>
-		</div>
+<div class="form-group">
+<?php echo form_label($this->lang->line('customers_company_name'), 'company_name', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
+	<?php echo form_input(array(
+		'name'=>'company_name',
+		'class'=>'form-control',
+		'value'=>$person_info->company_name)
+	);?>
+	</div>
+</div>

-		<div class="field_row clearfix">	
-		<?php echo form_label($this->lang->line('customers_account_number').':', 'account_number'); ?>
-			<div class='form_field'>
-			<?php echo form_input(array(
-				'name'=>'account_number',
-				'id'=>'account_number',
-				'class'=>'account_number',
-				'value'=>$person_info->account_number)
-			);?>
-			</div>
-		</div>
+<div class="form-group">
+<?php echo form_label($this->lang->line('customers_account_number'), 'account_number', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
+	<?php echo form_input(array(
+		'name'=>'account_number',
+		'id'=>'account_number',
+		'class'=>'account_number form-control',
+		'value'=>$person_info->account_number)
+	);?>
+	</div>
+</div>

-		<div class="field_row clearfix">	
-		<?php echo form_label($this->lang->line('customers_taxable').':', 'taxable'); ?>
-			<div class='form_field'>
-			<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' ? TRUE : (boolean)$person_info->taxable);?>
-			</div>
-		</div>
-
-		<?php
-		echo form_submit(array(
-			'name'=>'submit',
-			'id'=>'submit',
-			'value'=>$this->lang->line('common_submit'),
-			'class'=>'btn btn-primary btn-sm pull-right')
-		);
-		?>
-	</fieldset>
+<div class="form-group">
+<?php echo form_label($this->lang->line('customers_taxable'), 'taxable', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-1'>
+	<?php echo form_checkbox('taxable', '1', $person_info->taxable == '' ? TRUE : (boolean)$person_info->taxable, 'class="form-control"');?>
+	</div>
+</div>
 <?php echo form_close(); ?>

 <script type='text/javascript'>
@@ -74,7 +63,7 @@ $(document).ready(function()
 			$(form).ajaxSubmit({
 			success:function(response)
 			{
-				tb_remove();
+				dialog_support.hide();
 				post_person_form_submit(response);
 			},
 			dataType:'json'
--- a/application/views/giftcards/manage.php
+++ b/application/views/giftcards/manage.php
@@ -60,7 +60,7 @@ function post_giftcard_form_submit(response)
 	<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
 	<?php echo anchor("$controller_name/view/-1/width:$form_width",
 	"<div class='btn btn-info btn-sm pull-right'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
-	array('class'=>'thickbox none', 'title'=>$this->lang->line($controller_name.'_new')));
+	array('class'=>'modal-dlg none', 'title'=>$this->lang->line($controller_name.'_new')));
 	?>
 </div>

--- a/application/views/item_kits/manage.php
+++ b/application/views/item_kits/manage.php
@@ -73,7 +73,7 @@ function post_item_kit_form_submit(response)
 	<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
 	<?php echo anchor("$controller_name/view/-1/width:$form_width",
 	"<div class='btn btn-info btn-sm pull-right'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
-	array('class'=>'thickbox none', 'title'=>$this->lang->line($controller_name . '_new')));
+	array('class'=>'modal-dlg none', 'title'=>$this->lang->line($controller_name . '_new')));
 	?>
 </div>

--- a/application/views/items/excel_import.php
+++ b/application/views/items/excel_import.php
@@ -1,30 +1,25 @@
-<?php echo form_open_multipart('items/do_excel_import/',array('id'=>'item_form')); ?>
+<?php echo form_open_multipart('items/do_excel_import/',array('id'=>'item_form', 'class'=>'form_horizontal')); ?>
 	<div id="required_fields_message"><?php echo $this->lang->line('items_import_items_excel'); ?></div>
 	<ul id="error_message_box" class="error_message_box"></ul>
-	<b><a href="<?php echo site_url('items/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a></b>
-	<fieldset id="item_basic_info">
-		<legend><?php echo $this->lang->line('common_import'); ?></legend>

-		<div class="field_row clearfix">	
-		<?php echo form_label($this->lang->line('common_import_file_path').':', 'name',array('class'=>'wide')); ?>
-			<div class='form_field'>
-			<?php echo form_upload(array(
-				'name'=>'file_path',
-				'id'=>'file_path',
-				'value'=>'')
-			);?>
-			</div>
+	<div class="form-group">
+		<div class="col-xs-9">
+			<a href="<?php echo site_url('items/excel'); ?>"><?php echo $this->lang->line('common_download_import_template'); ?></a>
 		</div>
+	</div>
+
+	<div class="form-group">	
+	<?php echo form_label($this->lang->line('common_import_file_path').':', 'name',array('class'=>'control-label col-xs-3')); ?>
+		<div class='col-xs-6'>
+		<?php echo form_upload(array(
+			'name'=>'file_path',
+			'id'=>'file_path',
+			'class'=>'form-control',
+			'value'=>'')
+		);?>
+		</div>
+	</div>

-		<?php
-		echo form_submit(array(
-			'name'=>'submitf',
-			'id'=>'submitf',
-			'value'=>$this->lang->line('common_submit'),
-			'class'=>'btn btn-primary btn-sm pull-right')
-		);
-		?>
-	</fieldset>
 <?php echo form_close(); ?>

 <script type='text/javascript'>
--- a/application/views/items/form.php
+++ b/application/views/items/form.php
@@ -144,7 +144,7 @@
 	?>

 	<div class="form-group">
-		<?php echo form_label($this->lang->line('items_receiving_quantity'), 'receiving_quantity',array('class'=>'wide control-label col-xs-3')); ?>
+		<?php echo form_label($this->lang->line('items_receiving_quantity'), 'receiving_quantity',array('class'=>'control-label col-xs-3')); ?>
 		<div class='col-xs-2'>
 			<?php echo form_input(array(
 					'name'=>'receiving_quantity',
@@ -295,7 +295,7 @@
 		$('#item_form').validate({
 			submitHandler:function(form, event)
 			{
-				var stay_open = dialog_support.clicked_button != 'submit';
+				var stay_open = dialog_support.clicked_id() != 'submit';
 				var $form = $(form);

 				$.ajax({
@@ -317,7 +317,7 @@
 						}
 						else
 						{
-							dialog_support.hide_dialog();
+							dialog_support.hide();
 						}
 						post_item_form_submit(response, stay_open);
 					}
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -175,11 +175,11 @@ function post_bulk_form_submit(response)
    <div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
 	<?php echo anchor("$controller_name/excel_import/width:$form_width",
 	"<div class='btn btn-info btn-sm pull-right'><span>" . $this->lang->line('common_import_excel') . "</span></div>",
-	array('class'=>'thickbox none', 'title'=>'Import Items from Excel'));
+	array('class'=>'modal-dlg none', 'title'=>'Import Items from Excel'));
 	?>
 	<?php echo anchor("$controller_name/view/-1/width:$form_width",
 	"<div class='btn btn-info btn-sm pull-right' style='margin-right: 10px;'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
-	array('class'=>'thickbox none', 'title'=>$this->lang->line($controller_name . '_new')));
+	array('class'=>'modal-dlg', 'title'=>$this->lang->line($controller_name . '_new')));
 	?>
 </div>

--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -43,7 +43,7 @@
 		<!-- end js template tags -->
 	<?php else : ?>
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=be80220783" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=0c1bada54f" language="javascript"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>

--- a/application/views/people/form_basic_info.php
+++ b/application/views/people/form_basic_info.php
@@ -1,6 +1,6 @@
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_first_name').':', 'first_name',array('class'=>'required')); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_first_name'), 'first_name',array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'first_name',
 		'id'=>'first_name',
@@ -8,9 +8,9 @@
 	);?>
 	</div>
 </div>
-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_last_name').':', 'last_name',array('class'=>'required')); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_last_name'), 'last_name',array('class'=>'required control-label required col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'last_name',
 		'id'=>'last_name',
@@ -19,14 +19,15 @@
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_gender').':', 'gender',
-!empty($basic_version) ? array('class'=>'required') : array()); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_gender'), 'gender',
+!empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array()); ?>
+	<div class='col-sm-2'>
 	<?php echo form_radio(array(
 		'name'=>'gender',
 		'type'=>'radio',
 		'id'=>'gender',
+		'class'=>'form-control',
 		'value'=>1,
 		'checked'=>$person_info->gender === '1')
 	);
@@ -35,6 +36,7 @@
 		'name'=>'gender',
 		'type'=>'radio',
 		'id'=>'gender',
+		'class'=>'form-control',
 		'value'=>0,
 		'checked'=>$person_info->gender === '0')
 	);
@@ -43,97 +45,104 @@
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_email').':', 'email'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_email'), 'email', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'email',
 		'id'=>'email',
+		'class'=>'form-control',
 		'value'=>$person_info->email)
 	);?>
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_phone_number').':', 'phone_number'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_phone_number'), 'phone_number', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'phone_number',
 		'id'=>'phone_number',
+		'class'=>'form-control',
 		'value'=>$person_info->phone_number));?>
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_address_1').':', 'address_1'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_address_1'), 'address_1', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'address_1',
 		'id'=>'address_1',
+		'class'=>'form-control',
 		'value'=>$person_info->address_1));?>
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_address_2').':', 'address_2'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_address_2'), 'address_2', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'address_2',
 		'id'=>'address_2',
+		'class'=>'form-control',
 		'value'=>$person_info->address_2));?>
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_city').':', 'city'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_city'), 'city', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'city',
 		'id'=>'city',
+		'class'=>'form-control',
 		'value'=>$person_info->city));?>
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_state').':', 'state'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_state'), 'state', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'state',
 		'id'=>'state',
+		'class'=>'form-control',
 		'value'=>$person_info->state));?>
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_zip').':', 'zip'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_zip'), 'zip', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'zip',
 		'id'=>'postcode',
+		'class'=>'form-control',
 		'value'=>$person_info->zip));?>
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_country').':', 'country'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_country'), 'country', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_input(array(
 		'name'=>'country',
 		'id'=>'country',
+		'class'=>'form-control',
 		'value'=>$person_info->country));?>
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('common_comments').':', 'comments'); ?>
-	<div class='form_field'>
+<div class="form-group">	
+<?php echo form_label($this->lang->line('common_comments'), 'comments', array('class' => 'control-label col-xs-3')); ?>
+	<div class='col-xs-6'>
 	<?php echo form_textarea(array(
 		'name'=>'comments',
 		'id'=>'comments',
-		'value'=>$person_info->comments,
-		'rows'=>'5',
-		'cols'=>'17')		
-	);?>
+		'class'=>'form-control',
+		'value'=>$person_info->comments
+		));?>
 	</div>
 </div>

@@ -143,29 +152,29 @@ $(document).ready(function()
 {
 	nominatim.init({
 		fields : {
-			postcode : {  
-				dependencies :  ["postcode", "city", "state", "country"], 
-				response : {  
-					field : 'postalcode', 
-					format: ["postcode", "village|town|hamlet|city_district|city", "state", "country"] 
+			postcode : {
+				dependencies :  ["postcode", "city", "state", "country"],
+				response : {
+					field : 'postalcode',
+					format: ["postcode", "village|town|hamlet|city_district|city", "state", "country"]
 				}
 			},
-	
+
 			city : {
-				dependencies :  ["postcode", "city", "state", "country"], 
-				response : {  
-					format: ["postcode", "village|town|hamlet|city_district|city", "state", "country"] 
+				dependencies :  ["postcode", "city", "state", "country"],
+				response : {
+					format: ["postcode", "village|town|hamlet|city_district|city", "state", "country"]
 				}
 			},
-	
+
 			state : {
 				dependencies :  ["state", "country"]
 			},
-	
+
 			country : {
-				dependencies :  ["state", "country"] 
+				dependencies :  ["state", "country"]
 			}
-			
+
 		},
 		language : '<?php echo $this->config->item('language');?>'
 	});
--- a/application/views/people/manage.php
+++ b/application/views/people/manage.php
@@ -64,7 +64,7 @@ function post_person_form_submit(response)
 	?>
 		<?php echo anchor("$controller_name/excel_import/width:$form_width",
 		"<div class='btn btn-info btn-sm pull-right''><span>" . $this->lang->line('common_import_excel') . "</span></div>",
-			array('class'=>'thickbox none', 'title'=>'Import Items from Excel'));
+			array('class'=>'modal-dlg none', 'title'=>'Import Items from Excel'));
 		?>	
 	<?php
 	}
@@ -72,7 +72,7 @@ function post_person_form_submit(response)

 	<?php echo anchor("$controller_name/view/-1/width:$form_width",
 	"<div class='btn btn-info btn-sm pull-right' style='margin-right: 10px;'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
-	array('class'=>'thickbox none', 'title'=>$this->lang->line($controller_name . '_new')));
+	array('class'=>'modal-dlg none', 'title'=>$this->lang->line($controller_name . '_new')));
 	?>
 </div>

--- a/application/views/receivings/receiving.php
+++ b/application/views/receivings/receiving.php
@@ -53,7 +53,7 @@ if(isset($error))
 		<div id="new_item_button_register" >
 			<?php echo anchor("items/view/-1/width:450",
 			"<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')));
+			array('class'=>'modal-dlg none','title'=>$this->lang->line('sales_new_item')));
 			?>
 		</div>
 	<?php echo form_close(); ?>
@@ -207,7 +207,7 @@ if(isset($error))
 		<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='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')));
+		array('class'=>'modal-dlg none','title'=>$this->lang->line('recvs_new_supplier')));
 		?>
 		</div>
 		<div class="clearfix">&nbsp;</div>
--- a/application/views/reports/tabular_details.php
+++ b/application/views/reports/tabular_details.php
@@ -108,7 +108,7 @@ else
 					update_sortable_table();
 					animate_row(row);
 					row.find("a.expand").click(expand_handler).text(sign);
-					tb_init(row.find("a.thickbox"));
+					dialog_support.init(row.find("a.modal"));
 				});
 				set_feedback(response.message, 'alert alert-dismissible alert-success', false);
 			}
--- a/application/views/sales/register.php
+++ b/application/views/sales/register.php
@@ -46,7 +46,7 @@ if (isset($success))

 		<?php echo anchor("sales/suspended/width:425",
 		"<div class='btn btn-default btn-sm' id='show_suspended_sales_button'><span>".$this->lang->line('sales_suspended_sales')."</span></div>",
-		array('class'=>'thickbox none','title'=>$this->lang->line('sales_suspended_sales')));
+		array('class'=>'modal-dlg none','title'=>$this->lang->line('sales_suspended_sales')));
 		?>
 	<?php echo form_close(); ?>

@@ -60,7 +60,7 @@ if (isset($success))
 		<div id="new_item_button_register" >
 			<?php echo anchor("items/view/-1/width:450",
 			"<div class='btn btn-info btn-sm'><span>".$this->lang->line('sales_new_item')."</span></div>",
-			array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item')));
+			array('class'=>'modal-dlg none','title'=>$this->lang->line('sales_new_item')));
 			?>
 		</div>
 	<?php echo form_close(); ?>
@@ -229,7 +229,7 @@ if (isset($success))
 			<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='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')));
+			array('class'=>'modal-dlg none','title'=>$this->lang->line('sales_new_customer')));
 			?>
 		</div>
 		
--- a/application/views/suppliers/manage.php
+++ b/application/views/suppliers/manage.php
@@ -61,7 +61,7 @@ function post_person_form_submit(response)
 	<div id="title" class="float_left"><?php echo $this->lang->line('common_list_of').' '.$this->lang->line('module_'.$controller_name); ?></div>
 	<?php echo anchor("$controller_name/view/-1/width:$form_width",
 	"<div class='btn btn-info btn-sm pull-right'><span>" . $this->lang->line($controller_name . '_new') . "</span></div>",
-	array('class'=>'thickbox none', 'title'=>$this->lang->line($controller_name . '_new')));
+	array('class'=>'modal-dlg none', 'title'=>$this->lang->line($controller_name . '_new')));
 	?>
 </div>

--- a/dist/opensourcepos.js
+++ b/dist/opensourcepos.js
@@ -44518,7 +44518,7 @@ function do_search(show_feedback,on_complete)
 			$('#search').removeClass("ac_loading");
 			//$('#spinner').hide();
 			//re-init elements in new table, as table tbody children were replaced
-			tb_init('#sortable_table a.thickbox');
+			dialog_support.init('#sortable_table a.modal-dlg');
 			$('#pagination').html(response.pagination);
 			$('#sortable_table tbody :checkbox').click(checkbox_click);
 			$("#select_all").attr('checked',false);
@@ -44766,7 +44766,7 @@ function reinit_row(checkbox_id)
 	enable_row_selection(new_row);
 	//Re-init some stuff as we replaced row
 	update_sortable_table();
-	tb_init(new_row.find("a.thickbox"));
+	dialog_support.init(new_row.find("a.modal-dlg"));
 	//re-enable e-mail
 	new_checkbox.click(checkbox_click);	
 }
@@ -44819,21 +44819,52 @@ function get_visible_checkbox_ids()

 dialog_support = (function() {

-	var submit_form = function(button_id) {
-		return function(dialog_ref)
+	var btn_id, dialog_ref;
+
+	var hide = function() {
+		debugger;;
+		dialog_ref.close();
+	};
+
+	var clicked_id = function() {
+		return btn_id;
+	};
+
+	var submit = function(button_id) {
+		btn_id = button_id;
+		return function(dlog_ref)
 		{
-			dialog_support.clicked_button = button_id;
-			$('#item_form').submit();
-			dialog_support.hide_dialog = function() {
-				dialog_ref.close();
-			};
+			dialog_ref = dlog_ref;
+			$('form', dlog_ref.$modalBody).submit();
 		}
 	};

+	var init = function(selector) {
+		$(selector).click(function(event) {
+			var $link = $(event.target);
+			$link = $link.is("a") ? $link : $link.parents("a");
+			BootstrapDialog.show({
+				title: $link.attr('title'),
+				message: $('<div></div>').load($link.attr('href')),
+				buttons: [{
+					id: 'submit',
+					label: 'submit',
+					action: submit('submit')
+				}]
+			});
+			event.preventDefault();
+		});
+	};
+
+	$(document).ready(function() {
+		init("a.modal-dlg");
+	});
+
 	return {
-		hide: function () {},
-		clicked_button : undefined,
-		submit: submit_form
+		hide: hide,
+		clicked_id: clicked_id,
+		init: init,
+		submit: submit
 	};

 })();
--- a/dist/opensourcepos.min.js
+++ b/dist/opensourcepos.min.js
--- a/js/manage_tables.js
+++ b/js/manage_tables.js
@@ -89,7 +89,7 @@ function do_search(show_feedback,on_complete)
 			$('#search').removeClass("ac_loading");
 			//$('#spinner').hide();
 			//re-init elements in new table, as table tbody children were replaced
-			tb_init('#sortable_table a.thickbox');
+			dialog_support.init('#sortable_table a.modal-dlg');
 			$('#pagination').html(response.pagination);
 			$('#sortable_table tbody :checkbox').click(checkbox_click);
 			$("#select_all").attr('checked',false);
@@ -337,7 +337,7 @@ function reinit_row(checkbox_id)
 	enable_row_selection(new_row);
 	//Re-init some stuff as we replaced row
 	update_sortable_table();
-	tb_init(new_row.find("a.thickbox"));
+	dialog_support.init(new_row.find("a.modal-dlg"));
 	//re-enable e-mail
 	new_checkbox.click(checkbox_click);	
 }
@@ -390,21 +390,52 @@ function get_visible_checkbox_ids()

 dialog_support = (function() {

-	var submit_form = function(button_id) {
-		return function(dialog_ref)
+	var btn_id, dialog_ref;
+
+	var hide = function() {
+		debugger;;
+		dialog_ref.close();
+	};
+
+	var clicked_id = function() {
+		return btn_id;
+	};
+
+	var submit = function(button_id) {
+		btn_id = button_id;
+		return function(dlog_ref)
 		{
-			dialog_support.clicked_button = button_id;
-			$('#item_form').submit();
-			dialog_support.hide_dialog = function() {
-				dialog_ref.close();
-			};
+			dialog_ref = dlog_ref;
+			$('form', dlog_ref.$modalBody).submit();
 		}
 	};

+	var init = function(selector) {
+		$(selector).click(function(event) {
+			var $link = $(event.target);
+			$link = $link.is("a") ? $link : $link.parents("a");
+			BootstrapDialog.show({
+				title: $link.attr('title'),
+				message: $('<div></div>').load($link.attr('href')),
+				buttons: [{
+					id: 'submit',
+					label: 'submit',
+					action: submit('submit')
+				}]
+			});
+			event.preventDefault();
+		});
+	};
+
+	$(document).ready(function() {
+		init("a.modal-dlg");
+	});
+
 	return {
-		hide: function () {},
-		clicked_button : undefined,
-		submit: submit_form
+		hide: hide,
+		clicked_id: clicked_id,
+		init: init,
+		submit: submit
 	};

 })();
--- a/templates/spacelab/views/partial/header.php
+++ b/templates/spacelab/views/partial/header.php
@@ -38,7 +38,7 @@
 		<!-- end js template tags -->
 	<?php else : ?>
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=be80220783" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=0c1bada54f" language="javascript"></script>
 		<!-- end minjs template tags -->       
 	<?php endif; ?>