From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Oct 2018 19:06:49 +0000 (+0100)
Subject: Drop Menu module
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66da67fed457c2980fb8b3489ae27f0a381f788c;p=ipfire.org.git

Drop Menu module

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

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 @@
 
 				<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 eb14a002..55bfc0b8 100644
--- 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 9b3118fc..e69de29b 100644
--- 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
index 00000000..03c872a6
--- /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 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)