exercises styling, script from upstream

diff --git a/catalogue/static/catalogue/css/exercise.css b/catalogue/static/catalogue/css/exercise.css
index 3325f90..2be22bc 100644 (file)
--- a/catalogue/static/catalogue/css/exercise.css
+++ b/catalogue/static/catalogue/css/exercise.css
@@ -109,6 +109,10 @@
   cursor: pointer;
   z-index: 2;
   width: 38.625em; }
   cursor: pointer;
   z-index: 2;
   width: 38.625em; }

+.przyporzadkuj span.question-piece {
+  display: inline-block;
+  margin: .1em;
+  width: auto; }

 .przyporzadkuj .question-piece.disabled {
   background-color: #eee;
   color: #d4d6d8; }
 .przyporzadkuj .question-piece.disabled {
   background-color: #eee;
   color: #d4d6d8; }

diff --git a/catalogue/static/catalogue/css/exercise.scss b/catalogue/static/catalogue/css/exercise.scss
index cf7bfc3..e16d7d7 100755 (executable)
--- a/catalogue/static/catalogue/css/exercise.scss
+++ b/catalogue/static/catalogue/css/exercise.scss
@@ -162,6 +162,11 @@ $px: 0.0625em;
         @include bubble-drag;
         width: 618*$px;
     }
         @include bubble-drag;
         width: 618*$px;
     }

+    span.question-piece {
+        display: inline-block;
+        margin: .1em;
+        width: auto;
+    }

     .question-piece.disabled {
         @include bubble-drag-disabled;
     }
     .question-piece.disabled {
         @include bubble-drag-disabled;
     }

diff --git a/catalogue/static/catalogue/js/edumed.js b/catalogue/static/catalogue/js/edumed.js
index f11ac36..33b7c58 100644 (file)
--- a/catalogue/static/catalogue/js/edumed.js
+++ b/catalogue/static/catalogue/js/edumed.js
@@ -152,12 +152,18 @@
       if (!$placeholder.hasClass('multiple')) {
         $placeholder.hide();
       }
       if (!$placeholder.hasClass('multiple')) {
         $placeholder.hide();
       }

-      $added.append('<span class="remove">x</span><div class="clr">');
+      if ($added.is(".add-li")) {
+        $added.wrap("<li/>");
+      }
+      $added.append('<span class="remove">x</span><div class="clr"></div>');

       return $('.remove', $added).click(function(ev) {
       return $('.remove', $added).click(function(ev) {

-        $added.prev(".placeholder:not(.multiple)").show();

         if (!ismultiple) {
           $($added.data('original')).removeClass('disabled').draggable('enable');
         }
         if (!ismultiple) {
           $($added.data('original')).removeClass('disabled').draggable('enable');
         }

+        if ($added.is(".add-li")) {
+          $added = $added.closest('li');
+        }
+        $added.prev(".placeholder:not(.multiple)").show();

         return $added.remove();
       });
     };
         return $added.remove();
       });
     };


@@ -263,7 +269,7 @@
           should_be_checked = solution.indexOf(piece_no) >= 0;
         }
         console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked);
           should_be_checked = solution.indexOf(piece_no) >= 0;
         }
         console.log("check " + $("input[type=checkbox]", qpiece).attr("id") + " -> " + should_be_checked);

-        return $("input[type=checkbox]", qpiece).prop('checked', should_be_checked);
+        return $("input[type=checkbox],input[type=radio]", qpiece).prop('checked', should_be_checked);

       });
     };
 
       });
     };
 


@@ -598,12 +604,12 @@
 
     PrawdaFalsz.prototype.show_solutions = function() {
       var qp, _i, _len, _ref, _results;
 
     PrawdaFalsz.prototype.show_solutions = function() {
       var qp, _i, _len, _ref, _results;

-      reset();
+      this.reset();

       _ref = $(".question-piece", this.element);
       _results = [];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         qp = _ref[_i];
       _ref = $(".question-piece", this.element);
       _results = [];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         qp = _ref[_i];

-        if ($(qp).data('solution') === 'true') {
+        if ($(qp).data('solution') === true) {

           _results.push($(".true", qp).click());
         } else {
           _results.push($(".false", qp).click());
           _results.push($(".true", qp).click());
         } else {
           _results.push($(".false", qp).click());