[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/blocks block-SiteIndex.php,1.1.1.1,1.2 block-Table_of_Contents.php,1.1.1.1,1.2

[Patrick Walsh <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/sitemgr-site/blocks
In directory subversions:/tmp/cvs-serv16269/blocks

Modified Files:
        block-SiteIndex.php block-Table_of_Contents.php 
Log Message:
bunch of changes having to do with nested categories


Index: block-SiteIndex.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/sitemgr-site/blocks/block-SiteIndex.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** block-SiteIndex.php 29 Aug 2002 03:03:17 -0000      1.1.1.1
--- block-SiteIndex.php 5 Sep 2002 06:57:52 -0000       1.2
***************
*** 5,11 ****
  }
  
!       $title = 'Site Index';
        $bo = new bo;
!       $indexarray = $bo->getIndex();
        unset($bo);
        $content = "\n".'<table border="0" cellspacing="0" cellpadding="0" 
width="100%">';
--- 5,11 ----
  }
  
!       $title = 'Root Site Index';
        $bo = new bo;
!       $indexarray = $bo->getIndex(false,true);
        unset($bo);
        $content = "\n".'<table border="0" cellspacing="0" cellpadding="0" 
width="100%">';
***************
*** 25,34 ****
                        $catname = $page['catname'];
                        $content.="\n".'<tr><td width="15%" 
colspan="2">'.$break.'&nbsp;<b>'.
!                               $catname.'</b></td></tr>'."\n";
                }
-               $content .= "\n".'<tr><td align="right" valign="top" 
width="15%">'.
-                       
'&middot;&nbsp;</td><td>'.$page['pagelink'].'</td></tr>';
        }
        $content .= "\n</table>";
        if (count($indexarray)==0)
        {
--- 25,38 ----
                        $catname = $page['catname'];
                        $content.="\n".'<tr><td width="15%" 
colspan="2">'.$break.'&nbsp;<b>'.
!                               $page['catlink'].'</b></td></tr>'."\n";
!               }
!               if (!$page['hidden'])
!               {
!                       $content .= "\n".'<tr><td align="right" valign="top" 
width="15%">'.
!                               
'&middot;&nbsp;</td><td>'.$page['pagelink'].'</td></tr>';
                }
        }
        $content .= "\n</table>";
+       $content .= '<br>&nbsp;&nbsp;<i><a 
href="'.sitemgr_link2('/index.php','index=1').'"><font size="1">(View full 
index)</font></a></i>';
        if (count($indexarray)==0)
        {

Index: block-Table_of_Contents.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/sitemgr/sitemgr-site/blocks/block-Table_of_Contents.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** block-Table_of_Contents.php 29 Aug 2002 03:03:17 -0000      1.1.1.1
--- block-Table_of_Contents.php 5 Sep 2002 06:57:52 -0000       1.2
***************
*** 9,19 ****
        $indexarray = $bo->getCatLinks();
        unset($bo);
!       $content = "\n".'<table border="0" cellspacing="0" cellpadding="0" 
width="100%">';
        foreach($indexarray as $cat)
        {
!               $content .= "\n".'<tr><td align="right" valign="top" 
width="5%">'.
!                       
'&middot;&nbsp;</td><td><b>'.$cat['link'].'</b></td></tr>';
        }
!       $content .= "\n</table>";
        if (count($indexarray)==0)
        {
--- 9,24 ----
        $indexarray = $bo->getCatLinks();
        unset($bo);
!       $content = "\n".'<table border="0" cellspacing="0" cellpadding="0" 
width="100%">'.
!               '<tr><td>';
        foreach($indexarray as $cat)
        {
!               $space = str_pad('',$cat['depth']*18,'&nbsp;');
!               $content .= "\n".'<table border="0" cellspacing="0" 
cellpadding="0" '.
!                       'width="100%"><tr><td align="right" valign="top" 
width="5">'.
!                       $space.'&middot;&nbsp;</td><td width="100%"><b>'.
!                       $cat['link'].'</b></td></tr></table>';
        }
!       $content .= "\n</td></tr></table>";
!       //$content .= '<br>&nbsp;&nbsp;<i><a 
href="'.sitemgr_link2('/index.php','toc=1').'"><font size="1">(View full 
contents)</font></a></i>';
        if (count($indexarray)==0)
        {