Skip to content

fix(WUI): Navbar spacing and reactive main window #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samoehlert merged 4 commits into from
Nov 17, 2025
Merged

fix(WUI): Navbar spacing and reactive main window #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
706f4be
fix(burger-menu): switch to bootstrap 4 classes
soehlert Nov 14, 2025
e51a652
style(navbar): fix navbar spacing both in wide and hamburger sized fo…
soehlert Nov 14, 2025
e2f9ee6
fix(main-container): make the main container reactive so it fits widt…
soehlert Nov 14, 2025
303a84b
Merge branch 'main' into topic/soehlert/reactive_wui
samoehlert Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions scram/templates/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,39 @@
<input class="form-control pl-2 me-2" name="cidr" type="search" placeholder="cidr">
<button class="btn btn-info mb-2" style="background-color:#2ba6c8!important;" type="submit">Search</button>
</form>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto text-nowrap">
<li class="nav-item d-inline mt-2">
<a id="entry-list" class="nav-link" href="{% url 'route_manager:entry-list' %}">{% trans "Entries" %}</a>
<ul class="navbar-nav flex-column flex-lg-row justify-content-lg-end align-items-lg-center w-100">
<li class="nav-item pl-lg-2">
<a id="entry-list" class="nav-link py-1 px-lg-1" href="{% url 'route_manager:entry-list' %}">{% trans "Entries" %}</a>
</li>
{% if request.user.is_superuser %}
<li class="nav-item d-inline mt-2">
<a id="admin-page" class="nav-link" href="{% url 'admin:index' %}">{% trans "Admin" %}</a>
<li class="nav-item">
<a id="admin-page" class="nav-link py-1 px-lg-1" href="{% url 'admin:index' %}">{% trans "Admin" %}</a>
</li>
{% endif %}
{% if user.is_authenticated %}
<li class="nav-item d-inline mt-2">
<a id="account-home" class="nav-link" href="{% url 'users:detail' user.username %}">{{ user.name }}</a>
<li class="nav-item">
<a id="account-home" class="nav-link py-1 px-lg-1" href="{% url 'users:detail' user.username %}">{{ user.name }}</a>
</li>
<li class="nav-item d-inline mt-3">
<li class="nav-item py-1">
<span class="badge badge-info badge-pill" style="background-color:#2ba6c8!important;">Blocks:<br>{{ active_block_entries }}</span>
</li>
<li class="nav-item mt-2 d-inline">
<li class="nav-item pl-lg-3 pl-0 pt-lg-0 pt-2">
<form action="{{ logout }}" method="post">
{% csrf_token %}
<button class="btn btn-outline-info ml-2 mb-2" style="outline-color:#2ba6c8!important;" type="submit">Logout</button>
<button class="btn btn-outline-info" style="outline-color:#2ba6c8!important;" type="submit">Logout</button>
</form>
</li>
{% else %}
<li class="nav-item d-inline mt-3">
<li class="nav-item py-1">
<span class="badge badge-info badge-pill" style="background-color:#2ba6c8!important;">Blocks:<br>{{ active_block_entries }}</span>
</li>
<li class="nav-item mt-2 d-inline">
<a class="btn btn-outline-info ml-2 mb-2" style="color:#2ba6c8!important;" role="button" href="{{ login }}">Login</a> </li>
<li class="nav-item pl-lg-3 pl-0 pt-lg-0 pt-2">
<a class="btn btn-outline-info" style="color:#2ba6c8!important;" role="button" href="{{ login }}">Login</a>
</li>
{% endif %}
</ul>
</div>
Expand Down
36 changes: 23 additions & 13 deletions scram/templates/route_manager/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,30 @@ <h1 class="display-3 text-center text-white font-weight-bold">SCRAM</h1>
</div>
{% if readwrite %}
<div class="d-flex justify-content-center mt-2">
<form class="form-inline" action="{% url 'route_manager:add' %}" method="post">
<form class="w-100" action="{% url 'route_manager:add' %}" method="post">
{% csrf_token %}
<div class="form-group inline mb-2">
<input class="form-control mb-2 mr-2" name="route" placeholder="cidr" type="text">
<select class="form-control mb-2 mr-2" name="actiontype">
{% for at in entries.keys %}
{% if at.available %}
<option>{{ at }}</option>
{% endif %}
{% endfor %}
</select>
<input class="form-control mb-2 mr-2" name="comment" placeholder="comment" type="text">
<input class="form-control mb-2 mr-2" name="expiration" type="datetime-local">
<button class="btn btn-info mb-2 ml-2" style="background-color:#2ba6c8!important;" type="submit">Add Entry</button>
<div class="form-row align-items-center justify-content-center">
<div class="col-auto mb-2">
<input class="form-control" name="route" placeholder="cidr" type="text">
</div>
<div class="col-auto mb-2">
<select class="form-control" name="actiontype">
{% for at in entries.keys %}
{% if at.available %}
<option>{{ at }}</option>
{% endif %}
{% endfor %}
</select>
</div>
<div class="col-auto mb-2">
<input class="form-control" name="comment" placeholder="comment" type="text">
</div>
<div class="col-auto mb-2">
<input class="form-control" name="expiration" type="datetime-local">
</div>
<div class="col-auto mb-2">
<button class="btn btn-info" style="background-color:#2ba6c8!important;" type="submit">Add Entry</button>
</div>
</div>
</form>
</div>
Expand Down
Loading