r256 - in trunk/web: . include

[DONOTREPLY at icculus.org]

Author: floam
Date: 2005-11-03 23:18:09 -0500 (Thu, 03 Nov 2005)
New Revision: 256

Modified:
   trunk/web/include/instruc.php
   trunk/web/include/status.php
   trunk/web/include/thebrain.php
   trunk/web/newindex.php
Log:
 * Fix bad tag nesting and general stupidity
 * Detect browser and only send high-tech mimes to things that advertise 
support.


Modified: trunk/web/include/instruc.php
===================================================================
--- trunk/web/include/instruc.php	2005-11-04 03:17:45 UTC (rev 255)
+++ trunk/web/include/instruc.php	2005-11-04 04:18:09 UTC (rev 256)
@@ -51,14 +51,14 @@
 	<li>Create a patch between <em class="shell">oldfile</em> and <em class="shell">newfile</em>:<br />
 	<span class="shell">diff -u <em>oldfile</em> <em>newfile</em></span></li>
 	<li>Create a patch between directory <em class="shell">olddir</em> and <em class="shell">newdir</em>:<br />
-	<span class="shell">diff -Naur <em>olddir</em> <em>newdir</em></li>
+	<span class="shell">diff -Naur <em>olddir</em> <em>newdir</em></span></li>
 	<li>Apply a patch <em class="shell">amazing_new_feature.patch</em>:<br />
 	<span class="shell">patch -p0 -i <em>amazing_new_feature.patch</em></span></li>
 </ul>
 <p>For more information on <span class="shell">diff</span> and <span class="shell">patch</span>,
 read their man-pages.</p>
 <p>The prefered way to get the ball rolling on a patch is to file a <a href="http://bugs.icculus.org">bug</a>
-for your patch and attach the patch to it and then send a notice to the mailing list
+for your request with the patch attached to it and then send a notice to the mailing list
 about it. If you're really so lazy that you can't do this, we would prefer you at least
 <a href="mailto:zakk at icculus.org">mail it to zakk at icculus.org</a> rather than not do
 anything.</p>

Modified: trunk/web/include/status.php
===================================================================
--- trunk/web/include/status.php	2005-11-04 03:17:45 UTC (rev 255)
+++ trunk/web/include/status.php	2005-11-04 04:18:09 UTC (rev 256)
@@ -60,26 +60,27 @@
 		<td></td> <!--LKWR-->
 		<td>Client has severe graphical glitches.</td> <!--Notes-->
 	</tr>
+	<tr>
 		<td scope="row">FreeBSD</td> <!--OS-->
 		<td>gcc-x86</td> <!--Platform-->
 		<td>working</td> <!--Status-->
 		<td></td> <!--LKWR-->
 		<td></td> <!--Notes-->
 	</tr>
-	</tr>
+	<tr>
 		<td scope="row" rowspan="2">Solaris</td> <!--OS-->
 		<td>gcc-x86</td> <!--Platform-->
 		<td>broken</td> <!--Status-->
 		<td></td> <!--LKWR-->
 		<td></td> <!--Notes-->
 	</tr>
-	</tr>
+	<tr>
 		<td>gcc-sparc</td> <!--Platform-->
 		<td>broken</td> <!--Status-->
 		<td></td> <!--LKWR-->
 		<td></td> <!--Notes-->
 	</tr>
-	</tr>
+	<tr>
 		<td scope="row">IRIX</td> <!--OS-->
 		<td>cc-*</td> <!--Platform-->
 		<td>broken</td> <!--Status-->

Modified: trunk/web/include/thebrain.php
===================================================================
--- trunk/web/include/thebrain.php	2005-11-04 03:17:45 UTC (rev 255)
+++ trunk/web/include/thebrain.php	2005-11-04 04:18:09 UTC (rev 256)
@@ -1,4 +1,20 @@
 <?php
+if  ((strpos($_SERVER['HTTP_ACCEPT'], "application/xhtml+xml")) || ($ua->parent == "Validation Checkers"))  {
+	$content_type = "application/xhtml+xml";
+}
+
+elseif ((strpos($_SERVER['HTTP_ACCEPT'], "application/xml")) || ($ua->browser == "IE" && $ua->version >= 6)) {
+	if ($ua->browser == "IE") {
+		$extradoctype = "<?xml-stylesheet type=\"text/xsl\" href=\"/include/copy.xsl\"?>\n";
+	}
+	$content_type = "application/xml";
+}
+else {
+	$content_type = "text/html";
+}
+
+header("Content-type: $content_type; charset=UTF-8");
+
 $navlist = array(
  "home" => "Home",
  "instruc" => "Instructions",

Modified: trunk/web/newindex.php
===================================================================
--- trunk/web/newindex.php	2005-11-04 03:17:45 UTC (rev 255)
+++ trunk/web/newindex.php	2005-11-04 04:18:09 UTC (rev 256)
@@ -5,11 +5,12 @@
 ?>
 <?php //hawhaw
 	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>";
+	echo $extradoctype;
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-	<meta content="application/xhtml+xml; charset=UTF-8" />
+	<meta content="<?php echo $content_type; ?> charset=UTF-8" />
 	<title>icculus.org/quake3: <?php echo $navlist[$page]; ?></title>
 	<link rel="stylesheet" href="ioq3.css" type="text/css" />
 </head>