From: Ronald Wiesinger <rowie@uhweb28125.united-hoster.com>
Date: Sun, 1 Feb 2009 17:07:46 +0000 (+0100)
Subject: add links.xml to ipfire.org and add link button to menu.xml
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f21054e4bf8c0306a7494df89c67e97bb36b2eb7;p=ipfire.org.git

add links.xml to ipfire.org and add link button to menu.xml
---

diff --git a/www/ipfire.py b/www/ipfire.py
index 283ed11a..1e8b5376 100644
--- a/www/ipfire.py
+++ b/www/ipfire.py
@@ -182,17 +182,17 @@ class Xml:
 
 	def load(self):
 		self.path = \
-			os.path.join(os.environ['DOCUMENT_ROOT'], "data/%s.xml" % self.page)
+			os.path.join(os.path.dirname(os.environ['SCRIPT_FILENAME']), "data/%s.xml" % self.page)
 		try:
 			f = open(self.path)
 			self.data = f.read()
 			f.close()
 			self.dom = \
 				xml.dom.minidom.parseString(self.data).getElementsByTagName("Site")[0]
-		except IOError:
+		#except IOError:
 			#self.page = "404"
 			#self.load()
-			raise Error404
+		#	raise Error404
 		except:
 			#self.page = "500"
 			#self.load()
diff --git a/www/menu.xml b/www/menu.xml
index 8823fc0e..57a397b8 100644
--- a/www/menu.xml
+++ b/www/menu.xml
@@ -18,4 +18,9 @@
 		<Name lang="en">Development</Name>
 		<Name lang="de">Entwicklung</Name>
 	</Item>
+	<Item uri="links">
+		<Name lang="en">Links</Name>
+		<Name lang="de">Links</Name>
+	</Item>
+
 </Site>