diff --git a/requirements.txt b/requirements.txt index d7f8017..62a29b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.8.6 +Django==1.9.1 tabimport openpyxl==2.2.6 xlrd diff --git a/stages/static/js/attribution.js b/stages/static/js/attribution.js index 2140ea1..d23836f 100644 --- a/stages/static/js/attribution.js +++ b/stages/static/js/attribution.js @@ -1,3 +1,5 @@ +$ = django.jQuery; + function update_periods(section_id) { if (!section_id) return; $.getJSON('/section/' + section_id + '/periods/', function(data) { diff --git a/stages/static/js/jquery.cookie.js b/stages/static/js/jquery.cookie.js index c4f99af..8bdbf85 100644 --- a/stages/static/js/jquery.cookie.js +++ b/stages/static/js/jquery.cookie.js @@ -35,7 +35,8 @@ } catch(er) {} } - var config = $.cookie = function (key, value, options) { + var $ = django.jQuery; + var config = $.cookie = function (key, value, options) { // write if (value !== undefined) { diff --git a/templates/attribution.html b/templates/attribution.html index 586443f..d4a73c9 100644 --- a/templates/attribution.html +++ b/templates/attribution.html @@ -33,10 +33,11 @@ {% endblock %} {% block extrahead %} - - - - + + + + + {% endblock %} diff --git a/templates/trainings_list.html b/templates/trainings_list.html index 2be5c0a..5eece70 100644 --- a/templates/trainings_list.html +++ b/templates/trainings_list.html @@ -2,7 +2,7 @@
  • {{ obj.student }} ({{ obj.student.klass }}) - {{ obj.availability.corporation }} - {{ obj.availability.domain }} {% if obj.referent %} (réf: {{ obj.referent }}){% else %}- Pas de référent{% endif %} {% if obj.availability.contact %} (cont: {{ obj.availability.contact }}){% else %}- Pas de contact{% endif %} -    - +    +
  • {% endfor %}