Navbar (#31)

* started workin on 'navbar' module

* changed bootstrap theme to bootswatch/Simplex

* big work on navbar logic

* starting creating menus using navbar

* converted app views to new Wepage decorator, updated navbar

* reimplemented DernieresMaraudes as a dropdown instead of ContextMixin

* reorganised static files, minor code cleanups

* turned Link.href into lazy-evaluated property

* collapsed 'navbar' module into 'website', dynamic building of ApplicationMenu subclasses

* minor cleanup

* blah blah blah

* added way to add admin/non-admin links

* minor style change : red border for active page instead of all dropdowns

* deleted file

* prepare adding removing menu templates files, being replaced by code

* essayé de généraliser le code pour les modaux bootstrap, non testé git status

* more preparation and thinking on navbar app_menus logic...

* added LinkManager and DropdownManager, getting closer...

* small fix in DropdownManager.__get__

* boosted up work: keep it simple so it can be merged fast, major layout changes

* added month filter on maraudes:liste

* added 'as_icon' filter to display boolean/null values as bootstrap icons

* remove inactive user from planning selection

* removed all unused 'menu' templates

* set up django_select2 to use static files

* small fix after review

maraudes/templates/compte_rendu/compterendu.html

@@ -1,15 +1,15 @@
 {% load notes %}
-<h3> Compte-rendu </h3>
-
-<table class="table table-bordered">
+<div class="col-lg-6 col-md-12">
+  <table class="table table-bordered">
   {% for note in notes %}
       {% inline_table note header="sujet" %}
   {% endfor %}
-</table>
-
-<div class="well bg-info">
-  <p><strong>Informations</strong></p>
-  <p>Rencontres : {{ maraude.observation_count}}</p>
+  </table>
+</div>
+<div class="col-lg-6 col-md-12">
+  <div class="well bg-info">
+    <p><strong>Informations</strong></p>
+    <p>Rencontres : {{ maraude.rencontre_count}}</p>
+    <p>Personnes rencontrées : {{ maraude.observation_count}}</p>
+  </div>
 </div>
-
-

maraudes/templates/compte_rendu/compterendu_create.html

@@ -1,6 +1,6 @@
 {% load bootstrap3 %}{% load staticfiles %}
 
-<script type="text/javascript" src="{% static "jquery.formset.js" %}"></script>
+<script type="text/javascript" src="{% static "scripts/jquery.formset.js" %}"></script>
 <script type="text/javascript">
   /* Dynamic Formsets */
   $(function() {
@@ -38,6 +38,14 @@
 
 <div class="row">
   <div class="col-lg-6 col-md-12">
+    <!-- Modal buttons -->
+    <div class="well well-sm text-right"><strong>Créer un nouvel objet :</strong>
+    <div class="btn-group" role="group" aria-label="...">
+      <button id="new-sujet" class="btn btn-sm btn-primary">{% bootstrap_icon "user" %} Sujet</button>
+      <button id="new-lieu" class="btn btn-sm btn-primary">{% bootstrap_icon "globe" %} Lieu</button>
+    </div>
+    </div>
+
     <form method="post" action="{% url 'maraudes:create' maraude.pk %}?finalize=False">
     {% csrf_token %}
       <div class="panel panel-primary panel-collapse">
@@ -71,7 +79,7 @@
     </div>
   </div>
 </div>
-
+<!-- Modal and button linking -->
 <div class="modal fade" id="form-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
    <div class="modal-dialog">
      <div class="modal-content">
@@ -85,3 +93,12 @@
      </div>
    </div>
 </div>
+<script type="text/javascript" src="{% static 'scripts/bootstrap-modal.js' %}"></script>
+<script type="text/javascript">
+  $.fn.openModalEvent('new-sujet',
+  '{% url "sujets:create" %}?next={% url "maraudes:create" pk=maraude.pk %}',
+  'Nouveau sujet');
+  $.fn.openModalEvent('new-lieu',
+  '{% url "maraudes:lieu-create" %}?next={% url "maraudes:create" pk=maraude.pk %}',
+  'Nouveau lieu');
+</script>

maraudes/templates/compte_rendu/menu/creation.html

@@ -1,54 +0,0 @@
-{% load bootstrap3 %}
-  <li class="dropdown app-menu"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Création<b class="caret"></b></a>
-  <ul class="dropdown-menu">
-    <li><a href="#" id="new-sujet">{% bootstrap_icon "user" %} Nouveau sujet</a></li>
-    <li><a href="#" id="new-lieu">{% bootstrap_icon "globe" %} Nouveau lieu</a></li>
-  </ul>
-
-<script type="text/javascript">
-    /* Lier les boutons de création
-    *  Thanks to Derek Morgan, https://dmorgan.info/posts/django-views-bootstrap-modals/
-    */
-  $(function() {
-
-    var formAjaxSubmit = function(form, modal) {
-     $(form).submit(function (e) {
-         e.preventDefault();
-         $.ajax({
-             type: $(this).attr('method'),
-             url: $(this).attr('action'),
-             data: $(this).serialize(),
-             success: function (xhr, ajaxOptions, thrownError) {
-                 if ( $(xhr).find('.has-error').length > 0 || $(xhr).find('.alert-danger').length > 0) {
-                     $(modal).find('.modal-body').html(xhr);
-                     formAjaxSubmit(form, modal);
-                 } else {
-                     $(modal).modal('toggle');
-                    // Reload page ?
-                     location.reload(true)
-                 }
-             },
-             error: function (xhr, ajaxOptions, thrownError) {
-                 // handle response errors here
-             }
-         });
-      });
-    };
-  /* TODO: Use formAjaxSubmit above, but reload page on form success */
-     $('#new-sujet').click(function() {
-         $('#form-modal-body').load('{% url "sujets:create" %}?next={% url "maraudes:create" pk=maraude.id %}', function () {
-            $('.modal-title').text("Nouveau sujet");
-            $('#form-modal').modal('toggle');
-            formAjaxSubmit("#form-modal-body form", "#form-modal");
-         });
-     });
-    $('#new-lieu').click(function() {
-
-         $('#form-modal-body').load('{% url "maraudes:lieu-create" %}?next={% url "maraudes:create" pk=maraude.id %}', function () {
-            $('.modal-title').text("Nouveau lieu");
-            $('#form-modal').modal('toggle');
-            formAjaxSubmit("#form-modal-body form", "#form-modal");
-         });
-     });
-  });
-</script>