added SignalementForm, updated NoteFormMixin, various fixes

This commit is contained in:
Arthur Gerbaud
2016-08-24 18:17:59 +02:00
parent 6e9a76696e
commit 746c21e52b
13 changed files with 100 additions and 38 deletions

View File

@@ -1,4 +1,3 @@
<div class="panel panel-primary">
<div class="panel-heading">
<h4 class="panel-title">Enregistrer un appel</h4>

View File

@@ -1,4 +1,5 @@
{% load bootstrap3 %}
{{ form.media.js }}{{ form.media.css }}
<form action="" method="POST">{% csrf_token %}
{% with "inline" as layout %}
<div class="form-group form-{{layout}} well col-md-10 col-md-offset-2">

View File

@@ -1,5 +1,7 @@
<div class="col-md-6 col-md-offset-6">
{% include "suivi/appel_form.html" %}
<div class="col-md-6">
{% include "suivi/signalement_form.html" with form=signalement_form %}
</div>
<div class="col-md-6">
{% include "suivi/appel_form.html" with form=appel_form %}
</div>

View File

@@ -1,9 +1,14 @@
{% load bootstrap3 %}
<li class="dropdown app-menu"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Sujets<b class="caret"></b></a>
<li class="app-menu">
<a href="{% url 'sujets:liste' %}">Liste des sujets
<span class="pull-right">{% bootstrap_icon "list" %}</span></a>
</li>
{% if user.is_superuser %}{% load bootstrap3 %}
<li class="dropdown app-menu">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
Administration <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="{% url 'sujets:liste' %}">{% bootstrap_icon "list" %} Liste complète</a></li>
{% if user.is_superuser %}{% load bootstrap3 %}
<li class="dropdown-header">Administration</li>
<li><a href="{% url 'sujets:create' %}">{% bootstrap_icon "plus" %} Nouveau sujet</a></li>
<li><a href="{% url 'admin:app_list' app_label='sujets' %}">
{% bootstrap_icon "wrench" %} Gérer les sujets</a></li>