From a28b45a9613d00aba25f97480041453fedae4359 Mon Sep 17 00:00:00 2001 From: nightflyza Date: Mon, 30 Mar 2015 12:58:32 +0300 Subject: [PATCH] 0.6.5 rev 4320 --- RELEASE | 2 +- modules/general/report_complex/index.php | 49 +++++++++--------------- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/RELEASE b/RELEASE index a9990f571..0a6a47e47 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -0.6.5 rev 4319 +0.6.5 rev 4320 diff --git a/modules/general/report_complex/index.php b/modules/general/report_complex/index.php index f86215347..298a4986b 100755 --- a/modules/general/report_complex/index.php +++ b/modules/general/report_complex/index.php @@ -108,35 +108,24 @@ public function getData() { } public function printable($data) { - $style = wf_tag('style', false, '', 'type="text/css"'); - $style.=' - table.sortable { - border-width: 1px; - border-spacing: 2px; - border-style: outset; - border-color: gray; - border-collapse: separate; - background-color: white; - } - table.sortable th { - border-width: 1px; - padding: 1px; - border-style: dashed; - border-color: gray; - background-color: white; - -moz-border-radius: ; - } - table.sortable td { - border-width: 1px; - padding: 1px; - border-style: dashed; - border-color: gray; - background-color: white; - -moz-border-radius: ; - } - '; - $style.= wf_tag('style', true); - $result = $style . $data; + $style = file_get_contents(CONFIG_PATH."ukvprintable.css"); + + $header = ' + + + + + + + + + '; + + $footer = ' '; + + $result=$header.$data.$footer; return ($result); } @@ -510,7 +499,7 @@ public function renderAll($cutdata = false) { } else { - show_window(__('Error'), __('This module is disabled')); + show_error( __('This module is disabled')); } }