Index: branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r5636 -r5637 --- branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5636) +++ branches/unlabeled/unlabeled-1.28.2/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5637) @@ -152,6 +152,10 @@ $block_params['name'] = $this->SelectParam($params, 'render_as,block'); // which block to parse as current ? + if ($category_id == 0) { + $block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,block_root_cat,rootcatblock,render_as'); + } + if ($block_params['is_module_root'] == 1) { // module root $block_params['name'] = $this->SelectParam($params, 'module_root_render_as,block_module_root,rootmoduleblock,render_as'); } Index: branches/unlabeled/unlabeled-1.13.2/kernel/units/configuration/configuration_tag_processor.php =================================================================== diff -u -N -r5636 -r5637 --- branches/unlabeled/unlabeled-1.13.2/kernel/units/configuration/configuration_tag_processor.php (.../configuration_tag_processor.php) (revision 5636) +++ branches/unlabeled/unlabeled-1.13.2/kernel/units/configuration/configuration_tag_processor.php (.../configuration_tag_processor.php) (revision 5637) @@ -184,6 +184,10 @@ $block_params['cat_name'] = $category_names[$category_pos]; $block_params['name'] = $this->SelectParam($params, 'render_as,block'); + if ($category_id == 0) { + $block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,block_root_cat,rootcatblock,render_as'); + } + $this->Application->SetVar($this->Prefix.'_id', $category_id); $ret .= $this->Application->ParseBlock($block_params, 1); } Index: branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r5636 -r5637 --- branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5636) +++ branches/unlabeled/unlabeled-1.28.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5637) @@ -152,6 +152,10 @@ $block_params['name'] = $this->SelectParam($params, 'render_as,block'); // which block to parse as current ? + if ($category_id == 0) { + $block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,block_root_cat,rootcatblock,render_as'); + } + if ($block_params['is_module_root'] == 1) { // module root $block_params['name'] = $this->SelectParam($params, 'module_root_render_as,block_module_root,rootmoduleblock,render_as'); } Index: branches/unlabeled/unlabeled-1.13.2/core/units/configuration/configuration_tag_processor.php =================================================================== diff -u -N -r5636 -r5637 --- branches/unlabeled/unlabeled-1.13.2/core/units/configuration/configuration_tag_processor.php (.../configuration_tag_processor.php) (revision 5636) +++ branches/unlabeled/unlabeled-1.13.2/core/units/configuration/configuration_tag_processor.php (.../configuration_tag_processor.php) (revision 5637) @@ -184,6 +184,10 @@ $block_params['cat_name'] = $category_names[$category_pos]; $block_params['name'] = $this->SelectParam($params, 'render_as,block'); + if ($category_id == 0) { + $block_params['name'] = $this->SelectParam($params, 'root_cat_render_as,block_root_cat,rootcatblock,render_as'); + } + $this->Application->SetVar($this->Prefix.'_id', $category_id); $ret .= $this->Application->ParseBlock($block_params, 1); } Index: branches/unlabeled/unlabeled-1.7.2/kernel/constants.php =================================================================== diff -u -N -r5290 -r5637 --- branches/unlabeled/unlabeled-1.7.2/kernel/constants.php (.../constants.php) (revision 5290) +++ branches/unlabeled/unlabeled-1.7.2/kernel/constants.php (.../constants.php) (revision 5637) @@ -26,4 +26,9 @@ $application =& kApplication::Instance(); $spacer_url = $application->BaseURL().'kernel/admin_templates/img/spacer.gif'; define('SPACER_URL', $spacer_url); + + if (!$application->IsAdmin()) { + // don't show debugger buttons on front (if not overrided in "debug.php") + safeDefine('DBG_TOOLBAR_BUTTONS', 0); + } ?> \ No newline at end of file Index: branches/unlabeled/unlabeled-1.8.2/core/kernel/utility/debugger/debugger.js =================================================================== diff -u -N -r5631 -r5637 --- branches/unlabeled/unlabeled-1.8.2/core/kernel/utility/debugger/debugger.js (.../debugger.js) (revision 5631) +++ branches/unlabeled/unlabeled-1.8.2/core/kernel/utility/debugger/debugger.js (.../debugger.js) (revision 5637) @@ -69,15 +69,14 @@ window.onscroll = function(ev) { window.$Debugger.Resize(ev); } window.onresize = function(ev) { window.$Debugger.Resize(ev); } document.onkeydown = function(ev) { window.$Debugger.KeyDown(ev); } - - var $body = document.getElementsByTagName('BODY')[0]; - $body.insertBefore(this.GetToolbar('$Debugger'), $body.firstChild); } -Debugger.prototype.GetToolbar = function($var_name) { +Debugger.prototype.AddToolbar = function($var_name) { var $span = document.createElement('SPAN'); $span.innerHTML = '  
'; - return $span; + + var $body = document.getElementsByTagName('BODY')[0]; + $body.insertBefore($span, $body.firstChild); } Debugger.prototype.AppendRow = function($html) { Index: branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php =================================================================== diff -u -N -r5632 -r5637 --- branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php (.../debugger.php) (revision 5632) +++ branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php (.../debugger.php) (revision 5637) @@ -112,7 +112,7 @@ 'DBG_IGNORE_STRICT_ERRORS' => 1, // ignore PHP5 errors about private/public view modified missing in class declarations 'DBG_DOMVIEWER' => '/temp/domviewer.html', // path to DOMViewer on website 'DOC_ROOT' => str_replace('\\', '/', realpath($_SERVER['DOCUMENT_ROOT']) ), // windows hack - 'DBG_LOCAL_BASE_PATH' => 'w:' // replace DOC_ROOT in filenames (in errors) using this path + 'DBG_LOCAL_BASE_PATH' => 'w:', // replace DOC_ROOT in filenames (in errors) using this path ); // only for IE, in case if no windows php script editor defined @@ -656,8 +656,9 @@ $this->InitReport(); // set parameters required by AJAX // defined here, because user can define this contant while script is running, not event before debugger is started - $this->safeDefine('DBG_RAISE_ON_WARNINGS', 0); - + $this->safeDefine('DBG_RAISE_ON_WARNINGS', 0); + $this->safeDefine('DBG_TOOLBAR_BUTTONS', 1); + $this->appendSession(); // show php session if any // ensure, that 1st line of debug output always is this one: @@ -761,6 +762,9 @@ if ($this->IsFatalError || DBG_RAISE_ON_WARNINGS) { echo '$Debugger.Toggle();'; } + if (DBG_TOOLBAR_BUTTONS) { + echo '$Debugger.AddToolbar();'; + } ?> window.focus();