fixes bootstrap4 imports, statistiques templates and adds shadow effect on active links

This commit is contained in:
artus
2018-10-13 23:08:39 +02:00
parent a7858d22b0
commit 5799ab1ea3
15 changed files with 85 additions and 97 deletions

View File

@@ -1,5 +1,5 @@
{% extends "notes/base.html" %}
{% load bootstrap3 notes %}
{% load bootstrap4 notes %}
{% block page_content %}
<div class="col-lg-8 col-md-12">

View File

@@ -1,5 +1,5 @@
{% extends "notes/details.html" %}
{% load bootstrap3 %}
{% load bootstrap4 %}
{% block title %}
{{ block.super }} {{ sujet }}
@@ -29,7 +29,7 @@
<div class="panel-heading" role="tab" id="notesAjoutHeading">
<h4 class="panel-title">
<a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseNotesAjout" aria-expanded="false" aria-controls="collapseTwo">
{% bootstrap_icon "plus" %} Ajouter une note
Ajouter une note
</a>
</h4>
</div>
@@ -60,11 +60,11 @@
</div>
<div class="panel-footer text-right">
<span class="text-right" id="normal-buttons">
<p>{% bootstrap_icon "tasks" %} {{ sujet.statistiques.info_completed }}%&nbsp;
<p>{{ sujet.statistiques.info_completed }}%&nbsp;
<span class="btn btn-primary btn-sm" id="update-stats">Mettre à jour</span></p>
</span>
<span class="text-right" id="update-buttons">
<label for="submit-form" class="btn btn-primary">{% bootstrap_icon "floppy-save" %} Enregistrer</label>
<label for="submit-form" class="btn btn-primary">Enregistrer</label>
<span class="btn btn-primary btn-sm" id="cancel">Annuler</span>
</span>
@@ -94,8 +94,8 @@
<div class="panel panel-primary text-right"><div class="panel-heading"><h4 class="panel-title"><strong>Administration :</strong></h4></div>
<div class="panel-body text-center">
<div class="btn-group-vertical" role="group" aria-label="...">
<a href="{% url 'admin:notes_note_changelist' %}?sujet__exact={{sujet.pk}}" class="btn btn-primary">{% bootstrap_icon "pencil" %} Éditer les notes</a>
<a href="{% url 'notes:sujets-merge' pk=object.pk %}" class="btn btn-danger">{% bootstrap_icon "paste" %} Fusionner</a>
<a href="{% url 'admin:notes_note_changelist' %}?sujet__exact={{sujet.pk}}" class="btn btn-primary">Éditer les notes</a>
<a href="{% url 'notes:sujets-merge' pk=object.pk %}" class="btn btn-danger">Fusionner</a>
</div>
</div>
</div>

View File

@@ -5,12 +5,13 @@
{{ block.super }}
{% block sidebar_insert %}{% endblock %}
{% if filters %}
<div class="well">
<h4 class="text-right"><span class="glyphicon glyphicon-filter"></span> <strong>Filtres</strong></h4>
<ul class="nav nav-pills nav-stacked text-right">
<h4 class="sidebar-heading mt-4 px-3">Filtrer</h4>
<ul class="nav flex-column">
{% for filter in filters %}
<li role="presentation" {% if filter.active %} class="active" {% endif %}>
<a href="?filter={{filter.parameter_name}}">{{ filter.title }}</a>
<li role="presentation" class="nav-item">
<a href="?filter={{filter.parameter_name}}" class="nav-link {% if filter.active %}active{% endif %}">
{{ filter.title }}
</a>
</li>
{% endfor %}
</ul>

View File

@@ -9,21 +9,18 @@
{% endblock %}
{% block sidebar_insert %}
<div class="panel panel-primary text-right">
<div class="panel-body">
<h4><strong>Rechercher</strong></h4>
<form action="{% url "notes:liste-sujet" %}" method="POST" class="form form-group">{% csrf_token %}
<div class="input-group">
<h4 class="sidebar-heading mt-4 px-3">Rechercher</h4>
<form action="{% url "notes:liste-sujet" %}" method="POST" class="form form-group">
{% csrf_token %}
<div class="input-group">
<input type="text" name="q" class="form-control" placeholder="Chercher un sujet" aria-describedby="basic-addon1">
<span class="input-group-btn">
<button type="submit" class="btn btn-primary"><span class=" glyphicon glyphicon-search"></span> </button>
<button type="submit" class="btn btn-primary">C</button>
</span>
</div>
</form>
<hr/>
<h4><strong>Outils</strong></h4>
<a class="btn btn-primary" href="{% url "notes:create-sujet" %}">
<span class="glyphicon glyphicon-plus"></span> Ajouter un sujet</a> </div></div>
</div>
</form>
<h4 class="sidebar-heading mt-4 px-3">Outils</h4>
<a class="btn btn-primary btn-block" href="{% url "notes:create-sujet" %}">Ajouter un sujet</a>
{% endblock %}
{% block search %}