diff --git a/parsifal/__init__.py b/parsifal/__init__.py index 19823db8..07823235 100644 --- a/parsifal/__init__.py +++ b/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) diff --git a/parsifal/apps/reviews/conducting/static/js/conducting_study_selection.js b/parsifal/apps/reviews/conducting/static/js/conducting_study_selection.js index 6d804a05..488ac8db 100644 --- a/parsifal/apps/reviews/conducting/static/js/conducting_study_selection.js +++ b/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(); } -}); \ No newline at end of file +}); diff --git a/parsifal/apps/reviews/conducting/templates/conducting/conducting_study_selection.html b/parsifal/apps/reviews/conducting/templates/conducting/conducting_study_selection.html index 743d3a43..be1384ef 100644 --- a/parsifal/apps/reviews/conducting/templates/conducting/conducting_study_selection.html +++ b/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 %} - + {% compress css %} + + {% endcompress %} {% endblock stylesheet %} {% block javascript %} - - - - + {% compress js %} + + + + + {% endcompress %} {% endblock javascript %} {% block tab_content %}