demo: Add an example for a couple of buttons

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 38d3756e20d04fe7ebc3f90aca375a02ddecffc0..97cb3aa9699c85025f1ed378ae4dfcf5642c07a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,8 +140,13 @@ westferry_uidir = $(pythondir)/westferry/ui
 templatesdir = $(datadir)/westferry/templates
 
 dist_templates_DATA = \
-       src/templates/base.html \
-       src/templates/demo.html
+       src/templates/base.html
+
+templates_demodir = $(templatesdir)/demo
+
+dist_templates_demo_DATA = \
+       src/templates/demo/forms.html \
+       src/templates/demo/index.html
 
 templates_modulesdir = $(templatesdir)/modules
 

diff --git a/src/templates/demo.html b/src/templates/demo/forms.html
similarity index 67%
rename from src/templates/demo.html
rename to src/templates/demo/forms.html
index 9b3bda1b2c7f79fc5a26de9bcae9b889058c068f..efe03145d7c7c155085bfd93219288d28790ead1 100644 (file)
--- a/src/templates/demo.html
+++ b/src/templates/demo/forms.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block main %}
        {% module Form(form) %}

diff --git a/src/templates/demo/index.html b/src/templates/demo/index.html
new file mode 100644 (file)
index 0000000..6f722a8
--- /dev/null
+++ b/src/templates/demo/index.html
@@ -0,0 +1,15 @@
+{% extends "../base.html" %}
+
+{% block main %}
+       <h3>{{ _("Controls") }}</h3>
+
+       <h4>{{ _("Buttons") }}</h4>
+
+       <div class="button-group">
+               <a class="primary button" href="#">{{ _("Primary") }}</a>
+               <a class="secondary button" href="#">{{ _("Secondary") }}</a>
+               <a class="success button" href="#">{{ _("Success") }}</a>
+               <a class="warning button" href="#">{{ _("Warning") }}</a>
+               <a class="alert button" href="#">{{ _("Alert") }}</a>
+       </div>
+{% end block %}

diff --git a/src/westferry/handlers/demo.py b/src/westferry/handlers/demo.py
index d327899cda6db19ffe6573ea9e611d0a5e8d1796..9cd70e0beaf42765f4480fe3dc9f0d65eaaa723d 100644 (file)
--- a/src/westferry/handlers/demo.py
+++ b/src/westferry/handlers/demo.py
@@ -37,7 +37,7 @@ class DemoBaseHandler(base.BaseHandler):
                m.add_divider()
 
                # Forms
-               m.add_handler(DemoFormHandler)
+               m.add_handler(DemoFormsHandler)
 
                return m
 
@@ -47,15 +47,15 @@ class DemoOverviewHandler(DemoBaseHandler):
        title = N_("Overview")
 
        def get(self):
-               self.render("base.html")
+               self.render("demo/index.html")
 
 
-class DemoFormHandler(DemoBaseHandler):
+class DemoFormsHandler(DemoBaseHandler):
        url = r"/demo/forms"
        title = N_("Forms")
 
        def get(self):
-               self.render("demo.html", form=self.form)
+               self.render("demo/forms.html", form=self.form)
 
        def post(self):
                data = self.form.export()