lots of changes

git-svn-id: svn://svn.icculus.org/quake3/trunk@224 edf5b092-35ff-0310-97b2-ce42778d08ea

6 files changed, 75 insertions, 111 deletions

diff --git a/web/include/home.php b/web/include/home.php
index 943f6a8..7ba6753 100644
--- a/web/include/home.php
+++ b/web/include/home.php
@@ -1,96 +1,19 @@
-<p>Quake 3 runs natively on everything, thanks to <a href="http://www.idsoftware.com/">ID Software</a> for releasing the
-	game source.</p>
-
-	<p class="angryzakk">Open-Source Quake 3 does not entitle you to steal, warez, 
-	pie-rat, or borrow Quake 3/Team Arena data. Do not file bugs or show your face in
-	the <acronym title="Internet Relay Chat">IRC</acronym> channel if you've acquired
-	the game data illegally!</p>
-	<p><img src="images/quake3.jpg" alt="Quake3 Screenshot" class="right"/></p>
-
-
-	<h2>What works:</h2>
-	<ul>
-		<li>Everything.</li>
-		<li>x86_64 support (including movies, native and interpreted vm mods!)</li>
-		<li>PowerPC, we think.</li>
-		<li><a href="http://www.libsdl.org/" title="Simple DirectMedia Layer">SDL</a> input, joysticks, window handling, etc.</li>
-		<li><a href="http://www.libsdl.org/" title="Simple DirectMedia Layer">SDL</a> sound, so <a href="http://alsa-project.org" title="Advanced Linux Sound Architecture">ALSA</a> should work now.</li>
-		<li>Win32 compiles and runs fine with current <acronym title="Subversion">SVN</acronym>.</li>
-		<li>mingw support.</li>
-		<li>FreeBSD</li>
-	</ul>
-
-	<h2>What doesn't work/known bugs:</h2>
-	<ul>
-		<li>World of Warcraft client.</li>
-		<li>Nobody has actually written the <a href="http://www.openal.org/">OpenAL</a> juju yet.</li>
-		<li>Nobody has made any optional graphics upgrades yet.</li>
-		<li>Nobody has ported this thing to the PSP yet.</li>
-		<li>Punkbuster, never will work unless even balance makes it so.</li>
-		</ul>
-	<h2>What's the point?</h2>
-	<ul>
-		<li>No random patches to make the mynx model naked, etc.</li>
-		<li>No patches to change the gameplay. Make a mod, not an engine change.</li>
-		<li>No patches to remove the cdkey check from anything that requires the
-		Quake 3 data (<span class="shell">pak0.pk3</span> from the cd, team arena,
-		mods that use Quake 3 maps/textures/models/etc.)</li>
-		<li>Security fixes.</li>
-		<li>Bug fixes.</li>
-		<li>New architectures (x86-64, AmigaOS, BeOS, DOS, PSP, whatever.)</li>
-		<li><a href="http://www.openal.org/">OpenAL</a> (for better support of
-		<a href="http://alsa-project.org" title="Advanced Linux Sound Architecture">ALSA</a>
-		and such) at some point</li>
-		<li>Entirely optional, and disabled by default, graphics upgrades. We love
-		bloom lighting and such, but please make sure they're disabled by default
-		(at the compilation level), and when enabled still need to be ticked on in
-		the menus.</li>
-		<li>Ditto for sound.</li>
-		<li>Mod support.</li>
-		<li>Hopefully we'll get a pack of bare-bones data files to test that the
-		engine works, too.</li>
-	</ul>
-
-	<h2>To use:</h2>
-	<ul>
-		<li>Make sure you've got a Quake 3 CD-ROM. You might be able to get away
-		with the shareware version or one of the other retail versions, but I haven't
-		tried. The Quake 3 source release does not obviate the need for a legitimate
-		copy of Quake 3.</li>
-		<li>If you're using Gentoo, just <span class="shell">emerge quake3</span>,
-		you'll get a semi-recent build.</li>
-		<li>Get the source code from <acronym title="Subversion">SVN</acronym>:</li>
-		<li class="shell">svn co svn://svn.icculus.org/quake3/trunk quake3</li>
-		<li><a href="http://svn.icculus.org/*checkout*/quake3/trunk/i_o-q3-readme">
-		Read the README.</a></li>
-		<li>Compile.</li>
-		<li>Copy your <span class="shell">pak0.pk3</span> off your legitimate Quake 3 CD-ROM, and we will also
-		need the pk3s from the latest id patch (
-		<a href="http://filesingularity.timedoctor.org/linuxq3apoint-1.32b-3.x86.run">linux</a>
-		/<a href="http://filesingularity.timedoctor.org/q3pointrelease_132.exe">win32</a>
-		/<a href="http://filesingularity.timedoctor.org/Quake3-132.pkg.sit">mac</a>).</li>
-		<li>Run game, be happy.</li>
-		<li>Touch the penguin.</li>
-		<li>Clap your hands!</li>
-		<li>Feature requests, bug reports, and preferably patches go to the
-		<a href="http://bugzilla.icculus.org/">bugzilla</a> AND give the bugzilla
-		url or bug # for your bug in the mailing list.</li>
-		<li>Subscribe to the mailing list:
-		<a href="mailto:quake3-subscribe@icculus.org">quake3-subscribe@icculus.org</a></li>
-		<li>patches go to <a href="mailto:zakk@icculus.org">zakk@icculus.org</a>
-		if you're not interested in bugzilla.</li>
-		<li>Please do not send patches that aren't yours without the approval of
-		the actual patch author.</li>
-		<li>Web view of the SVN: <a href="http://svn.icculus.org/quake3/trunk/">
-		http://svn.icculus.org/quake3/trunk/</a></li>
-		<li>Buy id software's other games.</li>
-		<li>Donate everything else to charity.</li>
-		<li>Stop by <em>#icculus.org/quake3</em> on <em>irc.freenode.net</em></li>
-	</ul>
-
-	<h1>If you have problems:</h1>
-	<p>
-		Submit everything to the <a href="http://bugzilla.icculus.org/">bugzilla</a>.
-		Do NOT contact us for copies of the game.
-		Otherwise, if you aren't sending us patches, or good feedback, don't contact us at all.
-	</p>
+<p>Quake 3 now runs natively on many platforms thanks to ID Software releasing the engine 
+source code.</p>
+<img src="images/quake3.jpg" class="right" />
+<h2>What's the point?</h2>
+<p>This project is aiming to build upon the work of ID Software on Quake 3 source code.
+The source was released on August 20, 2005 under the GPL license. Since then, we have
+feverishly been cleaning up, fixing bugs of, and adding features to Quake 3. Our eventual
+goal is to have created <strong>the</strong> Quake3 source code distribution that people
+base their games and forks with their own pointed goals upon. Our focus is initially
+to get the game working everywhere. Sane new features are also smiled upon.
+</p>
+<h2>Progress.</h2>
+<p>While a lot is on the horizon, quite a few goals have been completed already. Quake 3
+now works natively on x86_64 and PowerPC architectures, and the game builds and runs
+in FreeBSD. SDL is now used for about everything, making the game far easier to port
+to new platforms and architectures. Many bugs have been fixed. A more in-depth database
+of new features, working status of platforms, and bugs is the <a href="?page=status">Status</a>
+section.</p>
+<h2>The future</h2>
diff --git a/web/include/instruc.php b/web/include/instruc.php
new file mode 100644
index 0000000..3643adf
--- /dev/null
+++ b/web/include/instruc.php
@@ -0,0 +1,13 @@
+<h2>How to check out and build:</h2>
+<ol>
+	<li>Step 1</li>
+	<li>Step 2</li>
+	<li>Step 3</li>
+	<li>Step 4</li>
+	<li>Step 5</li>
+	<li>Step etc</li>
+</ol>
+<h2>How to submit your changes:</h2>
+<p>rules rules rules, angry zakk-style text rules rules rules, angry zakk-style text rules rules rules, angry zakk-style text rules rules rules, angry zakk-style text rules rules rules, angry zakk-style text rules rules rules, angry zakk-style textrules rules rules, angry zakk-style text</p>
+<p>rules rules rules, angry zakk-style textrules rules rules, angry zakk-style text rules rules rules, angry zakk-style textrules rules rules, angry zakk-style textrules rules rules, angry zakk-style text rules rules rules, angry zakk-style textrules rules rules, angry zakk-style textrules rules rules, angry zakk-style text rules rules rules, angry zakk-style textrules rules rules, angry zakk-style text</p>
+<p>rules rules rules, angry zakk-style textrules rules rules, angry zakk-style text rules rules rules, angry zakk-style textrules rules rules, angry zakk-style textrules rules rules, angry zakk-style text rules rules rules, angry zakk-style textrules rules rules, angry zakk-style textrules rules rules, angry zakk-style text rules rules rules, angry zakk-style textrules rules rules, angry zakk-style textrules rules rules, angry zakk-style text rules rules rules, angry zakk-style textrules rules rules, angry zakk-style text</p>
diff --git a/web/include/status.php b/web/include/status.php
new file mode 100644
index 0000000..8aab09c
--- /dev/null
+++ b/web/include/status.php
@@ -0,0 +1,2 @@
+<h2>tba</h2>
+<p>asdasd</p>
diff --git a/web/include/thebrain.php b/web/include/thebrain.php
index eb36a73..0baf3d0 100644
--- a/web/include/thebrain.php
+++ b/web/include/thebrain.php
@@ -6,12 +6,14 @@ $navlist = array(
 );
 
 function include_safe($file) {
-	if (strpos(realpath("include/$file"), realpath($_SERVER['DOCUMENT_ROOT'])) !== 0) {
-		$code = 403;
-		require("errors.php");
-	}
-	elseif (file_exists("include/$file")) {
-		include($file);
+	if (file_exists("include/$file")) {
+		if (strpos(realpath("include/$file"), realpath($_SERVER['DOCUMENT_ROOT'])) !== 0) {
+			$code = 403;
+			require("errors.php");
+		}
+		else {
+			include($file);
+		}
 	}
 	else {
 		$code = 404;
@@ -24,5 +26,5 @@ if (!$_GET['page']) {
 }
 else {
 	$page = $_GET['page'];
-
+}
 ?>
diff --git a/web/ioq3.css b/web/ioq3.css
index 8ae8bd8..a7240be 100644
--- a/web/ioq3.css
+++ b/web/ioq3.css
@@ -5,7 +5,13 @@ body, html {
 	background-color: #888;
 }
 
+#content {
+	float: left;
+	clear: left;
+}
+
 #footer {
+	clear: left;
 	color: #4d4d4d;
 	background-color: transparent;
 	border-top: .1em dashed #222;
@@ -19,6 +25,16 @@ body, html {
 	background-color: transparent;
 }
 
+#navigation {
+	float: right;
+	list-style: none;
+	display: inline;
+}
+
+#navigation li {
+	display: inline;
+}
+
 :link, :visited {
 	color: black;
 	background-color: transparent;
@@ -32,6 +48,7 @@ h1, :link:hover, :visited:hover {
 }
 
 h1 {
+	float: left;
 	font-size: 1.75em;
 }
 
@@ -60,3 +77,7 @@ img {
 	font-size: 1.2em;
 	font-weight: bold;
 }
+
+.current {
+	font-weight: bold;
+}
diff --git a/web/newindex.php b/web/newindex.php
index 95d7a0c..bb3c1c6 100644
--- a/web/newindex.php
+++ b/web/newindex.php
@@ -3,27 +3,30 @@ set_include_path("include");
 require("thebrain.php");
 ob_start();
 ?>
-<?xml version="1.0" encoding="UTF-8" ?>
+<?php //hawhaw
+	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>";
+?>
 <!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" />
-	<title>icculus.org/quake3 <?php //echo current section ?></title>
+	<title>icculus.org/quake3: <?php echo $navlist[$page]; ?></title>
 	<link rel="stylesheet" href="ioq3.css" type="text/css" />
 </head>
 <body>
 	<h1>icculus.org/quake3</h1>
-	<div id="navigation">
+	<ul id="navigation">
 		<?php
 		foreach ($navlist as $file => $alias) {
-			echo "<li";
-			if ($file == $_GET['page']) { echo " class=\"current\" "; }
-			echo "><a href=\"/$file\">$alias</a></li>\n";
+			echo "<li>";
+			if ($file != $page) { echo "<a href=\"?page=$file\">$alias</a>"; }
+			else { echo "<span class=\"current\">$alias</span>"; }
+			echo "</li>\n";
 		}
 		?>
-	</div>
+	</ul>
 	<div id="content">
-		<?php safe_include($_GET['page']); ?>
+		<?php include_safe("$page.php"); ?>
 	</div>
 	<div id="footer">
 		<a href="http://jigsaw.w3.org/css-validator/validator?uri=http://icculus.org/quake3/ioq3.css">