abstract demo_home

mattvonrocketstein · Jan 22, 2015 · 4803dd8 · 4803dd8
1 parent da0ac9e
commit 4803dd8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/corkscrew/demo/views.py b/corkscrew/demo/views.py
@@ -3,6 +3,7 @@
 import demjson
 from collections import OrderedDict
 
+from corkscrew.admin import AdminView
 from corkscrew.views import View
 from corkscrew.views import JSONEdit
 from corkscrew.comet import SijaxDemo
@@ -14,26 +15,12 @@ class MyMenu(MakeMenu):
     pass
 
 class Home(View):
-    url = '/'
 
-    @View.use_local_template
+    url      = '/'
+    template = 'demo_home.html'
+
     def main(self):
-        """
-        <strong>various demos</strong>
-        <div style="margin-left:15px">
-            {% for k,v in demos.items()%}
-            <b><a href="{{k}}">{{k}}</a></b><br/><span style=margin-left:15px>
-            {{v}}</span><br/><br/>
-            {%endfor%}
-        </div><hr>
-        <strong>app metatdata</strong>
-        <table style="margin-left:15px">
-            {% for k,v in app_metadata.items()%}
-            <tr><td><b>{{k}}</b></td><td>{{v}}</td></tr>
-            {%endfor%}
-        </table><hr>
-        """
-        return dict(
+        return self.render(
             demos=OrderedDict(
                 [ ['/comet?start=1','comet demo (via sijax)'],
                   ['/json_editor','a simple json editor'],
@@ -74,7 +61,7 @@ def get_json(self):
                      subobj = dict(
                          arr=["foo", "ha"],
                          numero= 1))))
-from corkscrew.admin import AdminView
+
 __views__ = [
     Home, Nav,
     DemoPage,

diff --git a/corkscrew/templates/demo_home.html b/corkscrew/templates/demo_home.html
@@ -0,0 +1,25 @@
+{%extends "layout.html"%}
+
+{%block body_title%} {{body_title or "admin"}} {%endblock%}
+
+{%block body%}
+<strong>various demos</strong>
+<div style="margin-left:15px">
+  {% for k,v in demos.items()%}
+  <b><a href="{{k}}">{{k}}</a></b><br/><span style=margin-left:15px>
+    {{v}}</span><br/><br/>
+  {%endfor%}
+</div>
+<br/>
+<hr/>
+<br/>
+<strong>app metatdata</strong>
+<table style="margin-left:15px">
+  {% for k,v in app_metadata.items()%}
+  <tr><td><b>{{k}}</b></td><td>{{v}}</td></tr>
+  {%endfor%}
+</table>
+<br/>
+<hr/>
+
+{%endblock%}