From: <mako@atdot.cc>
Date: Sun, 16 Sep 2007 20:55:02 +0000 (-0400)
Subject: merged in jinja template move
X-Git-Url: https://projects.mako.cc/source/yourule/commitdiff_plain/ee98f53330408fd5f0c0a27720a3dc0d9edced89?hp=2b6309dc7c65b8849fcd9aa7aae834b014ab5a10

merged in jinja template move
---

diff --git a/templates/_form_elements.tmpl b/templates/_form_elements.tmpl
index b365ce0..001617b 100644
--- a/templates/_form_elements.tmpl
+++ b/templates/_form_elements.tmpl
@@ -1,15 +1,15 @@
 <p><label for="units">Units:</label>
 <select id="unitselector" name="units">
-<option values="centimeters"#if $getVar('units', '') == 'centimeters'# selected="selected"'#end if#>centimeters</option>
-<option value="inches"#if $getVar('units', '') == 'inches'# selected="selected"'#end if#>inches</option>
+<option values="centimeters"<% if units == 'centimeters' %>selected="selected"<% endif %>>centimeters</option>
+<option value="inches"<% if units == 'inches' %>selected="selected"<% endif %>>inches</option>
 </select>
 </p>
 
 <p><label for="pixel_width">Screen width (in pixels):</label>
-<input type="text" name="pixel_width" value="$getVar('pixel_width', None)" /></p>
+<input type="text" name="pixel_width" value="<%= pixel_width %>" /></p>
 
 <p><label for="unit_width"><em>Horizontal</em> screen width (in <span class="unittext">units</span>):</label>
-<input type="text" name="unit_width" value="$getVar('unit_width', None)" /></p>
+<input type="text" name="unit_width" value="<%= unit_width %>" /></p>
 
 <script>
 // simple chunk of javascript to handle changes
diff --git a/templates/gallery.tmpl b/templates/gallery.tmpl
index 0a94f91..b80b538 100644
--- a/templates/gallery.tmpl
+++ b/templates/gallery.tmpl
@@ -1,6 +1,6 @@
-#extends site
+<% extends 'site.tmpl' %>
 
-#block body
+<% block body %>
 
 <h2>Gallery of Existing Rulers</h2>
 
@@ -12,18 +12,18 @@
 <th>Rulers</th>
 <th></th>
 </tr>
-#for $ruler in $rulers
+<% for ruler in rulers %>
 <tr>
-  <td>$ruler.model</td>
-  <td>$ruler.pixel_width</td>
-  <td>$ruler.cm_width()/$ruler.in_width</td>
+  <td><%= ruler.model%></td>
+  <td><%= ruler.pixel_width %></td>
+  <td><%= ruler.cm_width() %>/<%= ruler.in_width() %></td>
   <td>
-    <a href="/show/ruler_${ruler.pixel_width}px_${ruler.cm_width}centimeters.png?fromgallery=true">cm</a>/<a href="/show/ruler_${ruler.pixel_width}px_${ruler.in_width}inches.png?fromgallery=true">in</a>
+    <a href="/show/ruler_<%= ruler.pixel_width %>px_<%= ruler.cm_width() %>centimeters.png?fromgallery=true">cm</a>/<a href="/show/ruler_<%= ruler.pixel_width %>px_<%= ruler.in_width() %>inches.png?fromgallery=true">in</a>
   </td>
-  <td><form method="GET" action="delete/$ruler.id" style="display:inline;">
+  <td><form method="GET" action="delete/<%= ruler.id %>" style="display:inline;">
       <input type="submit" value="delete" /></form></td>
 </tr>
-#end for
+<% endfor %>
 </table>
 
 <h2>Add Your Ruler</h2>
@@ -31,21 +31,21 @@
 <p>If your ruler is not on the list you should add it with the box
 form.</p>
 
-#if $getVar('errormsg', False)
+<% if errormsg %>
 <div class="errormsg">
 <strong>Error</strong><br />
-$getVar('errormsg', False)
+<%= errormsg %>
 </div>
-#end if
+<% endif %>
 <form method="POST" action="/gallery">
 
-#include 'templates/_form_elements.tmpl'
+<% include '_form_elements.tmpl' %>
 
 <p><label for="model">Laptop or monitor model:</label>
 <input type="text" name="model" size="50" maxlength="100"
-value="$getVar("model", None)" /></p>
+value="<%= model %>" /></p>
 
 <input type="Submit" name="submit" value="Save" />
 </form>
 
-#end block body
+<% endblock %>
diff --git a/templates/index.tmpl b/templates/index.tmpl
index 7d2832c..5f3f352 100644
--- a/templates/index.tmpl
+++ b/templates/index.tmpl
@@ -1,6 +1,6 @@
-#extends site
+<% extends 'site.tmpl' %>
 
-#block body
+<% block body %>
 
 <h2>Ruler Gallery </h2>
 
@@ -10,19 +10,18 @@ href="/gallery">ruler gallery</a>.</p>
 
 <h2>Create Custom Ruler</h2>
 
-#if $getVar('errormsg', False)
+<% if errormsg %>
 <div class="errormsg">
 <strong>Error</strong><br />
-$getVar('errormsg', False)
+<%= errormsg %>
 </div>
+<% endif %>
 
-#end if
 <form method="POST" action="/">
 
-#include 'templates/_form_elements.tmpl'
+<% include '_form_elements.tmpl' %>
 
 <input type="Submit" name="submit" value="Generate" />
 <form>
 
-
-#end block body
+<% endblock %>
diff --git a/templates/show_ruler.tmpl b/templates/show_ruler.tmpl
index ac20fd6..d10b380 100644
--- a/templates/show_ruler.tmpl
+++ b/templates/show_ruler.tmpl
@@ -3,17 +3,17 @@
 <link rel="stylesheet" type="text/css" href="/static/style.css" />
 </head>
 <p id="menu">
-<a href="/show/$other_unit_url">show in $other_unit</a>
+<a href="/show/<%= other_unit_url %>">show in <%= other_unit %></a>
 /
-#if $fromgallery
+<% if fromgallery %>
 <a href="/gallery">back to gallery</a>
-#else
-<a href="/gallery/$ruler_url">save for others</a>
-#end if
+<% else %>
+<a href="/gallery/<%= ruler_url %>">save for others</a>
+<% endif %>
 </p>
 
 <div id="rulerimg">
-<img src="/$ruler_url" alt="$ruler_url" />
+<img src="/<%= ruler_url %>" alt="<%= ruler_url %>" />
 </div>
 
 
diff --git a/templates/site.tmpl b/templates/site.tmpl
index 53cfed3..d9eaad3 100644
--- a/templates/site.tmpl
+++ b/templates/site.tmpl
@@ -2,6 +2,7 @@
 <head>
   <link rel="stylesheet" type="text/css" href="/static/style.css" />
   <script src="/static/prototype.js" type="text/javascript"></script>
+  <title>You Rule</title>
 </head>
 <body>
 <div id="wrapper">
@@ -13,10 +14,8 @@
 <div class="mainbox">
   <div class="mainbox_top"><div></div></div>
   <div class="mainbox_content">
-
-#filter Filter
-$body
-#end filter
+    <% block body %>
+    <% endblock %>
   </div>
   <div class="mainbox_bottom"><div></div></div>
 </div>
diff --git a/yourule.py b/yourule.py
index c5ffdb7..3de9e7b 100755
--- a/yourule.py
+++ b/yourule.py
@@ -6,6 +6,16 @@ import sys, os, re
 from storm.locals import *
 from svgruler import SVGRuler
 
+from jinja import Environment, FileSystemLoader
+jinja_env = Environment('<%', '%>', '<%=', '%>', '<%#', '%>', 
+                        loader=FileSystemLoader('templates/'))
+
+def render(filename, vars):
+    web.header("Content-Type","text/html; charset=utf-8")
+    tmpl = jinja_env.get_template(filename + '.tmpl')
+    print tmpl.render(vars)
+    web.debug(web.ctx)
+
 # the url map for the application
 urls = ( '/?', 'index',
          '/ruler_([0-9\.]+)px_([0-9\.]+)([A-Za-z]+).(svg|png|jpg)', 'ruler_img',
@@ -57,8 +67,7 @@ class Ruler(object):
 
 class index:
     def GET(self):
-        web.header("Content-Type","text/html; charset=utf-8")
-        web.render('index.tmpl')
+        render('index', locals())
 
     def POST(self):
         input = web.input()
@@ -69,7 +78,7 @@ class index:
             pixel_width = input['pixel_width']
             unit_width = input['unit_width']
             units = input['units']
-            web.render('index.tmpl')
+            render('index', locals())
         else:
             ruler = Ruler(pixel_width = input['pixel_width'], 
                           unit_width = input['unit_width'], 
@@ -79,7 +88,6 @@ class index:
 
 class show_ruler:
     def GET(self, ruler_url, ext):
-        web.debug('test test')
         if web.input().has_key('fromgallery'):
             fromgallery = True
         else:
@@ -87,9 +95,7 @@ class show_ruler:
 
         other_unit, other_unit_url = get_other_unit(ruler_url)
 
-        web.header("Content-Type","text/html; charset=utf-8")
-        web.render('show_ruler.tmpl')
-
+        render('show_ruler', locals())
 
 class ruler_img:
     def GET(self, pixel_width=None, unit_width=None, units=None, ext=None):
@@ -129,7 +135,7 @@ class gallery:
 
         rulers = store.find(Ruler, Ruler.show == 1)
         rulers.order_by(Ruler.model)
-        web.render('gallery.tmpl')
+        render('gallery', locals())
 
     def POST(self, ruler_url):
         input = web.input()
@@ -154,7 +160,7 @@ class gallery:
 
         rulers = store.find(Ruler, Ruler.show == 1)
         rulers.order_by(Ruler.model)
-        web.render('gallery.tmpl')
+        render('gallery', locals())
 
 class delete:
     def GET(self, id):
@@ -211,8 +217,6 @@ def validate_input(input):
 
     return(errormsg)
 
-# render the site template here so that i can use it later
-web.render('site.tmpl', None, True, 'site')
 
 web.webapi.internalerror = web.debugerror
 if __name__ == "__main__":