From 081800caec7fcea29d83143ea8f985c29ae5a27a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 17 Jul 2018 14:06:04 +0100 Subject: [PATCH] Drop some extra base templates Signed-off-by: Michael Tremer --- Makefile.am | 1 - src/templates/base-1.html | 1 - src/templates/base-2.html | 13 ----- src/templates/base-feature.html | 71 -------------------------- src/templates/donate.html | 2 +- src/templates/download-splash.html | 2 +- src/templates/download.html | 2 +- src/templates/downloads-all.html | 2 +- src/templates/downloads-index.html | 2 +- src/templates/downloads-item.html | 2 +- src/templates/downloads-mirrors.html | 2 +- src/templates/error.html | 2 +- src/templates/index.html | 2 +- src/templates/mirrors-item.html | 2 +- src/templates/mirrors.html | 2 +- src/templates/static/chat.html | 2 +- src/templates/static/get-involved.html | 2 +- src/templates/static/get-started.html | 2 +- src/templates/static/get-support.html | 2 +- src/templates/static/hardware.html | 2 +- src/templates/static/legal.html | 2 +- 21 files changed, 17 insertions(+), 103 deletions(-) delete mode 100644 src/templates/base-1.html delete mode 100644 src/templates/base-2.html delete mode 100644 src/templates/base-feature.html diff --git a/Makefile.am b/Makefile.am index 038a969a..6e806e7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,7 +99,6 @@ webdir = $(backenddir)/web templates_DATA = \ src/templates/base.html \ - src/templates/base-1.html \ src/templates/donate.html \ src/templates/error.html \ src/templates/error-404.html \ diff --git a/src/templates/base-1.html b/src/templates/base-1.html deleted file mode 100644 index 94d9808c..00000000 --- a/src/templates/base-1.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "base.html" %} diff --git a/src/templates/base-2.html b/src/templates/base-2.html deleted file mode 100644 index f2c5ff5e..00000000 --- a/src/templates/base-2.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base.html" %} - -{% block body %} -
-
- {% block bodyA %}{% end block %} -
- -
- {% block bodyB %}{% end block %} -
-
-{% end block %} diff --git a/src/templates/base-feature.html b/src/templates/base-feature.html deleted file mode 100644 index 219a052b..00000000 --- a/src/templates/base-feature.html +++ /dev/null @@ -1,71 +0,0 @@ -{% extends "base-2.html" %} - -{% block bodyB %} - - -

{{ _("Features") }}

- -{% end block %} diff --git a/src/templates/donate.html b/src/templates/donate.html index ac4e942e..4393e263 100644 --- a/src/templates/donate.html +++ b/src/templates/donate.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Donate") }}{% end block %} diff --git a/src/templates/download-splash.html b/src/templates/download-splash.html index 4ed6d62d..c06ec8ac 100644 --- a/src/templates/download-splash.html +++ b/src/templates/download-splash.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Thanks for downloading IPFire") }}{% end block %} diff --git a/src/templates/download.html b/src/templates/download.html index 68b24d5f..64bec138 100644 --- a/src/templates/download.html +++ b/src/templates/download.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Download IPFire") }}{% end block %} diff --git a/src/templates/downloads-all.html b/src/templates/downloads-all.html index 855c1046..f78d3327 100644 --- a/src/templates/downloads-all.html +++ b/src/templates/downloads-all.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Ancient Downloads") }}{% end block %} diff --git a/src/templates/downloads-index.html b/src/templates/downloads-index.html index 68049c33..60dd48a4 100644 --- a/src/templates/downloads-index.html +++ b/src/templates/downloads-index.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Download Center") }}{% end block %} diff --git a/src/templates/downloads-item.html b/src/templates/downloads-item.html index ed8348fd..5e33f788 100644 --- a/src/templates/downloads-item.html +++ b/src/templates/downloads-item.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}Download {{ release.name }}{% end block %} diff --git a/src/templates/downloads-mirrors.html b/src/templates/downloads-mirrors.html index 61a2c912..811125de 100644 --- a/src/templates/downloads-mirrors.html +++ b/src/templates/downloads-mirrors.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Mirror-Server") }}{% end block %} diff --git a/src/templates/error.html b/src/templates/error.html index 80e33660..405a28a4 100644 --- a/src/templates/error.html +++ b/src/templates/error.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Error") }} {{ code }}{% end block %} diff --git a/src/templates/index.html b/src/templates/index.html index f37280e0..4e72a650 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Welcome to IPFire") }}{% end block %} diff --git a/src/templates/mirrors-item.html b/src/templates/mirrors-item.html index 3375080a..6a477ae6 100644 --- a/src/templates/mirrors-item.html +++ b/src/templates/mirrors-item.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}{{ _("Mirror %s") % item.hostname }}{% end block %} diff --git a/src/templates/mirrors.html b/src/templates/mirrors.html index 2d723cb1..cd455960 100644 --- a/src/templates/mirrors.html +++ b/src/templates/mirrors.html @@ -1,4 +1,4 @@ -{% extends "base-1.html" %} +{% extends "base.html" %} {% block title %}Mirrors{% end block %} diff --git a/src/templates/static/chat.html b/src/templates/static/chat.html index eac75bea..84fc2774 100644 --- a/src/templates/static/chat.html +++ b/src/templates/static/chat.html @@ -1,4 +1,4 @@ -{% extends "../base-1.html" %} +{% extends "../base.html" %} {% block title %}{{ _("Chat") }}{% end block %} diff --git a/src/templates/static/get-involved.html b/src/templates/static/get-involved.html index 6f527298..cf4d4d2f 100644 --- a/src/templates/static/get-involved.html +++ b/src/templates/static/get-involved.html @@ -1,4 +1,4 @@ -{% extends "../base-1.html" %} +{% extends "../base.html" %} {% block title %}{{ _("Get Involved") }}{% end block %} diff --git a/src/templates/static/get-started.html b/src/templates/static/get-started.html index daf36496..2c5ba8e0 100644 --- a/src/templates/static/get-started.html +++ b/src/templates/static/get-started.html @@ -1,4 +1,4 @@ -{% extends "../base-1.html" %} +{% extends "../base.html" %} {% block title %}{{ _("Get Started") }}{% end block %} diff --git a/src/templates/static/get-support.html b/src/templates/static/get-support.html index 00cb3bf3..ceb25dd1 100644 --- a/src/templates/static/get-support.html +++ b/src/templates/static/get-support.html @@ -1,4 +1,4 @@ -{% extends "../base-1.html" %} +{% extends "../base.html" %} {% block title %}{{ _("Get Support") }}{% end block %} diff --git a/src/templates/static/hardware.html b/src/templates/static/hardware.html index f3b3d5f8..cf146d2c 100644 --- a/src/templates/static/hardware.html +++ b/src/templates/static/hardware.html @@ -1,4 +1,4 @@ -{% extends "../base-1.html" %} +{% extends "../base.html" %} {% block title %}{{ _("Hardware") }}{% end block %} diff --git a/src/templates/static/legal.html b/src/templates/static/legal.html index a51d4753..9dbefa38 100644 --- a/src/templates/static/legal.html +++ b/src/templates/static/legal.html @@ -1,4 +1,4 @@ -{% extends "../base-1.html" %} +{% extends "../base.html" %} {% block title %}{{ _("Legal") }}{% end block %} -- 2.47.3