From 52a9673f697493d520738f28296c66035b36fb4b Mon Sep 17 00:00:00 2001
From: Alice Kile <buoyantair@protonmail.com>
Date: Tue, 3 Dec 2019 15:42:02 +0530
Subject: [PATCH] fix: implement requested changes

- pass short_description to header.html include statement in templates/setup.html
- pass description to header.html include statement in
  modules/sharing/templates/sharing.html
- use `[]` instead of `None` for the initial value of description
  property in SetupView (plinth/views.py)
- add license info to header.html

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/modules/sharing/templates/sharing.html |  2 +-
 plinth/templates/header.html                  | 19 +++++++++++++++++++
 plinth/templates/setup.html                   |  2 +-
 plinth/views.py                               |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/plinth/modules/sharing/templates/sharing.html b/plinth/modules/sharing/templates/sharing.html
index 1e22a3372..746329c13 100644
--- a/plinth/modules/sharing/templates/sharing.html
+++ b/plinth/modules/sharing/templates/sharing.html
@@ -33,7 +33,7 @@
 
 {% block content %}
 
-  {% include "header.html" with icon_filename=icon_filename name=title description='' %}
+  {% include "header.html" with icon_filename=icon_filename name=title description=description %}
 
   <p>
     <a title="{% trans 'Add share' %}"
diff --git a/plinth/templates/header.html b/plinth/templates/header.html
index ecb68be28..51ff130ac 100644
--- a/plinth/templates/header.html
+++ b/plinth/templates/header.html
@@ -1,3 +1,22 @@
+{% comment %}
+#
+# This file is part of FreedomBox.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+{% endcomment %}
+
 {% load bootstrap %}
 {% load i18n %}
 {% load static %}
diff --git a/plinth/templates/setup.html b/plinth/templates/setup.html
index 6011695ad..9de74ce09 100644
--- a/plinth/templates/setup.html
+++ b/plinth/templates/setup.html
@@ -36,7 +36,7 @@
 
 {% block content %}
 
-  {% include "header.html" with icon_filename=setup_helper.module.icon_filename name=setup_helper.module.name description=setup_helper.module.description manual_page=setup_helper.module.manual_page setup=True %}
+  {% include "header.html" with icon_filename=setup_helper.module.icon_filename name=setup_helper.module.name description=setup_helper.module.description short_description=setup_helper.module.short_description manual_page=setup_helper.module.manual_page setup=True %}
 
   {% include "toolbar.html" with clients=setup_helper.module.clients %}
 
diff --git a/plinth/views.py b/plinth/views.py
index cee5d0901..4cb7be766 100644
--- a/plinth/views.py
+++ b/plinth/views.py
@@ -211,7 +211,7 @@ class SetupView(TemplateView):
     template_name = 'setup.html'
     name = 'None'
     # List of paragraphs describing the service
-    description = ""
+    description = []
 
     def get_context_data(self, **kwargs):
         """Return the context data rendering the template."""