[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: chora annotate.php,1.6,1.7 cvs.php,1.14,1.15 dif
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: chora annotate.php,1.6,1.7 cvs.php,1.14,1.15 diff.php,1.9,1.10 history.php,1.6,1.7 index.php,1.9,1.10 |
|
Date: |
Sun, 28 Apr 2002 16:06:06 -0400 |
Update of /cvsroot/phpgroupware/chora
In directory subversions:/tmp/cvs-serv28736
Modified Files:
annotate.php cvs.php diff.php history.php index.php
Log Message:
Used new template names
Index: annotate.php
===================================================================
RCS file: /cvsroot/phpgroupware/chora/annotate.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** annotate.php 28 Apr 2002 19:50:05 -0000 1.6
--- annotate.php 28 Apr 2002 20:06:03 -0000 1.7
***************
*** 41,46 ****
$title = "CVS Annotation of $where for version $rev";
! include($conf['paths']['templates'].'/page_header.inc');
! include($conf['paths']['templates'].'/annotate_header.inc');
@reset($lines);
--- 41,46 ----
$title = "CVS Annotation of $where for version $rev";
! include($conf['paths']['templates'].'/page_header.tpl');
! include($conf['paths']['templates'].'/annotate_header.tpl');
@reset($lines);
***************
*** 50,58 ****
$rev = $line['rev'];
$line = htmlspecialchars($line['line']);
! include($conf['paths']['templates'].'/annotate_line.inc');
}
! include($conf['paths']['templates'].'/annotate_footer.inc');
! //include($conf['paths']['templates'].'/page_footer.inc');
$GLOBALS['phpgw']->common->phpgw_footer();
?>
--- 50,57 ----
$rev = $line['rev'];
$line = htmlspecialchars($line['line']);
! include($conf['paths']['templates'].'/annotate_line.tpl');
}
! include($conf['paths']['templates'].'/annotate_footer.tpl');
$GLOBALS['phpgw']->common->phpgw_footer();
?>
Index: cvs.php
===================================================================
RCS file: /cvsroot/phpgroupware/chora/cvs.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** cvs.php 28 Apr 2002 19:50:05 -0000 1.14
--- cvs.php 28 Apr 2002 20:06:03 -0000 1.15
***************
*** 61,65 ****
}
! include($conf['paths']['templates'].'/page_header.inc');
$thisarr = array('age','rev','name','author');
--- 61,65 ----
}
! include($conf['paths']['templates'].'/page_header.tpl');
$thisarr = array('age','rev','name','author');
***************
*** 82,86 ****
/* Print out the directory header */
$printAllCols = sizeof($fileList);
! include($conf['paths']['templates'].'/dir_header.inc');
/* Unless we're at the top, display the 'back' bar */
--- 82,86 ----
/* Print out the directory header */
$printAllCols = sizeof($fileList);
! include($conf['paths']['templates'].'/dir_header.tpl');
/* Unless we're at the top, display the 'back' bar */
***************
*** 88,92 ****
{
$url =
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' .
preg_replace('|[^/]+$|', '', $where));
! include($conf['paths']['templates'].'/dir_back.inc');
}
--- 88,92 ----
{
$url =
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' .
preg_replace('|[^/]+$|', '', $where));
! include($conf['paths']['templates'].'/dir_back.tpl');
}
***************
*** 97,101 ****
$dirrow = (++$dirrow % 2);
$url =
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' . $where . '/' .
$currDir);
!
include($conf['paths']['templates'].'/dir_directory.inc');
}
--- 97,101 ----
$dirrow = (++$dirrow % 2);
$url =
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' . $where . '/' .
$currDir);
!
include($conf['paths']['templates'].'/dir_directory.tpl');
}
***************
*** 124,134 ****
}
}
! include($conf['paths']['templates'].'/dir_file.inc');
}
/* Display the options control panel at the bottom */
$formwhere = $scriptName.'/'.$where;
! include($conf['paths']['templates'].'/dir_footer.inc');
! //include($conf['paths']['templates'].'/page_footer.inc');
$GLOBALS['phpgw']->common->phpgw_footer();
}
--- 124,133 ----
}
}
! include($conf['paths']['templates'].'/dir_file.tpl');
}
/* Display the options control panel at the bottom */
$formwhere = $scriptName.'/'.$where;
! include($conf['paths']['templates'].'/dir_footer.tpl');
$GLOBALS['phpgw']->common->phpgw_footer();
}
***************
*** 146,151 ****
$extraLink = '<a href="' .
$GLOBALS['phpgw']->link('/chora/history.php','rt='.$rt.'&where=' . $where) .
'">Switch to Branch View</a>';
! include($conf['paths']['templates'].'/page_header.inc');
! include($conf['paths']['templates'].'/diff_header.inc');
$mimeType = $CVS->getMimeType($fullname);
--- 145,150 ----
$extraLink = '<a href="' .
$GLOBALS['phpgw']->link('/chora/history.php','rt='.$rt.'&where=' . $where) .
'">Switch to Branch View</a>';
! include($conf['paths']['templates'].'/page_header.tpl');
! include($conf['paths']['templates'].'/diff_header.tpl');
$mimeType = $CVS->getMimeType($fullname);
***************
*** 217,221 ****
$logMessage = htmlify($lg->log);
! include($conf['paths']['templates'].'/diff_rev.inc');
}
--- 216,220 ----
$logMessage = htmlify($lg->log);
! include($conf['paths']['templates'].'/diff_rev.tpl');
}
***************
*** 236,240 ****
}
! include($conf['paths']['templates'].'/diff_request.inc');
$GLOBALS['phpgw']->common->phpgw_footer();
--- 235,239 ----
}
! include($conf['paths']['templates'].'/diff_request.tpl');
$GLOBALS['phpgw']->common->phpgw_footer();
Index: diff.php
===================================================================
RCS file: /cvsroot/phpgroupware/chora/diff.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** diff.php 28 Apr 2002 19:50:05 -0000 1.9
--- diff.php 28 Apr 2002 20:06:03 -0000 1.10
***************
*** 116,121 ****
$title = "Diff for $where between version $r1 and $r2";
! include($conf['paths']['templates'].'/page_header.inc');
! include($conf['paths']['templates'].'/hr_diff_header.inc');
/* Retrieve the tree of changes from CVSLib */
--- 116,121 ----
$title = "Diff for $where between version $r1 and $r2";
! include($conf['paths']['templates'].'/page_header.tpl');
! include($conf['paths']['templates'].'/hr_diff_header.tpl');
/* Retrieve the tree of changes from CVSLib */
***************
*** 130,134 ****
if (!sizeof($lns))
{
!
include($conf['paths']['templates'].'/hr_diff_nochange.inc');
}
else
--- 130,134 ----
if (!sizeof($lns))
{
!
include($conf['paths']['templates'].'/hr_diff_nochange.tpl');
}
else
***************
*** 141,145 ****
$righthead = htmlspaces(@$header['newline']);
$headfunc = htmlspaces(@$header['function']);
!
include($conf['paths']['templates'].'/hr_diff_row.inc');
/* Each header block consists of a number of
changes (add, remove, change) */
--- 141,145 ----
$righthead = htmlspaces(@$header['newline']);
$headfunc = htmlspaces(@$header['function']);
!
include($conf['paths']['templates'].'/hr_diff_row.tpl');
/* Each header block consists of a number of
changes (add, remove, change) */
***************
*** 154,158 ****
{
$line =
htmlspaces($line);
!
include($conf['paths']['templates'].'/hr_diff_add.inc');
}
break;
--- 154,158 ----
{
$line =
htmlspaces($line);
!
include($conf['paths']['templates'].'/hr_diff_add.tpl');
}
break;
***************
*** 162,171 ****
{
$line =
htmlspaces($line);
!
include($conf['paths']['templates'].'/hr_diff_remove.inc');
}
break;
case CVSLIB_DIFF_EMPTY:
$line =
htmlspaces($change['line']);
!
include($conf['paths']['templates'].'/hr_diff_empty.inc');
break;
case CVSLIB_DIFF_CHANGE:
--- 162,171 ----
{
$line =
htmlspaces($line);
!
include($conf['paths']['templates'].'/hr_diff_remove.tpl');
}
break;
case CVSLIB_DIFF_EMPTY:
$line =
htmlspaces($change['line']);
!
include($conf['paths']['templates'].'/hr_diff_empty.tpl');
break;
case CVSLIB_DIFF_CHANGE:
***************
*** 181,185 ****
$right
= htmlspaces($right);
}
!
include($conf['paths']['templates'].'/hr_diff_change.inc');
}
break;
--- 181,185 ----
$right
= htmlspaces($right);
}
!
include($conf['paths']['templates'].'/hr_diff_change.tpl');
}
break;
***************
*** 189,194 ****
}
// print legend
! include($conf['paths']['templates'].'/hr_diff_footer.inc');
! //include($conf['paths']['templates'].'/page_footer.inc');
$GLOBALS['phpgw']->common->phpgw_footer();
}
--- 189,193 ----
}
// print legend
! include($conf['paths']['templates'].'/hr_diff_footer.tpl');
$GLOBALS['phpgw']->common->phpgw_footer();
}
Index: history.php
===================================================================
RCS file: /cvsroot/phpgroupware/chora/history.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** history.php 28 Apr 2002 19:50:05 -0000 1.6
--- history.php 28 Apr 2002 20:06:03 -0000 1.7
***************
*** 195,205 ****
$title = "CVS Branching View for $where";
$extraLink = '<a href="' .
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' . $where) .
'">Switch to Log View</a>';
! include $conf['paths']['templates'].'/page_header.inc';
! include $conf['paths']['templates'].'/history_header.inc';
@reset($grid);
while(list(,$row) = @each($grid))
{
! include $conf['paths']['templates'].'/history_row_start.inc';
/* Start traversing the grid of rows and columns */
--- 195,205 ----
$title = "CVS Branching View for $where";
$extraLink = '<a href="' .
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' . $where) .
'">Switch to Log View</a>';
! include $conf['paths']['templates'].'/page_header.tpl';
! include $conf['paths']['templates'].'/history_header.tpl';
@reset($grid);
while(list(,$row) = @each($grid))
{
! include $conf['paths']['templates'].'/history_row_start.tpl';
/* Start traversing the grid of rows and columns */
***************
*** 210,214 ****
{
$bg='';
! include
$conf['paths']['templates'].'/history_blank.inc';
continue;
}
--- 210,214 ----
{
$bg='';
! include
$conf['paths']['templates'].'/history_blank.tpl';
continue;
}
***************
*** 222,226 ****
$bg =
isset($branchColours[$rev])?$branchColours[$rev]:'white';
$symname = $fl->branches[$rev];
! include
$conf['paths']['templates'].'/history_branch_cell.inc';
}
elseif(preg_match('|^:|',$rev))
--- 222,226 ----
$bg =
isset($branchColours[$rev])?$branchColours[$rev]:'white';
$symname = $fl->branches[$rev];
! include
$conf['paths']['templates'].'/history_branch_cell.tpl';
}
elseif(preg_match('|^:|',$rev))
***************
*** 229,233 ****
$bgbr =
$_rev->strip(preg_replace('|^\:|','',$rev),1);
$bg =
isset($branchColours[$bgbr])?$branchColours[$bgbr]:'white';
! include
$conf['paths']['templates'].'/history_blank.inc';
}
elseif($_rev->valid($rev))
--- 229,233 ----
$bgbr =
$_rev->strip(preg_replace('|^\:|','',$rev),1);
$bg =
isset($branchColours[$bgbr])?$branchColours[$bgbr]:'white';
! include
$conf['paths']['templates'].'/history_blank.tpl';
}
elseif($_rev->valid($rev))
***************
*** 240,256 ****
$date = gmdate('jS M Y',$log->queryDate());
$lines = $log->queryChangedLines();
! include
$conf['paths']['templates'].'/history_rev.inc';
}
else
{
/* Exhausted other possibilities, just show a
blank cell */
! include
$conf['paths']['templates'].'/history_blank.inc';
}
}
! include $conf['paths']['templates'].'/history_row_end.inc';
}
! include $conf['paths']['templates'].'/history_footer.inc';
! //include $conf['paths']['templates'].'/page_footer.inc';
$GLOBALS['phpgw']->common->phpgw_footer();
?>
--- 240,255 ----
$date = gmdate('jS M Y',$log->queryDate());
$lines = $log->queryChangedLines();
! include
$conf['paths']['templates'].'/history_rev.tpl';
}
else
{
/* Exhausted other possibilities, just show a
blank cell */
! include
$conf['paths']['templates'].'/history_blank.tpl';
}
}
! include $conf['paths']['templates'].'/history_row_end.tpl';
}
! include $conf['paths']['templates'].'/history_footer.tpl';
$GLOBALS['phpgw']->common->phpgw_footer();
?>
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/chora/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** index.php 28 Apr 2002 19:52:11 -0000 1.9
--- index.php 28 Apr 2002 20:06:03 -0000 1.10
***************
*** 22,27 ****
@is_readable(CHORA_BASE . '/config/conf.php') &&
@is_readable(CHORA_BASE . '/config/cvsroots.php') &&
! @is_readable(CHORA_BASE . '/config/html.php') &&
! @is_readable(CHORA_BASE . '/config/mime.php'));
if ($chora_configured)
--- 22,28 ----
@is_readable(CHORA_BASE . '/config/conf.php') &&
@is_readable(CHORA_BASE . '/config/cvsroots.php') &&
! @is_readable(CHORA_BASE . '/config/html.php')
! );
! //@is_readable(CHORA_BASE . '/config/mime.php'));
if ($chora_configured)
***************
*** 37,43 ****
$title = "Chora is not fully configured.";
! //include CHORA_BASE . '/templates/common-header.inc';
! include CHORA_BASE . '/templates/default/notconfigured.inc';
! include CHORA_BASE . '/templates/default/common-footer.inc';
}
?>
--- 38,43 ----
$title = "Chora is not fully configured.";
! include CHORA_BASE . '/templates/default/notconfigured.tpl';
! include CHORA_BASE . '/templates/default/common-footer.tpl';
}
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: chora annotate.php,1.6,1.7 cvs.php,1.14,1.15 diff.php,1.9,1.10 history.php,1.6,1.7 index.php,1.9,1.10,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: chora/config mime.php,1.2,NONE mime.php.dist,1.1.1.1,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: chora/templates/default annotate_footer.inc,1.1,NONE annotate_header.inc,1.1,NONE annotate_line.inc,1.1,NONE common-footer.inc,1.1,NONE common-header.inc,1.1,NONE diff_header.inc,1.1,NONE diff_request.inc,1.1,NONE diff_rev.inc,1.1,NONE dir_back.inc,1.1,NONE dir_directory.inc,1.1,NONE dir_file.inc,1.1,NONE dir_footer.inc,1.1,NONE dir_header.inc,1.1,NONE error_page.inc,1.1,NONE history_blank.inc,1.1,NONE history_branch_cell.inc,1.1,NONE history_footer.inc,1.1,NONE history_header.inc,1.1,NONE history_rev.inc,1.1,NONE history_row_end.inc,1.1,NONE history_row_start.inc,1.1,NONE hr_diff_add.inc,1.1,NONE hr_diff_change.inc,1.1,NONE hr_diff_empty.inc,1.1,NONE hr_diff_footer.inc,1.1,NONE hr_diff_header.inc,1.1,NONE hr_diff_nochange.inc,1.1,NONE hr_diff_remove.inc,1.1,NONE hr_diff_row.inc,1.1,NONE notconfigured.inc,1.1,NONE page_footer.inc,1.1,NONE page_header.inc,1.3,NONE
- Previous by thread:
[Phpgroupware-cvs] CVS: chora/config mime.php,1.2,NONE mime.php.dist,1.1.1.1,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: chora/templates/default annotate_footer.inc,1.1,NONE annotate_header.inc,1.1,NONE annotate_line.inc,1.1,NONE common-footer.inc,1.1,NONE common-header.inc,1.1,NONE diff_header.inc,1.1,NONE diff_request.inc,1.1,NONE diff_rev.inc,1.1,NONE dir_back.inc,1.1,NONE dir_directory.inc,1.1,NONE dir_file.inc,1.1,NONE dir_footer.inc,1.1,NONE dir_header.inc,1.1,NONE error_page.inc,1.1,NONE history_blank.inc,1.1,NONE history_branch_cell.inc,1.1,NONE history_footer.inc,1.1,NONE history_header.inc,1.1,NONE history_rev.inc,1.1,NONE history_row_end.inc,1.1,NONE history_row_start.inc,1.1,NONE hr_diff_add.inc,1.1,NONE hr_diff_change.inc,1.1,NONE hr_diff_empty.inc,1.1,NONE hr_diff_footer.inc,1.1,NONE hr_diff_header.inc,1.1,NONE hr_diff_nochange.inc,1.1,NONE hr_diff_remove.inc,1.1,NONE hr_diff_row.inc,1.1,NONE notconfigured.inc,1.1,NONE page_footer.inc,1.1,NONE page_header.inc,1.3,NONE
- Index(es):