Merge pull request #66 from vitorfs/dev

Release v2.0.1

Author: vitorfs

parsifal/__init__.py

@@ -1,5 +1,5 @@
 from parsifal.utils.version import get_version
 
-VERSION = (2, 0, 0, "final", 0)
+VERSION = (2, 0, 1, "final", 0)
 
 __version__ = get_version(VERSION)

parsifal/apps/reviews/conducting/static/js/conducting_study_selection.js

@@ -34,7 +34,7 @@ $(function () {
         $("#tab-files").html(data);
       },
       error: function () {
-        
+
       },
       complete: function () {
         $.parsifal.pageLoading();
@@ -155,10 +155,10 @@ $(function () {
 
     if (keyCode == ESCAPE_KEY) {
       if ($("body").hasClass("modal-open")) {
-        $(".modal").modal('hide');  
+        $(".modal").modal('hide');
       }
       else {
-        $(".source-articles tbody tr").removeClass("active");    
+        $(".source-articles tbody tr").removeClass("active");
       }
     }
     else if (!$("body").hasClass("modal-open")) {
@@ -181,10 +181,10 @@ $(function () {
 
     var active = $(".source-articles tbody tr.active").index();
     var old_active = active;
-    var size = $(".source-articles tbody tr").size();
+    var size = $(".source-articles tbody tr").length;
     var next;
     do {
-      active = (active + step) % size;  
+      active = (active + step) % size;
       next = $(".source-articles tbody tr:eq("+active+")");
     } while($(next).is(":hidden"));
     $(".source-articles tbody tr").removeClass("active");
@@ -241,7 +241,7 @@ $(function () {
       }
     });
   }
-  
+
   $(".btn-save-article").click(function () {
     save_article(false);
   });
@@ -509,4 +509,4 @@ $(function () {
     $("#source-tab li.active a").click();
   }
 
-});
+});

parsifal/apps/reviews/conducting/templates/conducting/conducting_study_selection.html

@@ -1,16 +1,20 @@
 {% extends 'conducting/conducting.html' %}
 
-{% load static %}
+{% load compress static %}
 
 {% block stylesheet %}
-  <link href="{% static 'css/fileupload/jquery.fileupload.css' %}" rel="stylesheet">
+  {% compress css %}
+    <link href="{% static 'css/fileupload/jquery.fileupload.css' %}" rel="stylesheet">
+  {% endcompress %}
 {% endblock stylesheet %}
 
 {% block javascript %}
-  <script src="{% static 'js/fileupload/jquery.ui.widget.js' %}"></script>
-  <script src="{% static 'js/fileupload/jquery.iframe-transport.js' %}"></script>
-  <script src="{% static 'js/fileupload/jquery.fileupload.js' %}"></script>
-  <script src="{% static 'js/conducting_study_selection.js' %}?v=2"></script>
+  {% compress js %}
+    <script src="{% static 'js/fileupload/jquery.ui.widget.js' %}"></script>
+    <script src="{% static 'js/fileupload/jquery.iframe-transport.js' %}"></script>
+    <script src="{% static 'js/fileupload/jquery.fileupload.js' %}"></script>
+    <script src="{% static 'js/conducting_study_selection.js' %}"></script>
+  {% endcompress %}
 {% endblock javascript %}
 
 {% block tab_content %}