[phpcvsview-cvs-updates] phpcvsview func_DiffFile.php,1.5,1.6 func_FileAnnotation.php,1.10,1.11 func
Status: Pre-Alpha
Brought to you by:
bcheesem
Menu
▾
▴
[phpcvsview-cvs-updates] phpcvsview func_DiffFile.php,1.5,1.6 func_FileAnnotation.php,1.10,1.11 func_FileHistory.php,1.12,1.13
|
From: Sijis A. <si...@us...> - 2005-04-15 05:34:42
|
Update of /cvsroot/phpcvsview/phpcvsview In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10179 Modified Files: func_DiffFile.php func_FileAnnotation.php func_FileHistory.php Log Message: - added/edited html output for xhtml compatibility Index: func_DiffFile.php =================================================================== RCS file: /cvsroot/phpcvsview/phpcvsview/func_DiffFile.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** func_DiffFile.php 5 Feb 2005 22:58:31 -0000 1.5 --- func_DiffFile.php 15 Apr 2005 05:34:32 -0000 1.6 *************** *** 33,37 **** // Add the quick link navigation bar. echo GetQuickLinkBar($lang['rev_diff'], true, true, ""); ! echo "<hr />"; // Get the DIFF from the server. --- 33,38 ---- // Add the quick link navigation bar. echo GetQuickLinkBar($lang['rev_diff'], true, true, ""); ! echo '<hr />'."\n"; ! echo '<div id="filediff">'."\n"; // Get the DIFF from the server. *************** *** 135,144 **** } // while - echo "<table><tr><td>"; $search = array("<", ">", "\n", "\t", " "); $replace = array("<", ">", "", " ", " "); foreach ($FilePatching as $Line) { ! echo "<div class=\""; switch($Line['mode']){ case '+': --- 136,144 ---- } // while $search = array("<", ">", "\n", "\t", " "); $replace = array("<", ">", "", " ", " "); foreach ($FilePatching as $Line) { ! echo ' <p class="'; switch($Line['mode']){ case '+': *************** *** 151,157 **** echo "normal"; } // switch ! echo "\">".str_replace($search, $replace, $Line['text'])." </div>\n"; } ! echo "</td></tr></table><hr />"; $CVSServer->Disconnect(); --- 151,158 ---- echo "normal"; } // switch ! echo '">'.str_replace($search, $replace, $Line['text']).'</p>'."\n"; } ! echo '</div>'."\n"; ! echo '<hr />'."\n"; $CVSServer->Disconnect(); Index: func_FileAnnotation.php =================================================================== RCS file: /cvsroot/phpcvsview/phpcvsview/func_FileAnnotation.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** func_FileAnnotation.php 4 Feb 2005 09:42:22 -0000 1.10 --- func_FileAnnotation.php 15 Apr 2005 05:34:33 -0000 1.11 *************** *** 41,45 **** // Start the output for the table. echo '<hr />'."\n"; ! echo '<table border="0" cellpadding="2" cellspacing="0" width="100%">' ."\n"; $RowClass = 'row1'; --- 41,46 ---- // Start the output for the table. echo '<hr />'."\n"; ! echo '<div id="fileannotation">'."\n"; ! echo ' <table>' ."\n"; $RowClass = 'row1'; *************** *** 51,65 **** if (strcmp($PrevRev, $Annotation["Revision"]) != 0) { if (!$FirstLine) { ! echo "</pre></td></tr>\n"; } else { $FirstLine = false; } ! echo '<tr class="'.$RowClass.'"><td>'.$Annotation["Revision"].'</td><td>'.$Annotation["Author"]; ! echo '</td><td>'.$Annotation["Date"].'</td><td><pre>'.str_replace($search, $replace, $Annotation["Line"]); ! if ($RowClass == 'row1') { ! $RowClass = 'row2'; ! } else { ! $RowClass = 'row1'; ! } } else{ echo "\n".str_replace($search, $replace, $Annotation["Line"]); --- 52,68 ---- if (strcmp($PrevRev, $Annotation["Revision"]) != 0) { if (!$FirstLine) { ! echo '</pre></td>'."\n"; ! echo ' </tr>'."\n"; } else { $FirstLine = false; } ! echo ' <tr class="'.$RowClass.'">'."\n"; ! echo ' <td>'.$Annotation["Revision"].'</td>'."\n"; ! echo ' <td>'.$Annotation["Author"].'</td>'."\n"; ! echo ' <td>'.$Annotation["Date"].'</td>'."\n"; ! echo ' <td><pre>'.str_replace($search, $replace, $Annotation["Line"]); ! ! $RowClass = ($RowClass == "row1")? "row2" : "row1"; ! } else{ echo "\n".str_replace($search, $replace, $Annotation["Line"]); *************** *** 67,71 **** $PrevRev = $Annotation["Revision"]; } ! echo '</table><hr />'."\n"; // Close the connection. --- 70,78 ---- $PrevRev = $Annotation["Revision"]; } ! echo '</pre></td>'."\n"; ! echo ' </tr>'."\n"; ! echo ' </table>'."\n"; ! echo '</div>'."\n"; ! echo '<hr />'."\n"; // Close the connection. Index: func_FileHistory.php =================================================================== RCS file: /cvsroot/phpcvsview/phpcvsview/func_FileHistory.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** func_FileHistory.php 4 Feb 2005 09:44:36 -0000 1.12 --- func_FileHistory.php 15 Apr 2005 05:34:33 -0000 1.13 *************** *** 38,47 **** // Add the quick link navigation bar. echo GetQuickLinkBar($lang['rev_history'], false, true, ""); foreach ($CVSServer->FILES[0]["Revisions"] as $Revision) { $HREF = str_replace('//', '/', $env['script_name'].'?mp='.$env['mod_path']); $DateTime = strtotime($Revision["date"]); ! echo '<hr /><p><a id="rd'.$DateTime.'" />'."\n"; ! echo '<b>'.$lang['revision'].'</b> '.$Revision["Revision"].' -'; echo ' (<a href="'.$HREF.'&fv&dt='.$DateTime.'">'.$lang['view'].'</a>)'; echo ' (<a href="'.$HREF.'&fd&dt='.$DateTime.'">'.$lang['download'].'</a>)'; --- 38,51 ---- // Add the quick link navigation bar. echo GetQuickLinkBar($lang['rev_history'], false, true, ""); + + echo '<div id="filehistory">'."\n"; foreach ($CVSServer->FILES[0]["Revisions"] as $Revision) { $HREF = str_replace('//', '/', $env['script_name'].'?mp='.$env['mod_path']); $DateTime = strtotime($Revision["date"]); ! echo '<hr />'."\n"; ! //echo '<a name="rd'.$DateTime.'" /> </a>'."\n"; ! echo '<div class="filerevision">'."\n"; ! echo ' <p><b>'.$lang['revision'].'</b> '.$Revision["Revision"].' -'; echo ' (<a href="'.$HREF.'&fv&dt='.$DateTime.'">'.$lang['view'].'</a>)'; echo ' (<a href="'.$HREF.'&fd&dt='.$DateTime.'">'.$lang['download'].'</a>)'; *************** *** 50,68 **** echo $Revision["Revision"].'">'.$lang['diff'].'</a>)'; } ! echo ' (<a href="'.$HREF.'&fa='.$Revision["Revision"].'">'.$lang['annotate'].'</a>)<br />'."\n"; ! echo '<b>'.$lang['last_checkin'].'</b> '.strftime("%A %d %b %Y %T -0000", $DateTime).' ('.CalculateDateDiff($DateTime, strtotime(gmdate("M d Y H:i:s"))).' '.$lang['ago'].')<br />'."\n"; ! echo '<b>'.$lang['branch'].'</b> '.$Revision["Branches"].'<br />'."\n"; ! echo '<b>'.$lang['date'].'</b> '.strftime("%B %d, %Y", $DateTime).'<br />'."\n"; ! echo '<b>'.$lang['time'].'</b> '.strftime("%H:%M:%S", $DateTime).'<br />'."\n"; ! echo '<b>'.$lang['author'].'</b> '.$Revision["author"].'<br />'."\n"; ! echo '<b>'.$lang['state'].'</b> '.$Revision["state"].'<br />'."\n"; if ($Revision["PrevRevision"] != '') { ! echo '<b>'.$lang['changes'].$Revision["PrevRevision"].':</b> '.$Revision["lines"].'<br />'."\n"; } ! echo '<b>'.$lang['log_message'].'</b></p><pre>'.$Revision["LogMessage"].'</pre>'."\n"; } echo '<hr />'."\n"; ! echo GetDiffForm(); $CVSServer->Disconnect(); --- 54,75 ---- echo $Revision["Revision"].'">'.$lang['diff'].'</a>)'; } ! echo ' (<a href="'.$HREF.'&fa='.$Revision["Revision"].'">'.$lang['annotate'].'</a>)</p>'."\n"; ! echo ' <p><b>'.$lang['last_checkin'].'</b> '.strftime("%A %d %b %Y %T -0000", $DateTime).' ('.CalculateDateDiff($DateTime, strtotime(gmdate("M d Y H:i:s"))).' '.$lang['ago'].')</p>'."\n"; ! echo ' <p><b>'.$lang['branch'].'</b> '.$Revision["Branches"].'</p>'."\n"; ! echo ' <p><b>'.$lang['date'].'</b> '.strftime("%B %d, %Y", $DateTime).'</p>'."\n"; ! echo ' <p><b>'.$lang['time'].'</b> '.strftime("%H:%M:%S", $DateTime).'</p>'."\n"; ! echo ' <p><b>'.$lang['author'].'</b> '.$Revision["author"].'</p>'."\n"; ! echo ' <p><b>'.$lang['state'].'</b> '.$Revision["state"].'</p>'."\n"; if ($Revision["PrevRevision"] != '') { ! echo ' <p><b>'.$lang['changes'].$Revision["PrevRevision"].':</b> '.$Revision["lines"].'</p>'."\n"; } ! echo ' <p><b>'.$lang['log_message'].'</b></p>'."\n"; ! echo ' <p class="logmsg">'.$Revision["LogMessage"].'</p>'."\n"; ! echo '</div>'."\n"; } + echo '</div>'."\n"; echo '<hr />'."\n"; ! echo GetDiffForm(); $CVSServer->Disconnect(); |
