Skip to content
This repository has been archived by the owner on Mar 17, 2024. It is now read-only.

Commit

Permalink
Side/Nav-bar fix + Template tag update
Browse files Browse the repository at this point in the history
  • Loading branch information
@niklastheman
niklastheman committed May 11, 2023
1 parent 01a3f0c commit e299524
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 63 deletions.
2 changes: 1 addition & 1 deletion customtags/templatetags/can_create_app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# settings value
@register.simple_tag
def can_create_app(user, project, app):
app_slug = app.slug
app_slug = app if isinstance(app, str) else app.slug

user_can_create = AppInstance.objects.user_can_create(
user=user, project=project, app_slug=app_slug
Expand Down
73 changes: 41 additions & 32 deletions templates/common/navbar.html
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,79 @@
<nav class="navbar navbar-expand navbar-light justify-content-between shadow-sm">

<button class="btn" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSidebar"
aria-expanded="false" aria-controls="collapseSidebar">
<button class="btn" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSidebar" aria-expanded="false"
aria-controls="collapseSidebar">
<i class="bi bi-layout-sidebar fs-4"></i>
</button>

<ul class="navbar-nav">
<li class="nav-item d-none d-md-block">
<a class="nav-link d-flex align-items-center"
href="https://scaleoutsystems.github.io/stackn/#/tutorial" target="_blank">
<div class="d-flex">
<i class="bi bi-file-text me-1 fs-4"></i>
User Guide
</a>
<a class="nav-link" href="https://scaleoutsystems.github.io/stackn/#/tutorial" target="_blank">
User Guide
</a>
</div>
</li>
<li class="nav-item d-none d-md-block">
<a class="nav-link d-flex align-items-center" href="{% url 'portal:home' %}">
<div class="d-flex">
<i class="bi bi-house me-1 fs-4"></i>
About
</a>
<a class="nav-link" href="{% url 'portal:home' %}">
About
</a>
</div>
</li>

{% if request.user.is_authenticated %}

<li class="nav-item dropdown">

<a class="nav-link dropdown-toggle d-flex align-items-center" href="#"
data-bs-toggle="dropdown">
<i class="bi bi-person-circle me-1 fs-4"></i>
{{request.user}}
</a>
<div class="dropdown-menu dropdown-menu-end">
<a class="dropdown-item d-flex align-items-center" href="{% url 'password_change' %}">
<i class="bi bi-key me-1"></i>
Change Password
</a>
<a class="dropdown-item d-flex align-items-center" href="{% url 'logout' %}">
<i class="bi bi-box-arrow-right me-1"></i>
Sign out
</a>
<div class="d-flex align-items-center dropdown-toggle px-2">
<div class="d-flex">
<i class="bi bi-person-circle me-1 fs-4"></i>
<a class="nav-link" href="#" data-bs-toggle="dropdown">
{{request.user}}
</a>
<div class="dropdown-menu dropdown-menu-end">
<a class="dropdown-item d-flex align-items-center default" href="{% url 'password_change' %}">
<i class="bi bi-key me-1"></i>
Change Password
</a>
<a class="dropdown-item d-flex align-items-center default" href="{% url 'logout' %}">
<i class="bi bi-box-arrow-right me-1"></i>
Sign out
</a>
</div>
</div>
</div>
</li>

{% else %}
<li class="nav-item d-none d-md-block">

<a class="nav-link d-flex align-items-center" href="{% url 'common:signup' %}">
<div class="d-flex">
<i class="bi bi-person-check me-1 fs-4"></i>
Sign up
</a>
<a class="nav-link" href="{% url 'common:signup' %}">
Sign up
</a>
</div>
</li>
<li class="nav-item d-none d-md-block">

<a class="nav-link d-flex align-items-center" href="{% url 'login' %}">
<div class="d-flex">
<i class="bi bi-door-open me-1 fs-4"></i>
Login
</a>
<a class="nav-link" href="{% url 'login' %}">
Login
</a>
</div>
</li>
<li class="nav-item dropdown d-md-none">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
<a class="nav-link dropdown-toggle default" href="#" id="navbarDropdown" role="button"
data-bs-toggle="dropdown" aria-expanded="false">
<i class="bi bi-list fs-4"></i>
</a>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
<li>
<a class="dropdown-item" href="https://scaleoutsystems.github.io/stackn/#/tutorial"
target="_blank">
<a class="dropdown-item" href="https://scaleoutsystems.github.io/stackn/#/tutorial" target="_blank">
<i class="bi bi-file-text me-1"></i>
User Guide
</a>
Expand Down
18 changes: 9 additions & 9 deletions templates/common/sidebar_items.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
<h6 class="opacity-75 mb-3"><strong>Catalogs</strong></h6>
</li>
{% url 'portal:index' as index_portal_url %}
<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == index_portal_url %}active{% endif %}"
<li class="nav-item d-flex align-items-center">
<i class="bi bi-box fs-4"></i>
<a class="nav-link {% if request.path == index_portal_url %}active{% endif %}"
href="{{index_portal_url}}">
<i class="bi bi-box fs-4 me-3"></i>
Apps
</a>
</li>
{% url 'models:index' as index_models_url %}
<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == index_models_url %}active{% endif %}"
<li class="nav-item d-flex align-items-center">
<i class="bi bi-layers fs-4"></i>
<a class="nav-link {% if request.path == index_models_url %}active{% endif %}"
href="{{index_models_url}}">
<i class="bi bi-layers fs-4 me-3"></i>
Models
</a>
</li>
{% if request.user.is_authenticated %}
{% url 'projects:index' as index_projects_url %}
<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == index_projects_url %}active{% endif %}"
<li class="nav-item d-flex align-items-center">
<i class="bi bi-folder fs-4"></i>
<a class="nav-link {% if request.path == index_projects_url %}active{% endif %}"
href="{{index_projects_url}}">
<i class="bi bi-folder fs-4 me-3"></i>
Projects
</a>
</li>
Expand Down
42 changes: 21 additions & 21 deletions templates/projects/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,68 +11,68 @@ <h6 class="opacity-75 mb-3"><strong>{{ project.name }}</strong></h6>

{% url 'projects:details' request.user project.slug as dashboard_url %}

<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == dashboard_url %}active{% endif %}" href="{{dashboard_url}}">
<i class="bi bi-house me-3 fs-4"></i>
<li class="nav-item d-flex align-items-center">
<i class="bi bi-house fs-4"></i>
<a class="nav-link {% if request.path == dashboard_url %}active{% endif %}" href="{{dashboard_url}}">
Dashboard
</a>
</li>

{% url 'models:list' request.user project.slug as models_url %}

<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == models_url %}active{% endif %}"
<li class="nav-item d-flex align-items-center">
<i class="bi bi-layers fs-4"></i>
<a class="nav-link {% if request.path == models_url %}active{% endif %}"
href="{{models_url}}">
<i class="bi bi-layers fs-4 me-3"></i>
Models
</a>
</li>

{% url 'apps:filtered' request.user project.slug 'compute' as notebooks_url %}

<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == notebooks_url %}active{% endif %}"
<li class="nav-item d-flex align-items-center">
<i class="bi bi-cpu fs-4"></i>
<a class="nav-link {% if request.path == notebooks_url %}active{% endif %}"
href="{{notebooks_url}}">
<i class="bi bi-cpu fs-4 me-3"></i>
Notebooks
</a>
</li>

{% url 'apps:filtered' request.user project.slug 'serve' as serve_url %}

<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == serve_url %}active{% endif %}"
<li class="nav-item d-flex align-items-center">
<i class="bi bi-check2-circle fs-4"></i>
<a class="nav-link {% if request.path == serve_url %}active{% endif %}"
href="{{serve_url}}">
<i class="bi bi-check2-circle fs-4 me-3"></i>
Serve
</a>
</li>

{% url 'apps:filtered' request.user project.slug 'store' as store_url %}

<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == store_url %}active{% endif %}"
<li class="nav-item d-flex align-items-center">
<i class="bi bi-database fs-4"></i>
<a class="nav-link {% if request.path == store_url %}active{% endif %}"
href="{{store_url}}">
<i class="bi bi-database fs-4 me-3"></i>
Store
</a>
</li>

{% url 'apps:filtered' request.user project.slug 'develop' as develop_url %}

<li class="nav-item">
<a class="nav-link d-flex align-items-center {% if request.path == develop_url %}active{% endif %}"
<li class="nav-item d-flex align-items-center">
<i class="bi bi-code fs-4"></i>
<a class="nav-link {% if request.path == develop_url %}active{% endif %}"
href="{{develop_url}}">
<i class="bi bi-code fs-4 me-3"></i>
Develop
</a>
</li>

{% url 'projects:settings' request.user project.slug as settings_url %}

<li class="nav-item py-3">
<a class="nav-link d-flex align-items-center {% if request.path == settings_url %}active{% endif %}" href="{{settings_url}}">
<i class="bi bi-gear fs-4 me-3"></i>
<li class="nav-item py-3 d-flex align-items-center">
<i class="bi bi-gear fs-4"></i>
<a class="nav-link {% if request.path == settings_url %}active{% endif %}" href="{{settings_url}}">
Settings
</a>
</li>
Expand Down

0 comments on commit e299524

Please sign in to comment.