Drop some extra base templates

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

diff --git a/Makefile.am b/Makefile.am
index 038a969a5255b46e1e1205c161afcdb29eec596d..6e806e7aee5fa7016ae0a6ec9007b22b28ac933e 100644 (file)
--- 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 (file)
index 94d9808..0000000
--- 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 (file)
index f2c5ff5..0000000
--- a/src/templates/base-2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-
-{% block body %}
-       <div>
-               <div class="col-lg-9 col-md-9">
-                       {% block bodyA %}{% end block %}
-               </div>
-
-               <div class="col-lg-3 col-md-3">
-                       {% block bodyB %}{% end block %}
-               </div>
-       </div>
-{% end block %}

diff --git a/src/templates/base-feature.html b/src/templates/base-feature.html
deleted file mode 100644 (file)
index 219a052..0000000
--- a/src/templates/base-feature.html
+++ /dev/null
@@ -1,71 +0,0 @@
-{% extends "base-2.html" %}
-
-{% block bodyB %}
-       <ul>
-               <li>
-                       <a href="/features">{{ _("About IPFire") }}</a>
-               </li>
-               <li>
-                       <a href="/features/security">{{ _("Security") }}</a>
-               </li>
-               <li>
-                       <a href="/features/firewall">{{ _("Firewall") }}</a>
-               </li>
-               <li>
-                       <a href="/features/pakfire">{{ _("Pakfire") }}</a>
-               </li>
-               <li>
-                       <a href="/features/updates">{{ _("Updates") }}</a>
-               </li>
-               <li>
-                       <a href="/features/itsfree">{{ _("It's free") }}</a>
-               </li>
-       </ul>
-
-       <h3>{{ _("Features") }}</h3>
-       <ul>
-               <li>
-                       <a href="/features/dialup">{{ _("Dialup") }}</a>
-               </li>
-               <li>
-                       <a href="/features/proxy">{{ _("Web proxy") }}</a>
-               </li>
-               <ul>
-                       <li>
-                               <a href="/features/proxy/content-filter">{{ _("Content filter") }}</a>
-                       </li>
-                       <li>
-                               <a href="/features/proxy/update-accelerator">{{ _("Update accelerator") }}</a>
-                       </li>
-                       <li>
-                               <a href="/features/proxy/virus-scanner">{{ _("Virus scan") }}</a>
-                       </li>
-               </ul>
-               <li>
-                       <a href="/features/vpn">{{ _("VPN") }}</a>
-               </li>
-               <ul>
-                       <li>
-                               <a href="/features/vpn/ipsec">{{ _("IPsec") }}</a>
-                       </li>
-                       <li>
-                               <a href="/features/vpn/openvpn">{{ _("OpenVPN") }}</a>
-                       </li>
-               </ul>
-               <li>
-                       <a href="/features/ids">{{ _("Intrusion detection") }}</a>
-               </li>
-               <li>
-                       <a href="/features/qos">{{ _("Quality of Service") }}</a>
-               </li>
-               <li>
-                       <a href="/features/hardware">{{ _("Hardware") }}</a>
-               </li>
-               <li>
-                       <a href="/features/virtualization">{{ _("Virtualization") }}</a>
-               </li>
-               <li>
-                       <a href="/features/wireless">{{ _("Wireless AP") }}</a>
-               </li>
-       </ul>
-{% end block %}

diff --git a/src/templates/donate.html b/src/templates/donate.html
index ac4e942e4f4fea3f821213f1e661650dd548b247..4393e263ba145daa86d9172c6e5a8a6729aa5030 100644 (file)
--- 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 4ed6d62daba6ad871c9b7a563d3cd11fcd68ff79..c06ec8acc90028f08a62e6750fdd191795515610 100644 (file)
--- 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 68b24d5f40937582ff70f724214942a3d479c4e9..64bec13866bcb29c71bde9537edf7816c03f5acb 100644 (file)
--- 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 855c10463e87cad372d10c5c54c967d2ca7ef7b3..f78d3327ecd4a82862488c67ba0977721a841493 100644 (file)
--- 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 68049c3355963d111db30460016d26fb29297cd1..60dd48a473d33e2c0d233ab1e29aa95eac8a2552 100644 (file)
--- 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 ed8348fd4e42ece4758210973e131a4a66e62e40..5e33f788e74bd4f7065c9ecf7fed39cd5fc22e43 100644 (file)
--- 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 61a2c912dda04472cc38c67711642f80d1f2f9db..811125de2082c4e493fba15ea90c929cb0be6225 100644 (file)
--- 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 80e336602cbd948c3fb0a0853c640a984281e92f..405a28a463838f1056f0d81ecc5835065a5d9ec7 100644 (file)
--- 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 f37280e09c40397014011f76311bbc38409da2db..4e72a65007f63b95a73f7cca316008b995db6170 100644 (file)
--- 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 3375080ae6c1e8c6dd0b8b878d5450a3297ce5f6..6a477ae60784daaf854c5dd501a848525106b409 100644 (file)
--- 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 2d723cb121d9743854f3b901870b610d0d34138c..cd4559607a3013027e28e03fcffe5aa3ed39c860 100644 (file)
--- 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 eac75bea8c96ca77125f2eefc64cef2cc40f2731..84fc2774a7114240d575a1de98ce3d4ad9bc91a5 100644 (file)
--- 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 6f527298999620beb528f648239f07bab81d3e4a..cf4d4d2f5d6004b2854227ddf5de3337636ed45f 100644 (file)
--- 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 daf3649659d4077ddfc8be3e6b2f4a7c744ca1f3..2c5ba8e0af702456e19aed729c133960cfb1593d 100644 (file)
--- 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 00cb3bf3594901d4db184ee001252f5d4543a61d..ceb25dd1dac589182117266c50af9b5ce1bc2818 100644 (file)
--- 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 f3b3d5f8d5138c284c73a3374ad51c87d0473e89..cf146d2c7fe89e3fbb0ff1ca71a2f8c76035b02d 100644 (file)
--- 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 a51d4753e65ab340e5337f17067bd13afa5d292c..9dbefa38fd4bdf1fac76423333df0cb53c8b034a 100644 (file)
--- 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 %}