diff --git a/application/views/partial/bootstrap_tables_locale.php b/application/views/partial/bootstrap_tables_locale.php index fff777260..2a4df7935 100644 --- a/application/views/partial/bootstrap_tables_locale.php +++ b/application/views/partial/bootstrap_tables_locale.php @@ -2,40 +2,40 @@ 'use strict'; $.fn.bootstrapTable.locales['config->item('language'); ?>'] = { - formatLoadingMessage: function () { - return 'lang->line('tables_loading');?>'; - }, - formatRecordsPerPage: function (pageNumber) { - return 'lang->line('tables_rows_per_page'); ?>'.replace('{0}', pageNumber); - }, - formatShowingRows: function (pageFrom, pageTo, totalRows) { - return 'lang->line('tables_page_from_to'); ?>'.replace('{0}', pageFrom).replace('{1}', pageTo).replace('{2}', totalRows); - }, - formatSearch: function () { - return 'lang->line('common_search'); ?>'; - }, - formatNoMatches: function () { - return 'lang->line(preg_match('(customers|suppliers|employees)', $controller_name) ? - 'common_no_persons_to_display' : $controller_name . '_no_' . $controller_name .'_to_display'); ?>'; - }, - formatPaginationSwitch: function () { - return 'lang->line('tables_hide_show_pagination'); ?>'; - }, - formatRefresh: function () { - return 'lang->line('tables_refresh'); ?>'; - }, - formatToggle: function () { - return 'lang->line('tables_toggle'); ?>'; - }, - formatColumns: function () { - return 'lang->line('tables_columns'); ?>'; - }, - formatAllRows: function () { - return 'lang->line('tables_all'); ?>'; - }, - formatConfirmDelete : function() { - return 'lang->line((isset($editable) ? $editable : $controller_name). "_confirm_delete")?>'; - } + formatLoadingMessage: function () { + return 'lang->line('tables_loading');?>'; + }, + formatRecordsPerPage: function (pageNumber) { + return 'lang->line('tables_rows_per_page'); ?>'.replace('{0}', pageNumber); + }, + formatShowingRows: function (pageFrom, pageTo, totalRows) { + return 'lang->line('tables_page_from_to'); ?>'.replace('{0}', pageFrom).replace('{1}', pageTo).replace('{2}', totalRows); + }, + formatSearch: function () { + return 'lang->line('common_search'); ?>'; + }, + formatNoMatches: function () { + return 'lang->line(preg_match('(customers|suppliers|employees)', $controller_name) ? + 'common_no_persons_to_display' : $controller_name . '_no_' . $controller_name .'_to_display'); ?>'; + }, + formatPaginationSwitch: function () { + return 'lang->line('tables_hide_show_pagination'); ?>'; + }, + formatRefresh: function () { + return 'lang->line('tables_refresh'); ?>'; + }, + formatToggle: function () { + return 'lang->line('tables_toggle'); ?>'; + }, + formatColumns: function () { + return 'lang->line('tables_columns'); ?>'; + }, + formatAllRows: function () { + return 'lang->line('tables_all'); ?>'; + }, + formatConfirmDelete : function() { + return 'lang->line((isset($editable) ? $editable : $controller_name). "_confirm_delete")?>'; + } }; $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['config->item('language');?>']); diff --git a/application/views/reports/tabular.php b/application/views/reports/tabular.php index d62b6d01e..297780cd3 100644 --- a/application/views/reports/tabular.php +++ b/application/views/reports/tabular.php @@ -1,6 +1,4 @@ -load->view("partial/header"); -?> +load->view("partial/header"); ?>
@@ -37,11 +35,11 @@ showExport: true, data: , iconSize: 'sm', - paginationVAlign: 'bottom' + paginationVAlign: 'bottom', + escape: false }); }); -load->view("partial/footer"); -?> \ No newline at end of file + +load->view("partial/footer"); ?> \ No newline at end of file diff --git a/application/views/reports/tabular_details.php b/application/views/reports/tabular_details.php index 2c4366c87..833106d1f 100644 --- a/application/views/reports/tabular_details.php +++ b/application/views/reports/tabular_details.php @@ -1,4 +1,4 @@ -load->view("partial/header");?> +load->view("partial/header"); ?>
@@ -48,6 +48,7 @@ paginationVAlign: 'bottom', detailView: true, uniqueId: 'id', + escape: false, onPageChange: init_dialog, onPostBody: function() { dialog_support.init("a.modal-dlg"); @@ -63,4 +64,5 @@ init_dialog(); }); + load->view("partial/footer"); ?> \ No newline at end of file