some fixes in notes templates

This commit is contained in:
artus
2018-10-14 16:55:33 +02:00
parent a2bac751c9
commit 5ed4706069
7 changed files with 40 additions and 27 deletions

View File

@@ -3,7 +3,6 @@
{% block title %}Notes >{% endblock %}
{% block breadcrumbs %}
<li>Notes</li>
{% endblock %}
{% block sidebar %}

View File

@@ -2,7 +2,7 @@
{% load bootstrap4 notes %}
{% block page_content %}
<div class="col-lg-8 col-md-12">
<div class="col-lg-7 col-md-12">
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
<div class="panel panel-primary">
<div class="panel-heading" role="tab" id="notesHeading">
@@ -26,7 +26,7 @@
</div>
</div>
<div class="col-lg-4 col-md-12">
<div class="col-lg-5 col-md-12">
{% block right_column %}{% endblock %}
</div>
{% endblock %}

View File

@@ -5,24 +5,23 @@
{% endblock %}
{% block breadcrumbs %}
{{ block.super }}
<li><a href="{% url "notes:liste-maraude" %}">Maraudes</a></li>
<li>{{ maraude }}</li>
<h6 class="navbar-text text-white my-2">Compte-rendu</h6>
<p class="navbar-text my-2 ml-2">{{ maraude }}</p>
{% endblock %}
{% block sidebar %}
<h6 class="sidebar-heading mt-4 px-3">Navigation</h6>
<nav class="d-flex px-3 justify-content-center" aria-label="Maraudes navigation">
<nav class="d-flex px-3 justify-content-left" aria-label="Maraudes navigation">
<ul class="pagination">
<li class="page-item {% if not prev_maraude %}disabled{% endif %}">
<a class="page-link" href="{% if prev_maraude %}{% url "notes:details-maraude" prev_maraude.pk %}{% else %}#{% endif %}" aria-label="Previous">
<span aria-hidden="true">&laquo;</span>
<a class="page-link px-4" href="{% if prev_maraude %}{% url "notes:details-maraude" prev_maraude.pk %}{% else %}#{% endif %}" aria-label="Previous">
<span class="oi oi-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
</li>
<li class="page-item {% if not next_maraude %}disabled{% endif %}">
<a class="page-link" href="{% if next_maraude %}{% url "notes:details-maraude" next_maraude.pk %}{%else%}#{% endif %}" aria-label="Next">
<span aria-hidden="true">&raquo;</span>
<a class="page-link px-4" href="{% if next_maraude %}{% url "notes:details-maraude" next_maraude.pk %}{%else%}#{% endif %}" aria-label="Next">
<span class="oi oi-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</li>
@@ -31,7 +30,7 @@
{% endblock %}
{% block right_column %}
<div class="card sticky-top mt-4">
<div class="card position-fixed">
<h6 class="card-header">Informations</h6>
<div class="card-body">
<p><strong>Maraudeurs :</strong>&nbsp; {{ maraude.binome }} & {{ maraude.referent }}</p>

View File

@@ -21,15 +21,19 @@
{% block page_content %}
{% block search %}{% endblock %}
<!-- Table -->
{% table object_list cols=3 cell_template=table_cell_template header=table_header %}
{% if is_paginated %}
<div class="text-center">
<div class="d-flex flex-fill justify-content-center">
<ul class="pagination">{% with request.GET.filter as filter %}
{% for num in page_obj.paginator.page_range %}
<li {% if page_obj.number == num %} class="active" {%endif%}><a href="?{% if filter %}filter={{ filter }}&{%endif%}page={{num}}">{{num}}</a></li>
<li class="page-item {% if page_obj.number == num %}active{%endif%}">
<a class="page-link" href="?{% if filter %}filter={{ filter }}&{%endif%}page={{num}}">{{num}}</a>
</li>
{%endfor%}{% endwith %}
</ul>
</div>
{% endif %}
<!-- Table -->
<div class="card card-body">
{% table object_list cols=3 cell_template=table_cell_template header=table_header %}
</div>
{% endblock %}

View File

@@ -5,8 +5,7 @@
{% endblock %}
{% block breadcrumbs %}
{{block.super}}
<li><a href="{% url "notes:liste-maraude" %}">Maraudes</a></li>
<h6 class="navbar-text my-2 text-white">Liste des maraudes</h6>
{% endblock %}

View File

@@ -3,9 +3,7 @@
{% block title %}{{block.super}} Liste des sujets {% endblock %}
{% block breadcrumbs %}
{{ block.super }}
<li><a href="{% url "notes:liste-sujet" %}">Sujets</a></li>
{% if query_text %}<li>'{{query_text}}'</li>{% endif %}
<h6 class="navbar-text text-white my-2">Liste des sujets</h6>
{% endblock %}
{% block sidebar_insert %}