From 66da67fed457c2980fb8b3489ae27f0a381f788c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 15 Oct 2018 20:06:49 +0100 Subject: [PATCH] Drop Menu module Signed-off-by: Michael Tremer --- Makefile.am | 3 +-- src/templates/base.html | 22 ++++++++++++++++++++- src/templates/fireinfo/base.html | 11 +++++++++++ src/templates/modules/menu.html | 33 ------------------------------- src/templates/nopaste/base.html | 9 +++++++++ src/templates/nopaste/create.html | 2 +- src/templates/nopaste/view.html | 2 +- src/web/__init__.py | 2 -- src/web/ui_modules.py | 5 ----- 9 files changed, 44 insertions(+), 45 deletions(-) create mode 100644 src/templates/nopaste/base.html diff --git a/Makefile.am b/Makefile.am index c8fa2e1c..fc856cd0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,8 +142,7 @@ templates_location_DATA = \ templates_locationdir = $(templatesdir)/location templates_modules_DATA = \ - src/templates/modules/map.html \ - src/templates/modules/menu.html + src/templates/modules/map.html templates_modulesdir = $(templatesdir)/modules diff --git a/src/templates/base.html b/src/templates/base.html index a4d190de..90f9f747 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -29,7 +29,27 @@ diff --git a/src/templates/fireinfo/base.html b/src/templates/fireinfo/base.html index eb14a002..55bfc0b8 100644 --- a/src/templates/fireinfo/base.html +++ b/src/templates/fireinfo/base.html @@ -8,3 +8,14 @@ {% end header %} + +{% block menu %} + +{% end block %} diff --git a/src/templates/modules/menu.html b/src/templates/modules/menu.html index 9b3118fc..e69de29b 100644 --- a/src/templates/modules/menu.html +++ b/src/templates/modules/menu.html @@ -1,33 +0,0 @@ - diff --git a/src/templates/nopaste/base.html b/src/templates/nopaste/base.html new file mode 100644 index 00000000..03c872a6 --- /dev/null +++ b/src/templates/nopaste/base.html @@ -0,0 +1,9 @@ +{% extends "../base.html" %} + +{% block menu %} + +{% end block %} diff --git a/src/templates/nopaste/create.html b/src/templates/nopaste/create.html index 0ad8051d..5f8fd01b 100644 --- a/src/templates/nopaste/create.html +++ b/src/templates/nopaste/create.html @@ -1,4 +1,4 @@ -{% extends "../base.html" %} +{% extends "base.html" %} {% block title %} {% if mode == "paste" %} diff --git a/src/templates/nopaste/view.html b/src/templates/nopaste/view.html index 04e00f0a..bd525260 100644 --- a/src/templates/nopaste/view.html +++ b/src/templates/nopaste/view.html @@ -1,4 +1,4 @@ -{% extends "../base.html" %} +{% extends "base.html" %} {% block title %}{{ entry.subject or _("Paste %s") % entry.uuid }}{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index b11f2446..eac0bc0b 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -46,8 +46,6 @@ class Application(tornado.web.Application): "grouper" : grouper, }, "ui_modules" : { - "Menu" : ui_modules.MenuModule, - # Blog "BlogHistoryNavigation": blog.HistoryNavigationModule, "BlogList" : blog.ListModule, diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py index 6984e21f..6a622f6b 100644 --- a/src/web/ui_modules.py +++ b/src/web/ui_modules.py @@ -102,11 +102,6 @@ class MapModule(UIModule): return self.render_string("modules/map.html", latitude=latitude, longitude=longitude) -class MenuModule(UIModule): - def render(self): - return self.render_string("modules/menu.html") - - class MirrorItemModule(UIModule): def render(self, item): return self.render_string("modules/mirror-item.html", item=item) -- 2.39.2