nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

firstboot: Hide navigation toggler in mobile layouts

Browse Source 
Tests:

- Start first boot by removing /var/lib/plinth/plinth.sqlite3 and starting
service. Switch to responsive design mode and select a phone layout. Notice that
an inactive toggler appears during bootup/welcome/account first boot steps.

- With the patch, the toggler button does not appear during those steps. After
the account step, the toggler appears and is functional with help menu.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
Sunil Mohan Adapa 2024-10-05 14:22:43 -07:00 committed by Veiko Aasa
parent 17952c9cf3
commit fb2d26a16c
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,15 @@ no-brand
{% block mainmenu_left_collapse %} {% block mainmenu_left_collapse %}
{% endblock %} {% endblock %}
{% block notifications_dropdown %}
{% endblock %}
{% block mainmenu_toggler %}
{% if user.is_authenticated %}
{{ block.super }}
{% endif %}
{% endblock %}
{% block mainmenu_right %} {% block mainmenu_right %}
{% if user.is_authenticated %} {% if user.is_authenticated %}
{% include "firstboot_navbar.html" %} {% include "firstboot_navbar.html" %}

20
plinth/templates/base.html
View File

@ -89,15 +89,19 @@
</a> </a>
{% endblock %} {% endblock %}
<ul class="navbar-nav"> {% block notifications_dropdown %}
{% include "notifications-dropdown.html" %} <ul class="navbar-nav">
</ul> {% include "notifications-dropdown.html" %}
</ul>
{% endblock %}
<button class="navbar-toggler" type="button" data-toggle="collapse" {% block mainmenu_toggler %}
data-target="#navbar-collapse" aria-controls="navbar-collapse" <button class="navbar-toggler" type="button" data-toggle="collapse"
aria-expanded="false" aria-label="Toggle navigation"> data-target="#navbar-collapse" aria-controls="navbar-collapse"
<span class="fa fa-bars"></span> aria-expanded="false" aria-label="Toggle navigation">
</button> <span class="fa fa-bars"></span>
</button>
{% endblock %}
<div class="collapse navbar-collapse" id="navbar-collapse"> <div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="navbar-nav flex-grow-1"> <ul class="navbar-nav flex-grow-1">