From f21ea2042dd4b467380e6a370e9e68e5c332ca18 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Fri, 8 Mar 2019 14:21:45 -0800
Subject: [PATCH] ikiwiki: Consistent styling for delete warning page

- Do not use subsubmenu styling for delete confirmation page. This will make it
  consistent with the rest of the UI where confirmation pages are shown. Also
  showing a confirmation under a tab is confusing.

- Undo incorrect styling changes.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
---
 .../modules/ikiwiki/templates/ikiwiki_delete.html  |  4 ++--
 .../modules/ikiwiki/templates/ikiwiki_manage.html  | 14 +++++++-------
 plinth/modules/ikiwiki/views.py                    |  4 ----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/plinth/modules/ikiwiki/templates/ikiwiki_delete.html b/plinth/modules/ikiwiki/templates/ikiwiki_delete.html
index aa01065d8..29cf22826 100644
--- a/plinth/modules/ikiwiki/templates/ikiwiki_delete.html
+++ b/plinth/modules/ikiwiki/templates/ikiwiki_delete.html
@@ -1,4 +1,4 @@
-{% extends "service-subsubmenu.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -21,7 +21,7 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block configuration %}
+{% block content %}
 
   <h3>
     {% blocktrans trimmed %}
diff --git a/plinth/modules/ikiwiki/templates/ikiwiki_manage.html b/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
index 8708aa551..8850d435b 100644
--- a/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
+++ b/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
@@ -23,13 +23,13 @@
 
 {% block page_head %}
   <style type="text/css">
-   .wiki-label {
-       display: inline-block;
-       width: 40%;
-   }
-   .list-group-item .btn {
-       margin: -5px 0;
-   }
+    .wiki-label {
+        display: inline-block;
+        width: 40%;
+    }
+    .list-group-item .btn {
+        margin: -5px 0;
+    }
   </style>
 {% endblock %}
 
diff --git a/plinth/modules/ikiwiki/views.py b/plinth/modules/ikiwiki/views.py
index e4adfd238..95614d3b8 100644
--- a/plinth/modules/ikiwiki/views.py
+++ b/plinth/modules/ikiwiki/views.py
@@ -160,9 +160,5 @@ def delete(request, name):
     return TemplateResponse(
         request, 'ikiwiki_delete.html', {
             'title': ikiwiki.name,
-            'clients': ikiwiki.clients,
-            'description': ikiwiki.description,
-            'manual_page': ikiwiki.manual_page,
-            'subsubmenu': subsubmenu,
             'name': name
         })