Migrate url to django 3

diff --git a/app/urls.py b/app/urls.py
index c9d8ce9482121e67a167fc11fe70f1a0127d08f5..132935a2853a4b37d159bbfe2ec3b965fdfb49d6 100644 (file)
--- a/app/urls.py
+++ b/app/urls.py
@@ -22,7 +22,7 @@ urlpatterns = [
 
     # Languages
     url(r'^i18n/', include('django.conf.urls.i18n')),
-    url(r'^jsi18n/$', JavaScriptCatalog.as_view(packages=js_info_dict)),
+    url(r'^jsi18n/$', JavaScriptCatalog.as_view(packages=js_info_dict), name="js_catalog"),
     url(r'^robots\.txt$', lambda r: HttpResponse(
         "User-agent: *\nDisallow: /", mimetype="text/plain")),
 

diff --git a/teleforma/exam/templates/exam/inc/script_list.html b/teleforma/exam/templates/exam/inc/script_list.html
index c6edfbfdf3f053983faea10061a72f15feda65d7..911318c7fbff61a3a5e00ce3e8d786cd23a231a3 100644 (file)
--- a/teleforma/exam/templates/exam/inc/script_list.html
+++ b/teleforma/exam/templates/exam/inc/script_list.html
@@ -23,11 +23,11 @@
     <tbody id="spacing" class="script-list">
     {% for script in object_list %}
     <tr>
-     <td>{% if script.status != 2 and script.file %}<a href="{% url teleforma-exam-script-detail period.id script.id %}">{% endif %}{{ script.course.title }}{% if script.status != 2 and script.file %}</a>{% endif %}</td>
-     <td>{% if script.status != 2  and script.file%}<a href="{% url teleforma-exam-script-detail period.id script.id %}">{% endif %}{{ script.session }}{% if script.status != 2 and script.file %}</a>{% endif %}</td>
-     <td>{% if script.status != 2 and script.file %}<a href="{% url teleforma-exam-script-detail period.id script.id %}">{% endif %}{{ script.type }}{% if script.status != 2 and script.file %}</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 and script.file %}<a href="{% url 'teleforma-exam-script-detail' period.id script.id %}">{% endif %}{{ script.course.title }}{% if script.status != 2 and script.file %}</a>{% endif %}</td>
+     <td>{% if script.status != 2  and script.file%}<a href="{% url 'teleforma-exam-script-detail' period.id script.id %}">{% endif %}{{ script.session }}{% if script.status != 2 and script.file %}</a>{% endif %}</td>
+     <td>{% if script.status != 2 and script.file %}<a href="{% url 'teleforma-exam-script-detail' period.id script.id %}">{% endif %}{{ script.type }}{% if script.status != 2 and script.file %}</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>

diff --git a/teleforma/exam/templates/exam/messages/script_marked.txt b/teleforma/exam/templates/exam/messages/script_marked.txt
index 6d62e43c9e5b101a0608c97401100a800ece6fce..79de53d563a0a017b850b81ebfa5661069d2de34 100644 (file)
--- 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 171eea13c074e106e8b89057dd7a938769c10a22..dedc3e163a67f2f9cf17ff0109b381a268b6d81f 100644 (file)
--- a/teleforma/exam/templates/exam/quotas.html
+++ b/teleforma/exam/templates/exam/quotas.html
@@ -29,7 +29,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/score_form.html b/teleforma/exam/templates/exam/score_form.html
index 1846de9efe005ed84e20fe421d3d83518d196881..3bc6e24f2a59c8e1051890a0421a32ae2107c634 100644 (file)
--- a/teleforma/exam/templates/exam/score_form.html
+++ b/teleforma/exam/templates/exam/score_form.html
@@ -42,7 +42,7 @@
 
 
 <div>Ce formulaire vous permet d'enregistrer la note d'une copie papier <b>déjà corrigée hors de la plateforme e-learning</b>.</div>
-<div>Pour soumettre une nouvelle copie d'épreuve scannée à la correction en ligne, merci d'utiliser <a href="{% url teleforma-exam-script-create period.id %}">ce formulaire</a>.</div>
+<div>Pour soumettre une nouvelle copie d'épreuve scannée à la correction en ligne, merci d'utiliser <a href="{% url 'teleforma-exam-script-create' period.id %}">ce formulaire</a>.</div>
 <br/>
 <div>Veuillez indiquer <b>tous les champs</b> du formulaire suivant :</div>
 

diff --git a/teleforma/exam/templates/exam/scores.html b/teleforma/exam/templates/exam/scores.html
index 283a687f138e6fe16e26644fe13d0c90e2f29870..27ad9bc396b7a01083060fb9a67a2b9f7d8aabbf 100644 (file)
--- a/teleforma/exam/templates/exam/scores.html
+++ b/teleforma/exam/templates/exam/scores.html
@@ -16,11 +16,11 @@
 
 {% block modules %}
     <div class="module">
-    <h3><a href="{% url teleforma-home %}"><img src="/static/teleforma/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "My courses" %}</a></h3>
+    <h3><a href="{% url 'teleforma-home' %}"><img src="/static/teleforma/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "My courses" %}</a></h3>
     <div style="background: white;">
     <ul>
      {% for course in courses %}
-       <li><a href="{% url teleforma-exam-scripts-scores-course period.id course.id %}">{{ course.title}} {{ course.type }}</a></li>
+       <li><a href="{% url 'teleforma-exam-scripts-scores-course' period.id course.id %}">{{ course.title}} {{ course.type }}</a></li>
      {% endfor %}
     </ul>
     </div>
@@ -29,12 +29,12 @@
 {% block module-action %}
 {% if upload %}
 <div class="module_action">
-<a href="{% url teleforma-exam-scores-create period.id %}" class="component_icon button" id="action_green">{% trans "New score" %}</a>
+<a href="{% url 'teleforma-exam-scores-create' period.id %}" class="component_icon button" id="action_green">{% trans "New score" %}</a>
 </div>
 {% endif %}
 {% if admin %}
 <div class="module_action">
-<a href="{% url teleforma-exam-scores-mass-create period.id %}" class="component_icon button" id="action_green">Saisie en masse de notes</a>
+<a href="{% url 'teleforma-exam-scores-mass-create' period.id %}" class="component_icon button" id="action_green">Saisie en masse de notes</a>
 </div>
 {% endif %}
 {% endblock module-action %}

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index 525dc74d063712ef86445f8f4a7ab66aac5a4fbf..0281e1e027457c6e6371223d233cb17f1948854e 100644 (file)
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -47,11 +47,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/script_detail2.html b/teleforma/exam/templates/exam/script_detail2.html
index 2adc1932fee3bcc0e5f7609b007c87d021a34f8f..825800c94dccd00927292e28c14470232488ede4 100644 (file)
--- a/teleforma/exam/templates/exam/script_detail2.html
+++ b/teleforma/exam/templates/exam/script_detail2.html
@@ -31,11 +31,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 9c04f3fc4a67117534d4275668498532e17e2fb0..76ab9ba620bc97f033b921b906ecc81cb1039321 100644 (file)
--- a/teleforma/exam/templates/exam/scripts.html
+++ b/teleforma/exam/templates/exam/scripts.html
@@ -17,13 +17,13 @@
 
 {% block modules %}
 <div class="module">
-<h3><a href="{% url teleforma-desk %}"><img src="/static/teleforma/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "Scripts" %}</a></h3>
+<h3><a href="{% url 'teleforma-desk' %}"><img src="/static/teleforma/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>
@@ -32,7 +32,7 @@
 {% block module-action %}
 {% if upload %}
 <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>
 {% endif %}
 {% endblock module-action %}

diff --git a/teleforma/templates/admin/base.html b/teleforma/templates/admin/base.html
index 4eb8916680e8b2efbb602cc56fb4a68a0ad28540..888f3fb4bc057e8d8dd0bfe5847f46a2193f9040 100644 (file)
--- a/teleforma/templates/admin/base.html
+++ b/teleforma/templates/admin/base.html
@@ -153,7 +153,7 @@
               {% block quick-search %}
                 {% with 'SEARCH_URL'|suit_conf as search_url %}
                   {% if search_url %}
-                    <form class="form-search nav-quick-search" autocomplete="off" action="{% if '/' in search_url %}{{ search_url }}{% else %}{% url search_url %}{% endif %}" method="GET">
+                    <form class="form-search nav-quick-search" autocomplete="off" action="{% if '/' in search_url %}{{ search_url }}{% else %}{% url 'search_url' %}{% endif %}" method="GET">
                       <input type="text" name="q" class="input-medium search-query" id="quick-search">
                       <i class="input-icon icon-search"></i>
                       <input type="submit" class="submit" value="">

diff --git a/teleforma/templates/payment/email_initial.txt b/teleforma/templates/payment/email_initial.txt
index 2aa44539f6c4b020f9fb7ca70ef68432f6cab7fb..fb52c7cd665477d334c2656b8c6e542956d8f0e6 100644 (file)
--- a/teleforma/templates/payment/email_initial.txt
+++ b/teleforma/templates/payment/email_initial.txt
@@ -1,4 +1,4 @@
-{% url teleforma-payment-start payment.pk as payment_url %}
+{% url 'teleforma-payment-start' payment.pk as payment_url %}
 Bonjour,
 
 Suite à votre inscription à la formation {{ period }}, une échéance de

diff --git a/teleforma/templates/payment/email_reminder.txt b/teleforma/templates/payment/email_reminder.txt
index 90a3ae12196710591c87e35d33d1d0201fe09b47..04a1aa40d33a21917841c4be5f54e75a2a8d081f 100644 (file)
--- a/teleforma/templates/payment/email_reminder.txt
+++ b/teleforma/templates/payment/email_reminder.txt
@@ -1,4 +1,4 @@
-{% url teleforma-payment-start payment.pk as payment_url %}
+{% url 'teleforma-payment-start' payment.pk as payment_url %}
 Bonjour,
 
 A ce jour, nous restons dans l’attente de votre échéance de paiement

diff --git a/teleforma/templates/payment/payment_summary.html b/teleforma/templates/payment/payment_summary.html
index 0ff5e3a8297f0d3bdacbba1b1fa9ee44b282efea..4c06d4b6e362d46ceef063fe1c7f08dd8e8a4b61 100644 (file)
--- a/teleforma/templates/payment/payment_summary.html
+++ b/teleforma/templates/payment/payment_summary.html
@@ -4,7 +4,7 @@
   <h2>Votre échéancier de paiement</h2>
 
   <p>
-    <a href="{% url teleforma-receipt-download username=user.username %}" class="component_icon button">Télécharger la facture</a>
+    <a href="{% url 'teleforma-receipt-download' username=user.username %}" class="component_icon button">Télécharger la facture</a>
   </p>
   
   <table>

diff --git a/teleforma/templates/postman/view.html b/teleforma/templates/postman/view.html
index c4d25f807048a2179a742389cc9d102cdb762cf5..ce988abb4897f10607948f7313540efcb8398f81 100644 (file)
--- a/teleforma/templates/postman/view.html
+++ b/teleforma/templates/postman/view.html
@@ -16,14 +16,14 @@
  <div class="pm_header">
   {% if message.obfuscated_sender %}
     {% if not message.obfuscated_sender|startswith:'#' %}
-    <a href="{% url teleforma-profile-detail message.obfuscated_sender %}" title="{% get_training_profile message.sender %}">
+    <a href="{% url 'teleforma-profile-detail' message.obfuscated_sender %}" title="{% get_training_profile message.sender %}">
     {% endif %}
          <span class="pm_sender">{{ message.obfuscated_sender|or_me:user }}</span>
          {% if not message.obfuscated_sender|startswith:'#' %}</a>{% endif %}&raquo;
   {% endif %}
   {% if message.obfuscated_recipient %}
     {% if not message.obfuscated_recipient|startswith:'#' %}
-    <a href="{% url teleforma-profile-detail message.obfuscated_recipient %}" title="{% get_training_profile message.recipient %}">
+    <a href="{% url 'teleforma-profile-detail' message.obfuscated_recipient %}" title="{% get_training_profile message.recipient %}">
     {% endif %}
          <span class="pm_recipient">{{ message.obfuscated_recipient|or_me:user }}</span>
          {% if not message.obfuscated_recipient|startswith:'#' %}</a>{% endif %} |

diff --git a/teleforma/templates/registration/activate.html b/teleforma/templates/registration/activate.html
index a85fd163111bc64bb282337d4a2d7fc16efc966e..48d2d8350e1905ff434ffd10f33f241b64d4814e 100644 (file)
--- a/teleforma/templates/registration/activate.html
+++ b/teleforma/templates/registration/activate.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block title %}{% if account %}{% trans "Activation complete" %}{% else %}{% trans "Activation problem" %}{% endif %}{% endblock %}
 {% block content %}
-{% url teleforma-login as auth_login_url %}
+{% url 'teleforma-login' as auth_login_url %}
 {% if account %}
 {% blocktrans %}
 Thanks {{ account }}, activation complete!

diff --git a/teleforma/templates/registration/activation_complete.html b/teleforma/templates/registration/activation_complete.html
index a83b1b0b393c43f05885d7850307b955a3382d69..4098e357de633d8840bebeaf80146368056a5e50 100644 (file)
--- a/teleforma/templates/registration/activation_complete.html
+++ b/teleforma/templates/registration/activation_complete.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block title %}{% trans "Activation complete" %}{% endblock %}
 {% block content %}
-{% url teleforma-login as auth_login_url %}
+{% url 'teleforma-login' as auth_login_url %}
 {% blocktrans %}
 Thanks, activation complete!  You may now <a href='{{ auth_login_url }}'>login</a> using the username and password you set at registration.
 {% endblocktrans %}

diff --git a/teleforma/templates/registration/login.html b/teleforma/templates/registration/login.html
index b467f91e67d2ca68a282a3d124eb7474a80e2603..a91624d055ac3a2c74a28e55e423db5cfff75bbb 100644 (file)
--- a/teleforma/templates/registration/login.html
+++ b/teleforma/templates/registration/login.html
@@ -9,7 +9,7 @@
 <p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
 {% endif %}
 
-<form method="post" action="{% url teleforma-login %}">{% csrf_token %}
+<form method="post" action="{% url 'teleforma-login' %}">{% csrf_token %}
 <table>
 <tr>
     <td>{% trans form.username.label_tag %}</td>

diff --git a/teleforma/templates/registration/password_change_done.html b/teleforma/templates/registration/password_change_done.html
index b39cd4d95aa62f5de94a94d265de14e2a16b5e67..8789e28722b26dc8bd80e107ace52bd19e302202 100644 (file)
--- a/teleforma/templates/registration/password_change_done.html
+++ b/teleforma/templates/registration/password_change_done.html
@@ -1,6 +1,6 @@
 {% extends "teleforma/base.html" %}
 {% load i18n %}
-{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
+{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
 
 {% block title %}<br />{% trans 'Password change successful' %}{% endblock %}
 

diff --git a/teleforma/templates/registration/password_change_form.html b/teleforma/templates/registration/password_change_form.html
index 070340120e2a04b4d9d8b49b1552999bf4c54f58..e994011ce7c67d149dc2670ad0130579970d4c90 100644 (file)
--- a/teleforma/templates/registration/password_change_form.html
+++ b/teleforma/templates/registration/password_change_form.html
@@ -1,7 +1,7 @@
 {% extends "teleforma/base.html" %}
 {% load i18n adminmedia %}
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
-{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
+{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
 
 {% block title %}<br />{% trans 'Password change' %}{% endblock %}
 

diff --git a/teleforma/templates/registration/password_reset_email.html b/teleforma/templates/registration/password_reset_email.html
index 2db45208fc33b50d5f9938b46cd5149975ad4822..5bf161f6e07ef17f17cad0bf09ed271bba7ee56f 100644 (file)
--- a/teleforma/templates/registration/password_reset_email.html
+++ b/teleforma/templates/registration/password_reset_email.html
@@ -5,7 +5,7 @@
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url teleforma-password-reset-confirm uidb36=uid token=token %}
+{{ protocol }}://{{ domain }}{% url 'teleforma-password-reset-confirm' uidb36=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}
 

diff --git a/teleforma/templates/teleforma/base.html b/teleforma/templates/teleforma/base.html
index d753f910dbfcce035c0bab6211f1d0434c930488..a9b83ee1a61b517ff0e0b2e5e321e3434651f8cf 100644 (file)
--- a/teleforma/templates/teleforma/base.html
+++ b/teleforma/templates/teleforma/base.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 {% load i18n %}
 {% load teleforma_tags %}
-{% get_googletools as googletools %}
+{% comment %} {% get_googletools as googletools %}
 {%  if googletools %}
-{% load googletools %}
-{% endif %}
+{% load googletools %} {% endcomment %}
+{% comment %} {% endif %} {% endcomment %}
 {% get_current_language as LANGUAGE_CODE %}
 {% get_available_languages as LANGUAGES %}
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}"
@@ -40,7 +40,7 @@
   {% block extra_stylesheets %}{% endblock %}
 
   {% block javascript %}
-  <script src="{% url django.views.i18n.javascript_catalog %}" type="text/javascript"></script>
+  <script src="{% url 'js_catalog' %}" type="text/javascript"></script>
   <script src="/static/teleforma/js/jquery-1.6.min.js" type="text/javascript"></script>
   <script src="/static/teleforma/js/jquery-ui.js" type="text/javascript"></script>
   <script src="/static/teleforma/js/jquery.expander.min.js" type="text/javascript"></script>
@@ -94,13 +94,13 @@
           <li><a href="#desk#" class="red">&nbsp;{% trans "Desk" %}&nbsp;</a>
             <ul>
               {% for period in periods %}
-              <li><a href="{% url teleforma-desk-period-list period.id %}" class="red">{{ period.name }}</a></li>
+              <li><a href="{% url 'teleforma-desk-period-list' period.id %}" class="red">{{ period.name }}</a></li>
               {% endfor %}
             </ul>
           </li>
           {% else %}
           {% with periods.0 as period %}
-          <li><a href="{% url teleforma-desk-period-list period.id %}" class="red">{% trans "Desk" %}</a></li>
+          <li><a href="{% url 'teleforma-desk-period-list' period.id %}" class="red">{% trans "Desk" %}</a></li>
           {% endwith %}
           {% endif %}
 
@@ -110,14 +110,14 @@
 
           {% if user.is_authenticated %}
 
-          <li><a href="{% url postman_inbox %}" class="orange">{% trans "Messaging" %}{% if postman_unread_count %}
-              ({{ postman_unread_count }}){% endif %}</a></li>
+          <li><a href="postman_inbox" class="orange">{% trans "Messaging" %}{% if postman_unread_count %}
+              ({{ postman_unread_count }}){% endif %} TODO : fix this link</a></li>
 
           {% if not user.student or not user.student.get.restricted %}
-            <li><a href="{% url teleforma-annals %}" class="yellow">{% trans "Annals" %}</a></li>
+            <li><a href="{% url 'teleforma-annals' %}" class="yellow">{% trans "Annals" %}</a></li>
 
             {% if periods|length == 1 %}
-            <li><a href="{% url teleforma-exam-scripts-pending periods.0.id %}" class="green">&nbsp;{% trans "Scripts" %}
+            <li><a href="{% url 'teleforma-exam-scripts-pending' periods.0.id %}" class="green">&nbsp;{% trans "Scripts" %}
                 {% if user.is_staff or user.quotas.all %}{% untreated_scripts_count user periods.0.id %}
                 {% else %}{% treated_scripts_count user periods.0.id %}{% endif %}</a>
             </li>
@@ -127,7 +127,7 @@
                 {% else %}{% treated_scripts_count user periods.0.id %}{% endif %}</a>
               <ul>
                 {% for period in periods %}
-                <li><a href="{% url teleforma-exam-scripts-pending period.id %}" class="green">{{ period.name }}</a></li>
+                <li><a href="{% url 'teleforma-exam-scripts-pending' period.id %}" class="green">{{ period.name }}</a></li>
                 {% endfor %}
               </ul>
             </li>
@@ -135,17 +135,17 @@
           {% endif %}
 
           {% if user.professor.count %}
-          <li><a href="{% url teleforma-webclass-professor %}" class="yellow">Webclass</a></li>
+          <li><a href="{% url 'teleforma-webclass-professor' %}" class="yellow">Webclass</a></li>
           {% endif %}
 
           {% if periods|length == 1 %}
-          <li><a href="{% url teleforma-exam-scripts-scores-all periods.0.id %}"
+          <li><a href="{% url 'teleforma-exam-scripts-scores-all' periods.0.id %}"
               class="green">&nbsp;{% trans "Scores" %}</a></li>
           {% else %}
           <li><a href="#scores#" class="green">&nbsp;{% trans "Scores" %}</a>
             <ul>
               {% for period in periods %}
-              <li><a href="{% url teleforma-exam-scripts-scores-all period.id %}" class="green">{{ period.name }}</a>
+              <li><a href="{% url 'teleforma-exam-scripts-scores-all' period.id %}" class="green">{{ period.name }}</a>
               </li>
               {% endfor %}
             </ul>
@@ -156,7 +156,7 @@
           {% if user.is_superuser %}
           <li><a href="/admin/django/" target="_blank" class="blue">{% trans "Admin" %}</a></li>
           {% else %}
-          <li><a href="{% url teleforma-help %}" class="blue">{% trans "Help" %}</a></li>
+          <li><a href="{% url 'teleforma-help' %}" class="blue">{% trans "Help" %}</a></li>
           {% endif %}
 
           {% if user.is_staff or user.is_superuser %}
@@ -165,17 +165,17 @@
             <a href="#accounts#" class="blue">{% if user.first_name and user.last_name %}{{ user.first_name }}
               {{ user.last_name }}{% else %}{{ user.username }}{% endif %}</a>
             <ul>
-              <li><a href="{% url teleforma-profile-detail user.username %}" class="yellow">{% trans "Profile" %}</a>
+              <li><a href="{% url 'teleforma-profile-detail' user.username %}" class="yellow">{% trans "Profile" %}</a>
               </li>
               {% if user.is_staff %}
-              <li><a href="{% url teleforma-help %}">{% trans "Help" %}</a></li>
+              <li><a href="{% url 'teleforma-help' %}">{% trans "Help" %}</a></li>
               {% endif %}
-              <li><a href="{% url teleforma-logout %}">{% trans "Sign out" %}</a></li>
+              <li><a href="{% url 'teleforma-logout' %}">{% trans "Sign out" %}</a></li>
             </ul>
           </li>
           {% else %}
-          <li><a href="{% url teleforma-profile-detail user.username %}" class="darkblue">{% trans "Profile" %}</a></li>
-          <li><a href="{% url teleforma-logout %}" class="black">{% trans "Sign out" %}</a></li>
+          <li><a href="{% url 'teleforma-profile-detail' user.username %}" class="darkblue">{% trans "Profile" %}</a></li>
+          <li><a href="{% url 'teleforma-logout' %}" class="black">{% trans "Sign out" %}</a></li>
           {% endif %}
 
           {% endif %}
@@ -239,7 +239,7 @@
           <td>
             <p class="right">
               Copyright &copy; {% current_year %} {% organization %} |
-              <a href="{% url teleforma-flatpage "legal_notices" %}">{% trans "Legal notices" %}</a>
+              <a href="{% url 'teleforma-flatpage' "legal_notices" %}">{% trans "Legal notices" %}</a>
             </p>
           </td>
         </tr>
@@ -250,9 +250,9 @@
   </div>
   {% endblock layout %}
 
-  {% block analytics %}
+  {% comment %} {% block analytics %}
   {% analytics_code %}
-  {% endblock analytics %}
+  {% endblock analytics %} {% endcomment %}
 
   <script type='text/javascript'>
     window.scrollTo(0, 1);

diff --git a/teleforma/templates/teleforma/course.html b/teleforma/templates/teleforma/course.html
index 1a5e9c89cc2c4f768a72a2c790936a6c67485b41..0b32f76506e61106847704e7c78f1c24038e6dca 100644 (file)
--- a/teleforma/templates/teleforma/course.html
+++ b/teleforma/templates/teleforma/course.html
@@ -38,7 +38,7 @@
 </tr>
 {% for media in course.media.all %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-<td><a href="{% url teleforma-item-detail media.id %}">{{ media.title }}</a></td>
+<td><a href="{% url 'teleforma-item-detail' media.id %}">{{ media.title }}</a></td>
 <td>{{ media.description }}</td>
 <td>{{ media.date_added }}</td>
 </tr>

diff --git a/teleforma/templates/teleforma/course_conference_record.html b/teleforma/templates/teleforma/course_conference_record.html
index 36945890f094af115a51e0aa1ddaa644f9d58315..e2f5ba974444fe635a6d5675680cc7afe9c60b5c 100644 (file)
--- a/teleforma/templates/teleforma/course_conference_record.html
+++ b/teleforma/templates/teleforma/course_conference_record.html
@@ -13,12 +13,6 @@ jQuery(window).ready(function(){
     });
 </script>
 
-<script type="text/javascript">
-$(document).ready(function(){
-    InitChatWindow("{% url 'jqchat_ajax' room.id %}", null);
-    });
-</script>
-
 {% endblock extra_javascript %}
 
 

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index ed020836eb2060eaa50fa332869e9c75c185d659..5bedbc0fb928fb60570c1bd375d9ec786f7876dd 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -2,14 +2,6 @@
 {% load i18n %}
 {% load teleforma_tags %}
 
-{% block extra_javascript %}
-<script type="text/javascript">
-$(document).ready(function(){
-    InitChatWindow("{% url 'jqchat_ajax' room.id %}", null);
-    });
-</script>
-{% endblock extra_javascript %}
-
 {% block courses %}
 {% for c in all_courses %}
   {% with c.course as course %}
@@ -26,7 +18,7 @@ $(document).ready(function(){
   <div class="block important">
     <p>
       <strong>Vous n'êtes pas inscrit à la webclass de cette matière. </strong><a
-        href="{% url teleforma-webclass-appointments webclass.id %}"
+        href="{% url 'teleforma-webclass-appointments' webclass.id %}"
         class="conference-big-button component_icon button icon_next">Cliquez-ici pour choisir un créneau horaire</a>
     </p>
   </div>

diff --git a/teleforma/templates/teleforma/course_document.html b/teleforma/templates/teleforma/course_document.html
index 3a5ab65f4a064330459bf9b20c55895e35d20b28..d2cf8e6fc050f4b0e5e4561e0a550cee65c14565 100644 (file)
--- a/teleforma/templates/teleforma/course_document.html
+++ b/teleforma/templates/teleforma/course_document.html
@@ -4,12 +4,6 @@
 
 {% block extra_javascript %}
 
-<script type="text/javascript">
-$(document).ready(function(){
-    InitChatWindow("{% url 'jqchat_ajax' room.id %}", null);
-    });
-</script>
-
 <script type="text/javascript" src="/static/teleforma/js/pdf-min.js"></script>
 
 <script type="text/javascript">

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 6f421faaa0b306949258b4f16873c82af0079fa4..3bbea55eccfa84a3fd86204f3b84bed169c49ba2 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -12,7 +12,6 @@
 
 <script type="text/javascript">
 $(document).ready(function(){
-    InitChatWindow("{% url 'jqchat_ajax' room.id %}", null);
     $('#my_video_1').bind('contextmenu',function() { return false; });
     });
 </script>
@@ -72,7 +71,7 @@ $(document).ready(function(){
 <div class="course_title">
     <div style="float: right; font-size: 0.9em;">
         {% if "video" in media.mime_type %}
-        <a href="{% url teleforma-media-transcoded period.id media|get_audio_id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Audio" %}</a>
+        <a href="{% url 'teleforma-media-transcoded' period.id media|get_audio_id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Audio" %}</a>
         {% endif %}
         {% if "audio" in media.mime_type %}
         <a href="{% url 'teleforma-media-detail' period.id media|get_video_id %}" class="component_icon button icon_clap">&nbsp;{% trans "Video" %}</a>

diff --git a/teleforma/templates/teleforma/course_media_transcoded.html b/teleforma/templates/teleforma/course_media_transcoded.html
index 5374132ace9397adfb64537bd5816a1d775f43e8..2fa6fc106ceb97919b8f16ffcb2ef8c395969ac4 100644 (file)
--- a/teleforma/templates/teleforma/course_media_transcoded.html
+++ b/teleforma/templates/teleforma/course_media_transcoded.html
@@ -12,7 +12,6 @@
 
 <script type="text/javascript">
 $(document).ready(function(){
-    InitChatWindow("{% url jqchat_ajax room.id %}", null);
     $('#my_video_1').bind('contextmenu',function() { return false; });
     });
 </script>
@@ -23,7 +22,7 @@ $(document).ready(function(){
 {% if media_transcoded.file and media.is_published or user.is_superuser or user.is_staff %}
  {% if not "video" in media.mime_type or request.user_agent.os.family == 'iOS' %}
   <div class="module_action">
-   <a href="{% url teleforma-media-transcoded-download period.id media.id %}" class="component_icon button" id="action_red"><img src="/static/teleforma/images/download_media.png" alt="" style="vertical-align:middle" />&nbsp;{% trans "Download" %}</a>
+   <a href="{% url 'teleforma-media-transcoded-download' period.id media.id %}" class="component_icon button" id="action_red"><img src="/static/teleforma/images/download_media.png" alt="" style="vertical-align:middle" />&nbsp;{% trans "Download" %}</a>
   </div>
  {% endif %}
 {% endif %}
@@ -35,14 +34,14 @@ $(document).ready(function(){
 <div class="course_title">
     <div style="float: right; font-size: 0.9em;">
         {% if "video" in media_transcoded.mime_type %}
-        <a href="{% url teleforma-media-transcoded period.id media|get_audio_id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Audio" %}</a>
+        <a href="{% url 'teleforma-media-transcoded' period.id media|get_audio_id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Audio" %}</a>
         {% endif %}
         {% if "audio" in media_transcoded.mime_type %}
-        <a href="{% url teleforma-media-detail period.id media|get_video_id %}" class="component_icon button icon_clap">&nbsp;{% trans "Video" %}</a>
+        <a href="{% url 'teleforma-media-detail' period.id media|get_video_id %}" class="component_icon button icon_clap">&nbsp;{% trans "Video" %}</a>
         {% endif %}
     </div>
 
-    <a href="{% url teleforma-desk-period-course period.id course.id %}">{{ course.title }} - {{ type }}{% if media.conference.session %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}</a>
+    <a href="{% url 'teleforma-desk-period-course' period.id course.id %}">{{ course.title }} - {{ type }}{% if media.conference.session %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}</a>
 
 </div>
 
@@ -91,11 +90,11 @@ $(document).ready(function(){
 <dl class="listing">
 
 {% if media.conference %}
-<dt>{% trans "Course" %}</dt><dd><a href="{% url teleforma-desk-period-course period.id course.id %}">{{ media.course.title }} - {{ media.course_type }}</a></dd>
+<dt>{% trans "Course" %}</dt><dd><a href="{% url 'teleforma-desk-period-course' period.id course.id %}">{{ media.course.title }} - {{ media.course_type }}</a></dd>
 <dt>{% trans "Session" %}</dt><dd>{{ media.conference.session }}</dd>
 {% if media.conference.professor %}
 <dt>{% trans "Professor" %}</dt>
-    <dd><a href="{% url teleforma-profile-detail media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a></dd>
+    <dd><a href="{% url 'teleforma-profile-detail' media.conference.professor.user.username %}" target="_blank">{{ media.conference.professor }}</a></dd>
 {% endif %}
 {% if media.conference.comment %}<dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>{% endif %}
 <dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 70de4e9b25367da7c16fca63d0e22c0e1f662951..9574aa8097b8dd927f36dc4717d472a0def527e9 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -4,14 +4,6 @@
 {% load i18n %}
 
 
-{% block extra_javascript %}
-<script type="text/javascript">
-$(document).ready(function(){
-    InitChatWindow("{% url 'jqchat_ajax' room.id %}", null);
-    });
-</script>
-{% endblock extra_javascript %}
-
 {% block content %}
 
 <div id="module-set-left" style="width: 18%">
@@ -76,7 +68,7 @@ $(document).ready(function(){
     {% endif %}
 
     {% for appointment in appointments %}
-      <a href="{% url teleforma-appointments period_id=period.id course_id=appointment.course.id %}"><button>Rendez-vous individuels "{{ appointment.name }}"</button></a>
+      <a href="{% url 'teleforma-appointments' period_id=period.id course_id=appointment.course.id %}"><button>Rendez-vous individuels "{{ appointment.name }}"</button></a>
     {% endfor %}
   </div>
   <br />
@@ -97,7 +89,7 @@ $(document).ready(function(){
     </div>
 
     <div class="video" style="width:400px">
-      <a href="{% url teleforma-media-detail period.id home_video.id %}" title="{% trans "Play" %}">
+      <a href="{% url 'teleforma-media-detail' period.id home_video.id %}" title="{% trans "Play" %}">
         {% if home_video.poster_file %}
         {% thumbnail home_video.poster_file "168x96" as im %}
         <div style="background: no-repeat url('{{ im.url }}') 0 1px; background-size: 100%; background-color: #dfdfdf;">
@@ -159,7 +151,7 @@ $(document).ready(function(){
     {% for type in c.types %}
     <div class="course">
       <div class="course_title">
-        <a href="{% url teleforma-desk-period-course period.id course.id %}">{{ course.title }} -
+        <a href="{% url 'teleforma-desk-period-course' period.id course.id %}">{{ course.title }} -
           {{ type }}{% if course.description %} - {{ course.description }}{% endif %}</a>
       </div>
 

diff --git a/teleforma/templates/teleforma/home.html b/teleforma/templates/teleforma/home.html
index 2306b9a3f146a51e93439e8b2a5dde12dd9bf103..61392fcb2784f744e71e32e1a2044823661172c1 100644 (file)
--- a/teleforma/templates/teleforma/home.html
+++ b/teleforma/templates/teleforma/home.html
@@ -22,7 +22,7 @@
 {{ page_content|render_flatpage }}
 </div>
 
-<a href="{% url teleforma-login %}" class="component_icon button" id="action_red">{% trans "Connexion" %}</a>
+<a href="{% url 'teleforma-login' %}" class="component_icon button" id="action_red">{% trans "Connexion" %}</a>
 
 </div>
 {% endblock %}

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 8554c395ede0297b4429ddd55c2b43f5500566ca..5ffc00a865b5e5bd91c46ab53c6e28ebfe32b389 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -14,7 +14,7 @@
           {% if media.type == 'webm' or media.type == 'mp4' %}
             <tr>
             <td {% if forloop.first %}class="border-top"{% endif %} width="230px" style="vertical-align:middle">
-            <a href="{% url teleforma-media-detail period.id media.id %}" title="{% trans "Play" %}">
+            <a href="{% url 'teleforma-media-detail' period.id media.id %}" title="{% trans "Play" %}">
             {% if media.poster_file %}
                {% thumbnail media.poster_file "168x96" as im %}
                 <div style="background: no-repeat url('{{ im.url }}') 0 1px; background-size: 100%; background-color: #dfdfdf;">
@@ -50,7 +50,7 @@
             {% endif %}
             {% if media.file and media.is_published or user.is_superuser or user.is_staff %}
                 {% if not "video" in media.mime_type or request.user_agent.os.family == 'iOS' %}
-                    <a href="{% url teleforma-media-download period.id media.id %}">
+                    <a href="{% url 'teleforma-media-download' period.id media.id %}">
                         <img src="/static/teleforma/images/download_media.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" />
                     </a>
                 {% endif %}

diff --git a/teleforma/templates/teleforma/inc/media_list_pending.html b/teleforma/templates/teleforma/inc/media_list_pending.html
index c56ee34afa36d6600f4f5978cf849027bac3bde4..1da2f3dd47263ae89c747f63d79cf912646ab377 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list_pending.html
+++ b/teleforma/templates/teleforma/inc/media_list_pending.html
@@ -14,7 +14,7 @@
           {% if media.type == 'webm' or media.type == 'mp4' %}
             <tr>
             <td {% if forloop.first %}class="border-top"{% endif %} width="230px" style="vertical-align:middle">
-            <a href="{% url teleforma-media-detail period.id media.id %}" title="{% trans "Play" %}">
+            <a href="{% url 'teleforma-media-detail' period.id media.id %}" title="{% trans "Play" %}">
             {% if media.poster_file %}
                {% thumbnail media.poster_file "168x96" as im %}
                 <div style="background: no-repeat url('{{ im.url }}') 0 1px; background-size: 100%; background-color: #dfdfdf;">

diff --git a/teleforma/templates/teleforma/inc/module_searches.html b/teleforma/templates/teleforma/inc/module_searches.html
index 777d9e1ff6201eb04b09ab957c8ac834d7de1e76..0893821293bcd3508d2ec49bccfab54c5853781b 100644 (file)
--- a/teleforma/templates/teleforma/inc/module_searches.html
+++ b/teleforma/templates/teleforma/inc/module_searches.html
@@ -12,7 +12,7 @@
       </tr>
     {% for s in searches %}
      <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-        <td><a href="{% url teleforma-search-items %}?{{s.criteria.all|build_pattern_string|build_query_string}}">
+        <td><a href="{% url 'teleforma-search-items' %}?{{s.criteria.all|build_pattern_string|build_query_string}}">
             {% for c in s.criteria.all %}
                 <li>{% trans c.key %} : {{ c.value}}</li>
             {% endfor %}

diff --git a/teleforma/templates/teleforma/lists.html b/teleforma/templates/teleforma/lists.html
index f3ab5e1a7a3fafef1847c2af990688389a21fb11..4a99743e1a11d438259dff575fbe2ffe67d240d0 100644 (file)
--- a/teleforma/templates/teleforma/lists.html
+++ b/teleforma/templates/teleforma/lists.html
@@ -53,8 +53,8 @@
             <td style="border-bottom:1px solid #6A0307;color:#6A0307;font-size: 100%">{{ playlist.playlist.title }}</td>
             <td style="width:86ex; padding-right: 0; border-bottom:1px solid #6A0307; text-align:right">
             <a href="#" id="{{playlist.playlist.public_id}}" onclick="playlistUtils.showEdit(this, this.id); return false;" class="component_icon button icon_edit">{% trans "Edit" %}</a>
-                <a href="{% url teleforma-playlist-csv-export playlist.playlist.public_id 'collections' %}" class="component_icon button icon_csv">CSV Collections</a>
-                <a href="{% url teleforma-playlist-csv-export playlist.playlist.public_id 'items' %}" class="component_icon button icon_csv">CSV Items</a>
+                <a href="{% url 'teleforma-playlist-csv-export' playlist.playlist.public_id 'collections' %}" class="component_icon button icon_csv">CSV Collections</a>
+                <a href="{% url 'teleforma-playlist-csv-export' playlist.playlist.public_id 'items' %}" class="component_icon button icon_csv">CSV Items</a>
                 <a href="#" id="{{playlist.playlist.public_id}}" onclick="if(confirm(gettrans('delete the playlist permanently?'))){playlistUtils.remove(this.id);};return false;" class="component_icon button icon_cancel">{% trans "Delete" %}</a>
             </td>
         </tr>
@@ -78,16 +78,16 @@
         <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
             <td>
                 {% if resource.type == "item" and not resource.element == None %}
-                <a href="{% url teleforma-item-detail resource.element.public_id %}">{{ resource.element }}</a>
+                <a href="{% url 'teleforma-item-detail' resource.element.public_id %}">{{ resource.element }}</a>
                 {% endif %}
                 {% if resource.type == "collection" and not resource.element == None %}
-                <a href="{% url teleforma-collection-detail resource.element.public_id %}">{% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %}</a>
+                <a href="{% url 'teleforma-collection-detail' resource.element.public_id %}">{% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %}</a>
                 {% endif %}
                 {% if resource.type == "marker" and not resource.element == None  %}
-                <a href="{% url teleforma-item-detail-marker resource.element.public_id %}">{{ resource.element }}</a>
+                <a href="{% url 'teleforma-item-detail-marker' resource.element.public_id %}">{{ resource.element }}</a>
                 {% endif %}
                 {% if resource.type == "corpus" or resource.type == "fonds" %}
-                <a href="{% url teleforma-resource-detail resource.type resource.element.public_id %}">{{ resource.element.title }}</a>
+                <a href="{% url 'teleforma-resource-detail' resource.type resource.element.public_id %}">{{ resource.element.title }}</a>
                 {% endif %}
                 {% if resource.element == None %}{% trans "deleted" %}{% endif %}
             </td>

diff --git a/teleforma/templates/teleforma/login.html b/teleforma/templates/teleforma/login.html
index 504945710960737e87f6d9f8d228021394fca592..ffff12092d8d5368a16741593151a58a4c41486a 100644 (file)
--- a/teleforma/templates/teleforma/login.html
+++ b/teleforma/templates/teleforma/login.html
@@ -18,7 +18,7 @@ $(document).ready(function() {
 {% if form.errors %}
 <p class="login-error">{% trans "Your username and password didn't match. Please try again." %}</p>
 {% endif %}
-<form class="login" id="_loginForm" method="post" action="{% url teleforma-login %}">{% csrf_token %}
+<form class="login" id="_loginForm" method="post" action="{% url 'teleforma-login' %}">{% csrf_token %}
 <p>
 {{ form.username.label_tag }}
 {{ form.username }}<br />
@@ -26,7 +26,7 @@ $(document).ready(function() {
 {{ form.password }}
 </p>
 <div style="margin-top: 2em;">
-<span style="align: right; font-weight: bold; margin-right: 2em;"><a href="{% url teleforma-password-reset %}">{% trans "Password forgotten" %} ?</a></span>
+<span style="align: right; font-weight: bold; margin-right: 2em;"><a href="{% url 'teleforma-password-reset' %}">{% trans "Password forgotten" %} ?</a></span>
 <a href="#" class="component_icon button" id="action_red" onclick="$('#_loginForm').submit();"><img src="/static/teleforma/images/password.png" alt="" style="vertical-align:middle" />&nbsp;{% trans "Sign in" %}</a>
 <input type="hidden" name="next" value="{{ next }}" />
 </div>

diff --git a/teleforma/templates/teleforma/profile_detail.html b/teleforma/templates/teleforma/profile_detail.html
index 7fe07edd0d4065b4041521f80804c87356987033..4613b3d893f5f9ee473d240979a98d69c34d70b7 100644 (file)
--- a/teleforma/templates/teleforma/profile_detail.html
+++ b/teleforma/templates/teleforma/profile_detail.html
@@ -13,7 +13,7 @@
   {% block modules %}
 
     <div class="module">
-    <h3><a href="{% url teleforma-home %}"><img src="/static/teleforma/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% if user.username != usr.username%}{% trans "His courses" %}{% else %}{% trans "My courses" %}{% endif %}</a></h3>
+    <h3><a href="{% url 'teleforma-home' %}"><img src="/static/teleforma/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% if user.username != usr.username%}{% trans "His courses" %}{% else %}{% trans "My courses" %}{% endif %}</a></h3>
     <div style="background: white;">
     <ul>
     {% block courses %}
@@ -46,7 +46,7 @@
 
     <div id="password" style="float: right;">
     {% if user.is_authenticated and user.username == usr.username %}
-    <a href="{% url teleforma-password-change %}" class="component_icon button icon_login">{% trans "Change password" %}</a>
+    <a href="{% url 'teleforma-password-change' %}" class="component_icon button icon_login">{% trans "Change password" %}</a>
     {% elif user.is_staff %}
         <a href="{% url 'teleforma-user-login' usr.id %}" class="component_icon button icon_login">{% trans "Login as" %}</a>
     {%  endif %}

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index c77531cab75be3837bd470087a50cdc07e24b37f..273557f20bb35c7e5e7384615a01ecff249b3e66 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -2,10 +2,10 @@
 {% load i18n %}
 {% load telemeta_utils %}
 {% load teleforma_tags %}
-{% get_googletools as googletools %}
+{% comment %} {% get_googletools as googletools %}
 {%  if googletools %}
 {% load googletools %}
-{% endif %}
+{% endif %} {% endcomment %}
 {% get_current_language as LANGUAGE_CODE %}
 {% get_available_languages as LANGUAGES %}
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}><head>
@@ -132,7 +132,7 @@ alt="logo" />
   {% endif %}
 
   {% if user.professor.count %}
-    <li><a href="{% url teleforma-webclass-professor %}" class="yellow">Webclass</a></li>
+    <li><a href="{% url 'teleforma-webclass-professor' %}" class="yellow">Webclass</a></li>
   {% endif %}
 
   {% if periods|length == 1 %}
@@ -238,10 +238,10 @@ alt="logo" />
 
 </div>
 {% endblock layout %}
-
+{% comment %} 
 {% block analytics %}
 {% analytics_code %}
-{% endblock analytics %}
+{% endblock analytics %} {% endcomment %}
 
 <script type='text/javascript'>
 window.scrollTo(0, 1);

diff --git a/teleforma/webclass/templates/admin/webclass/webclassrecord/add_records_links.html b/teleforma/webclass/templates/admin/webclass/webclassrecord/add_records_links.html
index d47c5ad8031735c00ca633516842033893746bd3..d69180fc44980b57e42a6f84cd8a6f6d7f8edca2 100644 (file)
--- a/teleforma/webclass/templates/admin/webclass/webclassrecord/add_records_links.html
+++ b/teleforma/webclass/templates/admin/webclass/webclassrecord/add_records_links.html
@@ -1,5 +1,5 @@
 <div class="object-tools">
     {% for period in periods %}
-    <a class="btn btn-success" href="{% url teleforma-webclass-records-form period.id %}"><i class="icon-plus-sign icon-white"></i>{{ period.name}} </a>
+    <a class="btn btn-success" href="{% url 'teleforma-webclass-records-form' period.id %}"><i class="icon-plus-sign icon-white"></i>{{ period.name}} </a>
     {% endfor %}
 </div>
\ No newline at end of file

diff --git a/teleforma/webclass/templates/webclass/appointments_professor.html b/teleforma/webclass/templates/webclass/appointments_professor.html
index 787ef4a71896d72cf35878ac258030ba569c1abc..58250e187174a41d90e3bc08607aa6feec863d8b 100644 (file)
--- a/teleforma/webclass/templates/webclass/appointments_professor.html
+++ b/teleforma/webclass/templates/webclass/appointments_professor.html
@@ -45,7 +45,7 @@ Calendrier des Webclass
          {{slot.participants.count}}
         </td>
         <td>
-            <a href="{% url teleforma-webclass-join slot.id %}" target="_blank" class="conference-big-button component_icon button icon_next">Rejoindre la conférence</a>
+            <a href="{% url 'teleforma-webclass-join' slot.id %}" target="_blank" class="conference-big-button component_icon button icon_next">Rejoindre la conférence</a>
         </td>
     </tr>
     {% empty %}

diff --git a/teleforma/webclass/templates/webclass/inc/webclass_list.html b/teleforma/webclass/templates/webclass/inc/webclass_list.html
index 8f0c7897ac45994894f288b839af66a396d065ad..962b878639943b44d9def2492d90ac93f702e936 100644 (file)
--- a/teleforma/webclass/templates/webclass/inc/webclass_list.html
+++ b/teleforma/webclass/templates/webclass/inc/webclass_list.html
@@ -24,14 +24,14 @@
                     {% elif webclass_slot.status == 'ingoing' %}
                     <p>
                         La webclasse est en cours.
-                        <a href="{% url teleforma-webclass-join webclass_slot.id %}" target="_blank"
+                        <a href="{% url 'teleforma-webclass-join' webclass_slot.id %}" target="_blank"
                             class="conference-big-button component_icon button icon_next">Cliquez ici pour rejoindre la
                             conférence</a>
                     </p>
                     {% elif webclass_slot.status == 'almost' %}
                     <p>
                         La webclasse est accessible mais elle n'a pas encore démarré.
-                        <a href="{% url teleforma-webclass-join webclass_slot.id %}" target="_blank"
+                        <a href="{% url 'teleforma-webclass-join' webclass_slot.id %}" target="_blank"
                             class="conference-big-button component_icon button icon_next">Cliquez ici pour rejoindre la
                             conférence</a>
                     </p>
@@ -46,7 +46,7 @@
             {% for record in webclass_records %}
             <tr>
                 <td {% if forloop.first %}class="border-top" {% endif %} style="width:200px">
-                    <a href="{% url teleforma-webclass-record %}?url={{record.url}}" title="{% trans "View" %}">
+                    <a href="{% url 'teleforma-webclass-record' %}?url={{record.url}}" title="{% trans "View" %}">
                         <img src="{{ record.preview }}" style="width:176px" alt="{% trans 'Click here' %}" />
                         <div>Cliquez-ici</div>
                     </a>