From 5b639884b65d0d33cd12e876283dec9010a00f84 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 11 Mar 2020 14:47:23 -0700 Subject: [PATCH] pagekite: Drop ineffective base template The base template simply tries to override the description and formats its differently. However, since the introduction of app-header.html, this was ineffective and did nothing because blocks from included templates can't be overridden, apparently. Also, the base template is being used only in template as all other templates either don't use it or have been removed since. Signed-off-by: Sunil Mohan Adapa Reviewed-by: Veiko Aasa --- .../pagekite/templates/pagekite_base.html | 18 ------------------ .../pagekite/templates/pagekite_configure.html | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 plinth/modules/pagekite/templates/pagekite_base.html diff --git a/plinth/modules/pagekite/templates/pagekite_base.html b/plinth/modules/pagekite/templates/pagekite_base.html deleted file mode 100644 index d65879d96..000000000 --- a/plinth/modules/pagekite/templates/pagekite_base.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "app.html" %} -{% comment %} -# SPDX-License-Identifier: AGPL-3.0-or-later -{% endcomment %} - -{% block description %} - -

{{ description.0|safe }}

- -
    - {% for paragraph in description|slice:"1:6" %} -
  • {{ paragraph|safe }}
  • - {% endfor %} -
- -

{{ description|last|safe }}

- -{% endblock %} diff --git a/plinth/modules/pagekite/templates/pagekite_configure.html b/plinth/modules/pagekite/templates/pagekite_configure.html index 2ec8c5888..4ab42f477 100644 --- a/plinth/modules/pagekite/templates/pagekite_configure.html +++ b/plinth/modules/pagekite/templates/pagekite_configure.html @@ -1,4 +1,4 @@ -{% extends "pagekite_base.html" %} +{% extends "app.html" %} {% comment %} # SPDX-License-Identifier: AGPL-3.0-or-later {% endcomment %}