From ba309c2cc0b97e8d06e50e781580b72bba4a5287 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 1 Dec 2021 17:30:04 +0000 Subject: [PATCH] demo: Add an example for a couple of buttons Signed-off-by: Michael Tremer --- Makefile.am | 9 +++++++-- src/templates/{demo.html => demo/forms.html} | 2 +- src/templates/demo/index.html | 15 +++++++++++++++ src/westferry/handlers/demo.py | 8 ++++---- 4 files changed, 27 insertions(+), 7 deletions(-) rename src/templates/{demo.html => demo/forms.html} (67%) create mode 100644 src/templates/demo/index.html diff --git a/Makefile.am b/Makefile.am index 38d3756..97cb3aa 100644 --- 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 9b3bda1..efe0314 100644 --- 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 index 0000000..6f722a8 --- /dev/null +++ b/src/templates/demo/index.html @@ -0,0 +1,15 @@ +{% extends "../base.html" %} + +{% block main %} +

{{ _("Controls") }}

+ +

{{ _("Buttons") }}

+ + +{% end block %} diff --git a/src/westferry/handlers/demo.py b/src/westferry/handlers/demo.py index d327899..9cd70e0 100644 --- 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() -- 2.47.3