From: test test Date: Wed, 26 May 2021 16:01:17 +0000 (+0200) Subject: Migrate url to django 3 X-Git-Tag: 2.1~66^2^2~66 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2a7145c920c3a4c4ffa00b0a66f22ee992adfaea;p=teleforma.git Migrate url to django 3 --- diff --git a/app/urls.py b/app/urls.py index c9d8ce94..132935a2 100644 --- 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 c6edfbfd..911318c7 100644 --- a/teleforma/exam/templates/exam/inc/script_list.html +++ b/teleforma/exam/templates/exam/inc/script_list.html @@ -23,11 +23,11 @@ {% for script in object_list %} - {% if script.status != 2 and script.file %}{% endif %}{{ script.course.title }}{% if script.status != 2 and script.file %}{% endif %} - {% if script.status != 2 and script.file%}{% endif %}{{ script.session }}{% if script.status != 2 and script.file %}{% endif %} - {% if script.status != 2 and script.file %}{% endif %}{{ script.type }}{% if script.status != 2 and script.file %}{% endif %} - {% if script.author.username %}{{ script.author.last_name }}{% endif %} - {% if script.author.username %}{{ script.author.first_name }}{% endif %} + {% if script.status != 2 and script.file %}{% endif %}{{ script.course.title }}{% if script.status != 2 and script.file %}{% endif %} + {% if script.status != 2 and script.file%}{% endif %}{{ script.session }}{% if script.status != 2 and script.file %}{% endif %} + {% if script.status != 2 and script.file %}{% endif %}{{ script.type }}{% if script.status != 2 and script.file %}{% endif %} + {% if script.author.username %}{{ script.author.last_name }}{% endif %} + {% if script.author.username %}{{ script.author.first_name }}{% endif %} {{ script.date_added }} {% if script.date_marked %}{{ script.date_marked }}{% endif %} diff --git a/teleforma/exam/templates/exam/messages/script_marked.txt b/teleforma/exam/templates/exam/messages/script_marked.txt index 6d62e43c..79de53d5 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 171eea13..dedc3e16 100644 --- a/teleforma/exam/templates/exam/quotas.html +++ b/teleforma/exam/templates/exam/quotas.html @@ -29,7 +29,7 @@ {% for quota in object_list %} - {{ quota.corrector.username }} + {{ quota.corrector.username }} {{ quota.course.title }} {{ quota.date_start }} {{ quota.date_end }} diff --git a/teleforma/exam/templates/exam/score_form.html b/teleforma/exam/templates/exam/score_form.html index 1846de9e..3bc6e24f 100644 --- a/teleforma/exam/templates/exam/score_form.html +++ b/teleforma/exam/templates/exam/score_form.html @@ -42,7 +42,7 @@
Ce formulaire vous permet d'enregistrer la note d'une copie papier déjà corrigée hors de la plateforme e-learning.
-
Pour soumettre une nouvelle copie d'épreuve scannée à la correction en ligne, merci d'utiliser ce formulaire.
+
Pour soumettre une nouvelle copie d'épreuve scannée à la correction en ligne, merci d'utiliser ce formulaire.

Veuillez indiquer tous les champs du formulaire suivant :
diff --git a/teleforma/exam/templates/exam/scores.html b/teleforma/exam/templates/exam/scores.html index 283a687f..27ad9bc3 100644 --- a/teleforma/exam/templates/exam/scores.html +++ b/teleforma/exam/templates/exam/scores.html @@ -16,11 +16,11 @@ {% block modules %}
-

playlists{% trans "My courses" %}

+

playlists{% trans "My courses" %}

@@ -29,12 +29,12 @@ {% block module-action %} {% if upload %}
-{% trans "New score" %} +{% trans "New score" %}
{% endif %} {% if admin %}
-Saisie en masse de notes +Saisie en masse de notes
{% endif %} {% endblock module-action %} diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html index 525dc74d..0281e1e0 100644 --- a/teleforma/exam/templates/exam/script_detail.html +++ b/teleforma/exam/templates/exam/script_detail.html @@ -47,11 +47,11 @@
- {{ script.title }} + {{ script.title }}
{% if topic.file %} -  {% trans "Topic" %} +  {% trans "Topic" %} {% endif %} {% if script.score %} {% trans "Score" %} : {{ script.score|floatformat }}/20 diff --git a/teleforma/exam/templates/exam/script_detail2.html b/teleforma/exam/templates/exam/script_detail2.html index 2adc1932..825800c9 100644 --- a/teleforma/exam/templates/exam/script_detail2.html +++ b/teleforma/exam/templates/exam/script_detail2.html @@ -31,11 +31,11 @@
- {{ script.title }} + {{ script.title }}
{% if topic.file %} -  {% trans "Topic" %} +  {% trans "Topic" %} {% endif %} {% if script.score %} {% trans "Score" %} : {{ script.score|floatformat }}/20 diff --git a/teleforma/exam/templates/exam/scripts.html b/teleforma/exam/templates/exam/scripts.html index 9c04f3fc..76ab9ba6 100644 --- a/teleforma/exam/templates/exam/scripts.html +++ b/teleforma/exam/templates/exam/scripts.html @@ -17,13 +17,13 @@ {% block modules %}
-

playlists{% trans "Scripts" %}

+

playlists{% trans "Scripts" %}

@@ -32,7 +32,7 @@ {% block module-action %} {% if upload %}
-{% trans "New script" %} +{% trans "New script" %}
{% endif %} {% endblock module-action %} diff --git a/teleforma/templates/admin/base.html b/teleforma/templates/admin/base.html index 4eb89166..888f3fb4 100644 --- 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 %} -
+ diff --git a/teleforma/templates/payment/email_initial.txt b/teleforma/templates/payment/email_initial.txt index 2aa44539..fb52c7cd 100644 --- 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 90a3ae12..04a1aa40 100644 --- 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 0ff5e3a8..4c06d4b6 100644 --- a/teleforma/templates/payment/payment_summary.html +++ b/teleforma/templates/payment/payment_summary.html @@ -4,7 +4,7 @@

Votre échéancier de paiement

- Télécharger la facture + Télécharger la facture

diff --git a/teleforma/templates/postman/view.html b/teleforma/templates/postman/view.html index c4d25f80..ce988abb 100644 --- a/teleforma/templates/postman/view.html +++ b/teleforma/templates/postman/view.html @@ -16,14 +16,14 @@
{% if message.obfuscated_sender %} {% if not message.obfuscated_sender|startswith:'#' %} - + {% endif %} {{ message.obfuscated_sender|or_me:user }} {% if not message.obfuscated_sender|startswith:'#' %}{% endif %}» {% endif %} {% if message.obfuscated_recipient %} {% if not message.obfuscated_recipient|startswith:'#' %} - + {% endif %} {{ message.obfuscated_recipient|or_me:user }} {% if not message.obfuscated_recipient|startswith:'#' %}{% endif %} | diff --git a/teleforma/templates/registration/activate.html b/teleforma/templates/registration/activate.html index a85fd163..48d2d835 100644 --- 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 a83b1b0b..4098e357 100644 --- 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 login 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 b467f91e..a91624d0 100644 --- a/teleforma/templates/registration/login.html +++ b/teleforma/templates/registration/login.html @@ -9,7 +9,7 @@

{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}

{% endif %} -{% csrf_token %} +{% csrf_token %}
diff --git a/teleforma/templates/registration/password_change_done.html b/teleforma/templates/registration/password_change_done.html index b39cd4d9..8789e287 100644 --- 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 %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} +{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% block title %}
{% trans 'Password change successful' %}{% endblock %} diff --git a/teleforma/templates/registration/password_change_form.html b/teleforma/templates/registration/password_change_form.html index 07034012..e994011c 100644 --- 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 }}{% endblock %} -{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %} {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} +{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %} {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% block title %}
{% trans 'Password change' %}{% endblock %} diff --git a/teleforma/templates/registration/password_reset_email.html b/teleforma/templates/registration/password_reset_email.html index 2db45208..5bf161f6 100644 --- 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 d753f910..a9b83ee1 100644 --- a/teleforma/templates/teleforma/base.html +++ b/teleforma/templates/teleforma/base.html @@ -1,10 +1,10 @@ {% 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 %} + @@ -94,13 +94,13 @@
  •  {% trans "Desk" %} 
    • {% else %} {% with periods.0 as period %} -
  • {% trans "Desk" %}
    • +
  • {% trans "Desk" %}
    • {% endwith %} {% endif %} @@ -110,14 +110,14 @@ {% if user.is_authenticated %} -
  • {% trans "Messaging" %}{% if postman_unread_count %} - ({{ postman_unread_count }}){% endif %}
    • +
  • {% trans "Messaging" %}{% if postman_unread_count %} + ({{ postman_unread_count }}){% endif %} TODO : fix this link
    • {% if not user.student or not user.student.get.restricted %} -
  • {% trans "Annals" %}
    • +
  • {% trans "Annals" %}
    • {% if periods|length == 1 %} -
  •  {% trans "Scripts" %} +
  •  {% 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 %}
    • @@ -127,7 +127,7 @@ {% else %}{% treated_scripts_count user periods.0.id %}{% endif %} @@ -135,17 +135,17 @@ {% endif %} {% if user.professor.count %} -
  • Webclass
    • +
  • Webclass
    • {% endif %} {% if periods|length == 1 %} -
  •  {% trans "Scores" %}
    • {% else %}
  •  {% trans "Scores" %} @@ -156,7 +156,7 @@ {% if user.is_superuser %}
  • {% trans "Admin" %}
    • {% else %} -
  • {% trans "Help" %}
    • +
  • {% trans "Help" %}
    • {% endif %} {% if user.is_staff or user.is_superuser %} @@ -165,17 +165,17 @@ {% if user.first_name and user.last_name %}{{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %} {% else %} -
  • {% trans "Profile" %}
    • -
  • {% trans "Sign out" %}
    • +
  • {% trans "Profile" %}
    • +
  • {% trans "Sign out" %}
    • {% endif %} {% endif %} @@ -239,7 +239,7 @@ @@ -250,9 +250,9 @@ {% endblock layout %} - {% block analytics %} + {% comment %} {% block analytics %} {% analytics_code %} - {% endblock analytics %} + {% endblock analytics %} {% endcomment %} - - {% endblock extra_javascript %} diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html index ed020836..5bedbc0f 100644 --- 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 %} - -{% endblock extra_javascript %} - {% block courses %} {% for c in all_courses %} {% with c.course as course %} @@ -26,7 +18,7 @@ $(document).ready(function(){

    Vous n'êtes pas inscrit à la webclass de cette matière. Cliquez-ici pour choisir un créneau horaire

    diff --git a/teleforma/templates/teleforma/course_document.html b/teleforma/templates/teleforma/course_document.html index 3a5ab65f..d2cf8e6f 100644 --- a/teleforma/templates/teleforma/course_document.html +++ b/teleforma/templates/teleforma/course_document.html @@ -4,12 +4,6 @@ {% block extra_javascript %} - - @@ -72,7 +71,7 @@ $(document).ready(function(){
    {% if "video" in media.mime_type %} -  {% trans "Audio" %} +  {% trans "Audio" %} {% endif %} {% if "audio" in media.mime_type %}  {% trans "Video" %} diff --git a/teleforma/templates/teleforma/course_media_transcoded.html b/teleforma/templates/teleforma/course_media_transcoded.html index 5374132a..2fa6fc10 100644 --- a/teleforma/templates/teleforma/course_media_transcoded.html +++ b/teleforma/templates/teleforma/course_media_transcoded.html @@ -12,7 +12,6 @@ @@ -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' %}
    -  {% trans "Download" %} +  {% trans "Download" %}
    {% endif %} {% endif %} @@ -35,14 +34,14 @@ $(document).ready(function(){
    {% if "video" in media_transcoded.mime_type %} -  {% trans "Audio" %} +  {% trans "Audio" %} {% endif %} {% if "audio" in media_transcoded.mime_type %} -  {% trans "Video" %} +  {% trans "Video" %} {% endif %}
    - {{ course.title }} - {{ type }}{% if media.conference.session %} - {% trans "Session" %} {{ media.conference.session }}{% endif %} + {{ course.title }} - {{ type }}{% if media.conference.session %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}
    @@ -91,11 +90,11 @@ $(document).ready(function(){
    {% if media.conference %} -
    {% trans "Course" %}
    {{ media.course.title }} - {{ media.course_type }}
    +
    {% trans "Course" %}
    {{ media.course.title }} - {{ media.course_type }}
    {% trans "Session" %}
    {{ media.conference.session }}
    {% if media.conference.professor %}
    {% trans "Professor" %}
    -
    {{ media.conference.professor }}
    +
    {{ media.conference.professor }}
    {% endif %} {% if media.conference.comment %}
    {% trans "Comment" %}
    {{ media.conference.comment }}
    {% endif %}
    {% trans "Begin date" %}
    {{ media.conference.date_begin }}
    diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html index 70de4e9b..9574aa80 100644 --- a/teleforma/templates/teleforma/courses.html +++ b/teleforma/templates/teleforma/courses.html @@ -4,14 +4,6 @@ {% load i18n %} -{% block extra_javascript %} - -{% endblock extra_javascript %} - {% block content %}
    @@ -76,7 +68,7 @@ $(document).ready(function(){ {% endif %} {% for appointment in appointments %} - + {% endfor %}

    @@ -97,7 +89,7 @@ $(document).ready(function(){
    - + {% if home_video.poster_file %} {% thumbnail home_video.poster_file "168x96" as im %}
    @@ -159,7 +151,7 @@ $(document).ready(function(){ {% for type in c.types %}
    - {{ course.title }} - + {{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %}
    diff --git a/teleforma/templates/teleforma/home.html b/teleforma/templates/teleforma/home.html index 2306b9a3..61392fcb 100644 --- a/teleforma/templates/teleforma/home.html +++ b/teleforma/templates/teleforma/home.html @@ -22,7 +22,7 @@ {{ page_content|render_flatpage }}
    -{% trans "Connexion" %} +{% trans "Connexion" %}
    {% endblock %} diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index 8554c395..5ffc00a8 100644 --- 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' %}
    {% for s in searches %} - @@ -78,16 +78,16 @@ diff --git a/teleforma/templates/teleforma/login.html b/teleforma/templates/teleforma/login.html index 50494571..ffff1209 100644 --- a/teleforma/templates/teleforma/login.html +++ b/teleforma/templates/teleforma/login.html @@ -18,7 +18,7 @@ $(document).ready(function() { {% if form.errors %} {% endif %} -{% csrf_token %} +{% csrf_token %}

    {{ form.username.label_tag }} {{ form.username }}
    @@ -26,7 +26,7 @@ $(document).ready(function() { {{ form.password }}

    diff --git a/teleforma/templates/teleforma/profile_detail.html b/teleforma/templates/teleforma/profile_detail.html index 7fe07edd..4613b3d8 100644 --- a/teleforma/templates/teleforma/profile_detail.html +++ b/teleforma/templates/teleforma/profile_detail.html @@ -13,7 +13,7 @@ {% block modules %}
    -

    playlists{% if user.username != usr.username%}{% trans "His courses" %}{% else %}{% trans "My courses" %}{% endif %}

    +

    playlists{% if user.username != usr.username%}{% trans "His courses" %}{% else %}{% trans "My courses" %}{% endif %}

      {% block courses %} @@ -46,7 +46,7 @@
      {% if user.is_authenticated and user.username == usr.username %} - + {% elif user.is_staff %} {% endif %} diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index c77531ca..273557f2 100644 --- 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 %} @@ -132,7 +132,7 @@ alt="logo" /> {% endif %} {% if user.professor.count %} -
    • Webclass
      • +
    • Webclass
      • {% endif %} {% if periods|length == 1 %} @@ -238,10 +238,10 @@ alt="logo" />
      {% endblock layout %} - +{% comment %} {% block analytics %} {% analytics_code %} -{% endblock analytics %} +{% endblock analytics %} {% endcomment %}
    {% trans form.username.label_tag %}

    Copyright © {% current_year %} {% organization %} | - {% trans "Legal notices" %} + {% trans "Legal notices" %}

    - + {% if media.poster_file %} {% thumbnail media.poster_file "168x96" as im %}
    @@ -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' %} - + {% endif %} diff --git a/teleforma/templates/teleforma/inc/media_list_pending.html b/teleforma/templates/teleforma/inc/media_list_pending.html index c56ee34a..1da2f3dd 100644 --- 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' %}
    - + {% if media.poster_file %} {% thumbnail media.poster_file "168x96" as im %}
    diff --git a/teleforma/templates/teleforma/inc/module_searches.html b/teleforma/templates/teleforma/inc/module_searches.html index 777d9e1f..08938212 100644 --- a/teleforma/templates/teleforma/inc/module_searches.html +++ b/teleforma/templates/teleforma/inc/module_searches.html @@ -12,7 +12,7 @@
    + {% for c in s.criteria.all %}
  • {% trans c.key %} : {{ c.value}}
    • {% endfor %} diff --git a/teleforma/templates/teleforma/lists.html b/teleforma/templates/teleforma/lists.html index f3ab5e1a..4a99743e 100644 --- a/teleforma/templates/teleforma/lists.html +++ b/teleforma/templates/teleforma/lists.html @@ -53,8 +53,8 @@     		{{ playlist.playlist.title }} {% trans "Edit" %} - CSV Collections - CSV Items + CSV Collections + CSV Items {% trans "Delete" %}
    {% if resource.type == "item" and not resource.element == None %} - {{ resource.element }} + {{ resource.element }} {% endif %} {% if resource.type == "collection" and not resource.element == None %} - {% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %} + {% if resource.element.title %}{{ resource.element.title }}{% else %}{{ resource.element }}{% endif %} {% endif %} {% if resource.type == "marker" and not resource.element == None %} - {{ resource.element }} + {{ resource.element }} {% endif %} {% if resource.type == "corpus" or resource.type == "fonds" %} - {{ resource.element.title }} + {{ resource.element.title }} {% endif %} {% if resource.element == None %}{% trans "deleted" %}{% endif %}