From 7cbaec3e26d4daffc59dd791607c18bb57c36813 Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@riseup.net>
Date: Fri, 13 Sep 2019 07:47:25 +0530
Subject: [PATCH] firstboot: Add new help menu to firstboot navbar

- Refactor the help menu into a django template include.

- Show help menu if user is logged in, instead of after completing firstboot.

Closes: #1517

Signed-off-by: Joseph Nuthalapati <njoseph@riseup.net>
[sunil@medhas.org Rename help-menu.inc to help-menu.inc]
[sunil@medhas.org Use user.is_authenticated instead of another variable]
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
---
 .../first_boot/templates/base_firstboot.html  |  6 +-
 .../templates/firstboot_navbar.html           | 11 +---
 plinth/templates/base.html                    | 46 +------------
 plinth/templates/help-menu.html               | 66 +++++++++++++++++++
 4 files changed, 71 insertions(+), 58 deletions(-)
 create mode 100644 plinth/templates/help-menu.html

diff --git a/plinth/modules/first_boot/templates/base_firstboot.html b/plinth/modules/first_boot/templates/base_firstboot.html
index 78b28ea10..06780bd4d 100644
--- a/plinth/modules/first_boot/templates/base_firstboot.html
+++ b/plinth/modules/first_boot/templates/base_firstboot.html
@@ -29,7 +29,7 @@
 {% endblock %}
 
 {% block mainmenu_right %}
-    {% if firstboot_complete %}
-        {% include "firstboot_navbar.html" %}
-    {% endif %}
+  {% if user.is_authenticated %}
+    {% include "firstboot_navbar.html" %}
+  {% endif %}
 {% endblock %}
diff --git a/plinth/modules/first_boot/templates/firstboot_navbar.html b/plinth/modules/first_boot/templates/firstboot_navbar.html
index a3a8b4ea6..6317f2874 100644
--- a/plinth/modules/first_boot/templates/firstboot_navbar.html
+++ b/plinth/modules/first_boot/templates/firstboot_navbar.html
@@ -17,13 +17,4 @@
 #
 {% endcomment %}
 
-{% load i18n %}
-
-<li>
-  <a href="{% url 'help:index' %}" title="{% trans "Help" %}">
-    <span class="fa fa-question-circle nav-icon"></span>
-    <span class="nav-text hidden-sm hidden-md hidden-lg">
-      {% trans "Help" %}
-    </span>
-  </a>
-</li>
+{% include "help-menu.html" %}
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index ad69921e9..87b2c93d6 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -141,51 +141,7 @@
           {% block mainmenu_right %}
 
             {% if user.is_authenticated %}
-              <li class="dropdown">
-                <a href="{% url 'help:index' %}" title="{% trans "Help" %}"
-                   class="dropdown-toggle" data-toggle="dropdown"
-                   role="button" aria-expanded="false" aria-expanded="false">
-                  <span class="fa fa-question-circle nav-icon"></span>
-                  <span class="nav-text hidden-sm hidden-md hidden-lg">
-                    {% trans "Help" %}
-                  </span>
-                  <span class="caret"></span>
-                </a>
-                <ul class="dropdown-menu" role="menu">
-                  <li>
-                    <a href="{% url 'help:manual' %}"
-                       title="{% trans "Manual"%}">
-                      {% trans "Manual" %}
-                    </a>
-                  </li>
-                  <li role="separator" class="divider hidden-xs"></li>
-                  <li>
-                    <a href="{% url 'help:support' %}"
-                       title="{% trans "Get Support" %}">
-                      {% trans "Get Support" %}
-                    </a>
-                  </li>
-                  <li>
-                    <a href="{% url 'help:feedback' %}"
-                       title="{% trans "Submit Feedback" %}">
-                      {% trans "Submit Feedback" %}
-                    </a>
-                  </li>
-                  <li>
-                    <a href="{% url 'help:contribute' %}"
-                       title="{% trans "Contribute" %}">
-                      {% trans "Contribute" %}
-                    </a>
-                  </li>
-                  <li role="separator" class="divider hidden-xs"></li>
-                  <li>
-                    <a href="{% url 'help:about' %}"
-                       title="{% trans "About" %}">
-                      {% trans "About" %}
-                    </a>
-                  </li>
-                </ul>
-              </li>
+              {% include "help-menu.html" %}
               <li class="dropdown">
                 <a href="{% url 'users:edit' request.user.username %}"
                    class="dropdown-toggle" data-toggle="dropdown"
diff --git a/plinth/templates/help-menu.html b/plinth/templates/help-menu.html
new file mode 100644
index 000000000..f3dfc8181
--- /dev/null
+++ b/plinth/templates/help-menu.html
@@ -0,0 +1,66 @@
+{% 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 i18n %}
+
+<li class="dropdown">
+  <a href="{% url 'help:index' %}" title="{% trans "Help" %}"
+     class="dropdown-toggle" data-toggle="dropdown"
+     role="button" aria-expanded="false" aria-expanded="false">
+    <span class="fa fa-question-circle nav-icon"></span>
+    <span class="nav-text hidden-sm hidden-md hidden-lg">
+      {% trans "Help" %}
+    </span>
+    <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu" role="menu">
+    <li>
+      <a href="{% url 'help:manual' %}"
+         title="{% trans "Manual"%}">
+        {% trans "Manual" %}
+      </a>
+    </li>
+    <li role="separator" class="divider hidden-xs"></li>
+    <li>
+      <a href="{% url 'help:support' %}"
+         title="{% trans "Get Support" %}">
+        {% trans "Get Support" %}
+      </a>
+    </li>
+    <li>
+      <a href="{% url 'help:feedback' %}"
+         title="{% trans "Submit Feedback" %}">
+        {% trans "Submit Feedback" %}
+      </a>
+    </li>
+    <li>
+      <a href="{% url 'help:contribute' %}"
+         title="{% trans "Contribute" %}">
+        {% trans "Contribute" %}
+      </a>
+    </li>
+    <li role="separator" class="divider hidden-xs"></li>
+    <li>
+      <a href="{% url 'help:about' %}"
+         title="{% trans "About" %}">
+        {% trans "About" %}
+      </a>
+    </li>
+  </ul>
+</li>