[pypy-svn] r17142 - pypy/extradoc/pypy.org

[hpk at codespeak.net]

Author: hpk
Date: Thu Sep  1 08:51:33 2005
New Revision: 17142

Added:
   pypy/extradoc/pypy.org/eu-logo-small.jpg   (contents, props changed)
Modified:
   pypy/extradoc/pypy.org/confrest.py
   pypy/extradoc/pypy.org/conftest.py
   pypy/extradoc/pypy.org/consortium.txt
   pypy/extradoc/pypy.org/index.txt
Log:
bring the web page into shape, add an EU logo


Modified: pypy/extradoc/pypy.org/confrest.py
==============================================================================
--- pypy/extradoc/pypy.org/confrest.py	(original)
+++ pypy/extradoc/pypy.org/confrest.py	Thu Sep  1 08:51:33 2005
@@ -1,24 +1,30 @@
 from py.__.documentation.confrest import *
 
-class PyPyPage(Page): 
+class PyPyPage(Page):
     def fill(self):
         super(PyPyPage, self).fill()
         self.menubar[:] = html.div(
             html.a("home", href="index.html", class_="menu"), " ",
             html.a("news", href="news.html", class_="menu"), " ",
             html.a("consortium", href="consortium.html", class_="menu"), " ",
+            html.a("community/coding",
+                   href="http://codespeak.net/pypy/dist/pypy/doc/index.html",
+                   class_="menu"), " ",
             " ", id="menubar")
 
-class Project(Project): 
-    title = "PyPy EU Project" 
-    stylesheet = 'style.css'
-    encoding = 'latin1' 
+class Project(Project):
+    title = "PyPy EU Project"
+    stylesheet = 'http://codespeak.net/pypy/dist/pypy/doc/style.css'
+    encoding = 'latin1'
     prefix_title = "EU/PyPy"
     logo = html.div(
-        html.a(
-            html.img(alt="PyPy", id="pyimg", 
-                     src="http://codespeak.net/pypy/img/py-web1.png", 
-                     height=110, width=149)))
-    Page = PyPyPage 
+        html.a(html.img(alt="PyPy", id="pyimg",
+                        src="http://codespeak.net/pypy/img/py-web1.png",
+                        height=110, width=149)),
+        html.img(alt="EU Logo", id="extraimg",
+                 src="eu-logo-small.jpg",
+                 height=105, width=154),
+        )
+    Page = PyPyPage
 
 

Modified: pypy/extradoc/pypy.org/conftest.py
==============================================================================
--- pypy/extradoc/pypy.org/conftest.py	(original)
+++ pypy/extradoc/pypy.org/conftest.py	Thu Sep  1 08:51:33 2005
@@ -1,31 +1,31 @@
 import py
 from py.__.documentation.conftest import Directory, DoctestText, ReSTChecker
 
-class PyPyDoctestText(DoctestText): 
+class PyPyDoctestText(DoctestText):
 
-    def run(self): 
-        # XXX refine doctest support with respect to scoping 
-        return  
-        
-    def execute(self, module, docstring): 
-        # XXX execute PyPy prompts as well 
+    def run(self):
+        # XXX refine doctest support with respect to scoping
+        return
+
+    def execute(self, module, docstring):
+        # XXX execute PyPy prompts as well
         l = []
-        for line in docstring.split('\n'): 
-            if line.find('>>>>') != -1: 
-                line = "" 
-            l.append(line) 
-        text = "\n".join(l) 
-        super(PyPyDoctestText, self).execute(module, text) 
+        for line in docstring.split('\n'):
+            if line.find('>>>>') != -1:
+                line = ""
+            l.append(line)
+        text = "\n".join(l)
+        super(PyPyDoctestText, self).execute(module, text)
 
-        #mod = py.std.types.ModuleType(self.fspath.basename, text) 
-        #self.mergescopes(mod, scopes) 
+        #mod = py.std.types.ModuleType(self.fspath.basename, text)
+        #self.mergescopes(mod, scopes)
         #failed, tot = py.std.doctest.testmod(mod, verbose=1)
         #if failed:
         #    py.test.fail("doctest %s: %s failed out of %s" %(
         #                 self.fspath, failed, tot))
 
-class PyPyReSTChecker(ReSTChecker): 
-    DoctestText = PyPyDoctestText 
-    
-class Directory(Directory): 
-    ReSTChecker = PyPyReSTChecker 
+class PyPyReSTChecker(ReSTChecker):
+    DoctestText = PyPyDoctestText
+
+class Directory(Directory):
+    ReSTChecker = PyPyReSTChecker

Modified: pypy/extradoc/pypy.org/consortium.txt
==============================================================================
--- pypy/extradoc/pypy.org/consortium.txt	(original)
+++ pypy/extradoc/pypy.org/consortium.txt	Thu Sep  1 08:51:33 2005
@@ -15,7 +15,7 @@
 Change Maker http://www.changemaker.nu
 	Beatrice Düring bea at changemaker.nu (assistant project manager)
 
-Merlinux GmbH http://merlinux.de
+merlinux GmbH http://merlinux.de
 	Holger Krekel krekel at merlinux.de (technical director/board)
 
 Heinrich Heine Universität Düsseldorf http://www.uni-duesseldorf.de/

Added: pypy/extradoc/pypy.org/eu-logo-small.jpg
==============================================================================
Binary file. No diff available.

Modified: pypy/extradoc/pypy.org/index.txt
==============================================================================
--- pypy/extradoc/pypy.org/index.txt	(original)
+++ pypy/extradoc/pypy.org/index.txt	Thu Sep  1 08:51:33 2005
@@ -1,9 +1,13 @@
-PyPy
+PyPy EU project title 
+--------------------------------
 
 Researching a higly flexible and modular language platform and
 implementing it by leveraging the Open Source Python Language and
 Community
 
+PyPy EU project description 
+--------------------------------
+
 The PyPy project have been an ongoing Open Source Python language
 implementation since 2003.  In December 2004 PyPy recieved EU-funding
 within the Framework Programme 6, second call for proposals ("Open