[phpcvsview-cvs-updates] phpcvsview/Themes/Default theme.css,1.6,1.7 theme.php,1.6,1.7

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpcvsview/phpcvsview/Themes/Default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8352/Themes/Default

Modified Files:
	theme.css theme.php 
Log Message:
- Further cleanup of default theme.
- Altered GeSHi code to add a basic highlighter detection.
- Optimised some of the XHTML output from the theme.


Index: theme.php
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/Themes/Default/theme.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** theme.php	19 Dec 2004 09:45:10 -0000	1.6
--- theme.php	22 Dec 2004 11:06:00 -0000	1.7
***************
*** 32,40 ****
  	    $PageHead .= "<div class=\"title\">$Heading</div>";
  	}
! 
! 	$PageHead .= "<p>Welcome to our CVS Repository viewer. This page has been dynamically";
! 	$PageHead .= " created with '<a href=\"http://phpcvsview.sourceforge.net/\">phpCVS";
! 	$PageHead .= "Viewer</a>' created by <a href=\"mailto:bch...@us...";
! 	$PageHead .= "\">Brian Cheeseman</a>.</p><p>Please feel free to browse our source code.</p>";
  	return $PageHead;
  }
--- 32,53 ----
  	    $PageHead .= "<div class=\"title\">$Heading</div>";
  	}
! 	
! 	$PageHead .= "<p>Welcome to the CVS Repository viewing system for the phpCVSView project ";
! 	$PageHead .= "hosted at SourceForge.net</p><p>The goal of this project is simply to ";
! 	$PageHead .= "build a php application/class to provide access to a CVS based source ";
! 	$PageHead .= "control repository over the various connectivity mechanisms available for ";
! 	$PageHead .= "CVS in general. There are also some extensions to this goal planned for ";
! 	$PageHead .= "future releases such as a full web-based CVS client utilising the core of ";
! 	$PageHead .= "this project.</p><p>So please feel free to look at our code, suggest ";
! 	$PageHead .= "features, test the code in your own environment, submit bugs, and most of ";
! 	$PageHead .= "all support the commitment of the open source developers by using the many ";
! 	$PageHead .= "wonderful products available.</p><p>Kindest Regards,<br />Brian Cheeseman.";
! 	$PageHead .= "<br />phpCVSView Project Leader.</p>";
! 	
! //	$PageHead .= "<p>Welcome to our CVS Repository viewer. This page has been dynamically";
! //	$PageHead .= " created with '<a href=\"http://phpcvsview.sourceforge.net/\">phpCVS";
! //	$PageHead .= "Viewer</a>' created by <a href=\"mailto:bch...@us...";
! //	$PageHead .= "\">Brian Cheeseman</a> and <a href=\"mailto:si...@us...\">";
! //	$PageHead .= "Sijis Aviles</a>.</p><p>Please feel free to browse our source code.</p>";
  	return $PageHead;
  }
***************
*** 43,47 ****
  	global $StartTime;
  	$EndTime = microtime();
! 	$PageFoot = "<div class=\"footer\">This page was created by <a href=\"http://phpcvsview.sourceforge.net/\">phpCVSView</a> in ".number_format(microtime_diff($StartTime, $EndTime), 3)." seconds.";
  	$PageFoot .= "<p><a href=\"http://validator.w3.org/check?uri=referer\"><img src=\"http://www.w3.org/Icons/valid-xhtml11\" alt=\"Valid XHTML 1.1!\" height=\"31\" width=\"88\" /></a>&nbsp;&nbsp;";
  	$PageFoot .= "<a href=\"http://jigsaw.w3.org/css-validator/check/referer\"><img style=\"border:0;width:88px;height:31px\" src=\"http://www.w3c.org/Icons/valid-css\" alt=\"Valid CSS!\" /></a></p>";
--- 56,63 ----
  	global $StartTime;
  	$EndTime = microtime();
! 	$PageFoot = "<div class=\"footer\">This page was generated by <a href=\"http://phpcvsview.sourceforge.net/\">phpCVSView</a> in ".number_format(microtime_diff($StartTime, $EndTime), 3)." seconds.<br />";
! 	$PageFoot .= "phpCVSView created by <a href=\"mailto:bch...@us...";
! 	$PageFoot .= "\">Brian Cheeseman</a> and <a href=\"mailto:si...@us...\">";
! 	$PageFoot .= "Sijis Aviles</a>.";
  	$PageFoot .= "<p><a href=\"http://validator.w3.org/check?uri=referer\"><img src=\"http://www.w3.org/Icons/valid-xhtml11\" alt=\"Valid XHTML 1.1!\" height=\"31\" width=\"88\" /></a>&nbsp;&nbsp;";
  	$PageFoot .= "<a href=\"http://jigsaw.w3.org/css-validator/check/referer\"><img style=\"border:0;width:88px;height:31px\" src=\"http://www.w3c.org/Icons/valid-css\" alt=\"Valid CSS!\" /></a></p>";
***************
*** 87,91 ****
  	    $QLOut .= "</a>";
  	}
! 	$QLOut .= "</div>\n";
  	return $QLOut;
  }
--- 103,107 ----
  	    $QLOut .= "</a>";
  	}
! 	$QLOut .= "</div>";
  	return $QLOut;
  }
***************
*** 94,100 ****
  {
  	global $RowClass;
! 	echo "<hr />\n";
! 	echo "<table>\n";
! 	echo "  <tr class=\"head\">\n    <th>&nbsp;</th>\n    <th>File</th>\n    <th>Rev.</th>\n    <th>Age</th>\n    <th>Author</th>\n    <th>Last Log Entry</th>\n  </tr>\n";
  	$RowClass = "row1";
  }
--- 110,116 ----
  {
  	global $RowClass;
! 	echo "<hr />";
! 	echo "<table>";
! 	echo "<tr class=\"head\"><th>&nbsp;</th><th>File</th><th>Rev.</th><th>Age</th><th>Author</th><th>Last Log Entry</th></tr>";
  	$RowClass = "row1";
  }
***************
*** 102,106 ****
  function endDirList()
  {
! 	echo "  </table>\n";
  	echo "<hr />";
  }
--- 118,122 ----
  function endDirList()
  {
! 	echo "</table>";
  	echo "<hr />";
  }
***************
*** 110,121 ****
  	global $RowClass, $ParentIcon, $env;
  	$HREF = str_replace("//", "/", $env['script_name']."?mp=".substr($ModPath, 0, strrpos(substr($ModPath, 0, -1), "/"))."/");
! 	echo "  <tr class=\"$RowClass\">\n";
! 	echo "    <td align=\"center\"><a href=\"$HREF\"><img alt=\"parent\" src=\"".$env['script_path']."/$ParentIcon\" /></a></td>\n";
! 	echo "    <td><a href=\"$HREF\">Up one folder</a></td>\n";
! 	echo "    <td>&nbsp;</td>\n";
! 	echo "    <td>&nbsp;</td>\n";
! 	echo "    <td>&nbsp;</td>\n";
! 	echo "    <td>&nbsp;</td>\n";
! 	echo "  </tr>\n";
  	$RowClass = "row2";
  }
--- 126,137 ----
  	global $RowClass, $ParentIcon, $env;
  	$HREF = str_replace("//", "/", $env['script_name']."?mp=".substr($ModPath, 0, strrpos(substr($ModPath, 0, -1), "/"))."/");
! 	echo "<tr class=\"$RowClass\">";
! 	echo "<td class=\"min\"><a href=\"$HREF\"><img alt=\"parent\" src=\"".$env['script_path']."/$ParentIcon\" /></a></td>";
! 	echo "<td class=\"min\"><a href=\"$HREF\">Up&nbsp;one&nbsp;folder</a></td>";
! 	echo "<td>&nbsp;</td>";
! 	echo "<td>&nbsp;</td>";
! 	echo "<td>&nbsp;</td>";
! 	echo "<td>&nbsp;</td>";
! 	echo "</tr>";
  	$RowClass = "row2";
  }
***************
*** 126,137 ****
  	foreach ($Folders as $Folder) {
  		$HREF = str_replace("//", "/", $env['script_name']."?mp=$ModPath/".$Folder["Name"]."/");
! 		echo "  <tr class=\"$RowClass\">\n";
! 		echo "    <td align=\"center\"><a href=\"$HREF\"><img alt=\"DIR\" src=\"".$env['script_path']."/$FolderIcon\" /></a></td>\n";
! 		echo "    <td><a href=\"$HREF\">".$Folder["Name"]."</a></td>\n";
! 		echo "    <td>&nbsp;</td>\n";
! 		echo "    <td>&nbsp;</td>\n";
! 		echo "    <td>&nbsp;</td>\n";
! 		echo "    <td>&nbsp;</td>\n";
! 		echo "  </tr>\n";
  		if ($RowClass == "row1") {
  		    $RowClass = "row2";
--- 142,153 ----
  	foreach ($Folders as $Folder) {
  		$HREF = str_replace("//", "/", $env['script_name']."?mp=$ModPath/".$Folder["Name"]."/");
! 		echo "<tr class=\"$RowClass\">";
! 		echo "<td class=\"min\"><a href=\"$HREF\"><img alt=\"DIR\" src=\"".$env['script_path']."/$FolderIcon\" /></a></td>";
! 		echo "<td class=\"min\"><a href=\"$HREF\">".$Folder["Name"]."</a></td>";
! 		echo "<td>&nbsp;</td>";
! 		echo "<td>&nbsp;</td>";
! 		echo "<td>&nbsp;</td>";
! 		echo "<td>&nbsp;</td>";
! 		echo "</tr>";
  		if ($RowClass == "row1") {
  		    $RowClass = "row2";
***************
*** 148,159 ****
  		// Add the row data here.
  		$HREF = str_replace("//", "/", $env['script_name']."?mp=$ModPath/".$Val."/");
! 		echo "  <tr class=\"$RowClass\">\n";
! 		echo "    <td align=\"center\"><a href=\"$HREF\"><img alt=\"MOD\" src=\"".$env['script_path']."/$ModuleIcon\" /></a></td>\n";
! 		echo "    <td><a href=\"$HREF\">".$Key."</a></td>\n";
! 		echo "    <td>&nbsp;</td>\n";
! 		echo "    <td>&nbsp;</td>\n";
! 		echo "    <td>&nbsp;</td>\n";
! 		echo "    <td>&nbsp;</td>\n";
! 		echo "  </tr>\n";
  		if ($RowClass == "row1") {
  		    $RowClass = "row2";
--- 164,175 ----
  		// Add the row data here.
  		$HREF = str_replace("//", "/", $env['script_name']."?mp=$ModPath/".$Val."/");
! 		echo "<tr class=\"$RowClass\">";
! 		echo "<td class=\"min\"><a href=\"$HREF\"><img alt=\"MOD\" src=\"".$env['script_path']."/$ModuleIcon\" /></a></td>";
! 		echo "<td class=\"min\"><a href=\"$HREF\">".$Key."</a></td>";
! 		echo "<td>&nbsp;</td>";
! 		echo "<td>&nbsp;</td>";
! 		echo "<td>&nbsp;</td>";
! 		echo "<td>&nbsp;</td>";
! 		echo "</tr>";
  		if ($RowClass == "row1") {
  		    $RowClass = "row2";
***************
*** 171,182 ****
  		$DateTime = strtotime($File["Revisions"][$File["Head"]]["date"]);
  		$AGE = CalculateDateDiff($DateTime, strtotime(gmdate("M d Y H:i:s")));
! 		echo "  <tr class=\"$RowClass\">\n";
! 		echo "    <td align=\"center\"><a href=\"$HREF&amp;fh\"><img alt=\"FILE\" src=\"".$env['script_path']."/$FileIcon\" /></a></td>\n";
! 		echo "    <td><a href=\"$HREF&amp;fh\">".$File["Name"]."</a></td>\n";
! 		echo "    <td align=\"center\"><a href=\"$HREF&amp;fv&amp;dt=$DateTime\">".$File["Head"]."</a></td>\n";
! 		echo "    <td align=\"center\">".$AGE." ago</td>\n";
! 		echo "    <td align=\"center\">".$File["Revisions"][$File["Head"]]["author"]."</td>\n";
! 		echo "    <td>".str_replace("\n", "<br />", $File["Revisions"][$File["Head"]]["LogMessage"])."</td>\n";
! 		echo "  </tr>\n";
  		if ($RowClass == "row1") {
  		    $RowClass = "row2";
--- 187,198 ----
  		$DateTime = strtotime($File["Revisions"][$File["Head"]]["date"]);
  		$AGE = CalculateDateDiff($DateTime, strtotime(gmdate("M d Y H:i:s")));
! 		echo "<tr class=\"$RowClass\">";
! 		echo "<td align=\"center\"><a href=\"$HREF&amp;fh\"><img alt=\"FILE\" src=\"".$env['script_path']."/$FileIcon\" /></a></td>";
! 		echo "<td><a href=\"$HREF&amp;fh\">".$File["Name"]."</a></td>";
! 		echo "<td align=\"center\"><a href=\"$HREF&amp;fv&amp;dt=$DateTime\">".$File["Head"]."</a></td>";
! 		echo "<td align=\"center\">".str_replace(" ", "&nbsp;", $AGE)."&nbsp;ago</td>";
! 		echo "<td align=\"center\">".$File["Revisions"][$File["Head"]]["author"]."</td>";
! 		echo "<td>".str_replace(array("\n", " "), array("<br />", "&nbsp;"), $File["Revisions"][$File["Head"]]["LogMessage"])."</td>";
! 		echo "</tr>";
  		if ($RowClass == "row1") {
  		    $RowClass = "row2";

Index: theme.css
===================================================================
RCS file: /cvsroot/phpcvsview/phpcvsview/Themes/Default/theme.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** theme.css	19 Dec 2004 09:45:09 -0000	1.6
--- theme.css	22 Dec 2004 11:05:59 -0000	1.7
***************
*** 60,64 ****
  	font-size: 8pt;
  	border: 0px none;
! 	width: 100%;
  	border-spacing: 0px 0px;
  	border-collapse: collapse;
--- 60,71 ----
  	font-size: 8pt;
  	border: 0px none;
! 	width: 100%; 
! 	border-spacing: 0px 0px;
! 	border-collapse: collapse;
! }
! table.source
! {
! 	border: 0px none;
! 	width: 100%; 
  	border-spacing: 0px 0px;
  	border-collapse: collapse;
***************
*** 66,72 ****
  td
  {
! 	padding: 3px;
  }
  
  .geshi .de1, 
  .geshi .de2 
--- 73,93 ----
  td
  {
! 	padding-left: 4px;
! 	padding-right: 4px;
! 	padding-top: 1px;
! 	padding-bottom: 1px;
! }
! td.min
! {
! 	width: 1px;
! }
! li
! {
! 	font-family: 'Courier New', Courier, monospace; 
! 	font-size: 12px;
! 	font-weight: normal;
  }
  
+ /*
  .geshi .de1, 
  .geshi .de2 
***************
*** 152,153 ****
--- 173,177 ----
  	color: #0000ff;
  }
+ 
+ 
+ */
\ No newline at end of file