template works, still need to escape

2 files changed, 7 insertions, 4 deletions

diff --git a/app.py b/app.py
index 95d38cf..e8cabe8 100644
--- a/app.py
+++ b/app.py
@@ -4,17 +4,18 @@ import random
 import requests
 import string
 
-from bottle import post, route, request, run, static_file
+from bottle import post, route, request, run, static_file, template
 
 @route('/')
 def index(name='home'):
-    return static_file('index.html', root=os.path.dirname(__file__), mimetype='text/html')
+    return template('index.html', sig=None)
 
 @route('/s/:id')
 def sig(id='home'):
     url = 'https://pinkyswear.cloudant.com/pinkyswear/%s' % id
     r = requests.get(url, auth=('pinkyswear', 'abc123'))
-    return json.loads(r.content)['s']
+    sig = json.loads(r.content)['s']
+    return template('index.html', sig=sig)
 
 @post('/s')
 def sig(id='home'):
diff --git a/index.html b/index.html
index 4d9d8b3..7967466 100755
--- a/index.html
+++ b/index.html
@@ -29,7 +29,9 @@
   <script>
     $(document).ready(function() {
       var sig = $('.sigPad').signaturePad({drawOnly:true,errorMessage:"Write the swear",errorMessageDraw:"sign the swear bro"});
-	  //sig.regenerate(sig);
+      %if sig:
+	     sig.regenerate({{ sig }});
+      %end
     });
   </script>
   <script src="https://raw.github.com/yuvadm/pinkyswear/master/js/json2.min.js"></script>