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

[faassen at codespeak.net]

Author: faassen
Date: Wed Jul 14 18:02:43 2004
New Revision: 5565

Added:
   z3/www/trunk/layout/
      - copied from r5561, z3/util/trunk/layout/
   z3/www/trunk/layout/layout.html
      - copied unchanged from r5562, z3/util/trunk/layout/layout.html
   z3/www/trunk/layout/main_layout.html
      - copied unchanged from r5562, z3/util/trunk/layout/main_layout.html
   z3/www/trunk/layout/redirect.html
      - copied unchanged from r5562, z3/util/trunk/layout/redirect.html
   z3/www/trunk/mkwebsite.py
      - copied, changed from r5561, z3/util/trunk/mkwebsite.py
   z3/www/trunk/publish.py
      - copied, changed from r5561, z3/util/trunk/publish.py
   z3/www/trunk/publish_website.sh
      - copied unchanged from r5561, z3/util/trunk/publish_website.sh
   z3/www/trunk/resource/
      - copied from r5561, z3/util/trunk/resource/
   z3/www/trunk/resource/five-head.png
      - copied unchanged from r5562, z3/util/trunk/resource/five-head.png
   z3/www/trunk/resource/h4_rightmenu.gif
      - copied unchanged from r5562, z3/util/trunk/resource/h4_rightmenu.gif
   z3/www/trunk/resource/pattern.png
      - copied unchanged from r5562, z3/util/trunk/resource/pattern.png
   z3/www/trunk/resource/style.css
      - copied unchanged from r5562, z3/util/trunk/resource/style.css
   z3/www/trunk/text/
   z3/www/trunk/text/index.txt
Removed:
   z3/www/trunk/index.txt
Log:
Move over web construction script into www from util. Move index.txt
into 'text' directory. 


Deleted: /z3/www/trunk/index.txt
==============================================================================
--- /z3/www/trunk/index.txt	Wed Jul 14 18:02:43 2004
+++ (empty file)
@@ -1,18 +0,0 @@
-Zope 3 Base
-===========
-
-*All Your Bobobase Are Belong To Us*
-
-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: run Zope 3 within Apache 2`_
-* `zopexml: XML support for Zope 3`_
-
-.. _`Five: Zope 3 in Zope 2`: five
-.. _`modzope: run Zope 3 within Apache 2`: modzope
-.. _`zopexml: XML support for Zope 3`: zopexml

Copied: z3/www/trunk/mkwebsite.py (from r5561, z3/util/trunk/mkwebsite.py)
==============================================================================
--- z3/util/trunk/mkwebsite.py	(original)
+++ z3/www/trunk/mkwebsite.py	Wed Jul 14 18:02:43 2004
@@ -78,7 +78,7 @@
     
     website.registerPages(
         [
-        Z3Page('www', 'index.txt'),
+        publish.FileRstPage('text/index.txt'),
         ],
         main_layouter,
         '.',

Copied: z3/www/trunk/publish.py (from r5561, z3/util/trunk/publish.py)
==============================================================================
--- z3/util/trunk/publish.py	(original)
+++ z3/www/trunk/publish.py	Wed Jul 14 18:02:43 2004
@@ -95,7 +95,7 @@
         return self._data
 
 class FileResource(Resource):
-    """Simpler way to create a resource that's just a file.
+    """Convenience way to create a Resource from file.
     """
     def __init__(self, path, name=None):
         Resource.__init__(self, PathSource(path), name)
@@ -120,6 +120,12 @@
     def getData(self):
         return html_parts(self._data, initial_header_level=2)
 
+class FileRstPage(RstPage):
+    """Convenience way to create a RstPage from file.
+    """
+    def __init__(self, path, name=None):
+        RstPage.__init__(self, PathSource(path), name)
+        
 class SimplePage(BasePage):
     def __init__(self, name):
         self._name = name + '.html'

Added: z3/www/trunk/text/index.txt
==============================================================================
--- (empty file)
+++ z3/www/trunk/text/index.txt	Wed Jul 14 18:02:43 2004
@@ -0,0 +1,18 @@
+Zope 3 Base
+===========
+
+*All Your Bobobase Are Belong To Us*
+
+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: run Zope 3 within Apache 2`_
+* `zopexml: XML support for Zope 3`_
+
+.. _`Five: Zope 3 in Zope 2`: five
+.. _`modzope: run Zope 3 within Apache 2`: modzope
+.. _`zopexml: XML support for Zope 3`: zopexml