From f15505e6f407ea81fc1b2686ad9866b9f1b109d8 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Wed, 30 Jan 2019 17:41:21 -0800
Subject: [PATCH] backups: Add title and description to other pages

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/modules/backups/templates/backups_form.html   | 6 ++----
 plinth/modules/backups/templates/backups_upload.html | 9 +++++----
 plinth/modules/backups/views.py                      | 6 ++++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plinth/modules/backups/templates/backups_form.html b/plinth/modules/backups/templates/backups_form.html
index 97150a2a7..386d69534 100644
--- a/plinth/modules/backups/templates/backups_form.html
+++ b/plinth/modules/backups/templates/backups_form.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "service-subsubmenu.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -21,9 +21,7 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block content %}
-
-  <h3>{{ title }}</h3>
+{% block configuration %}
 
   <form class="form" method="post">
       {% csrf_token %}
diff --git a/plinth/modules/backups/templates/backups_upload.html b/plinth/modules/backups/templates/backups_upload.html
index c82d108df..608f36328 100644
--- a/plinth/modules/backups/templates/backups_upload.html
+++ b/plinth/modules/backups/templates/backups_upload.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "service-subsubmenu.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -24,12 +24,13 @@
 {% block page_head %}
 {% endblock %}
 
-{% block content %}
+{% block configuration %}
 
-  <h3>{{ title }}</h3>
   <p>
     {% blocktrans %}
-      You can choose the apps you wish to import after uploading a backup file.
+      Upload a backup file downloaded from another {{ box_name }} to restore is
+      contents. You can choose the apps you wish to restore after uploading a
+      backup file.
     {% endblocktrans %}
   </p>
   <div class="alert alert-warning" role="alert">
diff --git a/plinth/modules/backups/views.py b/plinth/modules/backups/views.py
index edaf002f0..94d1f81ea 100644
--- a/plinth/modules/backups/views.py
+++ b/plinth/modules/backups/views.py
@@ -85,7 +85,8 @@ class CreateArchiveView(SuccessMessageMixin, FormView):
     def get_context_data(self, **kwargs):
         """Return additional context for rendering the template."""
         context = super().get_context_data(**kwargs)
-        context['title'] = _('New Backup')
+        context['title'] = backups.name
+        context['description'] = backups.description
         context['subsubmenu'] = subsubmenu
         return context
 
@@ -130,7 +131,8 @@ class UploadArchiveView(SuccessMessageMixin, FormView):
     def get_context_data(self, **kwargs):
         """Return additional context for rendering the template."""
         context = super().get_context_data(**kwargs)
-        context['title'] = _('Upload and restore a backup file')
+        context['title'] = backups.name
+        context['description'] = backups.description
         context['subsubmenu'] = subsubmenu
         try:
             disk_info = storage.get_disk_info('/')