[geeklog-cvs] geeklog-1.3/public_html index.php,1.52,1.53 lib-common.php,1.266,1.267

[blaine at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv26431/public_html

Modified Files:
	index.php lib-common.php 
Log Message:
Added ability to have top centerblock span the right blocks - to create a wider centerblock. This is template specific and only triggered if a template called topcenterblock-span.thtml exists.

Index: index.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/index.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** index.php	6 Sep 2003 21:53:42 -0000	1.52
--- index.php	16 Nov 2003 21:44:18 -0000	1.53
***************
*** 80,84 ****
  // Show any Plugin formatted blocks
  // Requires a plugin to have a function called plugin_centerblock_<plugin_name>
! $display .= PLG_showCenterblock (1, $page, $topic); // top blocks
  
  $maxstories = 0;
--- 80,97 ----
  // Show any Plugin formatted blocks
  // Requires a plugin to have a function called plugin_centerblock_<plugin_name>
! $displayBlock = PLG_showCenterblock (1, $page, $topic); // top blocks
! if ($displayBlock != "") {
!         $display .= $displayBlock;
!         // Check if theme has added the template which allows the centerblock to span the top over the rightblocks
!         if (file_exists($_CONF['path_layout'] . 'topcenterblock-span.thtml')) {
!                 $topspan = new Template($_CONF['path_layout']);
!                 $topspan->set_file (array ('topspan'=>'topcenterblock-span.thtml'));
!                 $topspan->parse ('output', 'topspan');
!                 $display .= $topspan->finish ($topspan->get_var('output'));
!                 $GLOBALS['centerspan'] = true;
!         }
! } else {
!         $display .= $displayBlock;
! }
  
  $maxstories = 0;

Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.266
retrieving revision 1.267
diff -C2 -d -r1.266 -r1.267
*** lib-common.php	15 Nov 2003 18:55:38 -0000	1.266
--- lib-common.php	16 Nov 2003 21:44:18 -0000	1.267
***************
*** 1035,1039 ****
          $footer->set_var( 'right_blocks', '' );
      }
! 
      // Actually parse the template and make variable substitutions
      $footer->parse( 'index_footer', 'footer' );
--- 1035,1043 ----
          $footer->set_var( 'right_blocks', '' );
      }
!     
!     // Global centerspan variable set in index.php
!     if(isset($GLOBALS['centerspan'])) {
!         $footer->set_var( 'centerblockfooter-span', '</td></tr></table>' );
!     }
      // Actually parse the template and make variable substitutions
      $footer->parse( 'index_footer', 'footer' );