From c2e374964a95d103de0b2e58a989c2d90a636556 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Wed, 16 Jan 2013 07:51:27 +0100
Subject: [PATCH] Fix project-not-found page and project URLs

---
 public_html/modules/error/project.php    |  3 ++-
 public_html/templates/error/project.tpl  |  3 +++
 public_html/templates/project/index.tpl  |  6 +++---
 public_html/templates/project/layout.tpl | 14 +++++++-------
 4 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 public_html/templates/error/project.tpl

diff --git a/public_html/modules/error/project.php b/public_html/modules/error/project.php
index 32f1e38..e3a9600 100644
--- a/public_html/modules/error/project.php
+++ b/public_html/modules/error/project.php
@@ -13,4 +13,5 @@
  
 if(!isset($_APP)) { die("Unauthorized."); }
 
-$sPageContents = "That project does not exist.";
+$sPageContents = NewTemplater::Render("error/project", $locale->strings, array());
+$router->uVariables['page_type'] = "";
diff --git a/public_html/templates/error/project.tpl b/public_html/templates/error/project.tpl
new file mode 100644
index 0000000..536c998
--- /dev/null
+++ b/public_html/templates/error/project.tpl
@@ -0,0 +1,3 @@
+<section>
+	The project you are looking for does not appear to exist.
+</section>
diff --git a/public_html/templates/project/index.tpl b/public_html/templates/project/index.tpl
index 6817e8d..6e597aa 100644
--- a/public_html/templates/project/index.tpl
+++ b/public_html/templates/project/index.tpl
@@ -2,14 +2,14 @@
 	<section class="download">
 		<h3>Downloads</h3>
 		{%if isempty|stable-version == false}
-			<a href="download/stable" class="download">
+			<a href="{%?project-url}/download/stable" class="download">
 				<b class="stable"></b>
 				<strong>Latest stable</strong>
 				{%?stable-version}
 			</a>
 		{%/if}
 		{%if isempty|experimental-version == false}
-			<a href="download/experimental" class="download">
+			<a href="{%?project-url}/download/experimental" class="download">
 				<b class="experimental"></b>
 				<strong>Latest testing</strong>
 				{%?experimental-version}
@@ -37,7 +37,7 @@
 					<li><strong>{%?ticket[title]}</strong> {%?ticket[date]}</li>
 				{%/foreach}
 				{%if more-tickets == true}
-					<li class="more"><a href="tickets">more...</a></li>
+					<li class="more"><a href="{%?project-url}/tickets">more...</a></li>
 				{%/if}
 			{%else}
 				No tickets.
diff --git a/public_html/templates/project/layout.tpl b/public_html/templates/project/layout.tpl
index dc99c3f..f495de4 100644
--- a/public_html/templates/project/layout.tpl
+++ b/public_html/templates/project/layout.tpl
@@ -4,13 +4,13 @@
 	<div class="clear"></div>
 </div>
 <ul class="menu">
-	<li class="active"><a href="#">Overview</a></li>
-	<li><a href="#">Downloads</a></li>
-	<li><a href="#">Code</a></li>
-	<li><a href="#">Tickets</a></li>
-	<li><a href="#">Forum</a></li>
-	<li><a href="#">Contributors</a></li>
-	<li><a href="#">Invitations</a></li>
+	<li class="active"><a href="{%?project-url}">Overview</a></li>
+	<li><a href="{%?project-url}/downloads">Downloads</a></li>
+	<li><a href="{%?project-url}/code">Code</a></li>
+	<li><a href="{%?project-url}/tickets">Tickets</a></li>
+	<li><a href="{%?project-url}/forum">Forum</a></li>
+	<li><a href="{%?project-url}/contributors">Contributors</a></li>
+	<li><a href="{%?project-url}/invitations">Invitations</a></li>
 	<li class="clear"></li>
 </ul>
 <div class="main">