nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

firstboot: Hide left menu during first boot as intended

Browse Source 
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>
This commit is contained in:
Sunil Mohan Adapa 2019-09-17 19:49:01 -07:00 committed by Joseph Nuthalapati
parent 6db1926a62
commit dbb3558aab
No known key found for this signature in database
GPG Key ID: 5398F00A2FA43C35
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plinth/modules/first_boot/templates/base_firstboot.html
View File

@ -28,6 +28,9 @@
</style> </style>
{% endblock %} {% endblock %}
{% block mainmenu_left_collapse %}
{% endblock %}
{% block mainmenu_right %} {% block mainmenu_right %}
{% if user.is_authenticated %} {% if user.is_authenticated %}
{% include "firstboot_navbar.html" %} {% include "firstboot_navbar.html" %}

58
plinth/templates/base.html
View File

@ -108,34 +108,36 @@
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% if user.is_authenticated and user_is_admin %} {% block mainmenu_left_collapse %}
<li> {% if user.is_authenticated and user_is_admin %}
{% url 'index' as index_url %} <li>
<a href="{{ index_url }}" title='{% trans "Home" %}' {% url 'index' as index_url %}
class="{% if not submenu.url %} <a href="{{ index_url }}" title='{% trans "Home" %}'
menu_link_active {% else %} menu_link {% endif %}"> class="{% if not submenu.url %}
{% trans "Home" %} menu_link_active {% else %} menu_link {% endif %}">
</a> {% trans "Home" %}
</li> </a>
<li> </li>
{% url 'apps' as apps_url %} <li>
<a href="{{ apps_url }}" title='{% trans "Apps" %}' {% url 'apps' as apps_url %}
class="{% if apps_url == submenu.url %} <a href="{{ apps_url }}" title='{% trans "Apps" %}'
menu_link_active {% else %} menu_link {% endif %}"> class="{% if apps_url == submenu.url %}
<span class="fa fa-th"></span> menu_link_active {% else %} menu_link {% endif %}">
{% trans "Apps" %} <span class="fa fa-th"></span>
</a> {% trans "Apps" %}
</li> </a>
<li> </li>
{% url 'system' as system_url %} <li>
<a href="{{ system_url }}" title='{% trans "System" %}' {% url 'system' as system_url %}
class="{% if system_url == submenu.url %} <a href="{{ system_url }}" title='{% trans "System" %}'
menu_link_active {% else %} menu_link {% endif %}"> class="{% if system_url == submenu.url %}
<span class="fa fa-cog nav-icon"></span> menu_link_active {% else %} menu_link {% endif %}">
{% trans "System" %} <span class="fa fa-cog nav-icon"></span>
</a> {% trans "System" %}
</li> </a>
{% endif %} </li>
{% endif %}
{% endblock %}
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{% block mainmenu_right %} {% block mainmenu_right %}