projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New inventory sales report. Shows total sales - costs - contribution per category...
[fa-stable.git]
/
includes
/
main.inc
diff --git
a/includes/main.inc
b/includes/main.inc
index 2180ec05793a0b3d0ab91823227eae9f36cea835..2afb6e625cb2f62e2002aa67c5b976c8a5a4d39b 100644
(file)
--- a/
includes/main.inc
+++ b/
includes/main.inc
@@
-13,13
+13,8
@@
include_once($path_to_root . "/admin/db/users_db.inc");
include_once($path_to_root . "/includes/ui/ui_view.inc");
include_once($path_to_root . "/admin/db/users_db.inc");
include_once($path_to_root . "/includes/ui/ui_view.inc");
+ include_once($path_to_root . "/includes/ui/ui_controls.inc");
- function output_html($text)
- {
- global $before_box;
- return in_ajax() ? fmt_errors() : ($before_box.fmt_errors().$text);
- }
-
function page($title, $no_menu=false, $is_index=false, $onload="", $js="")
{
function page($title, $no_menu=false, $is_index=false, $onload="", $js="")
{
@@
-27,15
+22,11
@@
$hide_menu = $no_menu;
$hide_menu = $no_menu;
- // intercept all output to destroy it in case of ajax call
- ob_start('output_html');
- // colect all error msgs
- set_error_handler('error_handler' /*, errtypes */);
-
include($path_to_root . "/includes/page/header.inc");
page_header($title, $no_menu, $is_index, $onload, $js);
error_box();
include($path_to_root . "/includes/page/header.inc");
page_header($title, $no_menu, $is_index, $onload, $js);
error_box();
+ div_start('_page_body'); // whole page content for ajax reloading
}
function end_page($no_menu=false, $is_index=false)
}
function end_page($no_menu=false, $is_index=false)
@@
-44,9
+35,10
@@
$hide_menu = $no_menu;
$hide_menu = $no_menu;
+ div_end(); // _page_body section
include($path_to_root . "/includes/page/footer.inc");
include($path_to_root . "/includes/page/footer.inc");
-
$Ajax->run();
+ $Ajax->run();
page_footer($no_menu, $is_index);
}
page_footer($no_menu, $is_index);
}