From dbb3558aab7190856a62f77465d6f9db0dc7f7c3 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Tue, 17 Sep 2019 19:49:01 -0700
Subject: [PATCH] firstboot: Hide left menu during first boot as intended

This seems to be a regression from earlier behavior.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Joseph Nuthalapati <njoseph@riseup.net>
---
 .../first_boot/templates/base_firstboot.html  |  3 +
 plinth/templates/base.html                    | 58 ++++++++++---------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/plinth/modules/first_boot/templates/base_firstboot.html b/plinth/modules/first_boot/templates/base_firstboot.html
index 06780bd4d..500e9a8ca 100644
--- a/plinth/modules/first_boot/templates/base_firstboot.html
+++ b/plinth/modules/first_boot/templates/base_firstboot.html
@@ -28,6 +28,9 @@
   </style>
 {% endblock %}
 
+{% block mainmenu_left_collapse %}
+{% endblock %}
+
 {% block mainmenu_right %}
   {% if user.is_authenticated %}
     {% include "firstboot_navbar.html" %}
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 87b2c93d6..1202c2ceb 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -108,34 +108,36 @@
       </div>
       <div class="collapse navbar-collapse">
         <ul class="nav navbar-nav">
-          {% if user.is_authenticated and user_is_admin %}
-            <li>
-              {% url 'index' as index_url %}
-              <a href="{{ index_url }}" title='{% trans "Home" %}'
-                 class="{% if not submenu.url %}
-                 menu_link_active {% else %} menu_link {% endif %}">
-                {% trans "Home" %}
-              </a>
-            </li>
-            <li>
-              {% url 'apps' as apps_url %}
-              <a href="{{ apps_url }}" title='{% trans "Apps" %}'
-                 class="{% if apps_url == submenu.url %}
-                 menu_link_active {% else %} menu_link {% endif %}">
-                <span class="fa fa-th"></span>
-                {% trans "Apps" %}
-              </a>
-            </li>
-            <li>
-              {% url 'system' as system_url %}
-              <a href="{{ system_url }}" title='{% trans "System" %}'
-                 class="{% if system_url == submenu.url %}
-                 menu_link_active {% else %} menu_link {% endif %}">
-                <span class="fa fa-cog nav-icon"></span>
-                {% trans "System" %}
-              </a>
-            </li>
-          {% endif %}
+          {% block mainmenu_left_collapse %}
+            {% if user.is_authenticated and user_is_admin %}
+              <li>
+                {% url 'index' as index_url %}
+                <a href="{{ index_url }}" title='{% trans "Home" %}'
+                   class="{% if not submenu.url %}
+                   menu_link_active {% else %} menu_link {% endif %}">
+                  {% trans "Home" %}
+                </a>
+              </li>
+              <li>
+                {% url 'apps' as apps_url %}
+                <a href="{{ apps_url }}" title='{% trans "Apps" %}'
+                   class="{% if apps_url == submenu.url %}
+                   menu_link_active {% else %} menu_link {% endif %}">
+                  <span class="fa fa-th"></span>
+                  {% trans "Apps" %}
+                </a>
+              </li>
+              <li>
+                {% url 'system' as system_url %}
+                <a href="{{ system_url }}" title='{% trans "System" %}'
+                   class="{% if system_url == submenu.url %}
+                   menu_link_active {% else %} menu_link {% endif %}">
+                  <span class="fa fa-cog nav-icon"></span>
+                  {% trans "System" %}
+                </a>
+              </li>
+            {% endif %}
+          {% endblock %}
         </ul>
         <ul class="nav navbar-nav navbar-right">
           {% block mainmenu_right %}