Index: trunk/admin/include/sections.php =================================================================== diff -u -N -r1566 -r1611 --- trunk/admin/include/sections.php (.../sections.php) (revision 1566) +++ trunk/admin/include/sections.php (.../sections.php) (revision 1611) @@ -529,9 +529,9 @@ $o .= ''; //get path up to the parent node - while ( isset($node) && is_object($node) ) + while( isset($node) && is_object($node) ) { - if(!strlen($extra_title)) + if( !strlen($extra_title) ) { $bar_title = $node->Get("bar_title"); $bar_title_plain_text = $node->Get("bar_title_plain_text"); @@ -547,9 +547,11 @@ $caption.= $bar_title_plain_text; } else - $caption = $extra_title; + { + $caption = $extra_title; + } - $output = "$caption"; + $output = ''.$caption.''; unset($node); } Index: trunk/admin/include/mainscript.js =================================================================== diff -u -N -r13 -r1611 --- trunk/admin/include/mainscript.js (.../mainscript.js) (revision 13) +++ trunk/admin/include/mainscript.js (.../mainscript.js) (revision 1611) @@ -1,11 +1,14 @@ Get('Site_Name'); $env2 = BuildEnv(); print << +var main_title = '$SiteName'; + var CurrentTab= new String(); function getRealLeft(el) { @@ -144,6 +147,13 @@ } } +function set_window_title(\$title) +{ + var \$window = window; + if(\$window.parent) \$window = \$window.parent; + \$window.document.title = (main_title.length ? main_title + ' - ' : '') + \$title; +} + var env = "$env2"; Index: trunk/admin/include/mainscript.php =================================================================== diff -u -N -r1566 -r1611 --- trunk/admin/include/mainscript.php (.../mainscript.php) (revision 1566) +++ trunk/admin/include/mainscript.php (.../mainscript.php) (revision 1611) @@ -69,12 +69,15 @@ { $ampm = "true"; } +$SiteName = $GLOBALS['objConfig']->Get('Site_Name'); require_once($pathtoroot.$admin."/lv/js/js_lang.php"); print <<