python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved sidebar block menu for 'maraudes' and 'notes' inside a dropdown in navbar

Browse Source
This commit is contained in:
agerbaud
2017-07-20 14:44:33 +02:00
parent db79a48a9d
commit 9d95266fad
5 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
maraudes/templates/maraudes/base.html
View File

@@ -6,9 +6,3 @@
<li><a href="{% url "maraudes:index" %}">{{ date }}</a></li> <li><a href="{% url "maraudes:index" %}">{{ date }}</a></li>
{% endblock %} {% endblock %}
{% block sidebar %}
<div class="panel panel-default">
<div class="panel-body">
{% include "maraudes/menu.html" %}
</div>
</div>{% endblock %}

24
maraudes/templates/maraudes/menu.html
View File

@@ -1,25 +1,31 @@
{% load navbar %} {% load navbar %}
<ul class="nav nav-pills nav-stacked text-right"> <ul class="dropdown-menu">
<li role="presentation" {% active namespace="maraudes" viewname="index" %}> <li role="presentation" {% active namespace="maraudes" viewname="index" %}>
<a href="{% url "maraudes:index" %}">Tableau de bord&nbsp; <a href="{% url "maraudes:index" %}">
<span class="glyphicon glyphicon-dashboard"></span> <span class="glyphicon glyphicon-dashboard"></span>&nbsp;
Tableau de bord
</a> </a>
</li> </li>
<li role="presentation" {% active namespace="maraudes" viewname="create" %} <li role="presentation" {% active namespace="maraudes" viewname="create" %}
{% if not prochaine_maraude.date == date %} class="disabled"> {% if not prochaine_maraude.date == date %} class="disabled">
<a href="#">Compte-rendu&nbsp; <a href="#">
<span class="glyphicon glyphicon-pencil"></span></a> <span class="glyphicon glyphicon-pencil"></span>&nbsp;
Compte-rendu
</a>
</li> {% else %}> </li> {% else %}>
<a href="{% if prochaine_maraude.est_terminee %} <a href="{% if prochaine_maraude.est_terminee %}
{% url 'notes:details-maraude' pk=prochaine_maraude.pk %} {% url 'notes:details-maraude' pk=prochaine_maraude.pk %}
{%else%} {%else%}
{% url 'maraudes:create' pk=prochaine_maraude.pk %} {% url 'maraudes:create' pk=prochaine_maraude.pk %}
{% endif %}">Compte-rendu&nbsp; {% endif %}">
<span class="glyphicon glyphicon-pencil"></span></a> <span class="glyphicon glyphicon-pencil"></span>&nbsp;
Compte-rendu
</a>
</li> {% endif %} </li> {% endif %}
<li role="presentation" {% active namespace="maraudes" viewname="planning" %}> <li role="presentation" {% active namespace="maraudes" viewname="planning" %}>
<a href="{% url "maraudes:planning" %}">Planning&nbsp; <a href="{% url "maraudes:planning" %}">
<span class="glyphicon glyphicon-calendar"></span> <span class="glyphicon glyphicon-calendar"></span>&nbsp;
Planning
</a> </a>
</li> </li>
</ul> </ul>

6
notes/templates/notes/base.html
View File

@@ -7,8 +7,4 @@
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}
<div class="panel panel-default"> {% endblock %}
<div class="panel-body">
{% include "notes/menu.html" %}
</div>
</div>{% endblock %}

16
notes/templates/notes/menu.html
View File

@@ -1,13 +1,15 @@
{% load navbar %} {% load navbar %}
<ul class="nav nav-pills nav-stacked text-right"> <ul class="dropdown-menu">
<li role="presentation" {% active namespace="notes" viewname="liste-sujet" %}> <li {% active namespace="notes" viewname="liste-sujet" %}>
<a href="{% url "notes:liste-sujet" %}">Par sujet&nbsp; <a href="{% url "notes:liste-sujet" %}">
<span class="glyphicon glyphicon-user"></span> <span class="glyphicon glyphicon-user"></span>&nbsp;
Par sujet
</a> </a>
</li> </li>
<li role="presentation" {% active namespace="notes" viewname="liste-maraude" %}> <li {% active namespace="notes" viewname="liste-maraude" %}>
<a href="{% url "notes:liste-maraude" %}">Par maraude&nbsp; <a href="{% url "notes:liste-maraude" %}">
<span class="glyphicon glyphicon-road"></span> <span class="glyphicon glyphicon-road"></span> &nbsp;
Par maraude
</a> </a>
</li> </li>
</ul> </ul>

10
website/templates/base.html
View File

@@ -30,8 +30,14 @@
<div class="collapse navbar-collapse" id="navbar-collapse"> <div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-left"> <ul class="nav navbar-nav navbar-left">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li {% active namespace="maraudes" %}><a href="{% url "maraudes:index" %}">{% bootstrap_icon "road" %}&nbsp; Maraudes</a></li> <li class="dropdown">
<li {% active namespace="notes" %}><a href="{% url "notes:index" %}">{% bootstrap_icon "pencil" %}&nbsp; Notes</a></li> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% bootstrap_icon "road" %}&nbsp; Maraudes</span></a>
{% include "maraudes/menu.html" %}
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% bootstrap_icon "pencil" %}&nbsp; Notes</span></a>
{% include "notes/menu.html" %}
</li>
{% else %} {% else %}
<li {% active namespace="statistiques" %}><a href="{% url "statistiques:index" %}">{% bootstrap_icon "stats" %}&nbsp; Statistiques</a></li> <li {% active namespace="statistiques" %}><a href="{% url "statistiques:index" %}">{% bootstrap_icon "stats" %}&nbsp; Statistiques</a></li>
{% endif %} {% endif %}