From dd3d93e316c8197374a3152506914318e49f9f9e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 22 Oct 2018 11:23:04 +0100 Subject: [PATCH] Drop empty base templates for subdomains Signed-off-by: Michael Tremer --- Makefile.am | 3 --- src/templates/download/base.html | 1 - src/templates/download/release.html | 2 +- src/templates/nopaste/base.html | 1 - src/templates/nopaste/create.html | 2 +- src/templates/nopaste/view.html | 2 +- src/templates/people/base.html | 1 - src/templates/people/conferences.html | 2 +- src/templates/people/index.html | 2 +- src/templates/people/search.html | 2 +- src/templates/people/ssh-keys/base.html | 1 - src/templates/people/ssh-keys/delete.html | 2 +- src/templates/people/ssh-keys/error.html | 2 +- src/templates/people/ssh-keys/index.html | 2 +- src/templates/people/ssh-keys/upload.html | 2 +- src/templates/people/user-base.html | 2 +- src/templates/people/users.html | 2 +- 17 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 src/templates/download/base.html delete mode 100644 src/templates/nopaste/base.html delete mode 100644 src/templates/people/base.html delete mode 100644 src/templates/people/ssh-keys/base.html diff --git a/Makefile.am b/Makefile.am index 3980d518..e61a78f5 100644 --- 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 index d108a0c0..00000000 --- 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 aec3a2c5..479cfe48 100644 --- 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 index d108a0c0..00000000 --- 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 5f8fd01b..0ad8051d 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 bd525260..04e00f0a 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/templates/people/base.html b/src/templates/people/base.html deleted file mode 100644 index d108a0c0..00000000 --- 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 8b0ac71e..b382c5d0 100644 --- 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 fd5254b8..a3a18441 100644 --- 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 4a730964..d15b767d 100644 --- 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 index 5842b7da..00000000 --- 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 3ab79a76..5d7d55fa 100644 --- 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 a2e11a69..bd7c0728 100644 --- 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 a3884e9f..6dd6cb8a 100644 --- 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 7a5c7b6a..ba5c371b 100644 --- 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 316a0778..71576acf 100644 --- 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 914645e5..512c8201 100644 --- 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 %} -- 2.39.2