From 92128648acd0154d673e0ae56406a9f347cf8b22 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 29 May 2015 00:21:56 +0200
Subject: [PATCH] upgrade jquery from telemeta, add bootstrap, fix exam.urls

---
 teleforma/exam/templates/exam/inc/script_list.html     | 10 +++++-----
 .../exam/templates/exam/messages/script_marked.txt     |  2 +-
 teleforma/exam/templates/exam/quotas.html              |  2 +-
 teleforma/exam/templates/exam/script_detail.html       |  4 ++--
 teleforma/exam/templates/exam/scripts.html             | 10 +++++-----
 teleforma/templates/telemeta/base.html                 |  4 +++-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/teleforma/exam/templates/exam/inc/script_list.html b/teleforma/exam/templates/exam/inc/script_list.html
index 622533c3..03e85424 100644
--- a/teleforma/exam/templates/exam/inc/script_list.html
+++ b/teleforma/exam/templates/exam/inc/script_list.html
@@ -24,11 +24,11 @@
     <tbody id="spacing" class="script-list">
     {% for script in object_list %}
     <tr>
-     <td>{% if script.status != 2 %}<a href="{% url teleforma-exam-script-detail period.id script.id %}">{% endif %}{{ script.course.title }}{% if script.status != 2 %}</a>{% endif %}</td>
-     <td>{% if script.status != 2 %}<a href="{% url teleforma-exam-script-detail period.id script.id %}">{% endif %}{{ script.session }}{% if script.status != 2 %}</a>{% endif %}</td>
-     <td>{% if script.status != 2 %}<a href="{% url teleforma-exam-script-detail period.id script.id %}">{% endif %}{{ script.type }}{% if script.status != 2 %}</a>{% endif %}</td>
-     <td>{% if script.author.username %}<a href="{% url teleforma-profile-detail script.author.username %}">{{ script.author.last_name }}</a>{% endif %}</td>
-     <td>{% if script.author.username %}<a href="{% url teleforma-profile-detail script.author.username %}">{{ script.author.first_name }}</a>{% endif %}</td>
+     <td>{% if script.status != 2 %}<a href="{% url 'teleforma-exam-script-detail' period.id script.id %}">{% endif %}{{ script.course.title }}{% if script.status != 2 %}</a>{% endif %}</td>
+     <td>{% if script.status != 2 %}<a href="{% url 'teleforma-exam-script-detail' period.id script.id %}">{% endif %}{{ script.session }}{% if script.status != 2 %}</a>{% endif %}</td>
+     <td>{% if script.status != 2 %}<a href="{% url 'teleforma-exam-script-detail' period.id script.id %}">{% endif %}{{ script.type }}{% if script.status != 2 %}</a>{% endif %}</td>
+     <td>{% if script.author.username %}<a href="{% url 'teleforma-profile-detail' script.author.username %}">{{ script.author.last_name }}</a>{% endif %}</td>
+     <td>{% if script.author.username %}<a href="{% url 'teleforma-profile-detail' script.author.username %}">{{ script.author.first_name }}</a>{% endif %}</td>
      <td>{{ script.date_added }}</td>
      <td>{% if script.date_marked %}{{ script.date_marked }}{% endif %}</td>
      <td>{% if script.corrector %}{{ script.corrector }}{% endif %}</td>
diff --git a/teleforma/exam/templates/exam/messages/script_marked.txt b/teleforma/exam/templates/exam/messages/script_marked.txt
index 628853d0..f899c837 100644
--- a/teleforma/exam/templates/exam/messages/script_marked.txt
+++ b/teleforma/exam/templates/exam/messages/script_marked.txt
@@ -4,7 +4,7 @@ Votre copie soumise le {{ script.date_added }} en {{ script.course }} pour la s
 
 La note, les commentaires et les annotations sont disponibles à cette adresse :
 
-http://{{ site.domain }}{% url teleforma-exam-script-detail script.period.id script.id %}
+http://{{ site.domain }}{% url 'teleforma-exam-script-detail' script.period.id script.id %}
 
 {% trans "Best regards" %},
 {% trans "The site administrator" %} {% trans "of the" %} {% organization %}
diff --git a/teleforma/exam/templates/exam/quotas.html b/teleforma/exam/templates/exam/quotas.html
index 4f8b8ff2..ac6138f0 100644
--- a/teleforma/exam/templates/exam/quotas.html
+++ b/teleforma/exam/templates/exam/quotas.html
@@ -30,7 +30,7 @@
     <tbody id="spacing" class="script-list">
     {% for quota in object_list %}
     <tr>
-     <td><a href="{% url teleforma-profile-detail quota.corrector.username %}">{{ quota.corrector.username }}</a></td>
+     <td><a href="{% url 'teleforma-profile-detail' quota.corrector.username %}">{{ quota.corrector.username }}</a></td>
      <td>{{ quota.course.title }}</td>
      <td>{{ quota.date_start }}</td>
      <td>{{ quota.date_end }}</td>
diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index 813f605a..0f754f1a 100644
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -91,11 +91,11 @@
 
 <div class="course_title">
 
-    <a href="{% url teleforma-desk-period-course period.id script.course.id %}">{{ script.title }}</a>
+    <a href="{% url 'teleforma-desk-period-course' period.id script.course.id %}">{{ script.title }}</a>
 
     <div style="float: right; font-size: 0.9em;">
         {% if topic.file %}
-        <a id="topic" href="{% url teleforma-document-download topic.id %}" class="component_icon button icon_download">&nbsp;{% trans "Topic" %}</a>
+        <a id="topic" href="{% url 'teleforma-document-download' topic.id %}" class="component_icon button icon_download">&nbsp;{% trans "Topic" %}</a>
         {% endif %}
         {% if script.score %}
         <a id="score" href="#" class="component_icon button icon_ok">{% trans "Score" %} : {{ script.score|floatformat }}/20</a>
diff --git a/teleforma/exam/templates/exam/scripts.html b/teleforma/exam/templates/exam/scripts.html
index a51d712b..d9d612bc 100644
--- a/teleforma/exam/templates/exam/scripts.html
+++ b/teleforma/exam/templates/exam/scripts.html
@@ -18,13 +18,13 @@
 
 {% block modules %}
 <div class="module">
-<h3><a href="{% url teleforma-desk %}"><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "Scripts" %}</a></h3>
+<h3><a href="{% url 'teleforma-desk' %}"><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "Scripts" %}</a></h3>
  <div style="background: white;">
   <ul>
   {% block courses %}
-   <li><a href="{% url teleforma-exam-scripts-pending period.id %}">{% trans "Pending" %}{% if user.is_staff or user.quotass.all %}{% untreated_scripts_count user period %}{% endif %}</a></li>
-   <li><a href="{% url teleforma-exam-scripts-treated period.id %}">{% trans "Marked" %}{% if not user.is_staff and not user.quotas.all %}{% treated_scripts_count user period %}{% endif %}</a></li>
-   <li><a href="{% url teleforma-exam-scripts-rejected period.id %}">{% trans "Rejected" %}</a></li>
+   <li><a href="{% url 'teleforma-exam-scripts-pending' period.id %}">{% trans "Pending" %}{% if user.is_staff or user.quotass.all %}{% untreated_scripts_count user period %}{% endif %}</a></li>
+   <li><a href="{% url 'teleforma-exam-scripts-treated' period.id %}">{% trans "Marked" %}{% if not user.is_staff and not user.quotas.all %}{% treated_scripts_count user period %}{% endif %}</a></li>
+   <li><a href="{% url 'teleforma-exam-scripts-rejected' period.id %}">{% trans "Rejected" %}</a></li>
   {% endblock courses %}
   </ul>
  </div>
@@ -34,7 +34,7 @@
 {% if upload %}
 {% block module-action %}
 <div class="module_action">
-<a href="{% url teleforma-exam-script-create period.id %}" class="component_icon button" id="action_green">{% trans "New script" %}</a>
+<a href="{% url 'teleforma-exam-script-create' period.id %}" class="component_icon button" id="action_green">{% trans "New script" %}</a>
 </div>
 {% endblock module-action %}
 {% endif %}
diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 8d1ff77b..692eb975 100644
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -25,6 +25,7 @@
 {% block stylesheets %}
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta.css" />
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}teleforma/css/teleforma.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/lib/bootstrap/dist/css/bootstrap.css" />
 
 <!--[if IE]>
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta_ie.css" />
@@ -38,7 +39,7 @@
 
 {% block javascript %}
 <script src="{% url 'django.views.i18n.javascript_catalog' %}" type="text/javascript"></script>
-<script src="{{ STATIC_URL }}teleforma/js/jquery-1.6.min.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/lib/jquery/dist/jquery.min.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}teleforma/js/jquery-ui.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}teleforma/js/jquery.expander.min.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}teleforma/js/messi.min.js" type="text/javascript"></script>
@@ -47,6 +48,7 @@
 <script src="{{ STATIC_URL }}telemeta/js/locale.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}telemeta/js/application.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}teleforma/js/application.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/lib/bootstrap/dist/js/bootstrap.min.js" type="text/javascript"></script>
 
 {% if user.is_authenticated %}
 <script type='text/javascript'>var CURRENT_USER_NAME="{{ user.username }}";</script>
-- 
2.39.5