From: Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Date: Tue, 18 Dec 2018 13:40:16 +0000 (+0100)
Subject: update script to use pdfannotator instead of webviewer
X-Git-Tag: 1.4.0~12^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dd39f5c7de6a6daf8983929f4ac9983db97000a2;p=teleforma.git

update script to use pdfannotator instead of webviewer
---

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index 4843e622..518c7ae8 100644
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -3,16 +3,16 @@
 {% load teleforma_tags %}
 {% load i18n %}
 {% load static %}
-{% load pdfannotator %}
+{% load webviewer %}
 {% load thumbnail %}
 
 {% block extra_javascript %}
-{#  <link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">#}
-{#  <script src="//code.jquery.com/jquery-1.10.2.js"></script>#}
-{#  <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>#}
+  <link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">
+  <script src="//code.jquery.com/jquery-1.10.2.js"></script>
+  <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
   <script src="/static/exam/js/exam.js"></script>
-{#  <!--<script src='{% static "WebViewer/lib/html5/external/jquery-3.2.1.min.js" %}'></script>-->#}
-{#  <script src='{% static "WebViewer/lib/WebViewer.min.js" %}'></script>#}
+  <!--<script src='{% static "WebViewer/lib/html5/external/jquery-3.2.1.min.js" %}'></script>-->
+  <script src='{% static "WebViewer/lib/WebViewer.min.js" %}'></script>
   <script>
     // increase the default animation speed to exaggerate the effect
   {% if script.comments %}
@@ -25,26 +25,10 @@
 
 {% endblock extra_javascript %}
 
-{% block extra_stylesheets %}
-  <link rel="stylesheet" type="text/css" href="{% static "pdfannotator/toolbar.css" %}"/>
-  <link rel="stylesheet" type="text/css" href="{% static "pdfannotator/pdf_viewer.css" %}"/>
-  <style type="text/css">
-    body {
-      background-color: #eee;
-      font-family: sans-serif;
-      margin: 0;
-    }
-
-    
-  </style>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
-
-{% endblock %}
-
 {% block content %}
 
 {% block course %}
-<div class="course viewer">
+<div class="course">
 
 <div class="course_title">
 
@@ -62,10 +46,10 @@
         <a href="#" class="component_icon button icon_delete">{% trans "Rejected" %}</a>
         {% else %}
          {% if user.quotas.all %}
-        	<a id="opener_mark" href="#" class="component_icon button icon_edit"> {% trans "Scoring" %}</a>
-        	<a id="opener_reject" href="#" class="component_icon button icon_delete"> {% trans "Reject" %}</a>
+                <a id="opener_mark" href="#" class="component_icon button icon_edit"> {% trans "Scoring" %}</a>
+                <a id="opener_reject" href="#" class="component_icon button icon_delete"> {% trans "Reject" %}</a>
          {% else %}
-         	<a href="#" class="component_icon button icon_ok"> {% trans "Submitted" %}</a>
+                <a href="#" class="component_icon button icon_ok"> {% trans "Submitted" %}</a>
          {% endif %}
         {% endif %}
 
@@ -86,11 +70,11 @@
         {% if not field.html_name in mark_fields %}
             <td>{{ field.label_tag.as_hidden }}</td><td>{{ field.as_hidden }}</td>
         {% else %}
-        	{% if field.html_name == 'score' %}
+                {% if field.html_name == 'score' %}
              <td>{{ field.label_tag }}:</td><td> {{ field }}/20 <br />(utilisez la virgule pour les décimales)</td>
             {% else %}
              <td>{{ field.label_tag }}:</td><td> {{ field }}</td>
-        	{% endif %}
+                {% endif %}
 
         {% endif %}
         </tr>
@@ -145,12 +129,12 @@
 <br /><br />
 <div class="media">
  <div class="script">
-{#  {% if script.has_annotations_file %}#}
-{#    <iframe id="box-iframe" style="position:fixed; top:12%; left:0px; bottom:0px; right:0px; width:100%; height:85%; border:none; margin:0; padding:0; z-index:0;" src="{% if user.quotas.all or user.is_superuser %}{{ script_service_url }}?url={{ script.safe_url }}&username=Examinator&uuid={{ script.uuid }}{% else %}{{ script_service_url }}?url={{ script.safe_url }}&username={{ user.username }}&uuid={{ script.uuid }}{% endif %}">#}
-{#    </iframe>#}
-{#  {% else %}#}
-    {% pdfannotator url=script.unquoted_url uuid=script.uuid %}
-{#  {% endif %}#}
+  {% if script.has_annotations_file %}
+    <iframe id="box-iframe" style="position:fixed; top:12%; left:0px; bottom:0px; right:0px; width:100%; height:85%; border:none; margin:0; padding:0; z-index:0;" src="{% if user.quotas.all or user.is_superuser %}{{ script_service_url }}$
+    </iframe>
+  {% else %}
+    {% webviewer url=script.unquoted_url uuid=script.uuid %}
+  {% endif %}
  </div>
 </div>
 
@@ -162,3 +146,5 @@
 </div>
 {% endblock course %}
 {% endblock content %}
+
+