From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Oct 2018 10:01:34 +0000 (+0000)
Subject: fireinfo: Drop base template
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62eaa617a0f7bacf6a4cc3fdcf429fd632fb7d18;p=ipfire.org.git

fireinfo: Drop base template

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

diff --git a/Makefile.am b/Makefile.am
index cbc79bf4..211cc000 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,7 +138,6 @@ templates_download_DATA = \
 templates_downloaddir = $(templatesdir)/download
 
 templates_fireinfo_DATA = \
-	src/templates/fireinfo/base.html \
 	src/templates/fireinfo/driver.html \
 	src/templates/fireinfo/index.html \
 	src/templates/fireinfo/i-use-1.png \
diff --git a/src/templates/base.html b/src/templates/base.html
index 8e4b9f60..70e6569d 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -23,6 +23,8 @@
 
 					{% if hostname == "blog.ipfire.org" %}
 						{{ _("Blog") }}
+					{% elif hostname == "fireinfo.ipfire.org" %}
+						{{ _("Fireinfo") }}
 					{% elif hostname == "mirrors.ipfire.org" %}
 						{{ _("Mirrors") }}
 					{% elif hostname == "people.ipfire.org" %}
@@ -114,6 +116,27 @@
 								<span class="fas fa-heart"></span> {{ _("Donate") }}
 							</a>
 						</div>
+					{% elif hostname == "fireinfo.ipfire.org" %}
+						<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
+								aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
+							<span class="fas fa-bars"></span>
+						</button>
+
+						<div class="collapse navbar-collapse" id="navbar">
+							<ul class="navbar-nav ml-auto">
+								<li class="nav-item">
+									<a class="nav-link {% if request.path == "/device/vendors" %}active{% end %}" href="/device/vendors">
+										{{ _("Vendors") }}
+									</a>
+								</li>
+
+								<li class="nav-item">
+									<a class="nav-link {% if request.path == "/drafts" %}active{% end %}" href="/statistics">
+										{{ _("Statistics") }}
+									</a>
+								</li>
+							</ul>
+						</div>
 					{% elif hostname == "nopaste.ipfire.org" %}
 						<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
 								aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
diff --git a/src/templates/fireinfo/base.html b/src/templates/fireinfo/base.html
deleted file mode 100644
index 55bfc0b8..00000000
--- a/src/templates/fireinfo/base.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "../base.html" %}
-
-{% block header %}
-	<header class="jumbotron subhead" id="overview">
-		<div class="container">
-			<h1>{{ _("Fireinfo") }}</h1>
-			<p class="lead">{{ _("A hardware data collection tool for IPFire") }}</p>
-		</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/fireinfo/index.html b/src/templates/fireinfo/index.html
index 722838ac..619582c4 100644
--- a/src/templates/fireinfo/index.html
+++ b/src/templates/fireinfo/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}Fireinfo{% end block %}
 
diff --git a/src/templates/fireinfo/profile-notfound.html b/src/templates/fireinfo/profile-notfound.html
index e6aa1ace..e26842d8 100644
--- a/src/templates/fireinfo/profile-notfound.html
+++ b/src/templates/fireinfo/profile-notfound.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Profile not found") }}}{% end block %}
 
diff --git a/src/templates/fireinfo/stats-admin.html b/src/templates/fireinfo/stats-admin.html
index f9c66fa4..aa1d1f19 100644
--- a/src/templates/fireinfo/stats-admin.html
+++ b/src/templates/fireinfo/stats-admin.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Fireinfo") }}{% end block %}