[phpws-comm-commits] modules/article/inc runtime_chronological.php, 1.15, 1.16 runtime.php, 1.18, 1.19 runtime_categorized.php, 1.12, 1.13

[Eloi G. <ada...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/article/inc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2933/inc

Modified Files:
	runtime_chronological.php runtime.php runtime_categorized.php 
Log Message:
`Also on this Site` and `Popular Articles` templates now use their own box definitions, not the standard layout one.

Index: runtime_chronological.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_chronological.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** runtime_chronological.php	21 Nov 2008 14:16:26 -0000	1.15
--- runtime_chronological.php	21 Jan 2009 16:27:18 -0000	1.16
***************
*** 102,111 ****
  		$tpl->setCurrentBlock('list_rows');
  		$tpl->parseCurrentBlock();
! 	}
! 	$template['CONTENT'] = $tpl->get();
! 
! 	$template['TITLE'] = dgettext('article', 'Also on this Site...');
! 	$finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl');
!     Layout::add($finalContent, 'article', 'summaries', true);
  }
  /* If there are x articles before these, display the "Prev Articles" Block */
--- 102,108 ----
  		$tpl->setCurrentBlock('list_rows');
  		$tpl->parseCurrentBlock();
! 	}
! 	$tpl->setData(array('TITLE'=>dgettext('article', 'Also on this Site...')));
!     Layout::add($tpl->get(), 'article', 'summaries', true);
  }
  /* If there are x articles before these, display the "Prev Articles" Block */

Index: runtime_categorized.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime_categorized.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** runtime_categorized.php	18 Dec 2008 05:41:58 -0000	1.12
--- runtime_categorized.php	21 Jan 2009 16:27:18 -0000	1.13
***************
*** 96,103 ****
  		$tpl->parseCurrentBlock();
  	}
! 	$template['CONTENT'] = $tpl->get();
! 	$template['TITLE'] = dgettext('article', 'Also on this Site...');
! 	$finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl');
!     Layout::add($finalContent, 'article', 'summaries', true);
  }
  ?>
\ No newline at end of file
--- 96,101 ----
  		$tpl->parseCurrentBlock();
  	}
!     $tpl->setData(array('TITLE'=>dgettext('article', 'Also on this Site...')));
!     Layout::add($tpl->get(), 'article', 'summaries', true);
  }
  ?>
\ No newline at end of file

Index: runtime.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/article/inc/runtime.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** runtime.php	21 Nov 2008 14:16:26 -0000	1.18
--- runtime.php	21 Jan 2009 16:27:18 -0000	1.19
***************
*** 66,79 ****
  		if(count($result))
  		{
! 			$content = '';
  		    foreach($result AS $summary) {
! 				$link = PHPWS_Text::rewriteLink($summary['title'], 'article', array('id'=> $summary['id']));
! 		    	$content .= '<li>'.$link.'</li><br />&#013;';
  		    }
! 		    if (!empty($content))
  		    {
  		        $template['TITLE'] = dgettext('article', 'Popular Articles');
! 		        $template['CONTENT'] = '<ul>'.$content.'</ul>';
! 				$finalContent = PHPWS_Template::process($template, 'layout', 'box.tpl');
  		        Layout::add($finalContent, 'article', 'popular');
  		    }
--- 66,78 ----
  		if(count($result))
  		{
! 			$list = array();
  		    foreach($result AS $summary) {
! 				$list[]['ITEM'] = PHPWS_Text::rewriteLink($summary['title'], 'article', array('id'=> $summary['id']));
  		    }
! 		    if (!empty($list))
  		    {
  		        $template['TITLE'] = dgettext('article', 'Popular Articles');
! 		        $template['listrows'] = $list;
! 		        $finalContent = PHPWS_Template::process($template, 'article', 'popular_links.tpl');
  		        Layout::add($finalContent, 'article', 'popular');
  		    }