[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/inc class.bo.inc.php,1.6,1.7 class.ui.inc.php,1.7,1.8

[Patrick Walsh <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc
In directory subversions:/tmp/cvs-serv28112/inc

Modified Files:
        class.bo.inc.php class.ui.inc.php 
Log Message:
Added a navigational block for showing pages and subcats in the currently 
viewed category.


Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/class.bo.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.bo.inc.php    14 Sep 2002 07:25:21 -0000      1.6
--- class.bo.inc.php    17 Sep 2002 23:51:58 -0000      1.7
***************
*** 145,150 ****
                                                        foreach ($children as 
$child)
                                                        {
!                                                               $content .= 
'<br>&nbsp;&nbsp;&nbsp;&middot;&nbsp;'.
!                                                                       
$child['link'].' &ndash; '.$child['description'];
                                                        }
                                                }
--- 145,150 ----
                                                        foreach ($children as 
$child)
                                                        {
!                                                               $content .= 
'<br>&nbsp;&nbsp;&nbsp;&middot;&nbsp;<b>'.
!                                                                       
$child['link'].'</b> &ndash; '.$child['description'];
                                                        }
                                                }

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/class.ui.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.ui.inc.php    5 Sep 2002 09:07:06 -0000       1.7
--- class.ui.inc.php    17 Sep 2002 23:51:58 -0000      1.8
***************
*** 15,18 ****
--- 15,19 ----
                var $bo;
                var $t;
+               var $tmp_title;
  
                function ui()
***************
*** 177,181 ****
                function get_blocktitle($block)
                {
!                       return $block['title'];
                }
  
--- 178,189 ----
                function get_blocktitle($block)
                {
!                       if (!$block['title'])
!                       {
!                               return $this->tmp_title;
!                       }
!                       else
!                       {
!                               return $block['title'];
!                       }
                }
  
***************
*** 185,193 ****
                        if (file_exists('blocks/'.$block['blockfile']) && 
trim($block['blockfile']))
                        {
                                include('blocks/'.$block['blockfile']);
!                               if (!$content)
                                {
                                        $content = 'No content found';
                                }
                        }
                        elseif ($block['content'])
--- 193,203 ----
                        if (file_exists('blocks/'.$block['blockfile']) && 
trim($block['blockfile']))
                        {
+                               $title = '';
                                include('blocks/'.$block['blockfile']);
!                               if (!$content && !$block['skipifblank'])
                                {
                                        $content = 'No content found';
                                }
+                               $this->tmp_title = $title;
                        }
                        elseif ($block['content'])
***************
*** 214,222 ****
                                        if ($this->block_allowed($block))
                                        {
-                                               $title = 
$this->get_blocktitle($block);
                                                $content = 
$this->get_blockcontent($block);
!                                               
$this->t->set_var('block_title',$title);
!                                               
$this->t->set_var('block_content',$content);
!                                               
$this->t->parse('SBlock','SideBlock',true);
                                        }
                                }
--- 224,235 ----
                                        if ($this->block_allowed($block))
                                        {
                                                $content = 
$this->get_blockcontent($block);
!                                               $title = 
$this->get_blocktitle($block);
!                                               if ($content)
!                                               {
!                                                       
$this->t->set_var('block_title',$title);
!                                                       
$this->t->set_var('block_content',$content);
!                                                       
$this->t->parse('SBlock','SideBlock',true);
!                                               }
                                        }
                                }