[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/website main.php,1.12,1.13
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/website main.php,1.12,1.13 |
|
Date: |
Sun, 24 Feb 2002 12:46:54 -0500 |
Update of /cvsroot/phpgroupware/wcm/website
In directory subversions:/tmp/cvs-serv31522/website
Modified Files:
main.php
Log Message:
Slightly cleaner website display code - each section is parsed out inline
Index: main.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/website/main.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** main.php 24 Feb 2002 04:16:33 -0000 1.12
--- main.php 24 Feb 2002 17:46:51 -0000 1.13
***************
*** 54,63 ****
$tpl->set_block('frame','left_start','left_start');
$tpl->set_block('frame','left_end','left_end');
! $tpl->set_block('frame','top','top');
$tpl->set_block('frame','mid_start','mid_start');
$tpl->set_block('frame','mid_end','mid_end');
$tpl->set_block('frame','right_start','right_start');
$tpl->set_block('frame','right_end','right_end');
! $tpl->set_block('frame','bottom','bottom');
$site_left = $wcm->site['site_paneo'] ? $page['page_left'] :
$wcm->site['site_left'];
--- 54,65 ----
$tpl->set_block('frame','left_start','left_start');
$tpl->set_block('frame','left_end','left_end');
! $tpl->set_block('frame','top_start','top_start');
! $tpl->set_block('frame','top_end','top_end');
$tpl->set_block('frame','mid_start','mid_start');
$tpl->set_block('frame','mid_end','mid_end');
$tpl->set_block('frame','right_start','right_start');
$tpl->set_block('frame','right_end','right_end');
! $tpl->set_block('frame','bottom_start','bottom_start');
! $tpl->set_block('frame','bottom_end','bottom_end');
$site_left = $wcm->site['site_paneo'] ? $page['page_left'] :
$wcm->site['site_left'];
***************
*** 72,95 ****
/* TODO check expiration of each page and element */
! /* Read and parse page header and footer */
$header_data = $elements->read($page['page_header']);
$header = $header_data['element_source'];
$tpl->set_var('header',$header ? $header :
'<html><head>HEADER</head><body>');
! $footer_data = $elements->read($page['page_footer']);
! $footer = $footer_data['element_source'];
! $tpl->set_var('footer',$footer ? $footer : 'FOOTER</body></html>');
! /* Now parse each left, middle, and right element */
! /* TODO ['site_pages'][0] below assumes to parse only the first page of
a site */
! $top = '';
! $left = '';
! $mid = '';
! $right = '';
! $bottom = '';
$_list = array('top','left','mid','right','bottom');
while(list(,$section) = each($_list))
{
while(list($key,$val) = @each($page['page_elements'][$section]))
{
--- 74,92 ----
/* TODO check expiration of each page and element */
! /* Read and parse page header */
$header_data = $elements->read($page['page_header']);
$header = $header_data['element_source'];
$tpl->set_var('header',$header ? $header :
'<html><head>HEADER</head><body>');
! /* Start of page body */
! $tpl->pfp('out','framing_table_start');
! /* Now parse each top, left, middle, right, and bottom element */
$_list = array('top','left','mid','right','bottom');
while(list(,$section) = each($_list))
{
+ $working = '';
+
while(list($key,$val) = @each($page['page_elements'][$section]))
{
***************
*** 98,103 ****
case '4':
/* Hook */
!
$GLOBALS['phpgw']->hooks->single('website_' .
$section,$val['element_source'],True);
! $$section .=
$GLOBALS['phpgw_info']['wcm'][$section];
break;
case '3':
--- 95,100 ----
case '4':
/* Hook */
!
$GLOBALS['phpgw']->hooks->single('website_' . $section,
$val['element_source'],True);
! $working .=
$GLOBALS['phpgw_info']['wcm'][$section];
break;
case '3':
***************
*** 109,113 ****
while($line = fgets($f,1024))
{
! $$section .= $line;
}
fclose($f);
--- 106,110 ----
while($line = fgets($f,1024))
{
! $working .= $line;
}
fclose($f);
***************
*** 118,122 ****
case '1':
/* HTML from db */
! $$section .= $val['element_source'];
break;
default:
--- 115,119 ----
case '1':
/* HTML from db */
! $working .= $val['element_source'];
break;
default:
***************
*** 124,137 ****
}
}
}
! $tpl->set_var('top_content', $top ? $top : 'TOP');
! $tpl->set_var('left_content', $left ? $left : 'LEFT');
! $tpl->set_var('mid_content', $mid ? $mid : 'MIDDLE');
! $tpl->set_var('right_content', $right ? $right : 'RIGHT');
! $tpl->set_var('bottom_content', $bottom ? $bottom : 'BOTTOM');
!
! // _debug_array($page);
! $tpl->pfp('out','frame');
?>
--- 121,136 ----
}
}
+
+ $tpl->set_var($section . '_content', $working ? $working :
strtoupper($section));
+ $tpl->pfp('out', $section . '_start');
+ $tpl->pfp('out', $section . '_end');
}
! /* Read and parse page footer */
! $footer_data = $elements->read($page['page_footer']);
! $footer = $footer_data['element_source'];
! $tpl->set_var('footer',$footer ? $footer : 'FOOTER</body></html>');
! /* end of page body */
! $tpl->pfp('out','framing_table_end');
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/website main.php,1.12,1.13,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.11,1.12 class.uisite.inc.php,1.10,1.11
- Next by Date:
[Phpgroupware-cvs] CVS: wcm/website/templates frame.tpl,1.5,1.6
- Previous by thread:
[Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.11,1.12 class.uisite.inc.php,1.10,1.11
- Next by thread:
[Phpgroupware-cvs] CVS: wcm/website/templates frame.tpl,1.5,1.6
- Index(es):