Skip to content
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

ADMIN - Fixed navbar and sidenav #2556

Merged
merged 2 commits into from
May 22, 2023
Merged

ADMIN - Fixed navbar and sidenav #2556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad3af45
Fixed navbar and sidenav
TheoLechemia May 22, 2023
3e18023
style
TheoLechemia May 22, 2023
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
34 changes: 18 additions & 16 deletions backend/geonature/templates/admin/index_layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,38 @@
{% set children = item.get_children() %}
{%- if children %}
<a
data-toggle="collapse"
href="#collapseExample"
class="list-group-item disabled list-group-item-action main-item">
class="list-group-item list-group-item-action main-item">
{{ layout.menu_icon(item) }}{{ item.name }}
</a>
{%- for child in children -%}
{%- if child.is_category() -%}
{{ menu(menu_root=[child]) }}
{% else %}

<a
href="{{ child.get_url() }}"
class="list-group-item list-group-item-action child-item">
{{ layout.menu_icon(child) }}{{ child.name }}
</a>
{%- for child in children -%}
{%- if child.is_category() -%}
{{ menu(menu_root=[child]) }}
{% else %}

<a
href="{{ child.get_url() }}"
class="list-group-item list-group-item-action child-item">
{{ layout.menu_icon(child) }}{{ child.name }}
</a>

{%- endif %}
{%- endfor %}

{%- endif %}
{%- endfor %}
{% endif %}
{%- else %}
{%- if item.is_accessible() and item.is_visible() -%}
{%- if item.is_accessible() and item.is_visible() and item.name != 'Accueil' -%}

<a
href="{{ item.get_url() }}"
{% if item.target %} target="{{ item.target }}"{% endif %}
class="list-group-item list-group-item-action main-item">
{{ layout.menu_icon(item) }}{{ item.name }}
{{ layout.menu_icon(item) }}{{ item.name }}
</a>

{%- endif -%}
{% endif -%}
{% endfor %}
</div>

{% endmacro %}
99 changes: 60 additions & 39 deletions backend/geonature/templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,69 +3,90 @@

{% extends 'admin/base.html' %}

{% block head_tail %}
{% block head_css %}
{{ super() }}
<style>
.side-nav {
min-height: 94vh;
width: 15%;
background-color:#EEE; ;
#sticky-sidebar {
max-height: 94vh;
overflow-y: auto;
}
#main {
display: flex;

#container {
margin-top:80px;
}
.navbar {
margin-bottom: 0px;
}
#header {
height: 6vh;
height: 60px;
z-index: 100;
background-color: white;
border-bottom: solid 1px;
}
.main-item {
font-weight: bold;
background-color: gainsboro!important;
}
.child-item {
padding-left: 35px;
}
#content {
width: 85%;
padding: 20px;
}
#header {
border-bottom: solid 1px;
#sideNavToggler{
border-color:black
}
</style>
{% endblock %}

{% block page_body %}
{% block head_tail %}
<script>
function toggleSideBar() {
var main = document.getElementById("main");
if(main.classList.contains("offset-2")) {
document.getElementById("sticky-sidebar").style.display = "none"
main.classList.remove("offset-2");
main.classList.remove("col-10");
main.classList.add("col-12");
} else {
document.getElementById("sticky-sidebar").style.display = "block"
main.classList.add("offset-2");
main.classList.remove("col-12");
main.classList.add("col-10");
}

}

<div id="container">
<nav id="header" class="navbar navbar-expand-lg navbar-light">
<a class="navbar-brand mr-auto" href=" {{url_for("admin.index")}} ">Administration GeoNature</a>
<ul class="navbar-nav my-2 my-lg-0">
<li class="nav-item">
{{layout.menu_links()}}
</li>
</ul>
</nav>
</script>
{% endblock %}

<div id="main">
<nav class="side-nav">
{{index_layout.menu()}}
{% block page_body %}

</nav>
<div id="content" >
{% block brand %}
<h2 id="brand">{{ admin_view.name|capitalize }}</h2>
{% endblock %}
{{ layout.messages() }}
<nav id="header" class="navbar navbar-expand-lg navbar-light fixed-top">

{% set render_ctx = h.resolve_ctx() %}
<button id="sideNavToggler" class="mr-2 btn btn-light" type="button" onclick="toggleSideBar()" > <span class="navbar-toggler-icon"></span></button>
<a class="navbar-brand mr-auto" href=" {{url_for("admin.index")}} ">
<i class="fa fa-home"></i>
Administration GeoNature
</a>
<ul class="navbar-nav my-2 my-lg-0">
<li class="nav-item">
{{layout.menu_links()}}
</li>
</ul>
</nav>
<div class="container-fluid" id="container">
<div class="row" >
<div class="col-2 px-1 position-fixed" id="sticky-sidebar">

{% block body %}
{% endblock %}
</div>
</div>
{{index_layout.menu()}}
</div>

<div class="col-10 offset-2" id="main">
{% block body %}
{% endblock %}
</div>
</div>

</div>
</div>
{% endblock %}