Basic index page that works correctly

13 vuotta sitten · f56c158d31
--- a/build.py
+++ b/build.py
@@ -15,7 +15,7 @@ from mako.lookup import TemplateLookup

 def myapp(environ, start_response):
    start_response("200 OK", [("Content-Type", "text/html")])
    lookup = TemplateLookup(directories=["{{support_dir}}"])
    lookup = TemplateLookup(directories=["{{pages_dir}}"])
    template = Template(filename="{{src}}", module_directory="{{temp_dir}}",
                        lookup=lookup)
    return [template.render(environ=environ).encode("utf8")]
@@ -37,7 +37,7 @@ class Builder(object):
        self.build_dir = "www"
        self.static_dir = "static"
        self.pages_dir = "pages"
        self.support_dir = "support"
        self.support_dir = "pages/support"
        self.temp_dir = "temp"
        self.rs_file = "rewrite.script"

@@ -63,7 +63,7 @@ class Builder(object):

        logger.debug("build {0} -> {1}".format(src, dest))
        content = page_src.replace("{{src}}", src)
        content = content.replace("{{support_dir}}", self.support_dir)
        content = content.replace("{{pages_dir}}", self.pages_dir)
        content = content.replace("{{temp_dir}}", self.temp_dir)
        with open(dest, "w") as fp:
            fp.write(content)
@@ -94,6 +94,8 @@ class Builder(object):
        logger = self.root.getChild("pages")
        pages = os.listdir(self.pages_dir)
        for page in pages:
            if not os.path.isfile(os.path.join(self.pages_dir, page)):
                continue
            self._gen_page(page, logger)

    def gen_zws(self):
--- a/pages/hello.mako
+++ b/pages/hello.mako
@@ -1 +0,0 @@
 Hello World!
--- a/pages/index.mako
+++ b/pages/index.mako
@@ -1,3 +1,3 @@
 <%include file="header.mako" args="title='Index Page'"/>
 <%include file="/support/header.mako" args="title='Index Page'"/>
 <p>Earwig!</p>
 <%include file="footer.mako"/>
 <%include file="/support/footer.mako"/>
--- a/pages/support/footer.mako
+++ b/pages/support/footer.mako
@@ -0,0 +1,2 @@
    </body>
 </html>
--- a/pages/support/header.mako
+++ b/pages/support/header.mako
@@ -0,0 +1,8 @@
 <%page args="title"/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
    <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
        <title>${title} - earwig@toolserver</title>
    </head>
    <body>
--- a/support/footer.mako
+++ b/support/footer.mako
@@ -1,2 +0,0 @@
 </body>
 </html>
--- a/support/header.mako
+++ b/support/header.mako
@@ -1,5 +0,0 @@
 <html>
 <head>
 <title>${title}</title>
 </head>
 <body>