[geeklog-cvs] geeklog-1.3/public_html article.php,1.49,1.50 lib-common.php,1.358,1.359

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv21063/public_html

Modified Files:
	article.php lib-common.php 
Log Message:
Introduced a second parameter to function COM_makeList that is being passed as a CSS class name to the list created by that function.


Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.358
retrieving revision 1.359
diff -C2 -d -r1.358 -r1.359
*** lib-common.php	13 Aug 2004 08:54:49 -0000	1.358
--- lib-common.php	13 Aug 2004 15:41:58 -0000	1.359
***************
*** 3622,3626 ****
                      if( $day != 'noday' )
                      {
!                         $daylist = COM_makeList( $oldnews );
                          $daylist = preg_replace( "/(\015\012)|(\015)|(\012)/",
                                                   '', $daylist );
--- 3622,3626 ----
                      if( $day != 'noday' )
                      {
!                         $daylist = COM_makeList( $oldnews, 'list-older-stories' );
                          $daylist = preg_replace( "/(\015\012)|(\015)|(\012)/",
                                                   '', $daylist );
***************
*** 3643,3647 ****
          if( !empty( $oldnews ))
          {
!             $daylist = COM_makeList( $oldnews );
              $daylist = preg_replace( "/(\015\012)|(\015)|(\012)/", '', $daylist );
              $string .= $daylist;
--- 3643,3647 ----
          if( !empty( $oldnews ))
          {
!             $daylist = COM_makeList( $oldnews, 'list-older-stories' );
              $daylist = preg_replace( "/(\015\012)|(\015)|(\012)/", '', $daylist );
              $string .= $daylist;
***************
*** 4036,4040 ****
          if( !$rdferror )
          {
!             $blockcontent = COM_makeList( $RDFheadlines );
              $RDFheadlines = array();
              $blockcontent = preg_replace( "/(\015\012)|(\015)|(\012)/", '',
--- 4036,4040 ----
          if( !$rdferror )
          {
!             $blockcontent = COM_makeList( $RDFheadlines, 'list-feed' );
              $RDFheadlines = array();
              $blockcontent = preg_replace( "/(\015\012)|(\015)|(\012)/", '',
***************
*** 4221,4228 ****
--- 4221,4230 ----
              $oldDate1 = 'no_day';  // Invalid Date!
              $oldDate2 = 'last_d';  // Invalid Date!
+             $classname = 'list-personal-events';
              $headline = false;
          }
          else
          {
+             $classname = 'list-site-events';
              $headline = false;
          }
***************
*** 4284,4288 ****
                          if( !empty( $newevents ))
                          {
!                              $retval .= COM_makeList( $newevents );
                          }
  
--- 4286,4290 ----
                          if( !empty( $newevents ))
                          {
!                              $retval .= COM_makeList( $newevents, $classname );
                          }
  
***************
*** 4316,4320 ****
                  if( !empty( $newevents ))
                  {
!                     $retval .= COM_makeList( $newevents );
                      $newevents = array();
                  }
--- 4318,4322 ----
                  if( !empty( $newevents ))
                  {
!                     $retval .= COM_makeList( $newevents, $classname );
                      $newevents = array();
                  }
***************
*** 4658,4662 ****
              }
  
!             $retval .= COM_makeList( $newcomments );
          }
          else
--- 4660,4664 ----
              }
  
!             $retval .= COM_makeList( $newcomments, 'list-new-comments' );
          }
          else
***************
*** 4730,4734 ****
          else
          {
!             $retval .= COM_makeList( $newlinks );
          }
      }
--- 4732,4736 ----
          else
          {
!             $retval .= COM_makeList( $newlinks, 'list-new-links' );
          }
      }
***************
*** 4747,4751 ****
                  if( is_array( $content[$i] ))
                  {
!                     $retval .= COM_makeList( $content[$i] );
                  }
                  else
--- 4749,4753 ----
                  if( is_array( $content[$i] ))
                  {
!                     $retval .= COM_makeList( $content[$i], 'list-new-plugins' );
                  }
                  else
***************
*** 5284,5288 ****
  */
  
! function COM_makeList( $listofitems )
  {
      global $_CONF;
--- 5286,5290 ----
  */
  
! function COM_makeList( $listofitems, $classname = '' )
  {
      global $_CONF;
***************
*** 5291,5296 ****
      $list->set_file( array( 'list'     => 'list.thtml',
                              'listitem' => 'listitem.thtml' ));
-     $list->set_var( 'layout_url', $_CONF['layout_url'] );
      $list->set_var( 'site_url', $_CONF['site_url'] );
  
      foreach( $listofitems as $oneitem )
--- 5293,5308 ----
      $list->set_file( array( 'list'     => 'list.thtml',
                              'listitem' => 'listitem.thtml' ));
      $list->set_var( 'site_url', $_CONF['site_url'] );
+     $list->set_var( 'layout_url', $_CONF['layout_url'] );
+     if( empty( $classname ))
+     {
+         $list->set_var( 'list_class', '' );
+         $list->set_var( 'list_class_name', '' );
+     }
+     else
+     {
+         $list->set_var( 'list_class', 'class="' . $classname . '"' );
+         $list->set_var( 'list_class_name', $classname );
+     }
  
      foreach( $listofitems as $oneitem )
***************
*** 5548,5552 ****
      if( sizeof( $rel ) > 0 )
      {
!         $related = COM_checkWords( COM_makeList( $rel ));
      }
  
--- 5560,5564 ----
      if( sizeof( $rel ) > 0 )
      {
!         $related = COM_checkWords( COM_makeList( $rel, 'list-whats-related' ));
      }
  

Index: article.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/article.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** article.php	18 Jul 2004 11:53:35 -0000	1.49
--- article.php	13 Aug 2004 15:41:58 -0000	1.50
***************
*** 200,204 ****
                  $optionsblock = COM_startBlock ($LANG11[4], '',
                          COM_getBlockTemplate ('story_options_block', 'header'))
!                     . COM_makeList ($story_options)
                      . COM_endBlock (COM_getBlockTemplate ('story_options_block',
                          'footer'));
--- 200,204 ----
                  $optionsblock = COM_startBlock ($LANG11[4], '',
                          COM_getBlockTemplate ('story_options_block', 'header'))
!                     . COM_makeList ($story_options, 'list-story-options')
                      . COM_endBlock (COM_getBlockTemplate ('story_options_block',
                          'footer'));