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

diff --git a/www/ipfire.py b/www/ipfire.py
index 283ed11a8386b04082b11926c48469290b3947c5..1e8b537600c9ca766622cfe617cf38276bda3189 100644 (file)
--- 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 8823fc0ea268eb439f7c07b30136bdeb9f701213..57a397b8c3966872508c6ffd1f3aef2ba35915be 100644 (file)
--- 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>