Drop Menu module

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

diff --git a/Makefile.am b/Makefile.am
index c8fa2e1c4bdd68087419d79eeb8ea4dc8de63fca..fc856cd08a3da98aa0f9d5fc5c4b645090659075 100644 (file)
--- 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 a4d190de6f45bea0cf133ec681fd344aa44a0b20..90f9f747813da27043781a32a15a1c0c2ef1304e 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -29,7 +29,27 @@
 
                                <div class="collapse navbar-collapse" id="navbar">
                                        {% block menu %}
-                                               {% module Menu() %}
+                                               <ul class="navbar-nav ml-auto">
+                                                       <li class="nav-item d-sm-block d-md-block d-lg-none">
+                                                               <a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">{{ _("Home") }}</a>
+                                                       </li>
+
+                                                       <li class="nav-item">
+                                                               <a class="nav-link {% if request.path == "/features" %}active{% end %}" href="/features">{{ _("Features") }}</a>
+                                                       </li>
+
+                                                       <li class="nav-item">
+                                                               <a class="nav-link {% if request.path.startswith("/download") %}active{% end %}" href="/download">{{ _("Download") }}</a>
+                                                       </li>
+
+                                                       <li class="nav-item">
+                                                               <a class="nav-link {% if request.path == "/get-support" %}active{% end %}" href="/get-support">{{ _("Support") }}</a>
+                                                       </li>
+
+                                                       <li class="nav-item">
+                                                               <a class="nav-link {% if request.path == "/get-involved" %}active{% end %}" href="/get-involved">{{ _("Community") }}</a>
+                                                       </li>
+                                               </ul>
                                        {% end block %}
                                </div>
 

diff --git a/src/templates/fireinfo/base.html b/src/templates/fireinfo/base.html
index eb14a00215b6f933ba3d638452645476e10d858f..55bfc0b8999f8c8b8589eb11f19c6289691bca31 100644 (file)
--- a/src/templates/fireinfo/base.html
+++ b/src/templates/fireinfo/base.html
@@ -8,3 +8,14 @@
                </div>
        </header>
 {% end header %}
+
+{% block menu %}
+       <ul class="navbar-nav ml-auto">
+               <li class="nav-item">
+                       <a class="nav-link" href="/device/vendors">{{ _("Device Vendors") }}</a>
+               </li>
+               <li class="nav-item">
+                       <a class="nav-link" href="/statistics">{{ _("Statistics") }}</a>
+               </li>
+       </ul>
+{% end block %}

diff --git a/src/templates/modules/menu.html b/src/templates/modules/menu.html
index 9b3118fcf5733020253e17ec16a590307124eee4..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/templates/modules/menu.html
+++ b/src/templates/modules/menu.html
@@ -1,33 +0,0 @@
-<ul class="navbar-nav ml-auto">
-       {% if hostname in ("www.ipfire.org", "dev.ipfire.org") %}
-               <li class="nav-item d-sm-block d-md-block d-lg-none">
-                       <a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">{{ _("Home") }}</a>
-               </li>
-               <li class="nav-item">
-                       <a class="nav-link {% if request.path == "/features" %}active{% end %}" href="/features">{{ _("Features") }}</a>
-               </li>
-
-               <li class="nav-item">
-                       <a class="nav-link {% if request.path.startswith("/download") %}active{% end %}" href="/download">{{ _("Download") }}</a>
-               </li>
-
-               <li class="nav-item">
-                       <a class="nav-link {% if request.path == "/get-support" %}active{% end %}" href="/get-support">{{ _("Support") }}</a>
-               </li>
-
-               <li class="nav-item">
-                       <a class="nav-link {% if request.path == "/get-involved" %}active{% end %}" href="/get-involved">{{ _("Community") }}</a>
-               </li>
-       {% elif hostname == "fireinfo.ipfire.org" %}
-               <li class="nav-item">
-                       <a class="nav-link" href="/device/vendors">{{ _("Device Vendors") }}</a>
-               </li>
-               <li class="nav-item">
-                       <a class="nav-link" href="/statistics">{{ _("Statistics") }}</a>
-               </li>
-       {% elif hostname == "nopaste.ipfire.org" %}
-               <li class="nav-item">
-                       <a class="nav-link" href="/?mode=upload">{{ _("Upload file") }}</a>
-               </li>
-       {% end %}
-</ul>

diff --git a/src/templates/nopaste/base.html b/src/templates/nopaste/base.html
new file mode 100644 (file)
index 0000000..03c872a
--- /dev/null
+++ b/src/templates/nopaste/base.html
@@ -0,0 +1,9 @@
+{% extends "../base.html" %}
+
+{% block menu %}
+       <ul class="navbar-nav ml-auto">
+               <li class="nav-item">
+                       <a class="nav-link" href="/?mode=upload">{{ _("Upload file") }}</a>
+               </li>
+       </ul>   
+{% end block %}

diff --git a/src/templates/nopaste/create.html b/src/templates/nopaste/create.html
index 0ad8051d8c460d11c0795ee421f13104117e592c..5f8fd01b433dc033e6bfd1c5d4cc8bed102a122e 100644 (file)
--- 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 04e00f0a49d9502f9a0ee594439346fedf1ebcd5..bd5252604a3681381575e6a583f91a279b4ed064 100644 (file)
--- 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 b11f24466e7c3a2b7cf75d2039c3dfb579a055c2..eac0bc0b2cbad1a6270a28e1dbc961f8fa2b8c3d 100644 (file)
--- 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 6984e21f73fceaa91a6dd7d7a65e264f5a4a99c6..6a622f6b3327bff0ef3ad1520c9f7c40bbeb165c 100644 (file)
--- 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)