From 7e00c39a085e6801f01e043e841b7ef7b102a20f Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.net>
Date: Tue, 25 May 2010 14:18:00 +0200
Subject: Move page templates into their own folder

---
 controller.py             |  2 +-
 renderer.py               |  8 +++++---
 templates/add.mako        | 14 -------------
 templates/edit.mako       |  5 -----
 templates/pages/add.mako  | 14 +++++++++++++
 templates/pages/edit.mako |  5 +++++
 templates/pages/show.mako | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 templates/show.mako       | 52 -----------------------------------------------
 8 files changed, 77 insertions(+), 75 deletions(-)
 delete mode 100644 templates/add.mako
 delete mode 100644 templates/edit.mako
 create mode 100644 templates/pages/add.mako
 create mode 100644 templates/pages/edit.mako
 create mode 100644 templates/pages/show.mako
 delete mode 100644 templates/show.mako

diff --git a/controller.py b/controller.py
index 370391a..417046d 100644
--- a/controller.py
+++ b/controller.py
@@ -144,4 +144,4 @@ class FourOhFour:
 
     @staticmethod
     def catch (page = "?"):
-        return web.notfound(render("404", page = page))
+        return web.notfound(render("404", level = "", page = page))
diff --git a/renderer.py b/renderer.py
index 6f983a4..82068b7 100644
--- a/renderer.py
+++ b/renderer.py
@@ -17,9 +17,9 @@ class Renderer:
                 output_encoding='utf-8',
                 format_exceptions = True)
 
-    def render (self, tpl, **kwargs):
+    def render (self, tpl, level = "pages", **kwargs):
         try:
-            t = self.get_tpl(tpl)
+            t = self.get_tpl(tpl, level)
         except mako.exceptions.TopLevelLookupException, e:
             raise web.ctx.app_stack[-1].notfound(tpl)
        
@@ -27,10 +27,12 @@ class Renderer:
 
     __call__ = render
 
-    def get_tpl (self, tpl):
+    def get_tpl (self, tpl, level = ""):
         if not tpl.endswith(".mako"):
             tpl = tpl+".mako"
         
+        tpl = os.path.join(level, tpl)
+
         return self.lookup.get_template(tpl)
     
 # the one and only instance :)
diff --git a/templates/add.mako b/templates/add.mako
deleted file mode 100644
index ac67404..0000000
--- a/templates/add.mako
+++ /dev/null
@@ -1,14 +0,0 @@
-<%inherit file="/page.mako" />
-
-% if not form.valid:
-    ERROR!
-% endif
-
-<form name="add_expense" method="post">
-    ${form.render()}
-    <input type="submit" />
-</form>
-
-<%def name="heading()">
-    Add new expense
-</%def>
diff --git a/templates/edit.mako b/templates/edit.mako
deleted file mode 100644
index 09d5ea4..0000000
--- a/templates/edit.mako
+++ /dev/null
@@ -1,5 +0,0 @@
-<%inherit file="/add.mako" />
-
-<%def name="heading()">
-    Edit expense
-</%def>
diff --git a/templates/pages/add.mako b/templates/pages/add.mako
new file mode 100644
index 0000000..ac67404
--- /dev/null
+++ b/templates/pages/add.mako
@@ -0,0 +1,14 @@
+<%inherit file="/page.mako" />
+
+% if not form.valid:
+    ERROR!
+% endif
+
+<form name="add_expense" method="post">
+    ${form.render()}
+    <input type="submit" />
+</form>
+
+<%def name="heading()">
+    Add new expense
+</%def>
diff --git a/templates/pages/edit.mako b/templates/pages/edit.mako
new file mode 100644
index 0000000..760c706
--- /dev/null
+++ b/templates/pages/edit.mako
@@ -0,0 +1,5 @@
+<%inherit file="add.mako" />
+
+<%def name="heading()">
+    Edit expense
+</%def>
diff --git a/templates/pages/show.mako b/templates/pages/show.mako
new file mode 100644
index 0000000..dc23b9c
--- /dev/null
+++ b/templates/pages/show.mako
@@ -0,0 +1,52 @@
+<%inherit file="/page.mako" />
+
+% for e in exps:
+    % if len(exps) > 1:
+        <h2>${get_d(e)}</h2>
+    % endif
+    % for c in e.catexps:
+        <strong class="details_heading">${c.cat.name}</strong>    ${c.expense}<br/>
+        <div class="details">
+            <ul>
+                % for exp in c.all:
+                    <li><a href=${"/edit/%s" % exp.id | url}>${exp.day}.${exp.month}. -- ${exp.description}: ${exp.expense}</a></li>
+                % endfor
+            </ul>
+        </div>
+    % endfor
+    <strong class="details_heading">Constant:</strong> ${e.constsum}<br/>
+    <div class="details">
+        <ul>
+            % for c in e.consts:
+                <li>${c.monthly} -- ${c.description}</li>
+            % endfor
+        </ul>
+    </div>
+    <strong class="details_heading">In Summa:</strong> ${e.sum}<br />
+    <div class="details">
+        <ul>
+        % for exp in e.all:
+            <li><a href=${"/edit/%s" % exp.id | url}>${exp.day}.${exp.month}. -- ${exp.description}: ${exp.expense}</a></li>
+        % endfor
+        </ul>
+    </div>
+    <br/>
+% endfor
+
+<%def name="heading()">
+    % if len(exps) > 1:
+        Current expenses
+    % else:
+        Expenses for ${get_d(exps[0])}
+    % endif
+
+</%def>
+
+<%def name="get_d(e)">
+    ${e.date.year}/${e.date.month}
+</%def>
+
+<%def name="js()">
+    ${parent.js()}
+    <script type="text/javascript" src=${"/static/js/show.js" | url}></script>
+</%def>
diff --git a/templates/show.mako b/templates/show.mako
deleted file mode 100644
index dc23b9c..0000000
--- a/templates/show.mako
+++ /dev/null
@@ -1,52 +0,0 @@
-<%inherit file="/page.mako" />
-
-% for e in exps:
-    % if len(exps) > 1:
-        <h2>${get_d(e)}</h2>
-    % endif
-    % for c in e.catexps:
-        <strong class="details_heading">${c.cat.name}</strong>    ${c.expense}<br/>
-        <div class="details">
-            <ul>
-                % for exp in c.all:
-                    <li><a href=${"/edit/%s" % exp.id | url}>${exp.day}.${exp.month}. -- ${exp.description}: ${exp.expense}</a></li>
-                % endfor
-            </ul>
-        </div>
-    % endfor
-    <strong class="details_heading">Constant:</strong> ${e.constsum}<br/>
-    <div class="details">
-        <ul>
-            % for c in e.consts:
-                <li>${c.monthly} -- ${c.description}</li>
-            % endfor
-        </ul>
-    </div>
-    <strong class="details_heading">In Summa:</strong> ${e.sum}<br />
-    <div class="details">
-        <ul>
-        % for exp in e.all:
-            <li><a href=${"/edit/%s" % exp.id | url}>${exp.day}.${exp.month}. -- ${exp.description}: ${exp.expense}</a></li>
-        % endfor
-        </ul>
-    </div>
-    <br/>
-% endfor
-
-<%def name="heading()">
-    % if len(exps) > 1:
-        Current expenses
-    % else:
-        Expenses for ${get_d(exps[0])}
-    % endif
-
-</%def>
-
-<%def name="get_d(e)">
-    ${e.date.year}/${e.date.month}
-</%def>
-
-<%def name="js()">
-    ${parent.js()}
-    <script type="text/javascript" src=${"/static/js/show.js" | url}></script>
-</%def>
-- 
cgit v1.2.3-70-g09d2