From: Marcin Koziej Date: Wed, 30 Jan 2013 10:19:25 +0000 (+0100) Subject: Epic spelling mistake X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/63fa9213819e7006cd1ced0c690dad76f990ec60?hp=a528895b70b51139a214ace3ef87e585a7496ca5 Epic spelling mistake --- diff --git a/lib/librarian b/lib/librarian index ae0c7dcc..cdde48a1 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit ae0c7dcc02fae67423974e65fe8bfdf6e7a7636a +Subproject commit cdde48a1896f8ff4c49221fba175d9b1108b8d21 diff --git a/redakcja/static/edumed/css/edumed.css b/redakcja/static/edumed/css/edumed.css index d63ce5b4..1d2b9ea5 100644 --- a/redakcja/static/edumed/css/edumed.css +++ b/redakcja/static/edumed/css/edumed.css @@ -439,7 +439,7 @@ em.person { } -.excercise .buttons { +.exercise .buttons { text-align: right; } @@ -465,7 +465,7 @@ em.person { -.excercise .lista.predicate { +.exercise .lista.predicate { list-style: none; position: relative; clear: both; @@ -473,12 +473,12 @@ em.person { } -.excercise .subjects { +.exercise .subjects { padding-left: 0; } -.excercise .lista.predicate > li { +.exercise .lista.predicate > li { list-style: none; display: block; float: left; @@ -486,28 +486,28 @@ em.person { margin: 2px; } -.excercise.wide .lista.predicate > li { +.exercise.wide .lista.predicate > li { width: 100%; margin: 2px; } -.excercise .lista.predicate .droppable { +.exercise .lista.predicate .droppable { min-height: 50px; border: 1px dotted black; } -.excercise .draggable { +.exercise .draggable { padding: 3px; border: 1px dotted black; display: inline-block; } -.excercise .draggable.disabled { +.exercise .draggable.disabled { background-color: grey; } -.excercise .placeholder { +.exercise .placeholder { padding: 3px; border: 1px dotted black; display: inline-block; @@ -515,12 +515,12 @@ em.person { min-height: 1em; } -.excercise .placeholder.accepting.dragover { +.exercise .placeholder.accepting.dragover { background-color: #ffff99; } -.excercise.zastap .paragraph .placeholder { +.exercise.zastap .paragraph .placeholder { display: inline; min-width: none; min-height: none; @@ -530,12 +530,12 @@ em.person { -.excercise .lista.subjects { +.exercise .lista.subjects { padding-left: 0px; } -.excercise.uporzadkuj li { +.exercise.uporzadkuj li { cursor: move; } @@ -546,7 +546,7 @@ em.person { margin-left: 5px; } -.excercise.wybor li[data-name] { +.exercise.wybor li[data-name] { list-style: none; } diff --git a/redakcja/static/edumed/js/edumed.coffee b/redakcja/static/edumed/js/edumed.coffee index 227bce63..14c700ce 100644 --- a/redakcja/static/edumed/js/edumed.coffee +++ b/redakcja/static/edumed/js/edumed.coffee @@ -17,11 +17,11 @@ class EduModule extends Binding # $(".teacher", @element).removeClass "show" -class Excercise extends Binding +class Exercise extends Binding constructor: (element) -> - super 'excercise', element - # just save the html to reset the excercise - $(@element).data("excercise-html", $(@element).html()) + super 'exercise', element + # just save the html to reset the exercise + $(@element).data("exercise-html", $(@element).html()) $(".check", @element).click (ev) => @check() @@ -38,8 +38,8 @@ class Excercise extends Binding @reset() reset: -> - $(@element).html($(@element).data('excercise-html')) - excercise @element + $(@element).html($(@element).data('exercise-html')) + exercise @element piece_correct: (qpiece) -> $(qpiece).removeClass('incorrect').addClass('correct') @@ -178,7 +178,7 @@ class Excercise extends Binding -class Wybor extends Excercise +class Wybor extends Exercise constructor: (element) -> super element @@ -224,7 +224,7 @@ class Wybor extends Excercise -class Uporzadkuj extends Excercise +class Uporzadkuj extends Exercise constructor: (element) -> super element $('ol, ul', @element).sortable({ items: "> li" }) @@ -263,7 +263,7 @@ class Uporzadkuj extends Excercise # XXX propozycje="1/0" -class Luki extends Excercise +class Luki extends Exercise constructor: (element) -> super element @dragging false, false @@ -288,7 +288,7 @@ class Luki extends Excercise @draggable_move $qp, $(placeholder), false -class Zastap extends Excercise +class Zastap extends Exercise constructor: (element) -> super element $(".paragraph", @element).each (i, par) => @@ -354,7 +354,7 @@ class Zastap extends Excercise $(chld).remove() -class Przyporzadkuj extends Excercise +class Przyporzadkuj extends Exercise is_multiple: -> for qp in $(".question-piece", @element) if $(qp).data('solution').split(/[ ,]+/).length > 1 @@ -417,7 +417,7 @@ class Przyporzadkuj extends Excercise -class PrawdaFalsz extends Excercise +class PrawdaFalsz extends Exercise constructor: (element) -> super element @@ -457,7 +457,7 @@ class PrawdaFalsz extends Excercise ########## -excercise = (ele) -> +exercise = (ele) -> es = wybor: Wybor uporzadkuj: Uporzadkuj @@ -480,5 +480,5 @@ window.edumed = $(document).ready () -> new EduModule($("#book-text")) - $(".excercise").each (i, el) -> - excercise(this) \ No newline at end of file + $(".exercise").each (i, el) -> + exercise(this) \ No newline at end of file diff --git a/redakcja/static/edumed/js/edumed.js b/redakcja/static/edumed/js/edumed.js index 75ecc9e5..cc7b9e12 100644 --- a/redakcja/static/edumed/js/edumed.js +++ b/redakcja/static/edumed/js/edumed.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript 1.4.0 (function() { - var $, Binding, EduModule, Excercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, excercise, + var $, Binding, EduModule, Exercise, Luki, PrawdaFalsz, Przyporzadkuj, Uporzadkuj, Wybor, Zastap, exercise, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -30,14 +30,14 @@ })(Binding); - Excercise = (function(_super) { + Exercise = (function(_super) { - __extends(Excercise, _super); + __extends(Exercise, _super); - function Excercise(element) { + function Exercise(element) { var _this = this; - Excercise.__super__.constructor.call(this, 'excercise', element); - $(this.element).data("excercise-html", $(this.element).html()); + Exercise.__super__.constructor.call(this, 'exercise', element); + $(this.element).data("exercise-html", $(this.element).html()); $(".check", this.element).click(function(ev) { _this.check(); $(ev.target).next(".retry").show(); @@ -57,20 +57,20 @@ }); } - Excercise.prototype.reset = function() { - $(this.element).html($(this.element).data('excercise-html')); - return excercise(this.element); + Exercise.prototype.reset = function() { + $(this.element).html($(this.element).data('exercise-html')); + return exercise(this.element); }; - Excercise.prototype.piece_correct = function(qpiece) { + Exercise.prototype.piece_correct = function(qpiece) { return $(qpiece).removeClass('incorrect').addClass('correct'); }; - Excercise.prototype.piece_incorrect = function(qpiece) { + Exercise.prototype.piece_incorrect = function(qpiece) { return $(qpiece).removeClass('correct').addClass('incorrect'); }; - Excercise.prototype.check = function() { + Exercise.prototype.check = function() { var score, scores, _this = this; scores = []; @@ -85,7 +85,7 @@ return this.show_score(score); }; - Excercise.prototype.show_solutions = function() { + Exercise.prototype.show_solutions = function() { var _this = this; this.reset(); return $(".question", this.element).each(function(i, question) { @@ -93,7 +93,7 @@ }); }; - Excercise.prototype.get_value_list = function(elem, data_key, numbers) { + Exercise.prototype.get_value_list = function(elem, data_key, numbers) { var vl; vl = $(elem).attr("data-" + data_key).split(/[ ,]+/).map($.trim); if (numbers) { @@ -104,7 +104,7 @@ return vl; }; - Excercise.prototype.get_value_optional_list = function(elem, data_key) { + Exercise.prototype.get_value_optional_list = function(elem, data_key) { var mandat, opt, v, vals, _i, _len; vals = this.get_value_list(elem, data_key); mandat = []; @@ -120,15 +120,15 @@ return [mandat, opt]; }; - Excercise.prototype.show_score = function(score) { + Exercise.prototype.show_score = function(score) { return $(".message", this.element).text("Wynik: " + score[0] + " / " + score[1]); }; - Excercise.prototype.draggable_equal = function($draggable1, $draggable2) { + Exercise.prototype.draggable_equal = function($draggable1, $draggable2) { return false; }; - Excercise.prototype.draggable_accept = function($draggable, $droppable) { + Exercise.prototype.draggable_accept = function($draggable, $droppable) { var d, dropped, _i, _len; dropped = $droppable.closest("ul, ol").find(".draggable"); for (_i = 0, _len = dropped.length; _i < _len; _i++) { @@ -140,7 +140,7 @@ return true; }; - Excercise.prototype.draggable_move = function($draggable, $placeholder, ismultiple) { + Exercise.prototype.draggable_move = function($draggable, $placeholder, ismultiple) { var $added, _this = this; $added = $draggable.clone(); @@ -162,7 +162,7 @@ }); }; - Excercise.prototype.dragging = function(ismultiple, issortable) { + Exercise.prototype.dragging = function(ismultiple, issortable) { var _this = this; return $(".question", this.element).each(function(i, question) { var draggable_opts, self; @@ -204,7 +204,7 @@ }); }; - return Excercise; + return Exercise; })(Binding); @@ -269,7 +269,7 @@ return Wybor; - })(Excercise); + })(Exercise); Uporzadkuj = (function(_super) { @@ -329,7 +329,7 @@ return Uporzadkuj; - })(Excercise); + })(Exercise); Luki = (function(_super) { @@ -370,7 +370,7 @@ return Luki; - })(Excercise); + })(Exercise); Zastap = (function(_super) { @@ -461,7 +461,7 @@ return Zastap; - })(Excercise); + })(Exercise); Przyporzadkuj = (function(_super) { @@ -553,7 +553,7 @@ return Przyporzadkuj; - })(Excercise); + })(Exercise); PrawdaFalsz = (function(_super) { @@ -614,9 +614,9 @@ return PrawdaFalsz; - })(Excercise); + })(Exercise); - excercise = function(ele) { + exercise = function(ele) { var cls, es; es = { wybor: Wybor, @@ -636,8 +636,8 @@ $(document).ready(function() { new EduModule($("#book-text")); - return $(".excercise").each(function(i, el) { - return excercise(this); + return $(".exercise").each(function(i, el) { + return exercise(this); }); });