Drop empty base templates for subdomains

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

diff --git a/Makefile.am b/Makefile.am
index 3980d5183a7c55a6c4a63e8e0e35c9e3e7ebde1c..e61a78f5805ecb0f5eef1ddc87a6ad616d1f1cef 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,6 @@ templates_blog_modules_DATA = \
 templates_blog_modulesdir = $(templates_blogdir)/modules
 
 templates_download_DATA = \
-       src/templates/download/base.html \
        src/templates/download/release.html
 
 templates_downloaddir = $(templatesdir)/download
@@ -153,7 +152,6 @@ templates_newsletterdir = $(templatesdir)/newsletter
 
 templates_people_DATA = \
        src/templates/people/conferences.html \
-       src/templates/people/base.html \
        src/templates/people/call.html \
        src/templates/people/calls.html \
        src/templates/people/index.html \
@@ -178,7 +176,6 @@ templates_people_modules_DATA = \
 templates_people_modulesdir = $(templates_peopledir)/modules
 
 templates_people_ssh_keys_DATA = \
-       src/templates/people/ssh-keys/base.html \
        src/templates/people/ssh-keys/delete.html \
        src/templates/people/ssh-keys/error.html \
        src/templates/people/ssh-keys/error-invalid-key.html \

diff --git a/src/templates/download/base.html b/src/templates/download/base.html
deleted file mode 100644 (file)
index d108a0c..0000000
--- a/src/templates/download/base.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "../base.html" %}

diff --git a/src/templates/download/release.html b/src/templates/download/release.html
index aec3a2c50cd3a6997cd10aa9a22fe3d0491272ba..479cfe485ccf8f454620151525ea9df62fa9a08d 100644 (file)
--- a/src/templates/download/release.html
+++ b/src/templates/download/release.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Download %s") % release }}{% end block %}
 

diff --git a/src/templates/nopaste/base.html b/src/templates/nopaste/base.html
deleted file mode 100644 (file)
index d108a0c..0000000
--- a/src/templates/nopaste/base.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "../base.html" %}

diff --git a/src/templates/nopaste/create.html b/src/templates/nopaste/create.html
index 5f8fd01b433dc033e6bfd1c5d4cc8bed102a122e..0ad8051d8c460d11c0795ee421f13104117e592c 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 bd5252604a3681381575e6a583f91a279b4ed064..04e00f0a49d9502f9a0ee594439346fedf1ebcd5 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/templates/people/base.html b/src/templates/people/base.html
deleted file mode 100644 (file)
index d108a0c..0000000
--- a/src/templates/people/base.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "../base.html" %}

diff --git a/src/templates/people/conferences.html b/src/templates/people/conferences.html
index 8b0ac71e64cefd43cfb56c515a4e18817098df68..b382c5d0400fc55ed13f08efab73ad2a88bf8127 100644 (file)
--- a/src/templates/people/conferences.html
+++ b/src/templates/people/conferences.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Conferences") }}{% end block %}
 

diff --git a/src/templates/people/index.html b/src/templates/people/index.html
index fd5254b8010951357adbe84487a4ac94d8259b02..a3a18441be5dfdbd97bdb105da6772366447eaf8 100644 (file)
--- a/src/templates/people/index.html
+++ b/src/templates/people/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Home") }}{% end block %}
 

diff --git a/src/templates/people/search.html b/src/templates/people/search.html
index 4a73096495538171baadb838276598d57a4b045f..d15b767d9973d4a9f82eef5be42959e49cad16bf 100644 (file)
--- a/src/templates/people/search.html
+++ b/src/templates/people/search.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Search Results for \"%s\"") % q }}{% end block %}
 

diff --git a/src/templates/people/ssh-keys/base.html b/src/templates/people/ssh-keys/base.html
deleted file mode 100644 (file)
index 5842b7d..0000000
--- a/src/templates/people/ssh-keys/base.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "../user-base.html" %}

diff --git a/src/templates/people/ssh-keys/delete.html b/src/templates/people/ssh-keys/delete.html
index 3ab79a76a2f9de8550e37497195d4ad3966e3f58..5d7d55fa0ba500ba7da8ad6a9b3212fc4bd8154c 100644 (file)
--- a/src/templates/people/ssh-keys/delete.html
+++ b/src/templates/people/ssh-keys/delete.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../user-base.html" %}
 
 {% block title %}{{ account }} - {{ _("Delete SSH Key") }}{% end block %}
 

diff --git a/src/templates/people/ssh-keys/error.html b/src/templates/people/ssh-keys/error.html
index a2e11a697602066805cfb38f511eb6c1af528d42..bd7c0728b08287bdbe3e9d7fcbbee6849e6e2129 100644 (file)
--- a/src/templates/people/ssh-keys/error.html
+++ b/src/templates/people/ssh-keys/error.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../user-base.html" %}
 
 {% block title %}{{ account }} - {{ _("Error Adding SSH Key") }}{% end block %}
 

diff --git a/src/templates/people/ssh-keys/index.html b/src/templates/people/ssh-keys/index.html
index a3884e9f1a0c3429b95b44cda2164fe25e752558..6dd6cb8a2834b2062f05c3d6883bbf2b7557f4bf 100644 (file)
--- a/src/templates/people/ssh-keys/index.html
+++ b/src/templates/people/ssh-keys/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../user-base.html" %}
 
 {% block title %}{{ account }} - {{ _("SSH Keys") }}{% end block %}
 

diff --git a/src/templates/people/ssh-keys/upload.html b/src/templates/people/ssh-keys/upload.html
index 7a5c7b6af9fc3d2ed3b69dc2fe6ecd4a89ea065f..ba5c371bb3e6468a7ae04d1d94d3d768ea643a47 100644 (file)
--- a/src/templates/people/ssh-keys/upload.html
+++ b/src/templates/people/ssh-keys/upload.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../user-base.html" %}
 
 {% block title %}{{ account }} - {{ _("Upload New SSH Key") }}{% end block %}
 

diff --git a/src/templates/people/user-base.html b/src/templates/people/user-base.html
index 316a0778f0ddd012ff41eab9d28848828c6ed5f4..71576acfe76e3d4a2198f9a0bc97efce43f12f08 100644 (file)
--- a/src/templates/people/user-base.html
+++ b/src/templates/people/user-base.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ account }}{% end block %}
 

diff --git a/src/templates/people/users.html b/src/templates/people/users.html
index 914645e5ef51626f4fd6ab03d22b2ee21ddf690a..512c820144e6e235f6e3d2cf0caaf5721283c8cb 100644 (file)
--- a/src/templates/people/users.html
+++ b/src/templates/people/users.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Users") }}{% end block %}