Index: trunk/admin/category/category_maint.php =================================================================== diff -u -N -r668 -r860 --- trunk/admin/category/category_maint.php (.../category_maint.php) (revision 668) +++ trunk/admin/category/category_maint.php (.../category_maint.php) (revision 860) @@ -60,10 +60,10 @@ $localURL=$rootURL."kernel/"; $adminURL = $rootURL.$admin; $imagesURL = $adminURL."/images"; -$pathtolocal = $pathtoroot."in-news/"; +//$pathtolocal = $pathtoroot."in-news/"; require_once ($pathtoroot.$admin."/include/elements.php"); require_once ($pathtoroot."kernel/admin/include/navmenu.php"); -require_once ($pathtolocal."admin/include/navmenu.php"); +//require_once ($pathtolocal."admin/include/navmenu.php"); require_once($pathtoroot.$admin."/toolbar.php"); require_once($pathtoroot.$admin."/listview/listview.php"); $section = "in-portal:category_maint"; Index: trunk/admin/config/missing_label_edit.php =================================================================== diff -u -N -r374 -r860 --- trunk/admin/config/missing_label_edit.php (.../missing_label_edit.php) (revision 374) +++ trunk/admin/config/missing_label_edit.php (.../missing_label_edit.php) (revision 860) @@ -82,10 +82,10 @@ $localURL=$rootURL."kernel/"; $adminURL = $rootURL.$admin; $imagesURL = $adminURL."/images"; -$pathtolocal = $pathtoroot."in-news/"; +//$pathtolocal = $pathtoroot."in-news/"; require_once ($pathtoroot.$admin."/include/elements.php"); require_once ($pathtoroot."kernel/admin/include/navmenu.php"); -require_once ($pathtolocal."admin/include/navmenu.php"); +//require_once ($pathtolocal."admin/include/navmenu.php"); require_once($pathtoroot.$admin."/toolbar.php"); require_once($pathtoroot.$admin."/listview/listview.php"); Index: trunk/admin/users/user_mail.php =================================================================== diff -u -N -r374 -r860 --- trunk/admin/users/user_mail.php (.../user_mail.php) (revision 374) +++ trunk/admin/users/user_mail.php (.../user_mail.php) (revision 860) @@ -79,10 +79,10 @@ $localURL=$rootURL."kernel/"; $adminURL = $rootURL.$admin; $imagesURL = $rootURL."/images"; -$pathtolocal = $pathtoroot."in-news/"; +//$pathtolocal = $pathtoroot."in-news/"; require_once ($pathtoroot.$admin."/include/elements.php"); require_once ($pathtoroot."kernel/admin/include/navmenu.php"); -require_once ($pathtolocal."admin/include/navmenu.php"); +//require_once ($pathtolocal."admin/include/navmenu.php"); require_once($pathtoroot.$admin."/toolbar.php"); unset($objEditItems); Index: trunk/admin/users/group_mail.php =================================================================== diff -u -N -r374 -r860 --- trunk/admin/users/group_mail.php (.../group_mail.php) (revision 374) +++ trunk/admin/users/group_mail.php (.../group_mail.php) (revision 860) @@ -80,10 +80,10 @@ $localURL=$rootURL."kernel/"; $adminURL = $rootURL.$admin; $imagesURL = $adminURL."/images"; -$pathtolocal = $pathtoroot."in-news/"; +//$pathtolocal = $pathtoroot."in-news/"; require_once ($pathtoroot.$admin."/include/elements.php"); require_once ($pathtoroot."kernel/admin/include/navmenu.php"); -require_once ($pathtolocal."admin/include/navmenu.php"); +//require_once ($pathtolocal."admin/include/navmenu.php"); require_once($pathtoroot.$admin."/toolbar.php"); unset($objEditItems); Index: trunk/admin/config/missing_label_search.php =================================================================== diff -u -N -r534 -r860 --- trunk/admin/config/missing_label_search.php (.../missing_label_search.php) (revision 534) +++ trunk/admin/config/missing_label_search.php (.../missing_label_search.php) (revision 860) @@ -118,10 +118,10 @@ $localURL=$rootURL."kernel/"; $adminURL = $rootURL.$admin; $imagesURL = $adminURL."/images"; -$pathtolocal = $pathtoroot."in-news/"; +//$pathtolocal = $pathtoroot."in-news/"; require_once ($pathtoroot.$admin."/include/elements.php"); require_once ($pathtoroot."kernel/admin/include/navmenu.php"); -require_once ($pathtolocal."admin/include/navmenu.php"); +//require_once ($pathtolocal."admin/include/navmenu.php"); require_once($pathtoroot.$admin."/toolbar.php"); require_once($pathtoroot.$admin."/listview/listview.php");