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

cleaning up, improved scripts and menus

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-13 20:59:48 +02:00
parent 12f23b8acb
commit 128314bcb3
25 changed files with 274 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
maraudes/templates/compte_rendu/compterendu_create.html
View File

@@ -1,14 +1,10 @@
{% load bootstrap3 %}
{% load staticfiles %}
{% load bootstrap3 %}{% load staticfiles %}
{{ form.media.js }}{{ form.media.css }}
<script type="text/javascript" src="{% static "jquery.formset.js" %}"></script>
<script type="text/javascript">
/* Dynamic Formsets */
$(function() {
$.fn.onAddForm = function(row) {
/*
* Custom code to integrate with django-select2 and bootstrap3
*/
// Load django_select2 fields
row.find('.django-select2').djangoSelect2();
var button = row.find('a.btn-delete')
@@ -22,8 +18,6 @@
*/
};
});
$(function() {
$('.dynamic-formset').formset({
prefix: '{{ inline_formset.prefix }}',
@@ -40,67 +34,8 @@
text = $('a.btn-delete:first').text()
$('a.btn-delete').html('<span class="glyphicon glyphicon-minus"></span> ' + text);
});
/* 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 ) {
$(modal).find('.modal-body').html(xhr);
formAjaxSubmit(form, modal);
} else {
$(modal).modal('toggle');
// Reload page ?
}
},
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');
});
});
$('#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');
});
});
});
</script>
<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">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Modal title</h4>
</div>
<div id="form-modal-body" class="modal-body">
...
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Fermer</button>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 col-sd-12">
<form method="post" action="{% url 'maraudes:create' maraude.pk %}?finalize=False">
@@ -114,18 +49,9 @@
<div class="panel-body">
{% include "compte_rendu/compterendu_form.html" %}
</div>
<div class="panel-footer text-right">
<div class="btn-group">
<a class= "btn btn-primary" id="new-sujet">
{% bootstrap_icon "user" %} Nouveau sujet</a>
<a class="btn btn-primary" id="new-lieu">
{% bootstrap_icon "globe" %} Nouveau lieu</a>
</div>
</div>
</div>
</form>
</div>
<div class="col-md-6 col-sd-12">
<div class="panel panel-default">
<div class="panel-heading"><h4>Enregistrées
@@ -142,3 +68,17 @@
</div>
</div>
</div>
<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">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Modal title</h4>
</div>
<div id="form-modal-body" class="modal-body">
<div class="alert alert-warning">Content should be there...</div>
</div>
</div>
</div>
</div>