[z3-checkins] r5579 - in z3/www/trunk: . layout text

[faassen at codespeak.net]

Author: faassen
Date: Wed Jul 14 20:04:04 2004
New Revision: 5579

Modified:
   z3/www/trunk/layout/main_layout.html
   z3/www/trunk/mkwebsite.py
   z3/www/trunk/text/index.txt
Log:
Tweaks so that project links are auto generated on main z3 base page.


Modified: z3/www/trunk/layout/main_layout.html
==============================================================================
--- z3/www/trunk/layout/main_layout.html	(original)
+++ z3/www/trunk/layout/main_layout.html	Wed Jul 14 20:04:04 2004
@@ -27,6 +27,8 @@
 <div id="Content">
 <h1>{{title}}</h1>
 {{body}}
+<h2>Z3 Base Projects</h2>
+{{project_links}}
 </div>
 </div>
 </body>

Modified: z3/www/trunk/mkwebsite.py
==============================================================================
--- z3/www/trunk/mkwebsite.py	(original)
+++ z3/www/trunk/mkwebsite.py	Wed Jul 14 20:04:04 2004
@@ -18,10 +18,18 @@
     def registerProject(self, project):
         self._projects.append(project)
        
-    def getMainProjectLinks(self):
-        result = [(self._root.getShortTitle(), 'index.html')]
+    def getMainProjectLinks(self, short_title=True):
+        if short_title:
+            title = self._root.getShortTitle()
+        else:
+            title = self._root.getTitle()
+        result = [(title, 'index.html')]
         for project in self._projects:
-            result.append((project.getShortTitle(), project.getName()))
+            if short_title:
+                title = project.getShortTitle()
+            else:
+                title = project.getTitle()
+            result.append((title, project.getName()))
         return result
     
     def getProjectLinks(self):
@@ -155,6 +163,7 @@
         site.getRootLayouter(),
         '.',
         quick_links=quick_links,
+        project_links=site.getMainProjectLinks(short_title=False)[1:]
         )
    
     # redirect old five page

Modified: z3/www/trunk/text/index.txt
==============================================================================
--- z3/www/trunk/text/index.txt	(original)
+++ z3/www/trunk/text/index.txt	Wed Jul 14 20:04:04 2004
@@ -5,12 +5,3 @@
 
 The *Zope 3 Base* project aims to offer an approachable area for
 developers of Zope 3 related software.
-
-Sub projects
-------------
-
-* `Five: Zope 3 in Zope 2`_
-* `modzope: Zope 3 integrated into Apache`_
-
-.. _`Five: Zope 3 in Zope 2`: five
-.. _`modzope: Zope 3 integrated into Apache`: modzope