From 85a18446fb863939d7930182eaec4ac6929df22f Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Wed, 16 Jan 2013 14:37:45 +0100
Subject: [PATCH 01/83] Added H5P libraries

---
 content.json                  |   0
 js/questionset.js             | 305 ++++++++++++++++++++++++++++++++++
 library.json                  |   0
 schema.json                   | 168 +++++++++++++++++++
 views/questionset-intro.ejs   |   5 +
 views/questionset-results.ejs |   6 +
 views/questionset.ejs         |  60 +++++++
 7 files changed, 544 insertions(+)
 create mode 100644 content.json
 create mode 100644 js/questionset.js
 create mode 100644 library.json
 create mode 100644 schema.json
 create mode 100644 views/questionset-intro.ejs
 create mode 100644 views/questionset-results.ejs
 create mode 100644 views/questionset.ejs

diff --git a/content.json b/content.json
new file mode 100644
index 0000000..e69de29
diff --git a/js/questionset.js b/js/questionset.js
new file mode 100644
index 0000000..ca85d98
--- /dev/null
+++ b/js/questionset.js
@@ -0,0 +1,305 @@
+// Will render a Question with multiple choices for answers.
+
+// Options format:
+// {
+//   title: "Optional title for question box",
+//   question: "Question text",
+//   answers: [{text: "Answer text", correct: false}, ...],
+//   singleAnswer: true, // or false, will change rendered output slightly.
+// }
+//
+// Events provided:
+// - h5pQuestionSetFinished: Triggered when a question is finished. (User presses Finish-button)
+window.H5P = window.H5P || {};
+
+H5P.QuestionSet = function (options) {
+  if ( !(this instanceof H5P.QuestionSet) )
+    return new H5P.QuestionSet(options);
+
+  var $ = H5P.jQuery;
+
+  var texttemplate = '' +
+'<style type="text/css">' +
+'.dots-container {' +
+'  text-align: center;' +
+'}' +
+'.progress-dot {' +
+'  display: inline-block;' +
+'  width: 10px;' +
+'  height: 10px;' +
+'  border-radius: 50%;' +
+'}' +
+'.progress-dot.unanswered {' +
+'  background: darkred;' +
+'}' +
+'.progress-dot.answered {' +
+'  background: darkgreen;' +
+'}' +
+'.progress-dot.current {' +
+'  box-shadow: 0px 0px 6px firebrick;' +
+'}' +
+'.intro-page {' +
+'  background: white;' +
+'  position: absolute;' +
+'  z-index: 20;' +
+'  height: 100%;' +
+'  width: 100%;' +
+'  left: 0px;' +
+'  top: 0px;' +
+'}' +
+'</style>' +
+'<div class="questionset">' +
+'  <% if (introPage.showIntroPage) { %>' +
+'  <div class="intro-page">' +
+'    <div class="title"><%= introPage.title %></div>' +
+'    <div class="introduction"><%= introPage.introduction %></div>' +
+'    <div class="buttons"><button id="qs-startbutton"><%= introPage.startButtonText %></button></div>' +
+'  </div>' +
+'  <%} %>' +
+'  <div class="title"><%= title %></div>' +
+'  <% for (var i=0; i<questions.length; i++) { %>' +
+'    <div class="question-container" id="q-<%= i %>">' +
+'      <div><%= questions[i].machineName %></div>' +
+'    </div>' +
+'  <% } %>' +
+'  <div class="question-footer">' +
+'    <div class="progress">' +
+'      <% if (progressType == "dots") { %>' +
+'        <div class="dots-container">' +
+'          <% for (var i=0; i<questions.length; i++) { %>' +
+'          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>' +
+'          <%} %>' +
+'        </div>' +
+'      <% } else if (progressType == "textual") { %>' +
+'        <span class="progress-text"></span>' +
+'      <% } %>' +
+'    </div>' +
+'    <button class="prev button"><%= texts.prevButton %></button>' +
+'    <button class="next button"><%= texts.nextButton %></button>' +
+'    <button class="finish button"><%= texts.finishButton %></button>' +
+'  </div>' +
+'</div>' +
+  '';
+
+  var resulttemplate = '' +
+'<div class="questionset-results">' +
+'  <div class="greeting"><%= greeting %></div>' +
+'  <div class="score <%= scoreclass %>"><%= score %></div>' +
+'  <div class="resulttext"><%= resulttext %></div>' +
+'  <div><button class="qs-finishbutton"><%= finishButtonText %></button></div>' +
+'</div>' +
+'';
+
+  var that = this;
+  var defaults = {
+    title: "",
+    randomOrder: false,
+    initialQuestion: 0,
+    backgroundImage: "",
+    progressType: 'dots',
+    passPercentage: 50,
+    questions: [],
+    introPage: {
+      showIntroPage: true,
+      title: "Welcome",
+      introduction: "Click start to start.",
+      startButtonText: "Start"
+    },
+    texts: {
+      prevButton: "Previous",
+      nextButton: "Next",
+      finishButton: "Finish",
+      textualProgress: "Question: @current of @total questions"
+    },
+    endGame: {
+      showResultPage: true,
+      resultPage: {
+        succesGreeting: "Congratulations!",
+        successComment: "You have enough correct answers to pass the test.",
+        failGreeting: "Sorry!",
+        failComment: "You don't have enough correct answers to pass this test.",
+        scoreString: "@score/@total",
+        finishButtonText: "Finish"
+      },
+      animations: {
+        showAnimations: false,
+        succesResultAnimation: {
+          machineName: "H5P.Image",
+          options: {image: ""}
+        },
+        failedResultAnimation: {
+          machineName: "H5P.Image",
+          options: {image: ""}
+        }
+      }
+    }
+  };
+
+  var template = new EJS({text: texttemplate});
+  var endTemplate = new EJS({text: resulttemplate});
+  var params = $.extend({}, defaults, options);
+
+  var currentQuestion = 0;
+  var questionInstances = new Array();
+  var allQuestionsAnswered = false;
+  var $myDom;
+
+  if (params.randomOrder) {
+    // TODO: Randomize order of questions
+    console.log("TODO: Randomize order of questions");
+  }
+
+  // Instantiate question instances
+  for (var i=0; i<params.questions.length; i++) {
+    var quest = params.questions[i];
+    // TODO: Render on init, inject in template.
+    var tmp = new (H5P.classFromName(quest.machineName))(quest.options);
+    questionInstances.push(tmp);
+  }
+
+  var _updateFinishButton = function () {
+    var answered = true;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      answered = answered && (questionInstances[i]).getAnswerGiven();
+    }
+    $('.finish.button', $myDom).attr({'disabled': !answered});
+  };
+
+  var _showQuestion = function (questionNumber) {
+    // Sanitize input.
+    if (questionNumber < 0) { questionNumber = 0; }
+    if (questionNumber >= params.questions.length) { questionNumber = params.questions.length - 1; }
+
+    $('.prev.button', $myDom).attr({'disabled': (questionNumber === 0)});
+    $('.next.button', $myDom).attr({'disabled': (questionNumber == params.questions.length-1)});
+
+
+    // Hide all questions
+    $('.question-container', $myDom).hide();
+
+    // Reshow the requested question
+    $('#q-' + questionNumber, $myDom).show();
+
+    // Update progress indicator
+    // Test if current has been answered.
+    if (params.progressType == 'textual') {
+      $('.progress-text', $myDom).text(params.texts.textualProgress.replace("@current", questionNumber+1).replace("@total", params.questions.length));
+    } else {
+      // Set currentNess
+      $('.progress-dot.current', $myDom).removeClass('current');
+      $('#qdot-' + questionNumber, $myDom).addClass('current');
+    }
+
+    // Remember where we are
+    currentQuestion = questionNumber;
+    return currentQuestion;
+  };
+
+  // Function for attaching the multichoice to a DOM element.
+  var attach = function (targetId) {
+    // Render own DOM into target.
+    template.update(targetId, params);
+    $myDom = $('#' + targetId);
+    $myDom.css({backgroundImage: 'url(' + params.backgroundImage + ')'});
+
+    // Attach questions
+    for (var i=0; i<questionInstances.length; i++) {
+      var quest = questionInstances[i];
+      // TODO: Render on init, inject in template.
+      quest.attach('q-' + i);
+      $(quest).on('h5pQuestionAnswered', function (ev) {
+        $('#qdot-' + currentQuestion, $myDom).removeClass('unanswered').addClass('answered');
+        _updateFinishButton();
+      });
+      if (quest.getAnswerGiven()) {
+        $('#qdot-'+i, $myDom).removeClass('unanswered').addClass('answered');
+      }
+    }
+
+    $('#qs-startbutton').click(function (ev) {
+      $(this).parents('.intro-page').hide();
+    });
+
+    // Set event listeners.
+    $('.progress-dot', $myDom).click(function (ev) {
+      var idx = parseInt($(this).attr('id').split('-')[1]);
+      _showQuestion(idx);
+    });
+    $('.next.button', $myDom).click(function (ev) {
+      _showQuestion(currentQuestion + 1);
+    });
+    $('.prev.button', $myDom).click(function (ev) {
+      _showQuestion(currentQuestion - 1);
+    });
+    $('.finish.button', $myDom).click(function (ev) {
+      // Get total score.
+      var finals = getScore();
+      var totals = totalScore();
+      var scoreString = params.endGame.resultPage.scoreString.replace("@score", finals).replace("@total", totals);
+      var success = ((100 * finals / totals) >= params.passPercentage);
+      var eventData = {
+        score: scoreString,
+        passed: success
+      };
+      // Display result page.
+      if (params.endGame.showResultPage) {
+        // Render result page into.
+        var eparams = {
+          greeting: (success ? params.endGame.resultPage.succesGreeting : params.endGame.resultPage.failGreeting),
+          score: scoreString,
+          scoreclass: (success ? 'success' : 'fail'),
+          resulttext: (success ? params.endGame.resultPage.successComment : params.endGame.resultPage.failComment),
+          finishButtonText: params.endGame.resultPage.finishButtonText
+        };
+        endTemplate.update(targetId, eparams);
+        $('.qs-finishbutton').click(function (ev) {
+          // Display animation if present.
+          if (params.endGame.animations.showAnimations) {
+            // Init anims.
+            console.log("Now we should have started some anims...");
+            // On animation finished:
+              $(returnObject).trigger('h5pQuestionSetFinished', eventData);
+          } else {
+            // Trigger finished event.
+            $(returnObject).trigger('h5pQuestionSetFinished', eventData);
+          }
+        });
+      } else {
+        $(returnObject).trigger('h5pQuestionSetFinished', eventData);
+      }
+    });
+
+    // Hide all but initial Question.
+    _showQuestion(params.initialQuestion);
+    _updateFinishButton();
+    return this;
+  };
+
+  // Get current score for questionset.
+  var getScore = function () {
+    var score = 0;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      score += questionInstances[i].getScore();
+    }
+    return score;
+  };
+
+  // Get total score possible for questionset.
+  var totalScore = function () {
+    var score = 0;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      score += questionInstances[i].totalScore();
+    }
+    return score;
+  };
+
+  // Masquerade the main object to hide inner properties and functions.
+  var returnObject = {
+    attach: attach, // Attach to DOM object
+    getQuestions: function () {return questionInstances;},
+    getScore: getScore,
+    totalScore: totalScore,
+    defaults: defaults // Provide defaults for inspection
+  };
+  return returnObject;
+};
diff --git a/library.json b/library.json
new file mode 100644
index 0000000..e69de29
diff --git a/schema.json b/schema.json
new file mode 100644
index 0000000..790af6a
--- /dev/null
+++ b/schema.json
@@ -0,0 +1,168 @@
+{
+  "title": {
+    "label": "Title",
+    "description": "Question set title (optional)",
+    "type": "text",
+    "default": ""
+  },
+  "randomOrder": {
+    "label": "Randomize order",
+    "description": "Whether questions should be shown in random order",
+    "type": "boolean",
+    "default": false
+  },
+  "initialQuestion": {
+    "label": "Initial question",
+    "description": "Which question to start with. Count from 0",
+    "type": "integer",
+    "default": 0
+  },
+  "backgroundImage": {
+    "label": "Background image",
+    "description": "An optional background image for the Question set.",
+    "type": "image",
+    "default": ""
+  },
+  "progressType": {
+    "label": "Progress indicator",
+    "description": "Question set progress indicator style",
+    "type": "select",
+    "values": [{"text": "Textual", "value": "textual"}, {"text": "Dots", "value": "dots"}],
+    "default": "textual"
+  },
+  "passPercentage": {
+    "label": "Pass percentage",
+    "description": "Percentage of total score required for passing the quiz.",
+    "type": "integer",
+    "minValue": 0,
+    "maxValue": 100,
+    "default": 50
+  },
+  "questions": {
+    "label": "Questions",
+    "description": "List of questions in this set.",
+    "type": "h5p-library",
+    "validLibs": ["H5P.MultiChoice", "H5P.DragTextMatch", "H5PDragImageIntoPosition"],
+    "array": true,
+    "minEntries": 1,
+    "maxEntries": -1
+  },
+  "introPage": {
+    "label": "Intro page",
+    "description": "Data for the intro page",
+    "type": "combined",
+    "fields": {
+      "showIntroPage": {
+        "label": "Show intro page?",
+        "type": "boolean"
+      },
+      "title": {
+        "label": "Title",
+        "type": "text"
+      },
+      "introduction": {
+        "label": "Introduction text",
+        "type": "text"
+      },
+      "startButtonText": {
+        "label": "Start button text",
+        "type": "text"
+      }
+    }
+  },
+  "texts": {
+    "label": "Interface texts in quiz",
+    "type": "combined"
+    "fields": {
+      "prevButton": {
+        "label": "Back button",
+        "type": "text",
+        "default": "Previous"
+      },
+      "nextButton": {
+        "label": "Next button",
+        "type": "text",
+        "default": "Next"
+      },
+      "finishButton": {
+        "label": "Finish button",
+        "type": "text",
+        "default": "Finish"
+      },
+      "textualProgress": {
+        "label": "Progress text",
+        "description": "Text used if textual progress is selected.",
+        "type": "text",
+        "default": "Question: @current of @total questions"
+      }
+    }
+  },
+  "endGame": {
+    "label": "End game data",
+    "type": "combined",
+    "fields" {
+      "showResultPage": {
+        "label": "Show result page",
+        "type": "boolean",
+        "default": true
+      },
+      "resultPage": {
+        "label": "Result page",
+        "description": "Data and texts for the result page",
+        "type": "combined",
+        "fields": {
+          "successGreeting": {
+            "label": "Success greeting",
+            "description": "Title in result page on success",
+            "type": "text"
+          },
+          "successComment": {
+            "label": "Success comment",
+            "description": "Comment shown after the score",
+            "type": "text"
+          },
+          "failGreeting": {
+            "label": "Failed greeting",
+            "description": "Title in result page on failed quiz",
+            "type": "text"
+          },
+          "failComment": {
+            "label": "Failed comment",
+            "description": "Comment shown after the score on failed quiz",
+            "type": "text"
+          },
+          "finishButtonText": {
+            "label": "Finish button text",
+            "description": "Text for the finish button",
+            "type": "text"
+          }
+        }
+      },
+      "animations": {
+        "label": "Animations",
+        "type": "combined"
+        "fields": {
+          "showAnimations": {
+            "label": "Show animations",
+            "type": "boolean",
+            "default": false
+          }
+          "successResultAnimation": {
+            "label": "Result animation for success",
+            "description": "Add animation for successful completion of the quiz",
+            "optional": true,
+            "type": "h5p-library",
+            "validLibs": ["H5P.Animation", "H5P.Video", "H5P.Image"]
+          },
+          "failedResultAnimation": {
+            "label": "Result animation for failed quiz",
+            "description": "Add animation for failed completion of the quiz",
+            "optional": true,
+            "type": "h5p-library",
+            "validLibs": ["H5P.Animation", "H5P.Video", "H5P.Image"]
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/views/questionset-intro.ejs b/views/questionset-intro.ejs
new file mode 100644
index 0000000..cc18bb6
--- /dev/null
+++ b/views/questionset-intro.ejs
@@ -0,0 +1,5 @@
+<div class="questionset-intro">
+  <div class="title"><%= title %></div>
+  <div class="introduction"><%= introduction %></div>
+  <div class="buttons"><button id="qs-startbutton"><%= startButtonText %></button></div>
+</div>
\ No newline at end of file
diff --git a/views/questionset-results.ejs b/views/questionset-results.ejs
new file mode 100644
index 0000000..a107cb5
--- /dev/null
+++ b/views/questionset-results.ejs
@@ -0,0 +1,6 @@
+<div class="questionset-results">
+  <div class="greeting"><%= greeting %></div>
+  <div class="score <%= scoreclass %>"><%= score %></div>
+  <div class="resulttext"><%= resulttext %></div>
+  <div><button class="qs-finishbutton"><%= finishButtonText %></button></div>
+</div>
diff --git a/views/questionset.ejs b/views/questionset.ejs
new file mode 100644
index 0000000..574132b
--- /dev/null
+++ b/views/questionset.ejs
@@ -0,0 +1,60 @@
+<style type="text/css">
+.dots-container {
+  text-align: center;
+}
+.progress-dot {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+}
+.progress-dot.unanswered {
+  background: darkred;
+}
+.progress-dot.answered {
+  background: darkgreen;
+}
+.progress-dot.current {
+  box-shadow: 0px 0px 6px firebrick;
+}
+.intro-page {
+  background: white;
+  position: absolute;
+  z-index: 20;
+  height: 100%;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+}
+</style>
+<div class="questionset">
+  <% if (introPage.showIntroPage) { %>
+  <div class="intro-page">
+    <div class="title"><%= introPage.title %></div>
+    <div class="introduction"><%= introPage.introduction %></div>
+    <div class="buttons"><button id="qs-startbutton"><%= introPage.startButtonText %></button></div>
+  </div>
+  <%} %>
+  <div class="title"><%= title %></div>
+  <% for (var i=0; i<questions.length; i++) { %>
+    <div class="question-container" id="q-<%= i %>">
+      <div><%= questions[i].machineName %></div>
+    </div>
+  <% } %>
+  <div class="question-footer">
+    <div class="progress">
+      <% if (progressType == "dots") { %>
+        <div class="dots-container">
+          <% for (var i=0; i<questions.length; i++) { %>
+          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>
+          <%} %>
+        </div>
+      <% } else if (progressType == "textual") { %>
+        <span class="progress-text"></span>
+      <% } %>
+    </div>
+    <button class="prev button"><%= texts.prevButton %></button>
+    <button class="next button"><%= texts.nextButton %></button>
+    <button class="finish button"><%= texts.finishButton %></button>
+  </div>
+</div>

From f9e8360a7f594f5da0b448bd8f8042b77f5d176a Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Wed, 16 Jan 2013 19:33:59 +0100
Subject: [PATCH 02/83] Changes to example content.

Example content is now a working board game sans Images.
It can be uploaded using the H5P module too. It will work. (At least with the next commit)
---
 content.json          |  0
 css/questionset.css   | 27 +++++++++++++++++++++++++++
 js/questionset.js     | 42 ++++++++++--------------------------------
 library.json          | 16 ++++++++++++++++
 views/questionset.ejs | 29 -----------------------------
 5 files changed, 53 insertions(+), 61 deletions(-)
 delete mode 100644 content.json
 create mode 100644 css/questionset.css

diff --git a/content.json b/content.json
deleted file mode 100644
index e69de29..0000000
diff --git a/css/questionset.css b/css/questionset.css
new file mode 100644
index 0000000..fdc21b3
--- /dev/null
+++ b/css/questionset.css
@@ -0,0 +1,27 @@
+.dots-container {
+  text-align: center;
+}
+.progress-dot {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+}
+.progress-dot.unanswered {
+  background: darkred;
+}
+.progress-dot.answered {
+  background: darkgreen;
+}
+.progress-dot.current {
+  box-shadow: 0px 0px 6px firebrick;
+}
+.intro-page {
+  background: white;
+  position: absolute;
+  z-index: 20;
+  height: 100%;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+}
diff --git a/js/questionset.js b/js/questionset.js
index ca85d98..a3dbbff 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -19,35 +19,6 @@ H5P.QuestionSet = function (options) {
   var $ = H5P.jQuery;
 
   var texttemplate = '' +
-'<style type="text/css">' +
-'.dots-container {' +
-'  text-align: center;' +
-'}' +
-'.progress-dot {' +
-'  display: inline-block;' +
-'  width: 10px;' +
-'  height: 10px;' +
-'  border-radius: 50%;' +
-'}' +
-'.progress-dot.unanswered {' +
-'  background: darkred;' +
-'}' +
-'.progress-dot.answered {' +
-'  background: darkgreen;' +
-'}' +
-'.progress-dot.current {' +
-'  box-shadow: 0px 0px 6px firebrick;' +
-'}' +
-'.intro-page {' +
-'  background: white;' +
-'  position: absolute;' +
-'  z-index: 20;' +
-'  height: 100%;' +
-'  width: 100%;' +
-'  left: 0px;' +
-'  top: 0px;' +
-'}' +
-'</style>' +
 '<div class="questionset">' +
 '  <% if (introPage.showIntroPage) { %>' +
 '  <div class="intro-page">' +
@@ -197,10 +168,17 @@ H5P.QuestionSet = function (options) {
 
   // Function for attaching the multichoice to a DOM element.
   var attach = function (targetId) {
+    if (typeof(target) == "string") {
+      target = $("#" + target);
+    } else {
+      target = $(target);
+    }
+
     // Render own DOM into target.
-    template.update(targetId, params);
-    $myDom = $('#' + targetId);
-    $myDom.css({backgroundImage: 'url(' + params.backgroundImage + ')'});
+    $myDom = target;
+    $myDom.html(template.render(params)).css({
+      backgroundImage: 'url(' + params.backgroundImage + ')'
+    });
 
     // Attach questions
     for (var i=0; i<questionInstances.length; i++) {
diff --git a/library.json b/library.json
index e69de29..f957624 100644
--- a/library.json
+++ b/library.json
@@ -0,0 +1,16 @@
+{
+  "title": "Question set",
+  "contentType": "question",
+  "majorVersion": 1,
+  "minorVersion": 0,
+  "patchVersion": 0,
+  "machineName": "H5P.QuestionSet",
+  "author": "Amendor AS",
+  "license": "cc-by-sa",
+  "preloadedJs": [
+    {"path": "js/questionset.js"}
+  ],
+  "preloadedCss": [
+    {"path": "css/questionset.css"}
+  ]
+}
diff --git a/views/questionset.ejs b/views/questionset.ejs
index 574132b..f097cd3 100644
--- a/views/questionset.ejs
+++ b/views/questionset.ejs
@@ -1,32 +1,3 @@
-<style type="text/css">
-.dots-container {
-  text-align: center;
-}
-.progress-dot {
-  display: inline-block;
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
-}
-.progress-dot.unanswered {
-  background: darkred;
-}
-.progress-dot.answered {
-  background: darkgreen;
-}
-.progress-dot.current {
-  box-shadow: 0px 0px 6px firebrick;
-}
-.intro-page {
-  background: white;
-  position: absolute;
-  z-index: 20;
-  height: 100%;
-  width: 100%;
-  left: 0px;
-  top: 0px;
-}
-</style>
 <div class="questionset">
   <% if (introPage.showIntroPage) { %>
   <div class="intro-page">

From b98ef0fc7a15a2fd2d55fa2f809f9378f38aa802 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Wed, 16 Jan 2013 22:01:39 +0100
Subject: [PATCH 03/83] Fix bug in questionsets.js

---
 js/questionset.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index a3dbbff..0f880e4 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -167,7 +167,7 @@ H5P.QuestionSet = function (options) {
   };
 
   // Function for attaching the multichoice to a DOM element.
-  var attach = function (targetId) {
+  var attach = function (target) {
     if (typeof(target) == "string") {
       target = $("#" + target);
     } else {

From 0dd48ee8429a3144cdfe0b3169a6ef95a5d987b7 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Thu, 17 Jan 2013 22:57:10 +0100
Subject: [PATCH 04/83] Stop using dropbox for images

---
 js/questionset.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 0f880e4..5cd512a 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -12,11 +12,12 @@
 // - h5pQuestionSetFinished: Triggered when a question is finished. (User presses Finish-button)
 window.H5P = window.H5P || {};
 
-H5P.QuestionSet = function (options) {
+H5P.QuestionSet = function (options, contentId) {
   if ( !(this instanceof H5P.QuestionSet) )
-    return new H5P.QuestionSet(options);
+    return new H5P.QuestionSet(options, contentId);
 
   var $ = H5P.jQuery;
+  var cp = H5P.getContentPath(contentId);
 
   var texttemplate = '' +
 '<div class="questionset">' +
@@ -124,7 +125,7 @@ H5P.QuestionSet = function (options) {
   for (var i=0; i<params.questions.length; i++) {
     var quest = params.questions[i];
     // TODO: Render on init, inject in template.
-    var tmp = new (H5P.classFromName(quest.machineName))(quest.options);
+    var tmp = new (H5P.classFromName(quest.machineName))(quest.options, contentId);
     questionInstances.push(tmp);
   }
 
@@ -177,7 +178,7 @@ H5P.QuestionSet = function (options) {
     // Render own DOM into target.
     $myDom = target;
     $myDom.html(template.render(params)).css({
-      backgroundImage: 'url(' + params.backgroundImage + ')'
+      backgroundImage: 'url(' + cp + params.backgroundImage + ')'
     });
 
     // Attach questions

From 9ee3ee91f3f553abc792b2e193e0dce1acdbe9e8 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Thu, 17 Jan 2013 23:21:10 +0100
Subject: [PATCH 05/83] Store whether or not a library is runnable

---
 library.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library.json b/library.json
index f957624..5e5df50 100644
--- a/library.json
+++ b/library.json
@@ -4,6 +4,7 @@
   "majorVersion": 1,
   "minorVersion": 0,
   "patchVersion": 0,
+  "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",
   "license": "cc-by-sa",

From 6c8e2c57afaaf362eec7d4fba97096213614f97d Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Sun, 20 Jan 2013 22:25:34 +0100
Subject: [PATCH 06/83] Fix target bug in questionset

---
 js/questionset.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index 5cd512a..c9ebdc9 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -230,7 +230,7 @@ H5P.QuestionSet = function (options, contentId) {
           resulttext: (success ? params.endGame.resultPage.successComment : params.endGame.resultPage.failComment),
           finishButtonText: params.endGame.resultPage.finishButtonText
         };
-        endTemplate.update(targetId, eparams);
+        endTemplate.update(target.attr('id'), eparams);
         $('.qs-finishbutton').click(function (ev) {
           // Display animation if present.
           if (params.endGame.animations.showAnimations) {

From e8ef20a99517d866b4d6ccc271e60d613d0ec625 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Sun, 20 Jan 2013 22:57:53 +0100
Subject: [PATCH 07/83] Add temporary styling

---
 css/questionset.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/css/questionset.css b/css/questionset.css
index fdc21b3..26c5a3a 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -17,7 +17,8 @@
   box-shadow: 0px 0px 6px firebrick;
 }
 .intro-page {
-  background: white;
+  background-color: rgba(255,255,255,0.9);
+  padding: 10px;
   position: absolute;
   z-index: 20;
   height: 100%;
@@ -25,3 +26,7 @@
   left: 0px;
   top: 0px;
 }
+.questionset-results {
+  background-color: rgba(255, 255, 255, 0.75);
+  padding: 10px;
+}

From e8849590815e789e610cbaa578f36e666ad87a10 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Tue, 22 Jan 2013 22:07:24 +0100
Subject: [PATCH 08/83] Remove questionset

---
 css/questionset.css           |  32 ----
 js/questionset.js             | 284 ----------------------------------
 library.json                  |  17 --
 schema.json                   | 168 --------------------
 views/questionset-intro.ejs   |   5 -
 views/questionset-results.ejs |   6 -
 views/questionset.ejs         |  31 ----
 7 files changed, 543 deletions(-)
 delete mode 100644 css/questionset.css
 delete mode 100644 js/questionset.js
 delete mode 100644 library.json
 delete mode 100644 schema.json
 delete mode 100644 views/questionset-intro.ejs
 delete mode 100644 views/questionset-results.ejs
 delete mode 100644 views/questionset.ejs

diff --git a/css/questionset.css b/css/questionset.css
deleted file mode 100644
index 26c5a3a..0000000
--- a/css/questionset.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.dots-container {
-  text-align: center;
-}
-.progress-dot {
-  display: inline-block;
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
-}
-.progress-dot.unanswered {
-  background: darkred;
-}
-.progress-dot.answered {
-  background: darkgreen;
-}
-.progress-dot.current {
-  box-shadow: 0px 0px 6px firebrick;
-}
-.intro-page {
-  background-color: rgba(255,255,255,0.9);
-  padding: 10px;
-  position: absolute;
-  z-index: 20;
-  height: 100%;
-  width: 100%;
-  left: 0px;
-  top: 0px;
-}
-.questionset-results {
-  background-color: rgba(255, 255, 255, 0.75);
-  padding: 10px;
-}
diff --git a/js/questionset.js b/js/questionset.js
deleted file mode 100644
index c9ebdc9..0000000
--- a/js/questionset.js
+++ /dev/null
@@ -1,284 +0,0 @@
-// Will render a Question with multiple choices for answers.
-
-// Options format:
-// {
-//   title: "Optional title for question box",
-//   question: "Question text",
-//   answers: [{text: "Answer text", correct: false}, ...],
-//   singleAnswer: true, // or false, will change rendered output slightly.
-// }
-//
-// Events provided:
-// - h5pQuestionSetFinished: Triggered when a question is finished. (User presses Finish-button)
-window.H5P = window.H5P || {};
-
-H5P.QuestionSet = function (options, contentId) {
-  if ( !(this instanceof H5P.QuestionSet) )
-    return new H5P.QuestionSet(options, contentId);
-
-  var $ = H5P.jQuery;
-  var cp = H5P.getContentPath(contentId);
-
-  var texttemplate = '' +
-'<div class="questionset">' +
-'  <% if (introPage.showIntroPage) { %>' +
-'  <div class="intro-page">' +
-'    <div class="title"><%= introPage.title %></div>' +
-'    <div class="introduction"><%= introPage.introduction %></div>' +
-'    <div class="buttons"><button id="qs-startbutton"><%= introPage.startButtonText %></button></div>' +
-'  </div>' +
-'  <%} %>' +
-'  <div class="title"><%= title %></div>' +
-'  <% for (var i=0; i<questions.length; i++) { %>' +
-'    <div class="question-container" id="q-<%= i %>">' +
-'      <div><%= questions[i].machineName %></div>' +
-'    </div>' +
-'  <% } %>' +
-'  <div class="question-footer">' +
-'    <div class="progress">' +
-'      <% if (progressType == "dots") { %>' +
-'        <div class="dots-container">' +
-'          <% for (var i=0; i<questions.length; i++) { %>' +
-'          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>' +
-'          <%} %>' +
-'        </div>' +
-'      <% } else if (progressType == "textual") { %>' +
-'        <span class="progress-text"></span>' +
-'      <% } %>' +
-'    </div>' +
-'    <button class="prev button"><%= texts.prevButton %></button>' +
-'    <button class="next button"><%= texts.nextButton %></button>' +
-'    <button class="finish button"><%= texts.finishButton %></button>' +
-'  </div>' +
-'</div>' +
-  '';
-
-  var resulttemplate = '' +
-'<div class="questionset-results">' +
-'  <div class="greeting"><%= greeting %></div>' +
-'  <div class="score <%= scoreclass %>"><%= score %></div>' +
-'  <div class="resulttext"><%= resulttext %></div>' +
-'  <div><button class="qs-finishbutton"><%= finishButtonText %></button></div>' +
-'</div>' +
-'';
-
-  var that = this;
-  var defaults = {
-    title: "",
-    randomOrder: false,
-    initialQuestion: 0,
-    backgroundImage: "",
-    progressType: 'dots',
-    passPercentage: 50,
-    questions: [],
-    introPage: {
-      showIntroPage: true,
-      title: "Welcome",
-      introduction: "Click start to start.",
-      startButtonText: "Start"
-    },
-    texts: {
-      prevButton: "Previous",
-      nextButton: "Next",
-      finishButton: "Finish",
-      textualProgress: "Question: @current of @total questions"
-    },
-    endGame: {
-      showResultPage: true,
-      resultPage: {
-        succesGreeting: "Congratulations!",
-        successComment: "You have enough correct answers to pass the test.",
-        failGreeting: "Sorry!",
-        failComment: "You don't have enough correct answers to pass this test.",
-        scoreString: "@score/@total",
-        finishButtonText: "Finish"
-      },
-      animations: {
-        showAnimations: false,
-        succesResultAnimation: {
-          machineName: "H5P.Image",
-          options: {image: ""}
-        },
-        failedResultAnimation: {
-          machineName: "H5P.Image",
-          options: {image: ""}
-        }
-      }
-    }
-  };
-
-  var template = new EJS({text: texttemplate});
-  var endTemplate = new EJS({text: resulttemplate});
-  var params = $.extend({}, defaults, options);
-
-  var currentQuestion = 0;
-  var questionInstances = new Array();
-  var allQuestionsAnswered = false;
-  var $myDom;
-
-  if (params.randomOrder) {
-    // TODO: Randomize order of questions
-    console.log("TODO: Randomize order of questions");
-  }
-
-  // Instantiate question instances
-  for (var i=0; i<params.questions.length; i++) {
-    var quest = params.questions[i];
-    // TODO: Render on init, inject in template.
-    var tmp = new (H5P.classFromName(quest.machineName))(quest.options, contentId);
-    questionInstances.push(tmp);
-  }
-
-  var _updateFinishButton = function () {
-    var answered = true;
-    for (var i = questionInstances.length - 1; i >= 0; i--) {
-      answered = answered && (questionInstances[i]).getAnswerGiven();
-    }
-    $('.finish.button', $myDom).attr({'disabled': !answered});
-  };
-
-  var _showQuestion = function (questionNumber) {
-    // Sanitize input.
-    if (questionNumber < 0) { questionNumber = 0; }
-    if (questionNumber >= params.questions.length) { questionNumber = params.questions.length - 1; }
-
-    $('.prev.button', $myDom).attr({'disabled': (questionNumber === 0)});
-    $('.next.button', $myDom).attr({'disabled': (questionNumber == params.questions.length-1)});
-
-
-    // Hide all questions
-    $('.question-container', $myDom).hide();
-
-    // Reshow the requested question
-    $('#q-' + questionNumber, $myDom).show();
-
-    // Update progress indicator
-    // Test if current has been answered.
-    if (params.progressType == 'textual') {
-      $('.progress-text', $myDom).text(params.texts.textualProgress.replace("@current", questionNumber+1).replace("@total", params.questions.length));
-    } else {
-      // Set currentNess
-      $('.progress-dot.current', $myDom).removeClass('current');
-      $('#qdot-' + questionNumber, $myDom).addClass('current');
-    }
-
-    // Remember where we are
-    currentQuestion = questionNumber;
-    return currentQuestion;
-  };
-
-  // Function for attaching the multichoice to a DOM element.
-  var attach = function (target) {
-    if (typeof(target) == "string") {
-      target = $("#" + target);
-    } else {
-      target = $(target);
-    }
-
-    // Render own DOM into target.
-    $myDom = target;
-    $myDom.html(template.render(params)).css({
-      backgroundImage: 'url(' + cp + params.backgroundImage + ')'
-    });
-
-    // Attach questions
-    for (var i=0; i<questionInstances.length; i++) {
-      var quest = questionInstances[i];
-      // TODO: Render on init, inject in template.
-      quest.attach('q-' + i);
-      $(quest).on('h5pQuestionAnswered', function (ev) {
-        $('#qdot-' + currentQuestion, $myDom).removeClass('unanswered').addClass('answered');
-        _updateFinishButton();
-      });
-      if (quest.getAnswerGiven()) {
-        $('#qdot-'+i, $myDom).removeClass('unanswered').addClass('answered');
-      }
-    }
-
-    $('#qs-startbutton').click(function (ev) {
-      $(this).parents('.intro-page').hide();
-    });
-
-    // Set event listeners.
-    $('.progress-dot', $myDom).click(function (ev) {
-      var idx = parseInt($(this).attr('id').split('-')[1]);
-      _showQuestion(idx);
-    });
-    $('.next.button', $myDom).click(function (ev) {
-      _showQuestion(currentQuestion + 1);
-    });
-    $('.prev.button', $myDom).click(function (ev) {
-      _showQuestion(currentQuestion - 1);
-    });
-    $('.finish.button', $myDom).click(function (ev) {
-      // Get total score.
-      var finals = getScore();
-      var totals = totalScore();
-      var scoreString = params.endGame.resultPage.scoreString.replace("@score", finals).replace("@total", totals);
-      var success = ((100 * finals / totals) >= params.passPercentage);
-      var eventData = {
-        score: scoreString,
-        passed: success
-      };
-      // Display result page.
-      if (params.endGame.showResultPage) {
-        // Render result page into.
-        var eparams = {
-          greeting: (success ? params.endGame.resultPage.succesGreeting : params.endGame.resultPage.failGreeting),
-          score: scoreString,
-          scoreclass: (success ? 'success' : 'fail'),
-          resulttext: (success ? params.endGame.resultPage.successComment : params.endGame.resultPage.failComment),
-          finishButtonText: params.endGame.resultPage.finishButtonText
-        };
-        endTemplate.update(target.attr('id'), eparams);
-        $('.qs-finishbutton').click(function (ev) {
-          // Display animation if present.
-          if (params.endGame.animations.showAnimations) {
-            // Init anims.
-            console.log("Now we should have started some anims...");
-            // On animation finished:
-              $(returnObject).trigger('h5pQuestionSetFinished', eventData);
-          } else {
-            // Trigger finished event.
-            $(returnObject).trigger('h5pQuestionSetFinished', eventData);
-          }
-        });
-      } else {
-        $(returnObject).trigger('h5pQuestionSetFinished', eventData);
-      }
-    });
-
-    // Hide all but initial Question.
-    _showQuestion(params.initialQuestion);
-    _updateFinishButton();
-    return this;
-  };
-
-  // Get current score for questionset.
-  var getScore = function () {
-    var score = 0;
-    for (var i = questionInstances.length - 1; i >= 0; i--) {
-      score += questionInstances[i].getScore();
-    }
-    return score;
-  };
-
-  // Get total score possible for questionset.
-  var totalScore = function () {
-    var score = 0;
-    for (var i = questionInstances.length - 1; i >= 0; i--) {
-      score += questionInstances[i].totalScore();
-    }
-    return score;
-  };
-
-  // Masquerade the main object to hide inner properties and functions.
-  var returnObject = {
-    attach: attach, // Attach to DOM object
-    getQuestions: function () {return questionInstances;},
-    getScore: getScore,
-    totalScore: totalScore,
-    defaults: defaults // Provide defaults for inspection
-  };
-  return returnObject;
-};
diff --git a/library.json b/library.json
deleted file mode 100644
index 5e5df50..0000000
--- a/library.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "title": "Question set",
-  "contentType": "question",
-  "majorVersion": 1,
-  "minorVersion": 0,
-  "patchVersion": 0,
-  "runnable": 1,
-  "machineName": "H5P.QuestionSet",
-  "author": "Amendor AS",
-  "license": "cc-by-sa",
-  "preloadedJs": [
-    {"path": "js/questionset.js"}
-  ],
-  "preloadedCss": [
-    {"path": "css/questionset.css"}
-  ]
-}
diff --git a/schema.json b/schema.json
deleted file mode 100644
index 790af6a..0000000
--- a/schema.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  "title": {
-    "label": "Title",
-    "description": "Question set title (optional)",
-    "type": "text",
-    "default": ""
-  },
-  "randomOrder": {
-    "label": "Randomize order",
-    "description": "Whether questions should be shown in random order",
-    "type": "boolean",
-    "default": false
-  },
-  "initialQuestion": {
-    "label": "Initial question",
-    "description": "Which question to start with. Count from 0",
-    "type": "integer",
-    "default": 0
-  },
-  "backgroundImage": {
-    "label": "Background image",
-    "description": "An optional background image for the Question set.",
-    "type": "image",
-    "default": ""
-  },
-  "progressType": {
-    "label": "Progress indicator",
-    "description": "Question set progress indicator style",
-    "type": "select",
-    "values": [{"text": "Textual", "value": "textual"}, {"text": "Dots", "value": "dots"}],
-    "default": "textual"
-  },
-  "passPercentage": {
-    "label": "Pass percentage",
-    "description": "Percentage of total score required for passing the quiz.",
-    "type": "integer",
-    "minValue": 0,
-    "maxValue": 100,
-    "default": 50
-  },
-  "questions": {
-    "label": "Questions",
-    "description": "List of questions in this set.",
-    "type": "h5p-library",
-    "validLibs": ["H5P.MultiChoice", "H5P.DragTextMatch", "H5PDragImageIntoPosition"],
-    "array": true,
-    "minEntries": 1,
-    "maxEntries": -1
-  },
-  "introPage": {
-    "label": "Intro page",
-    "description": "Data for the intro page",
-    "type": "combined",
-    "fields": {
-      "showIntroPage": {
-        "label": "Show intro page?",
-        "type": "boolean"
-      },
-      "title": {
-        "label": "Title",
-        "type": "text"
-      },
-      "introduction": {
-        "label": "Introduction text",
-        "type": "text"
-      },
-      "startButtonText": {
-        "label": "Start button text",
-        "type": "text"
-      }
-    }
-  },
-  "texts": {
-    "label": "Interface texts in quiz",
-    "type": "combined"
-    "fields": {
-      "prevButton": {
-        "label": "Back button",
-        "type": "text",
-        "default": "Previous"
-      },
-      "nextButton": {
-        "label": "Next button",
-        "type": "text",
-        "default": "Next"
-      },
-      "finishButton": {
-        "label": "Finish button",
-        "type": "text",
-        "default": "Finish"
-      },
-      "textualProgress": {
-        "label": "Progress text",
-        "description": "Text used if textual progress is selected.",
-        "type": "text",
-        "default": "Question: @current of @total questions"
-      }
-    }
-  },
-  "endGame": {
-    "label": "End game data",
-    "type": "combined",
-    "fields" {
-      "showResultPage": {
-        "label": "Show result page",
-        "type": "boolean",
-        "default": true
-      },
-      "resultPage": {
-        "label": "Result page",
-        "description": "Data and texts for the result page",
-        "type": "combined",
-        "fields": {
-          "successGreeting": {
-            "label": "Success greeting",
-            "description": "Title in result page on success",
-            "type": "text"
-          },
-          "successComment": {
-            "label": "Success comment",
-            "description": "Comment shown after the score",
-            "type": "text"
-          },
-          "failGreeting": {
-            "label": "Failed greeting",
-            "description": "Title in result page on failed quiz",
-            "type": "text"
-          },
-          "failComment": {
-            "label": "Failed comment",
-            "description": "Comment shown after the score on failed quiz",
-            "type": "text"
-          },
-          "finishButtonText": {
-            "label": "Finish button text",
-            "description": "Text for the finish button",
-            "type": "text"
-          }
-        }
-      },
-      "animations": {
-        "label": "Animations",
-        "type": "combined"
-        "fields": {
-          "showAnimations": {
-            "label": "Show animations",
-            "type": "boolean",
-            "default": false
-          }
-          "successResultAnimation": {
-            "label": "Result animation for success",
-            "description": "Add animation for successful completion of the quiz",
-            "optional": true,
-            "type": "h5p-library",
-            "validLibs": ["H5P.Animation", "H5P.Video", "H5P.Image"]
-          },
-          "failedResultAnimation": {
-            "label": "Result animation for failed quiz",
-            "description": "Add animation for failed completion of the quiz",
-            "optional": true,
-            "type": "h5p-library",
-            "validLibs": ["H5P.Animation", "H5P.Video", "H5P.Image"]
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/views/questionset-intro.ejs b/views/questionset-intro.ejs
deleted file mode 100644
index cc18bb6..0000000
--- a/views/questionset-intro.ejs
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="questionset-intro">
-  <div class="title"><%= title %></div>
-  <div class="introduction"><%= introduction %></div>
-  <div class="buttons"><button id="qs-startbutton"><%= startButtonText %></button></div>
-</div>
\ No newline at end of file
diff --git a/views/questionset-results.ejs b/views/questionset-results.ejs
deleted file mode 100644
index a107cb5..0000000
--- a/views/questionset-results.ejs
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="questionset-results">
-  <div class="greeting"><%= greeting %></div>
-  <div class="score <%= scoreclass %>"><%= score %></div>
-  <div class="resulttext"><%= resulttext %></div>
-  <div><button class="qs-finishbutton"><%= finishButtonText %></button></div>
-</div>
diff --git a/views/questionset.ejs b/views/questionset.ejs
deleted file mode 100644
index f097cd3..0000000
--- a/views/questionset.ejs
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="questionset">
-  <% if (introPage.showIntroPage) { %>
-  <div class="intro-page">
-    <div class="title"><%= introPage.title %></div>
-    <div class="introduction"><%= introPage.introduction %></div>
-    <div class="buttons"><button id="qs-startbutton"><%= introPage.startButtonText %></button></div>
-  </div>
-  <%} %>
-  <div class="title"><%= title %></div>
-  <% for (var i=0; i<questions.length; i++) { %>
-    <div class="question-container" id="q-<%= i %>">
-      <div><%= questions[i].machineName %></div>
-    </div>
-  <% } %>
-  <div class="question-footer">
-    <div class="progress">
-      <% if (progressType == "dots") { %>
-        <div class="dots-container">
-          <% for (var i=0; i<questions.length; i++) { %>
-          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>
-          <%} %>
-        </div>
-      <% } else if (progressType == "textual") { %>
-        <span class="progress-text"></span>
-      <% } %>
-    </div>
-    <button class="prev button"><%= texts.prevButton %></button>
-    <button class="next button"><%= texts.nextButton %></button>
-    <button class="finish button"><%= texts.finishButton %></button>
-  </div>
-</div>

From 5f8e1a9f54accf7539510ceea81e928155b741f8 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <falcon@530912.no-reply.drupal.org>
Date: Thu, 4 Apr 2013 15:18:08 +0200
Subject: [PATCH 09/83] Adding back the modules that used to be submodules

---
 css/img/mark-fail.png         | Bin 0 -> 3520 bytes
 css/img/mark-pass.png         | Bin 0 -> 3220 bytes
 css/questionset.css           | 111 +++++++++++++
 js/questionset.js             | 303 ++++++++++++++++++++++++++++++++++
 library.json                  |  24 +++
 semantics.json                | 221 +++++++++++++++++++++++++
 views/questionset-results.ejs |   6 +
 views/questionset.ejs         |  31 ++++
 8 files changed, 696 insertions(+)
 create mode 100644 css/img/mark-fail.png
 create mode 100644 css/img/mark-pass.png
 create mode 100644 css/questionset.css
 create mode 100644 js/questionset.js
 create mode 100644 library.json
 create mode 100644 semantics.json
 create mode 100644 views/questionset-results.ejs
 create mode 100644 views/questionset.ejs

diff --git a/css/img/mark-fail.png b/css/img/mark-fail.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbd3936b1928c0ed73326d13e5253ed980926409
GIT binary patch
literal 3520
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

literal 0
HcmV?d00001

diff --git a/css/img/mark-pass.png b/css/img/mark-pass.png
new file mode 100644
index 0000000000000000000000000000000000000000..cceccd3eb81b94742b5128229ee04d0691ca0be0
GIT binary patch
literal 3220
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
GLSTZ1YaaRl

literal 0
HcmV?d00001

diff --git a/css/questionset.css b/css/questionset.css
new file mode 100644
index 0000000..0fe886e
--- /dev/null
+++ b/css/questionset.css
@@ -0,0 +1,111 @@
+.dots-container {
+  text-align: center;
+}
+.progress-dot {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  border: 1px solid #494949;
+  margin: 0 3px;
+  cursor: pointer;
+}
+.progress-dot.answered {
+  background: #494949;
+}
+.progress-dot.current {
+  box-shadow: 1px 1px 4px #494949;
+  margin: -1px 4px 1px 2px;
+}
+.intro-page {
+  /*background-color: rgba(255,255,255,0.9);*/
+  /*padding: 10px;*/
+  position: absolute;
+  z-index: 20;
+  height: 100%;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+}
+.intro-page .title {
+  font-size: 200%;
+  font-weight: bold;
+  text-align: center;
+  margin: 1em;
+}
+.intro-page .introduction {
+  font-size: 125%;
+  margin: 1em 10%;
+}
+.intro-page .buttons {
+  position: absolute;
+  top: 200px;
+  left: 182px;
+  text-align: right;
+}
+
+#qs-startbutton {
+  border: 4px solid #BABABA;
+  border-radius: 10px 10px 10px 10px;
+  font-size: 50px;
+  padding: 10px 20px;
+  cursor: pointer;
+}
+
+.qs-progress {
+  line-height: 40px;
+  padding: 0;
+}
+
+.questionset-results {
+  background-image: url(img/Paper-clean.png);
+  background-color: rgba(255, 255, 255, 0.75);
+
+  padding: 10px;
+  height: 480px;
+  text-align: center;
+}
+
+.questionset-results .greeting {
+  margin-top: 180px;
+}
+
+.questionset-results .score {
+  font-size: 25px;
+  margin-top: 40px;
+}
+
+.questionset-results .resulttext {
+  font-size: 20px;
+  line-height: 25px;
+  margin: 40px 100px;
+  padding-left: 60px;
+  min-height: 60px;
+  background-repeat: no-repeat;
+  background-position: left center;
+}
+
+.questionset-results .resulttext.fail {
+  background-image: url(img/mark-fail.png);
+}
+.questionset-results .resulttext.fail em {
+  font-style: normal;
+  color: #b9272d;
+}
+
+.questionset-results .resulttext.success {
+  background-image: url(img/mark-pass.png);
+}
+.questionset-results .resulttext.success em {
+  font-style: normal;
+  color: #6aa81b;
+}
+.questionset-results .buttons {
+  position: absolute;
+  bottom: 40px;
+  right: 25px;
+}
+
+button, .button {
+  cursor: pointer;
+}
\ No newline at end of file
diff --git a/js/questionset.js b/js/questionset.js
new file mode 100644
index 0000000..078d1da
--- /dev/null
+++ b/js/questionset.js
@@ -0,0 +1,303 @@
+// Will render a Question with multiple choices for answers.
+
+// Options format:
+// {
+//   title: "Optional title for question box",
+//   question: "Question text",
+//   answers: [{text: "Answer text", correct: false}, ...],
+//   singleAnswer: true, // or false, will change rendered output slightly.
+// }
+//
+// Events provided:
+// - h5pQuestionSetFinished: Triggered when a question is finished. (User presses Finish-button)
+var H5P = H5P || {};
+
+H5P.QuestionSet = function (options, contentId) {
+  if ( !(this instanceof H5P.QuestionSet) )
+    return new H5P.QuestionSet(options, contentId);
+
+  var $ = H5P.jQuery;
+  var cp = H5P.getContentPath(contentId);
+
+  var texttemplate = '' +
+'<% if (introPage.showIntroPage) { %>' +
+'<div class="intro-page">' +
+'  <div class="title"><%= introPage.title %></div>' +
+'  <div class="introduction"><%= introPage.introduction %></div>' +
+'  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>' +
+'</div>' +
+'<%} %>' +
+'<div class="questionset hidden">' +
+'  <div class="title"><%= title %></div>' +
+'  <% for (var i=0; i<questions.length; i++) { %>' +
+'    <div class="question-container" id="q-<%= i %>">' +
+'      <div><%= questions[i].library %></div>' +
+'    </div>' +
+'  <% } %>' +
+'  <div class="qs-footer">' +
+'    <div class="qs-progress">' +
+'      <% if (progressType == "dots") { %>' +
+'        <div class="dots-container">' +
+'          <% for (var i=0; i<questions.length; i++) { %>' +
+'          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>' +
+'          <%} %>' +
+'        </div>' +
+'      <% } else if (progressType == "textual") { %>' +
+'        <span class="progress-text"></span>' +
+'      <% } %>' +
+'    </div>' +
+'    <a class="prev button"><%= texts.prevButton %></a>' +
+'    <a class="next button"><%= texts.nextButton %></a>' +
+'    <a class="finish button"><%= texts.finishButton %></a>' +
+'  </div>' +
+'</div>' +
+  '';
+  var resulttemplate = '' +
+'<div class="questionset-results">' +
+'  <div class="greeting"><%= greeting %></div>' +
+'  <div class="score <%= scoreclass %>"><%= score %></div>' +
+'  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>' +
+'  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>' +
+'</div>' +
+  '';
+
+  var that = this;
+  var defaults = {
+    title: "",
+    randomOrder: false,
+    initialQuestion: 0,
+    backgroundImage: "",
+    progressType: 'dots',
+    passPercentage: 50,
+    questions: [],
+    introPage: {
+      showIntroPage: true,
+      title: "Welcome",
+      introduction: "Click start to start.",
+      startButtonText: "Start"
+    },
+    texts: {
+      prevButton: "Previous",
+      nextButton: "Next",
+      finishButton: "Finish",
+      textualProgress: "Question: @current of @total questions"
+    },
+    endGame: {
+      showResultPage: true,
+      resultPage: {
+        successGreeting: "Congratulations!",
+        successComment: "You have enough correct answers to pass the test.",
+        failGreeting: "Sorry!",
+        failComment: "You don't have enough correct answers to pass this test.",
+        scoreString: "@score/@total",
+        finishButtonText: "Finish"
+      },
+      animations: {
+        showAnimations: false,
+        successVideo: undefined,
+        failVideo: undefined
+      }
+    }
+  };
+
+  var template = new EJS({text: texttemplate});
+  var endTemplate = new EJS({text: resulttemplate});
+  var params = $.extend({}, defaults, options);
+
+  var currentQuestion = 0;
+  var questionInstances = new Array();
+  var allQuestionsAnswered = false;
+  var $myDom;
+
+  if (params.randomOrder) {
+    // TODO: Randomize order of questions
+    console.log("TODO: Randomize order of questions");
+  }
+
+  // Instantiate question instances
+  for (var i=0; i<params.questions.length; i++) {
+    var question = params.questions[i];
+    // TODO: Render on init, inject in template.
+
+    var libraryObject = H5P.libraryFromString(question.library);
+    var tmp = new (H5P.classFromName(libraryObject.machineName))(question.params, contentId);
+    questionInstances.push(tmp);
+  }
+
+  // Update button state.
+  var _updateButtons = function () {
+    var answered = true;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      answered = answered && (questionInstances[i]).getAnswerGiven();
+    }
+
+    if (currentQuestion === 0) {
+      $('.prev.button', $myDom).hide();
+    } else {
+      $('.prev.button', $myDom).show();
+    }
+    if (currentQuestion == (params.questions.length - 1)) {
+      $('.next.button', $myDom).hide();
+      if (answered) {
+        $('.finish.button', $myDom).show();
+      }
+    } else {
+      $('.next.button', $myDom).show();
+      $('.finish.button', $myDom).hide();
+    }
+
+ };
+
+  var _showQuestion = function (questionNumber) {
+    // Sanitize input.
+    if (questionNumber < 0) { questionNumber = 0; }
+    if (questionNumber >= params.questions.length) { questionNumber = params.questions.length - 1; }
+
+     // Hide all questions
+    $('.question-container', $myDom).hide();
+
+    // Reshow the requested question
+    $('#q-' + questionNumber, $myDom).show();
+
+    // Update progress indicator
+    // Test if current has been answered.
+    if (params.progressType == 'textual') {
+      $('.progress-text', $myDom).text(params.texts.textualProgress.replace("@current", questionNumber+1).replace("@total", params.questions.length));
+    } else {
+      // Set currentNess
+      $('.progress-dot.current', $myDom).removeClass('current');
+      $('#qdot-' + questionNumber, $myDom).addClass('current');
+    }
+
+    // Remember where we are
+    currentQuestion = questionNumber;
+    _updateButtons();
+    return currentQuestion;
+  };
+
+  var _displayEndGame = function () {
+    // Get total score.
+    var finals = getScore();
+    var totals = totalScore();
+    var scoreString = params.endGame.resultPage.scoreString.replace("@score", finals).replace("@total", totals);
+    var success = ((100 * finals / totals) >= params.passPercentage);
+    var eventData = {
+      score: scoreString,
+      passed: success
+    };
+    var displayResults = function () {
+      if (!params.endGame.showResultPage) {
+        $(returnObject).trigger('h5pQuestionSetFinished', eventData);
+        return;
+      }
+
+      var eparams = {
+        greeting: (success ? params.endGame.resultPage.succesGreeting : params.endGame.resultPage.failGreeting),
+        score: scoreString,
+        scoreclass: (success ? 'success' : 'fail'),
+        resulttext: (success ? params.endGame.resultPage.successComment : params.endGame.resultPage.failComment),
+        finishButtonText: params.endGame.resultPage.finishButtonText
+      };
+
+      // Show result page.
+      $myDom.children().hide();
+      $myDom.append(endTemplate.render(eparams));
+      $('.qs-finishbutton').click(function (ev) {
+        $(returnObject).trigger('h5pQuestionSetFinished', eventData);
+      });
+    };
+
+    if (params.endGame.animations.showAnimations) {
+      var videoData = success ? params.endGame.animations.successVideo : params.endGame.animations.failVideo;
+      if (videoData) {
+        H5P.playVideo($myDom, videoData, params.endGame.animations.skipButtonText, cp, function () {
+          displayResults();
+        });
+        return;
+      }
+    }
+    // Trigger finished event.
+    displayResults();
+  };
+
+  // Function for attaching the multichoice to a DOM element.
+  var attach = function (target) {
+    if (typeof(target) == "string") {
+      $myDom = $("#" + target);
+    } else {
+      $myDom = $(target);
+    }
+
+    // Render own DOM into target.
+    $myDom.html(template.render(params)).css({
+      backgroundImage: 'url(' + cp + params.backgroundImage.path + ')'
+    });
+
+    // Attach questions
+    for (var i=0; i<questionInstances.length; i++) {
+      var question = questionInstances[i];
+      // TODO: Render on init, inject in template.
+      question.attach('q-' + i);
+      $(question).on('h5pQuestionAnswered', function (ev) {
+        $('#qdot-' + currentQuestion, $myDom).removeClass('unanswered').addClass('answered');
+        _updateButtons();
+      });
+      if (question.getAnswerGiven()) {
+        $('#qdot-'+i, $myDom).removeClass('unanswered').addClass('answered');
+      }
+    }
+
+    $('#qs-startbutton').click(function (ev) {
+      $(this).parents('.intro-page').hide();
+      $('.questionset', $myDom).removeClass('hidden');
+    });
+
+    // Set event listeners.
+    $('.progress-dot', $myDom).click(function (ev) {
+      var idx = parseInt($(this).attr('id').split('-')[1], 10);
+      _showQuestion(idx);
+    });
+    $('.next.button', $myDom).click(function (ev) {
+      _showQuestion(currentQuestion + 1);
+    });
+    $('.prev.button', $myDom).click(function (ev) {
+      _showQuestion(currentQuestion - 1);
+    });
+    $('.finish.button', $myDom).click(function (ev) {
+      _displayEndGame();
+    });
+
+    // Hide all but initial Question.
+    _showQuestion(params.initialQuestion);
+    _updateButtons();
+    return this;
+  };
+
+  // Get current score for questionset.
+  var getScore = function () {
+    var score = 0;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      score += questionInstances[i].getScore();
+    }
+    return score;
+  };
+
+  // Get total score possible for questionset.
+  var totalScore = function () {
+    var score = 0;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      score += questionInstances[i].totalScore();
+    }
+    return score;
+  };
+
+  // Masquerade the main object to hide inner properties and functions.
+  var returnObject = {
+    attach: attach, // Attach to DOM object
+    getQuestions: function () {return questionInstances;},
+    getScore: getScore,
+    totalScore: totalScore,
+    defaults: defaults // Provide defaults for inspection
+  };
+  return returnObject;
+};
diff --git a/library.json b/library.json
new file mode 100644
index 0000000..cd31dac
--- /dev/null
+++ b/library.json
@@ -0,0 +1,24 @@
+{
+  "title": "Question set",
+  "contentType": "question",
+  "majorVersion": 1,
+  "minorVersion": 0,
+  "patchVersion": 6,
+  "runnable": 1,
+  "machineName": "H5P.QuestionSet",
+  "author": "Amendor AS",
+  "license": "cc-by-sa",
+  "preloadedJs": [
+    {"path": "js/questionset.js"}
+  ],
+  "preloadedCss": [
+    {"path": "css/questionset.css"}
+  ],
+  "preloadedDependencies": [
+    {
+      "machineName": "EmbeddedJS",
+      "majorVersion": 1, 
+      "minorVersion": 0
+    }
+  ]
+}
diff --git a/semantics.json b/semantics.json
new file mode 100644
index 0000000..d1ef7e8
--- /dev/null
+++ b/semantics.json
@@ -0,0 +1,221 @@
+[
+  {
+    "name": "title",
+    "type": "text",
+    "label": "Title",
+    "description": "Question set title (optional)."
+  },
+  {
+    "name": "randomOrder",
+    "type": "boolean",
+    "label": "Randomize order",
+    "description": "Whether questions should be shown in random order."
+  },
+  {
+    "name": "initialQuestion",
+    "type": "number",
+    "label": "Initial question",
+    "description": "Which question to start with. Count from 0."
+  },
+  {
+    "name": "backgroundImage",
+    "type": "image",
+    "label": "Background image",
+    "description": "An optional background image for the Question set."
+  },
+  {
+    "name": "progressType",
+    "type": "select",
+    "label": "Progress indicator",
+    "description": "Question set progress indicator style.",
+    "values": [
+      {
+        "text": "Textual",
+        "value": "textual"
+      },
+      {
+        "text": "Dots",
+        "value": "dots"
+      }
+    ],
+    "default": "textual"
+  },
+  {
+    "name": "passPercentage",
+    "type": "number",
+    "label": "Pass percentage",
+    "description": "Percentage of total score required for passing the quiz.",
+    "min": 0,
+    "max": 100,
+    "step": 1,
+    "default": 50
+  },
+  {
+    "name": "questions",
+    "type": "list",
+    "entity": "question",
+    "field": {
+      "name": "question",
+      "type": "group",
+      "label": "Question",
+      "fields": [
+        {
+          "name": "library",
+          "type": "library",
+          "label": "Question library",
+          "description": "Library for this question.",
+          "options": [
+            "H5P.MultiChoice 1.0"
+          ]
+        }
+      ]
+    }
+  },
+  {
+    "name": "introPage",
+    "type": "group",
+    "label": "Intro page",
+    "description": "Data for the intro page.",
+    "fields": [
+      {
+        "name": "showIntroPage",
+        "type": "boolean",
+        "label": "Show intro page?"
+      },
+      {
+        "name": "title",
+        "type": "text",
+        "label": "Title"
+      },
+      {
+        "name": "introduction",
+        "type": "text",
+        "label": "Introduction text"
+      },
+      {
+        "name": "startButtonText",
+        "type": "text",
+        "label": "Start button text"
+      }
+    ]
+  },
+  {
+    "name": "texts",
+    "type": "group",
+    "label": "Interface texts in quiz",
+    "common": true,
+    "fields": [
+      {
+        "name": "prevButton",
+        "type": "text",
+        "label": "Back button",
+        "default": "Previous"
+      },
+      {
+        "name": "nextButton",
+        "type": "text",
+        "label": "Next button",
+        "default": "Next"
+      },
+      {
+        "name": "finishButton",
+        "type": "text",
+        "label": "Finish button",
+        "default": "Finish"
+      },
+      {
+        "name": "textualProgress",
+        "type": "text",
+        "label": "Progress text",
+        "description": "Text used if textual progress is selected.",
+        "default": "Question: @current of @total questions"
+      }
+    ]
+  },
+  {
+    "name": "endGame",
+    "type": "group",
+    "label": "End game data",
+    "fields": [
+      {
+        "name": "showResultPage",
+        "type": "boolean",
+        "label": "Show result page",
+        "default": true
+      },
+      {
+        "name": "resultPage",
+        "type": "group",
+        "label": "Result page",
+        "description": "Data and texts for the result page.",
+        "fields": [
+          {
+            "name": "successGreeting",
+            "type": "text",
+            "label": "Success greeting",
+            "description": "Title in result page on success."
+          },
+          {
+            "name": "successComment",
+            "type": "text",
+            "label": "Success comment",
+            "description": "Comment shown after the score."
+          },
+          {
+            "name": "failGreeting",
+            "type": "text",
+            "label": "Failed greeting",
+            "description": "Title in result page on failed quiz."
+          },
+          {
+            "name": "failComment",
+            "type": "text",
+            "label": "Failed comment",
+            "description": "Comment shown after the score on failed quiz."
+          },
+          {
+            "name": "finishButtonText",
+            "type": "text",
+            "label": "Finish button text",
+            "description": "Text for the finish button."
+          }
+        ]
+      },
+      {
+        "name": "animations",
+        "type": "group",
+        "label": "Animations",
+        "fields": [
+          {
+            "name": "showAnimations",
+            "type": "boolean",
+            "label": "Show animations"
+          },
+          {
+            "name": "skippable",
+            "type": "boolean",
+            "label": "Skippable"
+          },
+          {
+            "name": "skipButtonText",
+            "type": "text",
+            "label": "Skip button text",
+            "common": true
+          },
+          {
+            "name": "successVideo",
+            "type": "video",
+            "label": "Success video",
+            "description": "Video displayed on successful quiz."
+          },
+          {
+            "name": "failVideo",
+            "type": "video",
+            "label": "Fail video",
+            "description": "Video displayed on failed quiz."
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/views/questionset-results.ejs b/views/questionset-results.ejs
new file mode 100644
index 0000000..722776d
--- /dev/null
+++ b/views/questionset-results.ejs
@@ -0,0 +1,6 @@
+<div class="questionset-results">
+  <div class="greeting"><%= greeting %></div>
+  <div class="score <%= scoreclass %>"><%= score %></div>
+  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>
+  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>
+</div>
diff --git a/views/questionset.ejs b/views/questionset.ejs
new file mode 100644
index 0000000..5219d42
--- /dev/null
+++ b/views/questionset.ejs
@@ -0,0 +1,31 @@
+<% if (introPage.showIntroPage) { %>
+<div class="intro-page">
+  <div class="title"><%= introPage.title %></div>
+  <div class="introduction"><%= introPage.introduction %></div>
+  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>
+</div>
+<%} %>
+<div class="questionset hidden">
+  <div class="title"><%= title %></div>
+  <% for (var i=0; i<questions.length; i++) { %>
+    <div class="question-container" id="q-<%= i %>">
+      <div><%= questions[i].name %></div>
+    </div>
+  <% } %>
+  <div class="qs-footer">
+    <div class="qs-progress">
+      <% if (progressType == "dots") { %>
+        <div class="dots-container">
+          <% for (var i=0; i<questions.length; i++) { %>
+          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>
+          <%} %>
+        </div>
+      <% } else if (progressType == "textual") { %>
+        <span class="progress-text"></span>
+      <% } %>
+    </div>
+    <a class="prev button"><%= texts.prevButton %></a>
+    <a class="next button"><%= texts.nextButton %></a>
+    <a class="finish button"><%= texts.finishButton %></a>
+  </div>
+</div>

From 785f787913e2da3652e66d3fcb41be3cd52b6f94 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Thu, 4 Apr 2013 15:44:06 +0200
Subject: [PATCH 10/83] Removed submodules

---
 css/img/mark-fail.png         | Bin 0 -> 3520 bytes
 css/img/mark-pass.png         | Bin 0 -> 3220 bytes
 css/questionset.css           | 111 +++++++++++++
 js/questionset.js             | 303 ++++++++++++++++++++++++++++++++++
 library.json                  |  24 +++
 semantics.json                | 221 +++++++++++++++++++++++++
 views/questionset-results.ejs |   6 +
 views/questionset.ejs         |  31 ++++
 8 files changed, 696 insertions(+)
 create mode 100644 css/img/mark-fail.png
 create mode 100644 css/img/mark-pass.png
 create mode 100644 css/questionset.css
 create mode 100644 js/questionset.js
 create mode 100644 library.json
 create mode 100644 semantics.json
 create mode 100644 views/questionset-results.ejs
 create mode 100644 views/questionset.ejs

diff --git a/css/img/mark-fail.png b/css/img/mark-fail.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbd3936b1928c0ed73326d13e5253ed980926409
GIT binary patch
literal 3520
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

literal 0
HcmV?d00001

diff --git a/css/img/mark-pass.png b/css/img/mark-pass.png
new file mode 100644
index 0000000000000000000000000000000000000000..cceccd3eb81b94742b5128229ee04d0691ca0be0
GIT binary patch
literal 3220
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
GLSTZ1YaaRl

literal 0
HcmV?d00001

diff --git a/css/questionset.css b/css/questionset.css
new file mode 100644
index 0000000..0fe886e
--- /dev/null
+++ b/css/questionset.css
@@ -0,0 +1,111 @@
+.dots-container {
+  text-align: center;
+}
+.progress-dot {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  border: 1px solid #494949;
+  margin: 0 3px;
+  cursor: pointer;
+}
+.progress-dot.answered {
+  background: #494949;
+}
+.progress-dot.current {
+  box-shadow: 1px 1px 4px #494949;
+  margin: -1px 4px 1px 2px;
+}
+.intro-page {
+  /*background-color: rgba(255,255,255,0.9);*/
+  /*padding: 10px;*/
+  position: absolute;
+  z-index: 20;
+  height: 100%;
+  width: 100%;
+  left: 0px;
+  top: 0px;
+}
+.intro-page .title {
+  font-size: 200%;
+  font-weight: bold;
+  text-align: center;
+  margin: 1em;
+}
+.intro-page .introduction {
+  font-size: 125%;
+  margin: 1em 10%;
+}
+.intro-page .buttons {
+  position: absolute;
+  top: 200px;
+  left: 182px;
+  text-align: right;
+}
+
+#qs-startbutton {
+  border: 4px solid #BABABA;
+  border-radius: 10px 10px 10px 10px;
+  font-size: 50px;
+  padding: 10px 20px;
+  cursor: pointer;
+}
+
+.qs-progress {
+  line-height: 40px;
+  padding: 0;
+}
+
+.questionset-results {
+  background-image: url(img/Paper-clean.png);
+  background-color: rgba(255, 255, 255, 0.75);
+
+  padding: 10px;
+  height: 480px;
+  text-align: center;
+}
+
+.questionset-results .greeting {
+  margin-top: 180px;
+}
+
+.questionset-results .score {
+  font-size: 25px;
+  margin-top: 40px;
+}
+
+.questionset-results .resulttext {
+  font-size: 20px;
+  line-height: 25px;
+  margin: 40px 100px;
+  padding-left: 60px;
+  min-height: 60px;
+  background-repeat: no-repeat;
+  background-position: left center;
+}
+
+.questionset-results .resulttext.fail {
+  background-image: url(img/mark-fail.png);
+}
+.questionset-results .resulttext.fail em {
+  font-style: normal;
+  color: #b9272d;
+}
+
+.questionset-results .resulttext.success {
+  background-image: url(img/mark-pass.png);
+}
+.questionset-results .resulttext.success em {
+  font-style: normal;
+  color: #6aa81b;
+}
+.questionset-results .buttons {
+  position: absolute;
+  bottom: 40px;
+  right: 25px;
+}
+
+button, .button {
+  cursor: pointer;
+}
\ No newline at end of file
diff --git a/js/questionset.js b/js/questionset.js
new file mode 100644
index 0000000..078d1da
--- /dev/null
+++ b/js/questionset.js
@@ -0,0 +1,303 @@
+// Will render a Question with multiple choices for answers.
+
+// Options format:
+// {
+//   title: "Optional title for question box",
+//   question: "Question text",
+//   answers: [{text: "Answer text", correct: false}, ...],
+//   singleAnswer: true, // or false, will change rendered output slightly.
+// }
+//
+// Events provided:
+// - h5pQuestionSetFinished: Triggered when a question is finished. (User presses Finish-button)
+var H5P = H5P || {};
+
+H5P.QuestionSet = function (options, contentId) {
+  if ( !(this instanceof H5P.QuestionSet) )
+    return new H5P.QuestionSet(options, contentId);
+
+  var $ = H5P.jQuery;
+  var cp = H5P.getContentPath(contentId);
+
+  var texttemplate = '' +
+'<% if (introPage.showIntroPage) { %>' +
+'<div class="intro-page">' +
+'  <div class="title"><%= introPage.title %></div>' +
+'  <div class="introduction"><%= introPage.introduction %></div>' +
+'  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>' +
+'</div>' +
+'<%} %>' +
+'<div class="questionset hidden">' +
+'  <div class="title"><%= title %></div>' +
+'  <% for (var i=0; i<questions.length; i++) { %>' +
+'    <div class="question-container" id="q-<%= i %>">' +
+'      <div><%= questions[i].library %></div>' +
+'    </div>' +
+'  <% } %>' +
+'  <div class="qs-footer">' +
+'    <div class="qs-progress">' +
+'      <% if (progressType == "dots") { %>' +
+'        <div class="dots-container">' +
+'          <% for (var i=0; i<questions.length; i++) { %>' +
+'          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>' +
+'          <%} %>' +
+'        </div>' +
+'      <% } else if (progressType == "textual") { %>' +
+'        <span class="progress-text"></span>' +
+'      <% } %>' +
+'    </div>' +
+'    <a class="prev button"><%= texts.prevButton %></a>' +
+'    <a class="next button"><%= texts.nextButton %></a>' +
+'    <a class="finish button"><%= texts.finishButton %></a>' +
+'  </div>' +
+'</div>' +
+  '';
+  var resulttemplate = '' +
+'<div class="questionset-results">' +
+'  <div class="greeting"><%= greeting %></div>' +
+'  <div class="score <%= scoreclass %>"><%= score %></div>' +
+'  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>' +
+'  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>' +
+'</div>' +
+  '';
+
+  var that = this;
+  var defaults = {
+    title: "",
+    randomOrder: false,
+    initialQuestion: 0,
+    backgroundImage: "",
+    progressType: 'dots',
+    passPercentage: 50,
+    questions: [],
+    introPage: {
+      showIntroPage: true,
+      title: "Welcome",
+      introduction: "Click start to start.",
+      startButtonText: "Start"
+    },
+    texts: {
+      prevButton: "Previous",
+      nextButton: "Next",
+      finishButton: "Finish",
+      textualProgress: "Question: @current of @total questions"
+    },
+    endGame: {
+      showResultPage: true,
+      resultPage: {
+        successGreeting: "Congratulations!",
+        successComment: "You have enough correct answers to pass the test.",
+        failGreeting: "Sorry!",
+        failComment: "You don't have enough correct answers to pass this test.",
+        scoreString: "@score/@total",
+        finishButtonText: "Finish"
+      },
+      animations: {
+        showAnimations: false,
+        successVideo: undefined,
+        failVideo: undefined
+      }
+    }
+  };
+
+  var template = new EJS({text: texttemplate});
+  var endTemplate = new EJS({text: resulttemplate});
+  var params = $.extend({}, defaults, options);
+
+  var currentQuestion = 0;
+  var questionInstances = new Array();
+  var allQuestionsAnswered = false;
+  var $myDom;
+
+  if (params.randomOrder) {
+    // TODO: Randomize order of questions
+    console.log("TODO: Randomize order of questions");
+  }
+
+  // Instantiate question instances
+  for (var i=0; i<params.questions.length; i++) {
+    var question = params.questions[i];
+    // TODO: Render on init, inject in template.
+
+    var libraryObject = H5P.libraryFromString(question.library);
+    var tmp = new (H5P.classFromName(libraryObject.machineName))(question.params, contentId);
+    questionInstances.push(tmp);
+  }
+
+  // Update button state.
+  var _updateButtons = function () {
+    var answered = true;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      answered = answered && (questionInstances[i]).getAnswerGiven();
+    }
+
+    if (currentQuestion === 0) {
+      $('.prev.button', $myDom).hide();
+    } else {
+      $('.prev.button', $myDom).show();
+    }
+    if (currentQuestion == (params.questions.length - 1)) {
+      $('.next.button', $myDom).hide();
+      if (answered) {
+        $('.finish.button', $myDom).show();
+      }
+    } else {
+      $('.next.button', $myDom).show();
+      $('.finish.button', $myDom).hide();
+    }
+
+ };
+
+  var _showQuestion = function (questionNumber) {
+    // Sanitize input.
+    if (questionNumber < 0) { questionNumber = 0; }
+    if (questionNumber >= params.questions.length) { questionNumber = params.questions.length - 1; }
+
+     // Hide all questions
+    $('.question-container', $myDom).hide();
+
+    // Reshow the requested question
+    $('#q-' + questionNumber, $myDom).show();
+
+    // Update progress indicator
+    // Test if current has been answered.
+    if (params.progressType == 'textual') {
+      $('.progress-text', $myDom).text(params.texts.textualProgress.replace("@current", questionNumber+1).replace("@total", params.questions.length));
+    } else {
+      // Set currentNess
+      $('.progress-dot.current', $myDom).removeClass('current');
+      $('#qdot-' + questionNumber, $myDom).addClass('current');
+    }
+
+    // Remember where we are
+    currentQuestion = questionNumber;
+    _updateButtons();
+    return currentQuestion;
+  };
+
+  var _displayEndGame = function () {
+    // Get total score.
+    var finals = getScore();
+    var totals = totalScore();
+    var scoreString = params.endGame.resultPage.scoreString.replace("@score", finals).replace("@total", totals);
+    var success = ((100 * finals / totals) >= params.passPercentage);
+    var eventData = {
+      score: scoreString,
+      passed: success
+    };
+    var displayResults = function () {
+      if (!params.endGame.showResultPage) {
+        $(returnObject).trigger('h5pQuestionSetFinished', eventData);
+        return;
+      }
+
+      var eparams = {
+        greeting: (success ? params.endGame.resultPage.succesGreeting : params.endGame.resultPage.failGreeting),
+        score: scoreString,
+        scoreclass: (success ? 'success' : 'fail'),
+        resulttext: (success ? params.endGame.resultPage.successComment : params.endGame.resultPage.failComment),
+        finishButtonText: params.endGame.resultPage.finishButtonText
+      };
+
+      // Show result page.
+      $myDom.children().hide();
+      $myDom.append(endTemplate.render(eparams));
+      $('.qs-finishbutton').click(function (ev) {
+        $(returnObject).trigger('h5pQuestionSetFinished', eventData);
+      });
+    };
+
+    if (params.endGame.animations.showAnimations) {
+      var videoData = success ? params.endGame.animations.successVideo : params.endGame.animations.failVideo;
+      if (videoData) {
+        H5P.playVideo($myDom, videoData, params.endGame.animations.skipButtonText, cp, function () {
+          displayResults();
+        });
+        return;
+      }
+    }
+    // Trigger finished event.
+    displayResults();
+  };
+
+  // Function for attaching the multichoice to a DOM element.
+  var attach = function (target) {
+    if (typeof(target) == "string") {
+      $myDom = $("#" + target);
+    } else {
+      $myDom = $(target);
+    }
+
+    // Render own DOM into target.
+    $myDom.html(template.render(params)).css({
+      backgroundImage: 'url(' + cp + params.backgroundImage.path + ')'
+    });
+
+    // Attach questions
+    for (var i=0; i<questionInstances.length; i++) {
+      var question = questionInstances[i];
+      // TODO: Render on init, inject in template.
+      question.attach('q-' + i);
+      $(question).on('h5pQuestionAnswered', function (ev) {
+        $('#qdot-' + currentQuestion, $myDom).removeClass('unanswered').addClass('answered');
+        _updateButtons();
+      });
+      if (question.getAnswerGiven()) {
+        $('#qdot-'+i, $myDom).removeClass('unanswered').addClass('answered');
+      }
+    }
+
+    $('#qs-startbutton').click(function (ev) {
+      $(this).parents('.intro-page').hide();
+      $('.questionset', $myDom).removeClass('hidden');
+    });
+
+    // Set event listeners.
+    $('.progress-dot', $myDom).click(function (ev) {
+      var idx = parseInt($(this).attr('id').split('-')[1], 10);
+      _showQuestion(idx);
+    });
+    $('.next.button', $myDom).click(function (ev) {
+      _showQuestion(currentQuestion + 1);
+    });
+    $('.prev.button', $myDom).click(function (ev) {
+      _showQuestion(currentQuestion - 1);
+    });
+    $('.finish.button', $myDom).click(function (ev) {
+      _displayEndGame();
+    });
+
+    // Hide all but initial Question.
+    _showQuestion(params.initialQuestion);
+    _updateButtons();
+    return this;
+  };
+
+  // Get current score for questionset.
+  var getScore = function () {
+    var score = 0;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      score += questionInstances[i].getScore();
+    }
+    return score;
+  };
+
+  // Get total score possible for questionset.
+  var totalScore = function () {
+    var score = 0;
+    for (var i = questionInstances.length - 1; i >= 0; i--) {
+      score += questionInstances[i].totalScore();
+    }
+    return score;
+  };
+
+  // Masquerade the main object to hide inner properties and functions.
+  var returnObject = {
+    attach: attach, // Attach to DOM object
+    getQuestions: function () {return questionInstances;},
+    getScore: getScore,
+    totalScore: totalScore,
+    defaults: defaults // Provide defaults for inspection
+  };
+  return returnObject;
+};
diff --git a/library.json b/library.json
new file mode 100644
index 0000000..cd31dac
--- /dev/null
+++ b/library.json
@@ -0,0 +1,24 @@
+{
+  "title": "Question set",
+  "contentType": "question",
+  "majorVersion": 1,
+  "minorVersion": 0,
+  "patchVersion": 6,
+  "runnable": 1,
+  "machineName": "H5P.QuestionSet",
+  "author": "Amendor AS",
+  "license": "cc-by-sa",
+  "preloadedJs": [
+    {"path": "js/questionset.js"}
+  ],
+  "preloadedCss": [
+    {"path": "css/questionset.css"}
+  ],
+  "preloadedDependencies": [
+    {
+      "machineName": "EmbeddedJS",
+      "majorVersion": 1, 
+      "minorVersion": 0
+    }
+  ]
+}
diff --git a/semantics.json b/semantics.json
new file mode 100644
index 0000000..d1ef7e8
--- /dev/null
+++ b/semantics.json
@@ -0,0 +1,221 @@
+[
+  {
+    "name": "title",
+    "type": "text",
+    "label": "Title",
+    "description": "Question set title (optional)."
+  },
+  {
+    "name": "randomOrder",
+    "type": "boolean",
+    "label": "Randomize order",
+    "description": "Whether questions should be shown in random order."
+  },
+  {
+    "name": "initialQuestion",
+    "type": "number",
+    "label": "Initial question",
+    "description": "Which question to start with. Count from 0."
+  },
+  {
+    "name": "backgroundImage",
+    "type": "image",
+    "label": "Background image",
+    "description": "An optional background image for the Question set."
+  },
+  {
+    "name": "progressType",
+    "type": "select",
+    "label": "Progress indicator",
+    "description": "Question set progress indicator style.",
+    "values": [
+      {
+        "text": "Textual",
+        "value": "textual"
+      },
+      {
+        "text": "Dots",
+        "value": "dots"
+      }
+    ],
+    "default": "textual"
+  },
+  {
+    "name": "passPercentage",
+    "type": "number",
+    "label": "Pass percentage",
+    "description": "Percentage of total score required for passing the quiz.",
+    "min": 0,
+    "max": 100,
+    "step": 1,
+    "default": 50
+  },
+  {
+    "name": "questions",
+    "type": "list",
+    "entity": "question",
+    "field": {
+      "name": "question",
+      "type": "group",
+      "label": "Question",
+      "fields": [
+        {
+          "name": "library",
+          "type": "library",
+          "label": "Question library",
+          "description": "Library for this question.",
+          "options": [
+            "H5P.MultiChoice 1.0"
+          ]
+        }
+      ]
+    }
+  },
+  {
+    "name": "introPage",
+    "type": "group",
+    "label": "Intro page",
+    "description": "Data for the intro page.",
+    "fields": [
+      {
+        "name": "showIntroPage",
+        "type": "boolean",
+        "label": "Show intro page?"
+      },
+      {
+        "name": "title",
+        "type": "text",
+        "label": "Title"
+      },
+      {
+        "name": "introduction",
+        "type": "text",
+        "label": "Introduction text"
+      },
+      {
+        "name": "startButtonText",
+        "type": "text",
+        "label": "Start button text"
+      }
+    ]
+  },
+  {
+    "name": "texts",
+    "type": "group",
+    "label": "Interface texts in quiz",
+    "common": true,
+    "fields": [
+      {
+        "name": "prevButton",
+        "type": "text",
+        "label": "Back button",
+        "default": "Previous"
+      },
+      {
+        "name": "nextButton",
+        "type": "text",
+        "label": "Next button",
+        "default": "Next"
+      },
+      {
+        "name": "finishButton",
+        "type": "text",
+        "label": "Finish button",
+        "default": "Finish"
+      },
+      {
+        "name": "textualProgress",
+        "type": "text",
+        "label": "Progress text",
+        "description": "Text used if textual progress is selected.",
+        "default": "Question: @current of @total questions"
+      }
+    ]
+  },
+  {
+    "name": "endGame",
+    "type": "group",
+    "label": "End game data",
+    "fields": [
+      {
+        "name": "showResultPage",
+        "type": "boolean",
+        "label": "Show result page",
+        "default": true
+      },
+      {
+        "name": "resultPage",
+        "type": "group",
+        "label": "Result page",
+        "description": "Data and texts for the result page.",
+        "fields": [
+          {
+            "name": "successGreeting",
+            "type": "text",
+            "label": "Success greeting",
+            "description": "Title in result page on success."
+          },
+          {
+            "name": "successComment",
+            "type": "text",
+            "label": "Success comment",
+            "description": "Comment shown after the score."
+          },
+          {
+            "name": "failGreeting",
+            "type": "text",
+            "label": "Failed greeting",
+            "description": "Title in result page on failed quiz."
+          },
+          {
+            "name": "failComment",
+            "type": "text",
+            "label": "Failed comment",
+            "description": "Comment shown after the score on failed quiz."
+          },
+          {
+            "name": "finishButtonText",
+            "type": "text",
+            "label": "Finish button text",
+            "description": "Text for the finish button."
+          }
+        ]
+      },
+      {
+        "name": "animations",
+        "type": "group",
+        "label": "Animations",
+        "fields": [
+          {
+            "name": "showAnimations",
+            "type": "boolean",
+            "label": "Show animations"
+          },
+          {
+            "name": "skippable",
+            "type": "boolean",
+            "label": "Skippable"
+          },
+          {
+            "name": "skipButtonText",
+            "type": "text",
+            "label": "Skip button text",
+            "common": true
+          },
+          {
+            "name": "successVideo",
+            "type": "video",
+            "label": "Success video",
+            "description": "Video displayed on successful quiz."
+          },
+          {
+            "name": "failVideo",
+            "type": "video",
+            "label": "Fail video",
+            "description": "Video displayed on failed quiz."
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/views/questionset-results.ejs b/views/questionset-results.ejs
new file mode 100644
index 0000000..722776d
--- /dev/null
+++ b/views/questionset-results.ejs
@@ -0,0 +1,6 @@
+<div class="questionset-results">
+  <div class="greeting"><%= greeting %></div>
+  <div class="score <%= scoreclass %>"><%= score %></div>
+  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>
+  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>
+</div>
diff --git a/views/questionset.ejs b/views/questionset.ejs
new file mode 100644
index 0000000..5219d42
--- /dev/null
+++ b/views/questionset.ejs
@@ -0,0 +1,31 @@
+<% if (introPage.showIntroPage) { %>
+<div class="intro-page">
+  <div class="title"><%= introPage.title %></div>
+  <div class="introduction"><%= introPage.introduction %></div>
+  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>
+</div>
+<%} %>
+<div class="questionset hidden">
+  <div class="title"><%= title %></div>
+  <% for (var i=0; i<questions.length; i++) { %>
+    <div class="question-container" id="q-<%= i %>">
+      <div><%= questions[i].name %></div>
+    </div>
+  <% } %>
+  <div class="qs-footer">
+    <div class="qs-progress">
+      <% if (progressType == "dots") { %>
+        <div class="dots-container">
+          <% for (var i=0; i<questions.length; i++) { %>
+          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>
+          <%} %>
+        </div>
+      <% } else if (progressType == "textual") { %>
+        <span class="progress-text"></span>
+      <% } %>
+    </div>
+    <a class="prev button"><%= texts.prevButton %></a>
+    <a class="next button"><%= texts.nextButton %></a>
+    <a class="finish button"><%= texts.finishButton %></a>
+  </div>
+</div>

From c4c526b1e410a559e81f4ff68fd62f0313f585ee Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Fri, 26 Apr 2013 17:27:35 +0200
Subject: [PATCH 11/83] Improved boardgame flexibility.

---
 css/questionset.css |  40 +++-----
 js/questionset.js   | 221 +++++++++++++++++++++++++-------------------
 2 files changed, 138 insertions(+), 123 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 0fe886e..49ebe12 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -18,51 +18,38 @@
   margin: -1px 4px 1px 2px;
 }
 .intro-page {
-  /*background-color: rgba(255,255,255,0.9);*/
-  /*padding: 10px;*/
-  position: absolute;
-  z-index: 20;
-  height: 100%;
-  width: 100%;
-  left: 0px;
-  top: 0px;
+
 }
 .intro-page .title {
-  font-size: 200%;
+  font-size: 2em;
   font-weight: bold;
   text-align: center;
-  margin: 1em;
+  padding: 1em 1em 0.5em;
 }
 .intro-page .introduction {
-  font-size: 125%;
-  margin: 1em 10%;
+  font-size: 1.25em;
+  margin: 0 1em;
 }
 .intro-page .buttons {
-  position: absolute;
-  top: 200px;
-  left: 182px;
-  text-align: right;
+  margin: 3em auto;
+  text-align: center;
 }
 
 #qs-startbutton {
-  border: 4px solid #BABABA;
-  border-radius: 10px 10px 10px 10px;
-  font-size: 50px;
-  padding: 10px 20px;
+  font-size: 3em;
+  border: 0.083em solid #BABABA;
+  border-radius: 0.2083em;
+  padding: 0.2083em 0.4167em;
   cursor: pointer;
 }
 
 .qs-progress {
-  line-height: 40px;
+  line-height: 2em;
   padding: 0;
+  margin: 1em 1em 0;
 }
 
 .questionset-results {
-  background-image: url(img/Paper-clean.png);
-  background-color: rgba(255, 255, 255, 0.75);
-
-  padding: 10px;
-  height: 480px;
   text-align: center;
 }
 
@@ -76,6 +63,7 @@
 }
 
 .questionset-results .resulttext {
+  text-align: left;
   font-size: 20px;
   line-height: 25px;
   margin: 40px 100px;
diff --git a/js/questionset.js b/js/questionset.js
index 078d1da..2a7c822 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -1,96 +1,101 @@
-// Will render a Question with multiple choices for answers.
-
-// Options format:
-// {
-//   title: "Optional title for question box",
-//   question: "Question text",
-//   answers: [{text: "Answer text", correct: false}, ...],
-//   singleAnswer: true, // or false, will change rendered output slightly.
-// }
-//
-// Events provided:
-// - h5pQuestionSetFinished: Triggered when a question is finished. (User presses Finish-button)
 var H5P = H5P || {};
 
+/**
+ * Will render a Question with multiple choices for answers.
+ *
+ * Options format:
+ * {
+ *   title: "Optional title for question box",
+ *   question: "Question text",
+ *   answers: [{text: "Answer text", correct: false}, ...],
+ *   singleAnswer: true, // or false, will change rendered output slightly.
+ * }
+ *
+ * Events provided:
+ * - h5pQuestionSetFinished: Triggered when a question is finished. (User presses Finish-button)
+ *
+ * @param {Array} options
+ * @param {int} contentId
+ * @returns {H5P.QuestionSet} Instance
+ */
 H5P.QuestionSet = function (options, contentId) {
-  if ( !(this instanceof H5P.QuestionSet) )
+  if (!(this instanceof H5P.QuestionSet)) {
     return new H5P.QuestionSet(options, contentId);
+  }
 
   var $ = H5P.jQuery;
   var cp = H5P.getContentPath(contentId);
 
-  var texttemplate = '' +
-'<% if (introPage.showIntroPage) { %>' +
-'<div class="intro-page">' +
-'  <div class="title"><%= introPage.title %></div>' +
-'  <div class="introduction"><%= introPage.introduction %></div>' +
-'  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>' +
-'</div>' +
-'<%} %>' +
-'<div class="questionset hidden">' +
-'  <div class="title"><%= title %></div>' +
-'  <% for (var i=0; i<questions.length; i++) { %>' +
-'    <div class="question-container" id="q-<%= i %>">' +
-'      <div><%= questions[i].library %></div>' +
-'    </div>' +
-'  <% } %>' +
-'  <div class="qs-footer">' +
-'    <div class="qs-progress">' +
-'      <% if (progressType == "dots") { %>' +
-'        <div class="dots-container">' +
-'          <% for (var i=0; i<questions.length; i++) { %>' +
-'          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>' +
-'          <%} %>' +
-'        </div>' +
-'      <% } else if (progressType == "textual") { %>' +
-'        <span class="progress-text"></span>' +
-'      <% } %>' +
-'    </div>' +
-'    <a class="prev button"><%= texts.prevButton %></a>' +
-'    <a class="next button"><%= texts.nextButton %></a>' +
-'    <a class="finish button"><%= texts.finishButton %></a>' +
-'  </div>' +
-'</div>' +
-  '';
-  var resulttemplate = '' +
-'<div class="questionset-results">' +
-'  <div class="greeting"><%= greeting %></div>' +
-'  <div class="score <%= scoreclass %>"><%= score %></div>' +
-'  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>' +
-'  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>' +
-'</div>' +
-  '';
+  var texttemplate =
+          '<% if (introPage.showIntroPage) { %>' +
+          '<div class="intro-page">' +
+          '  <div class="title"><%= introPage.title %></div>' +
+          '  <div class="introduction"><%= introPage.introduction %></div>' +
+          '  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>' +
+          '</div>' +
+          '<%} %>' +
+          '<div class="questionset hidden">' +
+          '  <div class="title"><%= title %></div>' +
+          '  <% for (var i=0; i<questions.length; i++) { %>' +
+          '    <div class="question-container" id="q-<%= i %>">' +
+          '      <div><%= questions[i].library %></div>' +
+          '    </div>' +
+          '  <% } %>' +
+          '  <div class="qs-footer">' +
+          '    <div class="qs-progress">' +
+          '      <% if (progressType == "dots") { %>' +
+          '        <div class="dots-container">' +
+          '          <% for (var i=0; i<questions.length; i++) { %>' +
+          '          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>' +
+          '          <%} %>' +
+          '        </div>' +
+          '      <% } else if (progressType == "textual") { %>' +
+          '        <span class="progress-text"></span>' +
+          '      <% } %>' +
+          '    </div>' +
+          '    <a class="prev button"><%= texts.prevButton %></a>' +
+          '    <a class="next button"><%= texts.nextButton %></a>' +
+          '    <a class="finish button"><%= texts.finishButton %></a>' +
+          '  </div>' +
+          '</div>';
+
+  var resulttemplate =
+          '<div class="questionset-results">' +
+          '  <div class="greeting"><%= greeting %></div>' +
+          '  <div class="score <%= scoreclass %>"><%= score %></div>' +
+          '  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>' +
+          '  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>' +
+          '</div>';
 
-  var that = this;
   var defaults = {
-    title: "",
+    title: '',
     randomOrder: false,
     initialQuestion: 0,
-    backgroundImage: "",
+    backgroundImage: '',
     progressType: 'dots',
     passPercentage: 50,
     questions: [],
     introPage: {
       showIntroPage: true,
-      title: "Welcome",
-      introduction: "Click start to start.",
-      startButtonText: "Start"
+      title: 'Welcome',
+      introduction: 'Click start to start.',
+      startButtonText: 'Start'
     },
     texts: {
-      prevButton: "Previous",
-      nextButton: "Next",
-      finishButton: "Finish",
-      textualProgress: "Question: @current of @total questions"
+      prevButton: 'Previous',
+      nextButton: 'Next',
+      finishButton: 'Finish',
+      textualProgress: 'Question: @current of @total questions'
     },
     endGame: {
       showResultPage: true,
       resultPage: {
-        successGreeting: "Congratulations!",
-        successComment: "You have enough correct answers to pass the test.",
-        failGreeting: "Sorry!",
+        successGreeting: 'Congratulations!',
+        successComment: 'You have enough correct answers to pass the test.',
+        failGreeting: 'Sorry!',
         failComment: "You don't have enough correct answers to pass this test.",
-        scoreString: "@score/@total",
-        finishButtonText: "Finish"
+        scoreString: '@score/@total',
+        finishButtonText: 'Finish'
       },
       animations: {
         showAnimations: false,
@@ -102,20 +107,18 @@ H5P.QuestionSet = function (options, contentId) {
 
   var template = new EJS({text: texttemplate});
   var endTemplate = new EJS({text: resulttemplate});
-  var params = $.extend({}, defaults, options);
+  var params = $.extend(true, {}, defaults, options);
 
   var currentQuestion = 0;
   var questionInstances = new Array();
-  var allQuestionsAnswered = false;
   var $myDom;
 
-  if (params.randomOrder) {
-    // TODO: Randomize order of questions
-    console.log("TODO: Randomize order of questions");
-  }
+//  if (params.randomOrder) {
+//    // TODO: Randomize order of questions
+//  }
 
   // Instantiate question instances
-  for (var i=0; i<params.questions.length; i++) {
+  for (var i = 0; i < params.questions.length; i++) {
     var question = params.questions[i];
     // TODO: Render on init, inject in template.
 
@@ -136,7 +139,7 @@ H5P.QuestionSet = function (options, contentId) {
     } else {
       $('.prev.button', $myDom).show();
     }
-    if (currentQuestion == (params.questions.length - 1)) {
+    if (currentQuestion === (params.questions.length - 1)) {
       $('.next.button', $myDom).hide();
       if (answered) {
         $('.finish.button', $myDom).show();
@@ -145,13 +148,16 @@ H5P.QuestionSet = function (options, contentId) {
       $('.next.button', $myDom).show();
       $('.finish.button', $myDom).hide();
     }
-
  };
 
   var _showQuestion = function (questionNumber) {
     // Sanitize input.
-    if (questionNumber < 0) { questionNumber = 0; }
-    if (questionNumber >= params.questions.length) { questionNumber = params.questions.length - 1; }
+    if (questionNumber < 0) {
+      questionNumber = 0;
+    }
+    if (questionNumber >= params.questions.length) {
+      questionNumber = params.questions.length - 1;
+    }
 
      // Hide all questions
     $('.question-container', $myDom).hide();
@@ -161,9 +167,10 @@ H5P.QuestionSet = function (options, contentId) {
 
     // Update progress indicator
     // Test if current has been answered.
-    if (params.progressType == 'textual') {
+    if (params.progressType === 'textual') {
       $('.progress-text', $myDom).text(params.texts.textualProgress.replace("@current", questionNumber+1).replace("@total", params.questions.length));
-    } else {
+    }
+    else {
       // Set currentNess
       $('.progress-dot.current', $myDom).removeClass('current');
       $('#qdot-' + questionNumber, $myDom).addClass('current');
@@ -202,7 +209,7 @@ H5P.QuestionSet = function (options, contentId) {
       // Show result page.
       $myDom.children().hide();
       $myDom.append(endTemplate.render(eparams));
-      $('.qs-finishbutton').click(function (ev) {
+      $('.qs-finishbutton').click(function () {
         $(returnObject).trigger('h5pQuestionSetFinished', eventData);
       });
     };
@@ -210,9 +217,28 @@ H5P.QuestionSet = function (options, contentId) {
     if (params.endGame.animations.showAnimations) {
       var videoData = success ? params.endGame.animations.successVideo : params.endGame.animations.failVideo;
       if (videoData) {
-        H5P.playVideo($myDom, videoData, params.endGame.animations.skipButtonText, cp, function () {
+        var $videoContainer = $('<div class="video-container"></div>').appendTo($myDom);
+
+        var video = new H5P.Video({
+          files: videoData,
+          fitToWrapper: true,
+          controls: false,
+          autoplay: true
+        }, cp);
+        video.endedCallback = function () {
           displayResults();
-        });
+          $videoContainer.hide();
+        };
+        video.attach($videoContainer);
+
+        if (params.endGame.animations.skipButtonText) {
+          $('<a class="button skip">' + params.endGame.animations.skipButtonText + '</a>').click(function () {
+            video.stop();
+            $videoContainer.hide();
+            displayResults();
+          }).appendTo($videoContainer);
+        }
+
         return;
       }
     }
@@ -222,9 +248,10 @@ H5P.QuestionSet = function (options, contentId) {
 
   // Function for attaching the multichoice to a DOM element.
   var attach = function (target) {
-    if (typeof(target) == "string") {
-      $myDom = $("#" + target);
-    } else {
+    if (typeof(target) === "string") {
+      $myDom = $('#' + target);
+    }
+    else {
       $myDom = $(target);
     }
 
@@ -234,11 +261,11 @@ H5P.QuestionSet = function (options, contentId) {
     });
 
     // Attach questions
-    for (var i=0; i<questionInstances.length; i++) {
+    for (var i = 0; i < questionInstances.length; i++) {
       var question = questionInstances[i];
       // TODO: Render on init, inject in template.
       question.attach('q-' + i);
-      $(question).on('h5pQuestionAnswered', function (ev) {
+      $(question).on('h5pQuestionAnswered', function () {
         $('#qdot-' + currentQuestion, $myDom).removeClass('unanswered').addClass('answered');
         _updateButtons();
       });
@@ -247,23 +274,23 @@ H5P.QuestionSet = function (options, contentId) {
       }
     }
 
-    $('#qs-startbutton').click(function (ev) {
+    $('#qs-startbutton').click(function () {
       $(this).parents('.intro-page').hide();
       $('.questionset', $myDom).removeClass('hidden');
     });
 
     // Set event listeners.
-    $('.progress-dot', $myDom).click(function (ev) {
+    $('.progress-dot', $myDom).click(function () {
       var idx = parseInt($(this).attr('id').split('-')[1], 10);
       _showQuestion(idx);
     });
-    $('.next.button', $myDom).click(function (ev) {
+    $('.next.button', $myDom).click(function () {
       _showQuestion(currentQuestion + 1);
     });
-    $('.prev.button', $myDom).click(function (ev) {
+    $('.prev.button', $myDom).click(function () {
       _showQuestion(currentQuestion - 1);
     });
-    $('.finish.button', $myDom).click(function (ev) {
+    $('.finish.button', $myDom).click(function () {
       _displayEndGame();
     });
 
@@ -286,7 +313,7 @@ H5P.QuestionSet = function (options, contentId) {
   var totalScore = function () {
     var score = 0;
     for (var i = questionInstances.length - 1; i >= 0; i--) {
-      score += questionInstances[i].totalScore();
+      score += questionInstances[i].getMaxScore();
     }
     return score;
   };
@@ -300,4 +327,4 @@ H5P.QuestionSet = function (options, contentId) {
     defaults: defaults // Provide defaults for inspection
   };
   return returnObject;
-};
+};
\ No newline at end of file

From 7e1be0c0f169f9f1cb048c0dc1c6a55455b6396b Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Tue, 30 Apr 2013 11:45:25 +0200
Subject: [PATCH 12/83] Added select box.

---
 semantics.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/semantics.json b/semantics.json
index d1ef7e8..db0c03d 100644
--- a/semantics.json
+++ b/semantics.json
@@ -28,14 +28,14 @@
     "type": "select",
     "label": "Progress indicator",
     "description": "Question set progress indicator style.",
-    "values": [
+    "options": [
       {
-        "text": "Textual",
-        "value": "textual"
+        "value": "textual",
+        "label": "Textual"
       },
       {
-        "text": "Dots",
-        "value": "dots"
+        "value": "dots",
+        "label": "Dots"
       }
     ],
     "default": "textual"

From 0118a7dfe9baad6b7000623def6ff41bca552ae2 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Tue, 30 Apr 2013 13:01:14 +0200
Subject: [PATCH 13/83] Fixed Boardgame video. Fixed QuestionSet dependency.

---
 library.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/library.json b/library.json
index cd31dac..0ff733b 100644
--- a/library.json
+++ b/library.json
@@ -17,7 +17,12 @@
   "preloadedDependencies": [
     {
       "machineName": "EmbeddedJS",
-      "majorVersion": 1, 
+      "majorVersion": 1,
+      "minorVersion": 0
+    },
+    {
+      "machineName": "H5P.Video",
+      "majorVersion": 1,
       "minorVersion": 0
     }
   ]

From 9b3130b463bd6ecdfd7461ab54d32342f5a1544c Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Thu, 2 May 2013 14:41:39 +0200
Subject: [PATCH 14/83] Numerus bug fixes and improved editor for boardgame.
 Fixed CKEditor readonly when created in invisible field.

---
 css/questionset.css |   2 +-
 js/questionset.js   |  53 +++++++-------
 semantics.json      | 166 +++++++++++++++++++++++---------------------
 3 files changed, 114 insertions(+), 107 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 49ebe12..152b284 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -54,7 +54,7 @@
 }
 
 .questionset-results .greeting {
-  margin-top: 180px;
+  margin: 1em;
 }
 
 .questionset-results .score {
diff --git a/js/questionset.js b/js/questionset.js
index 2a7c822..27edb9c 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -71,14 +71,14 @@ H5P.QuestionSet = function (options, contentId) {
     title: '',
     randomOrder: false,
     initialQuestion: 0,
-    backgroundImage: '',
+    backgroundImage: undefined,
     progressType: 'dots',
     passPercentage: 50,
     questions: [],
     introPage: {
       showIntroPage: true,
-      title: 'Welcome',
-      introduction: 'Click start to start.',
+      title: '',
+      introduction: '',
       startButtonText: 'Start'
     },
     texts: {
@@ -89,19 +89,15 @@ H5P.QuestionSet = function (options, contentId) {
     },
     endGame: {
       showResultPage: true,
-      resultPage: {
-        successGreeting: 'Congratulations!',
-        successComment: 'You have enough correct answers to pass the test.',
-        failGreeting: 'Sorry!',
-        failComment: "You don't have enough correct answers to pass this test.",
-        scoreString: '@score/@total',
-        finishButtonText: 'Finish'
-      },
-      animations: {
-        showAnimations: false,
-        successVideo: undefined,
-        failVideo: undefined
-      }
+      successGreeting: 'Congratulations!',
+      successComment: 'You have enough correct answers to pass the test.',
+      failGreeting: 'Sorry!',
+      failComment: "You don't have enough correct answers to pass this test.",
+      scoreString: '@score/@total',
+      finishButtonText: 'Finish',
+      showAnimations: false,
+      successVideo: undefined,
+      failVideo: undefined
     }
   };
 
@@ -186,7 +182,7 @@ H5P.QuestionSet = function (options, contentId) {
     // Get total score.
     var finals = getScore();
     var totals = totalScore();
-    var scoreString = params.endGame.resultPage.scoreString.replace("@score", finals).replace("@total", totals);
+    var scoreString = params.endGame.scoreString.replace("@score", finals).replace("@total", totals);
     var success = ((100 * finals / totals) >= params.passPercentage);
     var eventData = {
       score: scoreString,
@@ -199,11 +195,11 @@ H5P.QuestionSet = function (options, contentId) {
       }
 
       var eparams = {
-        greeting: (success ? params.endGame.resultPage.succesGreeting : params.endGame.resultPage.failGreeting),
+        greeting: (success ? params.endGame.successGreeting : params.endGame.failGreeting),
         score: scoreString,
         scoreclass: (success ? 'success' : 'fail'),
-        resulttext: (success ? params.endGame.resultPage.successComment : params.endGame.resultPage.failComment),
-        finishButtonText: params.endGame.resultPage.finishButtonText
+        resulttext: (success ? params.endGame.successComment : params.endGame.failComment),
+        finishButtonText: params.endGame.finishButtonText
       };
 
       // Show result page.
@@ -214,8 +210,8 @@ H5P.QuestionSet = function (options, contentId) {
       });
     };
 
-    if (params.endGame.animations.showAnimations) {
-      var videoData = success ? params.endGame.animations.successVideo : params.endGame.animations.failVideo;
+    if (params.endGame.showAnimations) {
+      var videoData = success ? params.endGame.successVideo : params.endGame.failVideo;
       if (videoData) {
         var $videoContainer = $('<div class="video-container"></div>').appendTo($myDom);
 
@@ -231,8 +227,8 @@ H5P.QuestionSet = function (options, contentId) {
         };
         video.attach($videoContainer);
 
-        if (params.endGame.animations.skipButtonText) {
-          $('<a class="button skip">' + params.endGame.animations.skipButtonText + '</a>').click(function () {
+        if (params.endGame.skipButtonText) {
+          $('<a class="button skip">' + params.endGame.skipButtonText + '</a>').click(function () {
             video.stop();
             $videoContainer.hide();
             displayResults();
@@ -256,9 +252,12 @@ H5P.QuestionSet = function (options, contentId) {
     }
 
     // Render own DOM into target.
-    $myDom.html(template.render(params)).css({
-      backgroundImage: 'url(' + cp + params.backgroundImage.path + ')'
-    });
+    $myDom.html(template.render(params));
+    if (params.backgroundImage !== undefined) {
+      $myDom.css({
+        background: 'url(' + cp + params.backgroundImage.path + ')'
+      });
+    }
 
     // Attach questions
     for (var i = 0; i < questionInstances.length; i++) {
diff --git a/semantics.json b/semantics.json
index db0c03d..acd3f6b 100644
--- a/semantics.json
+++ b/semantics.json
@@ -15,12 +15,14 @@
     "name": "initialQuestion",
     "type": "number",
     "label": "Initial question",
-    "description": "Which question to start with. Count from 0."
+    "description": "Which question to start with. Count from 0.",
+    "default": 0
   },
   {
     "name": "backgroundImage",
     "type": "image",
     "label": "Background image",
+    "optional": true,
     "description": "An optional background image for the Question set."
   },
   {
@@ -52,6 +54,7 @@
   },
   {
     "name": "questions",
+    "label": "Questions",
     "type": "list",
     "entity": "question",
     "field": {
@@ -74,28 +77,35 @@
   {
     "name": "introPage",
     "type": "group",
-    "label": "Intro page",
-    "description": "Data for the intro page.",
+    "label": "Quiz introduction",
     "fields": [
       {
         "name": "showIntroPage",
         "type": "boolean",
-        "label": "Show intro page?"
+        "label": "Display introduction"
       },
       {
         "name": "title",
         "type": "text",
-        "label": "Title"
+        "label": "Title",
+        "optional": true,
+        "description": "This title will be displayed above the introduction text."
       },
       {
         "name": "introduction",
         "type": "text",
-        "label": "Introduction text"
+        "widget": "textarea",
+        "label": "Introduction text",
+        "optional": true,
+        "description": "This text will be displayed before the quiz starts."
       },
       {
         "name": "startButtonText",
         "type": "text",
-        "label": "Start button text"
+        "label": "Start button text",
+        "optional": true,
+        "placeholder": "Start Quiz",
+        "default": "Start Quiz"
       }
     ]
   },
@@ -135,87 +145,85 @@
   {
     "name": "endGame",
     "type": "group",
-    "label": "End game data",
+    "label": "Quiz finished",
     "fields": [
       {
         "name": "showResultPage",
         "type": "boolean",
-        "label": "Show result page",
+        "label": "Display results",
         "default": true
       },
       {
-        "name": "resultPage",
-        "type": "group",
-        "label": "Result page",
-        "description": "Data and texts for the result page.",
-        "fields": [
-          {
-            "name": "successGreeting",
-            "type": "text",
-            "label": "Success greeting",
-            "description": "Title in result page on success."
-          },
-          {
-            "name": "successComment",
-            "type": "text",
-            "label": "Success comment",
-            "description": "Comment shown after the score."
-          },
-          {
-            "name": "failGreeting",
-            "type": "text",
-            "label": "Failed greeting",
-            "description": "Title in result page on failed quiz."
-          },
-          {
-            "name": "failComment",
-            "type": "text",
-            "label": "Failed comment",
-            "description": "Comment shown after the score on failed quiz."
-          },
-          {
-            "name": "finishButtonText",
-            "type": "text",
-            "label": "Finish button text",
-            "description": "Text for the finish button."
-          }
-        ]
+        "name": "successGreeting",
+        "type": "text",
+        "label": "Quiz passed title",
+        "placeholder": "Congratulations!",
+        "default": "Congratulations!",
+        "description": "This title will be displayed above results if the user has successfully passed the quiz."
       },
       {
-        "name": "animations",
-        "type": "group",
-        "label": "Animations",
-        "fields": [
-          {
-            "name": "showAnimations",
-            "type": "boolean",
-            "label": "Show animations"
-          },
-          {
-            "name": "skippable",
-            "type": "boolean",
-            "label": "Skippable"
-          },
-          {
-            "name": "skipButtonText",
-            "type": "text",
-            "label": "Skip button text",
-            "common": true
-          },
-          {
-            "name": "successVideo",
-            "type": "video",
-            "label": "Success video",
-            "description": "Video displayed on successful quiz."
-          },
-          {
-            "name": "failVideo",
-            "type": "video",
-            "label": "Fail video",
-            "description": "Video displayed on failed quiz."
-          }
-        ]
+        "name": "successComment",
+        "type": "text",
+        "widget": "textarea",
+        "label": "Passed comment",
+        "default": "You did very well!",
+        "description": "This comment will be displayed after the score if the user has successfully passed the quiz."
+      },
+      {
+        "name": "failGreeting",
+        "type": "text",
+        "label": "Quiz failed title",
+        "placeholder": "Oh, no!",
+        "default": "Oh, no!",
+        "description": "This title will be displayed above the results if the user has failed the quiz."
+      },
+      {
+        "name": "failComment",
+        "type": "text",
+        "widget": "textarea",
+        "label": "Failed comment",
+        "default": "This didn't go so well.",
+        "description": "This comment will be displayed after the score if the user has failed the quiz."
+      },
+      {
+        "name": "finishButtonText",
+        "type": "text",
+        "label": "Finish button text",
+        "default": "Finish",
+        "description": "Text for the finish button."
+      },
+      {
+        "name": "showAnimations",
+        "type": "boolean",
+        "label": "Display video before quiz results"
+      },
+      {
+        "name": "skippable",
+        "type": "boolean",
+        "label": "Enable skip video button"
+      },
+      {
+        "name": "skipButtonText",
+        "type": "text",
+        "label": "Skip video button label",
+        "default": "Skip video",
+        "description": "This is the label for the button which allows users to skip videos after a quiz.",
+        "common": true
+      },
+      {
+        "name": "successVideo",
+        "type": "video",
+        "label": "Passed video",
+        "optional": true,
+        "description": "This video will be played if the user successfully passed the quiz."
+      },
+      {
+        "name": "failVideo",
+        "type": "video",
+        "label": "Fail video",
+        "optional": true,
+        "description": "This video will be played if the user failes the quiz."
       }
     ]
   }
-]
+]
\ No newline at end of file

From bde6f57f5ae022ffb34c200fa152f0e8e957b639 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Fri, 3 May 2013 10:05:49 +0200
Subject: [PATCH 15/83] Made questionset standalone possible.

---
 css/questionset.css | 82 +++++++++++++++++++++++++++++++--------------
 js/questionset.js   | 46 +++++++++++++++++++++----
 2 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 152b284..af821e1 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -1,3 +1,13 @@
+.questionset.hidden {
+  display: none;
+}
+.questionset .h5p-multichoice > .h5p-show-solution {
+  display: none;
+}
+.questionset > .title {
+  font-size: 2em;
+  margin: 0.5em 0.16em 0.16em;
+}
 .dots-container {
   text-align: center;
 }
@@ -22,9 +32,9 @@
 }
 .intro-page .title {
   font-size: 2em;
+  line-height: 2em;
   font-weight: bold;
   text-align: center;
-  padding: 1em 1em 0.5em;
 }
 .intro-page .introduction {
   font-size: 1.25em;
@@ -35,18 +45,49 @@
   text-align: center;
 }
 
-#qs-startbutton {
-  font-size: 3em;
-  border: 0.083em solid #BABABA;
-  border-radius: 0.2083em;
-  padding: 0.2083em 0.4167em;
+.qs-footer {
+  overflow: hidden;
+}
+
+.qs-footer .button, .qs-startbutton, .qs-finishbutton, .questionset-results .button {
+  display: block;
+  line-height: 1.25em;
+  padding: 0.25em 1em;
+  border-radius: 0.75em;
   cursor: pointer;
+  color: #fff;
+  box-shadow: 0 0 0.5em #aebdc9;
+  margin: 0.5em;
+
+  background: #267ec9;
+  background-image: -webkit-linear-gradient(top, #3999ea, #267ec9);
+  background-image: -moz-linear-gradient(top, #3999ea, #267ec9);
+  background-image: -o-linear-gradient(top, #3999ea, #267ec9);
+  background-image: -ms-linear-gradient(top, #3999ea, #267ec9);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3999ea', endColorstr='#267ec9',GradientType=0);
+}
+.qs-footer .button:hover, .qs-startbutton:hover, .questionset-results .button:hover {
+  text-decoration: none;
+  color: #fff;
+  box-shadow: 0 0 0.5em #267ec9;
+}
+.qs-startbutton {
+  display: inline-block;
+  font-size: 2.5em;
+}
+.qs-footer > .prev, .qs-solutionbutton {
+  float: left;
+}
+.qs-footer > .next, .qs-footer > .finish, .qs-finishbutton {
+  float: right;
+}
+.questionset-results .qs-finishbutton {
+  display: none;
 }
 
 .qs-progress {
-  line-height: 2em;
-  padding: 0;
-  margin: 1em 1em 0;
+  text-align: center;
+  line-height: 1.5em;
 }
 
 .questionset-results {
@@ -58,17 +99,17 @@
 }
 
 .questionset-results .score {
-  font-size: 25px;
-  margin-top: 40px;
+  font-size: 1.5em;
+  margin: 1em;
 }
 
 .questionset-results .resulttext {
   text-align: left;
-  font-size: 20px;
-  line-height: 25px;
-  margin: 40px 100px;
-  padding-left: 60px;
-  min-height: 60px;
+  font-size: 1.25em;
+  line-height: 1.25em;
+  margin: 1em 4em;
+  padding-left: 3em;
+  min-height: 3em;
   background-repeat: no-repeat;
   background-position: left center;
 }
@@ -87,13 +128,4 @@
 .questionset-results .resulttext.success em {
   font-style: normal;
   color: #6aa81b;
-}
-.questionset-results .buttons {
-  position: absolute;
-  bottom: 40px;
-  right: 25px;
-}
-
-button, .button {
-  cursor: pointer;
 }
\ No newline at end of file
diff --git a/js/questionset.js b/js/questionset.js
index 27edb9c..9d14a3c 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -31,10 +31,10 @@ H5P.QuestionSet = function (options, contentId) {
           '<div class="intro-page">' +
           '  <div class="title"><%= introPage.title %></div>' +
           '  <div class="introduction"><%= introPage.introduction %></div>' +
-          '  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>' +
+          '  <div class="buttons"><a class="qs-startbutton button"><%= introPage.startButtonText %></a></div>' +
           '</div>' +
-          '<%} %>' +
-          '<div class="questionset hidden">' +
+          '<% } %>' +
+          '<div class="questionset<% if (introPage.showIntroPage) { %> hidden<% } %>">' +
           '  <div class="title"><%= title %></div>' +
           '  <% for (var i=0; i<questions.length; i++) { %>' +
           '    <div class="question-container" id="q-<%= i %>">' +
@@ -64,7 +64,7 @@ H5P.QuestionSet = function (options, contentId) {
           '  <div class="greeting"><%= greeting %></div>' +
           '  <div class="score <%= scoreclass %>"><%= score %></div>' +
           '  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>' +
-          '  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>' +
+          '  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a><a class="button qs-solutionbutton"><%= solutionButtonText %></a></div>' +
           '</div>';
 
   var defaults = {
@@ -95,6 +95,7 @@ H5P.QuestionSet = function (options, contentId) {
       failComment: "You don't have enough correct answers to pass this test.",
       scoreString: '@score/@total',
       finishButtonText: 'Finish',
+      solutionButtonText: 'Show solution',
       showAnimations: false,
       successVideo: undefined,
       failVideo: undefined
@@ -108,6 +109,7 @@ H5P.QuestionSet = function (options, contentId) {
   var currentQuestion = 0;
   var questionInstances = new Array();
   var $myDom;
+  renderSolutions = false;
 
 //  if (params.randomOrder) {
 //    // TODO: Randomize order of questions
@@ -178,7 +180,25 @@ H5P.QuestionSet = function (options, contentId) {
     return currentQuestion;
   };
 
+  var showSolutions = function () {
+    for (var i = 0; i < questionInstances.length; i++) {
+      questionInstances[i].showSolutions();
+    }
+  };
+
+  var rendered = false;
+
+  var reRender = function () {
+    rendered = false;
+  };
+
   var _displayEndGame = function () {
+    if (rendered) {
+      $myDom.children().hide().filter('.questionset-results').show();
+      return;
+    }
+    rendered = true;
+
     // Get total score.
     var finals = getScore();
     var totals = totalScore();
@@ -199,7 +219,8 @@ H5P.QuestionSet = function (options, contentId) {
         score: scoreString,
         scoreclass: (success ? 'success' : 'fail'),
         resulttext: (success ? params.endGame.successComment : params.endGame.failComment),
-        finishButtonText: params.endGame.finishButtonText
+        finishButtonText: params.endGame.finishButtonText,
+        solutionButtonText: params.endGame.solutionButtonText
       };
 
       // Show result page.
@@ -208,6 +229,11 @@ H5P.QuestionSet = function (options, contentId) {
       $('.qs-finishbutton').click(function () {
         $(returnObject).trigger('h5pQuestionSetFinished', eventData);
       });
+      $('.qs-solutionbutton', $myDom).click(function () {
+        showSolutions();
+        $myDom.children().hide().filter('.questionset').show();
+        _showQuestion(params.initialQuestion);
+      });
     };
 
     if (params.endGame.showAnimations) {
@@ -273,7 +299,7 @@ H5P.QuestionSet = function (options, contentId) {
       }
     }
 
-    $('#qs-startbutton').click(function () {
+    $('.qs-startbutton', $myDom).click(function () {
       $(this).parents('.intro-page').hide();
       $('.questionset', $myDom).removeClass('hidden');
     });
@@ -296,6 +322,10 @@ H5P.QuestionSet = function (options, contentId) {
     // Hide all but initial Question.
     _showQuestion(params.initialQuestion);
     _updateButtons();
+
+    if (renderSolutions) {
+      showSolutions();
+    }
     return this;
   };
 
@@ -322,7 +352,11 @@ H5P.QuestionSet = function (options, contentId) {
     attach: attach, // Attach to DOM object
     getQuestions: function () {return questionInstances;},
     getScore: getScore,
+    showSolutions: function () {
+      renderSolutions = true;
+    },
     totalScore: totalScore,
+    reRender: reRender,
     defaults: defaults // Provide defaults for inspection
   };
   return returnObject;

From 9beae17e5dd47c8166c34a9c21e46422bee7b0fa Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Fri, 3 May 2013 12:42:20 +0200
Subject: [PATCH 16/83] Fixed questionset styling in boardgame.

---
 css/questionset.css | 2 +-
 js/questionset.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index af821e1..416217c 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -107,7 +107,7 @@
   text-align: left;
   font-size: 1.25em;
   line-height: 1.25em;
-  margin: 1em 4em;
+  margin: 1em 3em;
   padding-left: 3em;
   min-height: 3em;
   background-repeat: no-repeat;
diff --git a/js/questionset.js b/js/questionset.js
index 9d14a3c..8ace8e4 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -35,7 +35,7 @@ H5P.QuestionSet = function (options, contentId) {
           '</div>' +
           '<% } %>' +
           '<div class="questionset<% if (introPage.showIntroPage) { %> hidden<% } %>">' +
-          '  <div class="title"><%= title %></div>' +
+          '  <% if (title !== "") { %><div class="title"><%= title %></div><% } %>' +
           '  <% for (var i=0; i<questions.length; i++) { %>' +
           '    <div class="question-container" id="q-<%= i %>">' +
           '      <div><%= questions[i].library %></div>' +

From 502503988db320f9332a52394ffbb4376397bb44 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Fri, 3 May 2013 13:17:09 +0200
Subject: [PATCH 17/83] Updated patchlvl

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 0ff733b..0c865da 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 6,
+  "patchVersion": 7,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From b32a3ceb54f6331d205879a5d6db7b726b20fb5a Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Fri, 3 May 2013 15:24:17 +0200
Subject: [PATCH 18/83] Fixed missing translations. Fixed video-support.
 Removed random order and initial question index.

---
 css/questionset.css | 18 ++++++++++++++++--
 js/questionset.js   |  3 ++-
 semantics.json      | 20 +++++++-------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 416217c..953313f 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -1,3 +1,6 @@
+.questionset, .intro-page, .questionset-results {
+  overflow: hidden;
+}
 .questionset.hidden {
   display: none;
 }
@@ -49,7 +52,7 @@
   overflow: hidden;
 }
 
-.qs-footer .button, .qs-startbutton, .qs-finishbutton, .questionset-results .button {
+.qs-footer .button, .qs-startbutton, .qs-finishbutton, .questionset-results .button, .video-container > .button {
   display: block;
   line-height: 1.25em;
   padding: 0.25em 1em;
@@ -66,7 +69,7 @@
   background-image: -ms-linear-gradient(top, #3999ea, #267ec9);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3999ea', endColorstr='#267ec9',GradientType=0);
 }
-.qs-footer .button:hover, .qs-startbutton:hover, .questionset-results .button:hover {
+.qs-footer .button:hover, .qs-startbutton:hover, .questionset-results .button:hover, .video-container > .button:hover {
   text-decoration: none;
   color: #fff;
   box-shadow: 0 0 0.5em #267ec9;
@@ -84,6 +87,17 @@
 .questionset-results .qs-finishbutton {
   display: none;
 }
+.video-container {
+  position: relative;
+}
+.video-container > video {
+  background-color: #000;
+}
+.video-container > .button {
+  position: absolute;
+  top: 0.5em;
+  right: 0.5em;
+}
 
 .qs-progress {
   text-align: center;
diff --git a/js/questionset.js b/js/questionset.js
index 8ace8e4..2a52995 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -76,7 +76,7 @@ H5P.QuestionSet = function (options, contentId) {
     passPercentage: 50,
     questions: [],
     introPage: {
-      showIntroPage: true,
+      showIntroPage: false,
       title: '',
       introduction: '',
       startButtonText: 'Start'
@@ -239,6 +239,7 @@ H5P.QuestionSet = function (options, contentId) {
     if (params.endGame.showAnimations) {
       var videoData = success ? params.endGame.successVideo : params.endGame.failVideo;
       if (videoData) {
+        $myDom.children().hide();
         var $videoContainer = $('<div class="video-container"></div>').appendTo($myDom);
 
         var video = new H5P.Video({
diff --git a/semantics.json b/semantics.json
index acd3f6b..5615235 100644
--- a/semantics.json
+++ b/semantics.json
@@ -5,19 +5,6 @@
     "label": "Title",
     "description": "Question set title (optional)."
   },
-  {
-    "name": "randomOrder",
-    "type": "boolean",
-    "label": "Randomize order",
-    "description": "Whether questions should be shown in random order."
-  },
-  {
-    "name": "initialQuestion",
-    "type": "number",
-    "label": "Initial question",
-    "description": "Which question to start with. Count from 0.",
-    "default": 0
-  },
   {
     "name": "backgroundImage",
     "type": "image",
@@ -185,6 +172,13 @@
         "default": "This didn't go so well.",
         "description": "This comment will be displayed after the score if the user has failed the quiz."
       },
+      {
+        "name": "solutionButtonText",
+        "type": "text",
+        "label": "Solution button label",
+        "default": "Show solution",
+        "description": "Text for the solution button."
+      },
       {
         "name": "finishButtonText",
         "type": "text",

From 8deb92bb8333de81eff37b9d8bcd2ed2f2d71546 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Fri, 3 May 2013 15:31:35 +0200
Subject: [PATCH 19/83] Upping the patch level.

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 0c865da..8ed289f 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 7,
+  "patchVersion": 8,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From 7d965bccd1cbe6c3c8019ed56e340359df3b7887 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <falcon@530912.no-reply.drupal.org>
Date: Fri, 3 May 2013 15:59:57 +0200
Subject: [PATCH 20/83] Add translations support for editor libraries

---
 language/nb.json | 223 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 223 insertions(+)
 create mode 100644 language/nb.json

diff --git a/language/nb.json b/language/nb.json
new file mode 100644
index 0000000..918b9d5
--- /dev/null
+++ b/language/nb.json
@@ -0,0 +1,223 @@
+[
+  {
+    "label": "Tittel",
+    "description": "Spørsmålssettets tittel (valgfri)."
+  },
+  {
+    "label": "Tilfeldig rekkefølge",
+    "description": "Skal spørsmålene vises i tilfeldig rekkefølge?"
+  },
+  {
+    "label": "Første spørsmål",
+    "description": "Spørsmålet som skal komme først.",
+    "default": 0
+  },
+  {
+    "name": "backgroundImage",
+    "type": "image",
+    "label": "Background image",
+    "optional": true,
+    "description": "An optional background image for the Question set."
+  },
+  {
+    "name": "progressType",
+    "type": "select",
+    "label": "Progress indicator",
+    "description": "Question set progress indicator style.",
+    "options": [
+      {
+        "value": "textual",
+        "label": "Textual"
+      },
+      {
+        "value": "dots",
+        "label": "Dots"
+      }
+    ],
+    "default": "textual"
+  },
+  {
+    "name": "passPercentage",
+    "type": "number",
+    "label": "Pass percentage",
+    "description": "Percentage of total score required for passing the quiz.",
+    "min": 0,
+    "max": 100,
+    "step": 1,
+    "default": 50
+  },
+  {
+    "name": "questions",
+    "label": "Questions",
+    "type": "list",
+    "entity": "question",
+    "field": {
+      "name": "question",
+      "type": "group",
+      "label": "Question",
+      "fields": [
+        {
+          "name": "library",
+          "type": "library",
+          "label": "Question library",
+          "description": "Library for this question.",
+          "options": [
+            "H5P.MultiChoice 1.0"
+          ]
+        }
+      ]
+    }
+  },
+  {
+    "name": "introPage",
+    "type": "group",
+    "label": "Quiz introduction",
+    "fields": [
+      {
+        "name": "showIntroPage",
+        "type": "boolean",
+        "label": "Display introduction"
+      },
+      {
+        "name": "title",
+        "type": "text",
+        "label": "Title",
+        "optional": true,
+        "description": "This title will be displayed above the introduction text."
+      },
+      {
+        "name": "introduction",
+        "type": "text",
+        "widget": "textarea",
+        "label": "Introduction text",
+        "optional": true,
+        "description": "This text will be displayed before the quiz starts."
+      },
+      {
+        "name": "startButtonText",
+        "type": "text",
+        "label": "Start button text",
+        "optional": true,
+        "placeholder": "Start Quiz",
+        "default": "Start Quiz"
+      }
+    ]
+  },
+  {
+    "name": "texts",
+    "type": "group",
+    "label": "Interface texts in quiz",
+    "common": true,
+    "fields": [
+      {
+        "name": "prevButton",
+        "type": "text",
+        "label": "Back button",
+        "default": "Previous"
+      },
+      {
+        "name": "nextButton",
+        "type": "text",
+        "label": "Next button",
+        "default": "Next"
+      },
+      {
+        "name": "finishButton",
+        "type": "text",
+        "label": "Finish button",
+        "default": "Finish"
+      },
+      {
+        "name": "textualProgress",
+        "type": "text",
+        "label": "Progress text",
+        "description": "Text used if textual progress is selected.",
+        "default": "Question: @current of @total questions"
+      }
+    ]
+  },
+  {
+    "name": "endGame",
+    "type": "group",
+    "label": "Quiz finished",
+    "fields": [
+      {
+        "name": "showResultPage",
+        "type": "boolean",
+        "label": "Display results",
+        "default": true
+      },
+      {
+        "name": "successGreeting",
+        "type": "text",
+        "label": "Quiz passed title",
+        "placeholder": "Congratulations!",
+        "default": "Congratulations!",
+        "description": "This title will be displayed above results if the user has successfully passed the quiz."
+      },
+      {
+        "name": "successComment",
+        "type": "text",
+        "widget": "textarea",
+        "label": "Passed comment",
+        "default": "You did very well!",
+        "description": "This comment will be displayed after the score if the user has successfully passed the quiz."
+      },
+      {
+        "name": "failGreeting",
+        "type": "text",
+        "label": "Quiz failed title",
+        "placeholder": "Oh, no!",
+        "default": "Oh, no!",
+        "description": "This title will be displayed above the results if the user has failed the quiz."
+      },
+      {
+        "name": "failComment",
+        "type": "text",
+        "widget": "textarea",
+        "label": "Failed comment",
+        "default": "This didn't go so well.",
+        "description": "This comment will be displayed after the score if the user has failed the quiz."
+      },
+      {
+        "name": "finishButtonText",
+        "type": "text",
+        "label": "Finish button text",
+        "default": "Finish",
+        "description": "Text for the finish button."
+      },
+      {
+        "name": "showAnimations",
+        "type": "boolean",
+        "label": "Display video before quiz results"
+      },
+      {
+        "name": "skippable",
+        "type": "boolean",
+        "label": "Enable skip video button"
+      },
+      {
+        "name": "skipButtonText",
+        "type": "text",
+        "label": "Skip video button label",
+        "default": "Skip video",
+        "description": "This is the label for the button which allows users to skip videos after a quiz.",
+        "common": true
+      },
+      {
+        "name": "successVideo",
+        "type": "video",
+        "label": "Passed video",
+        "optional": true,
+        "description": "This video will be played if the user successfully passed the quiz."
+      },
+      {
+        "name": "failVideo",
+        "type": "video",
+        "label": "Fail video",
+        "optional": true,
+        "description": "This video will be played if the user failes the quiz."
+      }
+    ]
+  }
+]
\ No newline at end of file

From dee16ccbd1d805c465ef2bb786ae8d6cf7ea4c77 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <falcon@530912.no-reply.drupal.org>
Date: Fri, 3 May 2013 18:51:10 +0200
Subject: [PATCH 21/83] Adding nb translations

---
 language/nb.json | 344 +++++++++++++++++------------------------------
 library.json     |   2 +-
 semantics.json   |   8 +-
 3 files changed, 130 insertions(+), 224 deletions(-)

diff --git a/language/nb.json b/language/nb.json
index 918b9d5..be97449 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -1,223 +1,133 @@
-[
-  {
-    "label": "Tittel",
-    "description": "Spørsmålssettets tittel (valgfri)."
-  },
-  {
-    "label": "Tilfeldig rekkefølge",
-    "description": "Skal spørsmålene vises i tilfeldig rekkefølge?"
-  },
-  {
-    "label": "Første spørsmål",
-    "description": "Spørsmålet som skal komme først.",
-    "default": 0
-  },
-  {
-    "name": "backgroundImage",
-    "type": "image",
-    "label": "Background image",
-    "optional": true,
-    "description": "An optional background image for the Question set."
-  },
-  {
-    "name": "progressType",
-    "type": "select",
-    "label": "Progress indicator",
-    "description": "Question set progress indicator style.",
-    "options": [
-      {
-        "value": "textual",
-        "label": "Textual"
-      },
-      {
-        "value": "dots",
-        "label": "Dots"
+{
+  "semantics": [
+    {
+      "label": "Tittel",
+      "description": "Spørsmålssettets tittel (valgfri)."
+    },
+    {
+      "label": "Bakgrunnsbilde",
+      "description": "Bakgrunnsbilde for spørsmålssettet(ikke obligatorisk)."
+    },
+    {
+      "label": "Fremdriftsindikator",
+      "description": "Velg om fremdriften skal angis som prikker(få spørsmål) eller som tekst(mange spørsmål).",
+      "options": [
+        {
+          "label": "Angi fremdrift med tekst"
+        },
+        {
+          "label": "Angi fremdrift med prikker"
+        }
+      ],
+    },
+    {
+      "label": "Krav for å bestå",
+      "description": "Antall prosent riktig som kreves for å bestå spørsmålssettet."
+    },
+    {
+      "label": "Spørsmål",
+      "entity": "spørsmål",
+      "field": {
+        "label": "Spørsmål",
+        "fields": [
+          {
+            "label": "Spørsmålstype",
+            "description": "Velg spørsmålstype for dette spørsmålet"
+          }
+        ]
       }
-    ],
-    "default": "textual"
-  },
-  {
-    "name": "passPercentage",
-    "type": "number",
-    "label": "Pass percentage",
-    "description": "Percentage of total score required for passing the quiz.",
-    "min": 0,
-    "max": 100,
-    "step": 1,
-    "default": 50
-  },
-  {
-    "name": "questions",
-    "label": "Questions",
-    "type": "list",
-    "entity": "question",
-    "field": {
-      "name": "question",
-      "type": "group",
-      "label": "Question",
+    },
+    {
+      "label": "Introduksjon",
       "fields": [
         {
-          "name": "library",
-          "type": "library",
-          "label": "Question library",
-          "description": "Library for this question.",
-          "options": [
-            "H5P.MultiChoice 1.0"
-          ]
+          "label": "Vis introduksjon"
+        },
+        {
+          "label": "Tittel",
+          "description": "Tittel for intoduksjonssiden."
+        },
+        {
+          "label": "Introduksjonstekst",
+          "description": "Denne teksten vises før spørsmålssettet starter."
+        },
+        {
+          "label": "Tekst til \"Start\" knappen",
+          "default": "Start"
+        }
+      ]
+    },
+    {
+      "label": "Ledetekster",
+      "fields": [
+        {
+          "label": "Tilbake-knappen",
+          "default": "Tilbake"
+        },
+        {
+          "label": "Neste-knappen",
+          "default": "Neste"
+        },
+        {
+          "label": "Avslutt-knappen",
+          "default": "Avslutt"
+        },
+        {
+          "label": "Fremdriftstekst",
+          "description": "Tekst brukt hvis tekstlig angivelse av fremdrift er valgt. Variabler: @current og @total",
+          "default": "Spørsmål @current av @total spørsmål"
+        }
+      ]
+    },
+    {
+      "label": "Spørsmålssett avslutning",
+      "fields": [
+        {
+          "label": "Vis resultater",
+        },
+        {
+          "label": "Tittel ved bestått",
+          "default": "Gratulerer!",
+          "description": "Denne tittelen vises dersom brukeren har bestått spørsmålssettet."
+        },
+        {
+          "label": "Kommentar ved bestått",
+          "default": "Du presterte meget godt!",
+          "description": "Denne kommentaren vises dersom brukeren har bestått spørsmålssettet."
+        },
+        {
+          "label": "Tittel ved ikke bestått",
+          "default": "Ikke bestått",
+          "description": "Denne tittelen vises dersom brukeren ikke har bestått spørsmålssettet."
+        },
+        {
+          "label": "Kommentar ved ikke bestått",
+          "default": "Dette gikk ikke så bra. Prøv igjen!",
+          "description": "Denne kommentaren vises dersom brukeren ikke har bestått spørsmålssettet."
+        },
+        {
+          "label": "Tekst til \"Avslutt\" knapp",
+          "default": "Avslutt"
+        },
+        {
+          "label": "Vis video før resultatene"
+        },
+        {
+          "label": "Tillat å hoppe over video"
+        },
+        {
+          "label": "Tekst til \"Hopp over video\" knapp",
+          "default": "Hopp over"
+        },
+        {
+          "label": "Video ved bestått",
+          "description": "Denne videoen vil bli vist dersom brukeren består spørsmålssettet."
+        },
+        {
+          "label": "Video ved ikke bestått",
+          "description": "Denne videoen vil bli vist dersom brukeren ikke består spørsmålssettet."
         }
       ]
     }
-  },
-  {
-    "name": "introPage",
-    "type": "group",
-    "label": "Quiz introduction",
-    "fields": [
-      {
-        "name": "showIntroPage",
-        "type": "boolean",
-        "label": "Display introduction"
-      },
-      {
-        "name": "title",
-        "type": "text",
-        "label": "Title",
-        "optional": true,
-        "description": "This title will be displayed above the introduction text."
-      },
-      {
-        "name": "introduction",
-        "type": "text",
-        "widget": "textarea",
-        "label": "Introduction text",
-        "optional": true,
-        "description": "This text will be displayed before the quiz starts."
-      },
-      {
-        "name": "startButtonText",
-        "type": "text",
-        "label": "Start button text",
-        "optional": true,
-        "placeholder": "Start Quiz",
-        "default": "Start Quiz"
-      }
-    ]
-  },
-  {
-    "name": "texts",
-    "type": "group",
-    "label": "Interface texts in quiz",
-    "common": true,
-    "fields": [
-      {
-        "name": "prevButton",
-        "type": "text",
-        "label": "Back button",
-        "default": "Previous"
-      },
-      {
-        "name": "nextButton",
-        "type": "text",
-        "label": "Next button",
-        "default": "Next"
-      },
-      {
-        "name": "finishButton",
-        "type": "text",
-        "label": "Finish button",
-        "default": "Finish"
-      },
-      {
-        "name": "textualProgress",
-        "type": "text",
-        "label": "Progress text",
-        "description": "Text used if textual progress is selected.",
-        "default": "Question: @current of @total questions"
-      }
-    ]
-  },
-  {
-    "name": "endGame",
-    "type": "group",
-    "label": "Quiz finished",
-    "fields": [
-      {
-        "name": "showResultPage",
-        "type": "boolean",
-        "label": "Display results",
-        "default": true
-      },
-      {
-        "name": "successGreeting",
-        "type": "text",
-        "label": "Quiz passed title",
-        "placeholder": "Congratulations!",
-        "default": "Congratulations!",
-        "description": "This title will be displayed above results if the user has successfully passed the quiz."
-      },
-      {
-        "name": "successComment",
-        "type": "text",
-        "widget": "textarea",
-        "label": "Passed comment",
-        "default": "You did very well!",
-        "description": "This comment will be displayed after the score if the user has successfully passed the quiz."
-      },
-      {
-        "name": "failGreeting",
-        "type": "text",
-        "label": "Quiz failed title",
-        "placeholder": "Oh, no!",
-        "default": "Oh, no!",
-        "description": "This title will be displayed above the results if the user has failed the quiz."
-      },
-      {
-        "name": "failComment",
-        "type": "text",
-        "widget": "textarea",
-        "label": "Failed comment",
-        "default": "This didn't go so well.",
-        "description": "This comment will be displayed after the score if the user has failed the quiz."
-      },
-      {
-        "name": "finishButtonText",
-        "type": "text",
-        "label": "Finish button text",
-        "default": "Finish",
-        "description": "Text for the finish button."
-      },
-      {
-        "name": "showAnimations",
-        "type": "boolean",
-        "label": "Display video before quiz results"
-      },
-      {
-        "name": "skippable",
-        "type": "boolean",
-        "label": "Enable skip video button"
-      },
-      {
-        "name": "skipButtonText",
-        "type": "text",
-        "label": "Skip video button label",
-        "default": "Skip video",
-        "description": "This is the label for the button which allows users to skip videos after a quiz.",
-        "common": true
-      },
-      {
-        "name": "successVideo",
-        "type": "video",
-        "label": "Passed video",
-        "optional": true,
-        "description": "This video will be played if the user successfully passed the quiz."
-      },
-      {
-        "name": "failVideo",
-        "type": "video",
-        "label": "Fail video",
-        "optional": true,
-        "description": "This video will be played if the user failes the quiz."
-      }
-    ]
-  }
-]
\ No newline at end of file
+  ]
+}
\ No newline at end of file
diff --git a/library.json b/library.json
index 8ed289f..834deab 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 8,
+  "patchVersion": 9,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",
diff --git a/semantics.json b/semantics.json
index 5615235..f82ac43 100644
--- a/semantics.json
+++ b/semantics.json
@@ -52,7 +52,7 @@
         {
           "name": "library",
           "type": "library",
-          "label": "Question library",
+          "label": "Question type",
           "description": "Library for this question.",
           "options": [
             "H5P.MultiChoice 1.0"
@@ -91,7 +91,6 @@
         "type": "text",
         "label": "Start button text",
         "optional": true,
-        "placeholder": "Start Quiz",
         "default": "Start Quiz"
       }
     ]
@@ -160,7 +159,6 @@
         "name": "failGreeting",
         "type": "text",
         "label": "Quiz failed title",
-        "placeholder": "Oh, no!",
         "default": "Oh, no!",
         "description": "This title will be displayed above the results if the user has failed the quiz."
       },
@@ -183,8 +181,7 @@
         "name": "finishButtonText",
         "type": "text",
         "label": "Finish button text",
-        "default": "Finish",
-        "description": "Text for the finish button."
+        "default": "Finish"
       },
       {
         "name": "showAnimations",
@@ -201,7 +198,6 @@
         "type": "text",
         "label": "Skip video button label",
         "default": "Skip video",
-        "description": "This is the label for the button which allows users to skip videos after a quiz.",
         "common": true
       },
       {

From 7c8f3bb813bd8321ef83d4bda8aea7cf5261fcc3 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <falcon@530912.no-reply.drupal.org>
Date: Fri, 3 May 2013 19:51:13 +0200
Subject: [PATCH 22/83] Add missing translations and fix json errors

---
 language/nb.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/language/nb.json b/language/nb.json
index be97449..ddf6ec7 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -18,7 +18,7 @@
         {
           "label": "Angi fremdrift med prikker"
         }
-      ],
+      ]
     },
     {
       "label": "Krav for å bestå",
@@ -83,7 +83,7 @@
       "label": "Spørsmålssett avslutning",
       "fields": [
         {
-          "label": "Vis resultater",
+          "label": "Vis resultater"
         },
         {
           "label": "Tittel ved bestått",

From 8a15f5e7fb29f10dd944a3df8d56103174507c80 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Sat, 4 May 2013 15:19:22 +0200
Subject: [PATCH 23/83] Improved summary semantics, start integrating
 dragQuestion in boardgame

---
 semantics.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/semantics.json b/semantics.json
index f82ac43..9d4d2fe 100644
--- a/semantics.json
+++ b/semantics.json
@@ -55,7 +55,8 @@
           "label": "Question type",
           "description": "Library for this question.",
           "options": [
-            "H5P.MultiChoice 1.0"
+            "H5P.MultiChoice 1.0",
+            "H5P.DragQuestion 1.0"
           ]
         }
       ]

From 7c0e4e4b85089383b200409783dc7e6b326ccf67 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Mon, 6 May 2013 01:36:46 +0200
Subject: [PATCH 24/83] Fix various bugs

---
 js/questionset.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index 2a52995..851d74f 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -302,7 +302,7 @@ H5P.QuestionSet = function (options, contentId) {
 
     $('.qs-startbutton', $myDom).click(function () {
       $(this).parents('.intro-page').hide();
-      $('.questionset', $myDom).removeClass('hidden');
+      $('.questionset', $myDom).addClass('started').removeClass('hidden');
     });
 
     // Set event listeners.

From da62f4f41a348d7cba795f967ff25222a8fb6301 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Mon, 6 May 2013 01:47:53 +0200
Subject: [PATCH 25/83] Fix problems with transition messing up height and
 width calculations

---
 js/questionset.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index 851d74f..be582ed 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -299,10 +299,13 @@ H5P.QuestionSet = function (options, contentId) {
         $('#qdot-'+i, $myDom).removeClass('unanswered').addClass('answered');
       }
     }
+    
+    // Allow other libraries to add transitions after the questions have been inited
+    $('.questionset', $myDom).addClass('started');
 
     $('.qs-startbutton', $myDom).click(function () {
       $(this).parents('.intro-page').hide();
-      $('.questionset', $myDom).addClass('started').removeClass('hidden');
+      $('.questionset', $myDom).removeClass('hidden');
     });
 
     // Set event listeners.

From 1c69ec84421c026ebaf51de2af8d6812aa1eaaed Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <falcon@530912.no-reply.drupal.org>
Date: Mon, 6 May 2013 10:21:36 +0200
Subject: [PATCH 26/83] Updating patch version

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 834deab..e74067b 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 9,
+  "patchVersion": 10,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From 355d847bb1848ec7e76488f1b92a8be525b3dbac Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Mon, 6 May 2013 14:54:24 +0200
Subject: [PATCH 27/83] Adjusted questionset to make dots more visible. Removed
 optional title.

---
 css/questionset.css | 35 +++++++++++++++++++++--------------
 js/questionset.js   | 12 +-----------
 language/nb.json    |  8 ++------
 semantics.json      |  6 ------
 4 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 953313f..469029f 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -7,31 +7,38 @@
 .questionset .h5p-multichoice > .h5p-show-solution {
   display: none;
 }
-.questionset > .title {
-  font-size: 2em;
-  margin: 0.5em 0.16em 0.16em;
-}
 .dots-container {
   text-align: center;
+  line-height: 2em;
 }
 .progress-dot {
   display: inline-block;
-  width: 10px;
-  height: 10px;
+  width: 0.75em;
+  height: 0.75em;
   border-radius: 50%;
-  border: 1px solid #494949;
-  margin: 0 3px;
+  margin: 0 0.25em;
   cursor: pointer;
+  background: #fff;
+  border: 0.0625em solid #c7c7c7;
+}
+.progress-dot:hover {
+  box-shadow: 0 0 0.5em #c7c7c7;
 }
 .progress-dot.answered {
-  background: #494949;
+  border: 0.0625em solid #fff;
+  background: #bccade;
 }
 .progress-dot.current {
-  box-shadow: 1px 1px 4px #494949;
-  margin: -1px 4px 1px 2px;
-}
-.intro-page {
-
+  width: 1em;
+  height: 1em;
+  border: 0.0625em solid #fff;
+  margin-bottom: -0.125em;
+  background: #267ec9;
+  background-image: -webkit-linear-gradient(top, #3999ea, #267ec9);
+  background-image: -moz-linear-gradient(top, #3999ea, #267ec9);
+  background-image: -o-linear-gradient(top, #3999ea, #267ec9);
+  background-image: -ms-linear-gradient(top, #3999ea, #267ec9);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3999ea', endColorstr='#267ec9',GradientType=0);
 }
 .intro-page .title {
   font-size: 2em;
diff --git a/js/questionset.js b/js/questionset.js
index be582ed..b8d5c89 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -3,14 +3,6 @@ var H5P = H5P || {};
 /**
  * Will render a Question with multiple choices for answers.
  *
- * Options format:
- * {
- *   title: "Optional title for question box",
- *   question: "Question text",
- *   answers: [{text: "Answer text", correct: false}, ...],
- *   singleAnswer: true, // or false, will change rendered output slightly.
- * }
- *
  * Events provided:
  * - h5pQuestionSetFinished: Triggered when a question is finished. (User presses Finish-button)
  *
@@ -35,7 +27,6 @@ H5P.QuestionSet = function (options, contentId) {
           '</div>' +
           '<% } %>' +
           '<div class="questionset<% if (introPage.showIntroPage) { %> hidden<% } %>">' +
-          '  <% if (title !== "") { %><div class="title"><%= title %></div><% } %>' +
           '  <% for (var i=0; i<questions.length; i++) { %>' +
           '    <div class="question-container" id="q-<%= i %>">' +
           '      <div><%= questions[i].library %></div>' +
@@ -68,7 +59,6 @@ H5P.QuestionSet = function (options, contentId) {
           '</div>';
 
   var defaults = {
-    title: '',
     randomOrder: false,
     initialQuestion: 0,
     backgroundImage: undefined,
@@ -299,7 +289,7 @@ H5P.QuestionSet = function (options, contentId) {
         $('#qdot-'+i, $myDom).removeClass('unanswered').addClass('answered');
       }
     }
-    
+
     // Allow other libraries to add transitions after the questions have been inited
     $('.questionset', $myDom).addClass('started');
 
diff --git a/language/nb.json b/language/nb.json
index ddf6ec7..22addf2 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -1,9 +1,5 @@
 {
   "semantics": [
-    {
-      "label": "Tittel",
-      "description": "Spørsmålssettets tittel (valgfri)."
-    },
     {
       "label": "Bakgrunnsbilde",
       "description": "Bakgrunnsbilde for spørsmålssettet(ikke obligatorisk)."
@@ -61,8 +57,8 @@
       "label": "Ledetekster",
       "fields": [
         {
-          "label": "Tilbake-knappen",
-          "default": "Tilbake"
+          "label": "Forrige-knappen",
+          "default": "Forrige"
         },
         {
           "label": "Neste-knappen",
diff --git a/semantics.json b/semantics.json
index 9d4d2fe..a785859 100644
--- a/semantics.json
+++ b/semantics.json
@@ -1,10 +1,4 @@
 [
-  {
-    "name": "title",
-    "type": "text",
-    "label": "Title",
-    "description": "Question set title (optional)."
-  },
   {
     "name": "backgroundImage",
     "type": "image",

From afe6404e0a0ffce96692c0de6b9e47af015f48d8 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Mon, 6 May 2013 16:58:24 +0200
Subject: [PATCH 28/83] Added Blanks to questionsset and fixed bugs.

---
 css/questionset.css |  2 +-
 js/questionset.js   | 23 ++++++++++-------------
 semantics.json      |  3 ++-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 469029f..6da07d3 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -4,7 +4,7 @@
 .questionset.hidden {
   display: none;
 }
-.questionset .h5p-multichoice > .h5p-show-solution {
+.questionset .h5p-multichoice > .h5p-show-solution, .h5p-blanks .h5p-button {
   display: none;
 }
 .dots-container {
diff --git a/js/questionset.js b/js/questionset.js
index b8d5c89..7ce5e96 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -28,7 +28,7 @@ H5P.QuestionSet = function (options, contentId) {
           '<% } %>' +
           '<div class="questionset<% if (introPage.showIntroPage) { %> hidden<% } %>">' +
           '  <% for (var i=0; i<questions.length; i++) { %>' +
-          '    <div class="question-container" id="q-<%= i %>">' +
+          '    <div class="question-container">' +
           '      <div><%= questions[i].library %></div>' +
           '    </div>' +
           '  <% } %>' +
@@ -37,7 +37,7 @@ H5P.QuestionSet = function (options, contentId) {
           '      <% if (progressType == "dots") { %>' +
           '        <div class="dots-container">' +
           '          <% for (var i=0; i<questions.length; i++) { %>' +
-          '          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>' +
+          '          <span class="progress-dot unanswered"></span>' +
           '          <%} %>' +
           '        </div>' +
           '      <% } else if (progressType == "textual") { %>' +
@@ -148,10 +148,7 @@ H5P.QuestionSet = function (options, contentId) {
     }
 
      // Hide all questions
-    $('.question-container', $myDom).hide();
-
-    // Reshow the requested question
-    $('#q-' + questionNumber, $myDom).show();
+    $('.question-container', $myDom).hide().eq(questionNumber).show();
 
     // Update progress indicator
     // Test if current has been answered.
@@ -161,7 +158,7 @@ H5P.QuestionSet = function (options, contentId) {
     else {
       // Set currentNess
       $('.progress-dot.current', $myDom).removeClass('current');
-      $('#qdot-' + questionNumber, $myDom).addClass('current');
+      $('.progress-dot:eq(' + questionNumber +')', $myDom).addClass('current');
     }
 
     // Remember where we are
@@ -279,14 +276,15 @@ H5P.QuestionSet = function (options, contentId) {
     // Attach questions
     for (var i = 0; i < questionInstances.length; i++) {
       var question = questionInstances[i];
-      // TODO: Render on init, inject in template.
-      question.attach('q-' + i);
+
+      question.attach($('.question-container:eq(' + i + ')', $myDom));
       $(question).on('h5pQuestionAnswered', function () {
-        $('#qdot-' + currentQuestion, $myDom).removeClass('unanswered').addClass('answered');
+        $('.progress-dot:eq(' + currentQuestion +')', $myDom).removeClass('unanswered').addClass('answered');
         _updateButtons();
       });
       if (question.getAnswerGiven()) {
-        $('#qdot-'+i, $myDom).removeClass('unanswered').addClass('answered');
+        $('.progress-dot:eq(' + i +')'
+        , $myDom).removeClass('unanswered').addClass('answered');
       }
     }
 
@@ -300,8 +298,7 @@ H5P.QuestionSet = function (options, contentId) {
 
     // Set event listeners.
     $('.progress-dot', $myDom).click(function () {
-      var idx = parseInt($(this).attr('id').split('-')[1], 10);
-      _showQuestion(idx);
+      _showQuestion($(this).index());
     });
     $('.next.button', $myDom).click(function () {
       _showQuestion(currentQuestion + 1);
diff --git a/semantics.json b/semantics.json
index a785859..02a3544 100644
--- a/semantics.json
+++ b/semantics.json
@@ -50,7 +50,8 @@
           "description": "Library for this question.",
           "options": [
             "H5P.MultiChoice 1.0",
-            "H5P.DragQuestion 1.0"
+            "H5P.DragQuestion 1.0",
+            "H5P.Blanks 1.0"
           ]
         }
       ]

From 29981b9f161cea90d2a92169853f337eb11a244e Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Tue, 7 May 2013 10:00:09 +0200
Subject: [PATCH 29/83] Updated patch level.

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index e74067b..eb04667 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 10,
+  "patchVersion": 11,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From a5cba503e3e68ef392b8c5da361ba74fb54937d2 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Tue, 7 May 2013 17:41:19 +0200
Subject: [PATCH 30/83] Updated questionset.

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index eb04667..8a69ccf 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 11,
+  "patchVersion": 12,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From cab6c070472a4d91ff089edf97b109a6707cc8c2 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <falcon@530912.no-reply.drupal.org>
Date: Fri, 10 May 2013 17:59:53 +0200
Subject: [PATCH 31/83] Update language files, and fix bug in checkbox field

---
 language/nb.json |   4 +-
 language/nn.json | 129 +++++++++++++++++++++++++++++++++++++++++++++++
 library.json     |   2 +-
 3 files changed, 132 insertions(+), 3 deletions(-)
 create mode 100644 language/nn.json

diff --git a/language/nb.json b/language/nb.json
index 22addf2..b5ccc5f 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -71,7 +71,7 @@
         {
           "label": "Fremdriftstekst",
           "description": "Tekst brukt hvis tekstlig angivelse av fremdrift er valgt. Variabler: @current og @total",
-          "default": "Spørsmål @current av @total spørsmål"
+          "default": " Deloppgåve @current av @total"
         }
       ]
     },
@@ -126,4 +126,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/language/nn.json b/language/nn.json
new file mode 100644
index 0000000..4754738
--- /dev/null
+++ b/language/nn.json
@@ -0,0 +1,129 @@
+{
+  "semantics": [
+    {
+      "label": "Bakgrunnsbilde",
+      "description": "Bakgrunnsbilde for spørsmålssettet(ikke obligatorisk)."
+    },
+    {
+      "label": "Fremdriftsindikator",
+      "description": "Velg om fremdriften skal angis som prikker(få spørsmål) eller som tekst(mange spørsmål).",
+      "options": [
+        {
+          "label": "Angi fremdrift med tekst"
+        },
+        {
+          "label": "Angi fremdrift med prikker"
+        }
+      ]
+    },
+    {
+      "label": "Krav for å bestå",
+      "description": "Antall prosent riktig som kreves for å bestå spørsmålssettet."
+    },
+    {
+      "label": "Spørsmål",
+      "entity": "spørsmål",
+      "field": {
+        "label": "Spørsmål",
+        "fields": [
+          {
+            "label": "Spørsmålstype",
+            "description": "Velg spørsmålstype for dette spørsmålet"
+          }
+        ]
+      }
+    },
+    {
+      "label": "Introduksjon",
+      "fields": [
+        {
+          "label": "Vis introduksjon"
+        },
+        {
+          "label": "Tittel",
+          "description": "Tittel for intoduksjonssiden."
+        },
+        {
+          "label": "Introduksjonstekst",
+          "description": "Denne teksten vises før spørsmålssettet starter."
+        },
+        {
+          "label": "Tekst til \"Start\" knappen",
+          "default": "Start"
+        }
+      ]
+    },
+    {
+      "label": "Ledetekster",
+      "fields": [
+        {
+          "label": "Forrige-knappen",
+          "default": "Forrige"
+        },
+        {
+          "label": "Neste-knappen",
+          "default": "Neste"
+        },
+        {
+          "label": "Avslutt-knappen",
+          "default": "Avslutt"
+        },
+        {
+          "label": "Fremdriftstekst",
+          "description": "Tekst brukt hvis tekstlig angivelse av fremdrift er valgt. Variabler: @current og @total",
+          "default": "Deloppgave @current av @total"
+        }
+      ]
+    },
+    {
+      "label": "Spørsmålssett avslutning",
+      "fields": [
+        {
+          "label": "Vis resultater"
+        },
+        {
+          "label": "Tittel ved bestått",
+          "default": "Gratulerer!",
+          "description": "Denne tittelen vises dersom brukeren har bestått spørsmålssettet."
+        },
+        {
+          "label": "Kommentar ved bestått",
+          "default": "Du presterte meget godt!",
+          "description": "Denne kommentaren vises dersom brukaren har bestått spørsmålssettet."
+        },
+        {
+          "label": "Tittel ved ikkje bestått",
+          "default": "Ikkje bestått",
+          "description": "Denne tittelen visast dersom brukaren ikkje har bestått spørsmålssettet."
+        },
+        {
+          "label": "Kommentar ved ikkje bestått",
+          "default": "Dette gikk ikkje så bra. Prøv igjen!",
+          "description": "Denne kommentaren vises dersom brukaren ikkje har bestått spørsmålssettet."
+        },
+        {
+          "label": "Tekst til \"Avslutt\" knapp",
+          "default": "Avslutt"
+        },
+        {
+          "label": "Vis video før resultata"
+        },
+        {
+          "label": "Tillat å hoppe over video"
+        },
+        {
+          "label": "Tekst til \"Hopp over video\" knapp",
+          "default": "Hopp over"
+        },
+        {
+          "label": "Video ved bestått",
+          "description": "Denne videoen vil bli vist dersom brukaren består spørsmålssettet."
+        },
+        {
+          "label": "Video ved ikke bestått",
+          "description": "Denne videoen vil bli vist dersom brukaren ikkje består spørsmålssettet."
+        }
+      ]
+    }
+  ]
+}
diff --git a/library.json b/library.json
index 8a69ccf..dbb41dd 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 12,
+  "patchVersion": 13,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From a4a2a4c959ac69065ff9395636a41c7db32a320e Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <s.t.g.with@gmail.com>
Date: Sun, 12 May 2013 00:08:05 +0200
Subject: [PATCH 32/83] Make fields optional

---
 library.json   | 2 +-
 semantics.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/library.json b/library.json
index dbb41dd..df1c119 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 13,
+  "patchVersion": 14,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",
diff --git a/semantics.json b/semantics.json
index 02a3544..f85af40 100644
--- a/semantics.json
+++ b/semantics.json
@@ -141,6 +141,7 @@
         "label": "Quiz passed title",
         "placeholder": "Congratulations!",
         "default": "Congratulations!",
+        "optional": true,
         "description": "This title will be displayed above results if the user has successfully passed the quiz."
       },
       {
@@ -149,6 +150,7 @@
         "widget": "textarea",
         "label": "Passed comment",
         "default": "You did very well!",
+        "optional": true,
         "description": "This comment will be displayed after the score if the user has successfully passed the quiz."
       },
       {
@@ -156,6 +158,7 @@
         "type": "text",
         "label": "Quiz failed title",
         "default": "Oh, no!",
+        "optional": true,
         "description": "This title will be displayed above the results if the user has failed the quiz."
       },
       {
@@ -164,6 +167,7 @@
         "widget": "textarea",
         "label": "Failed comment",
         "default": "This didn't go so well.",
+        "optional": true,
         "description": "This comment will be displayed after the score if the user has failed the quiz."
       },
       {

From 5ff8612801837caf3be5cd0dfbe8246ee58874eb Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Mon, 13 May 2013 14:08:01 +0200
Subject: [PATCH 33/83] Fixed white background and background image in QS.
 Improved IE8 support in multichoice.

---
 css/questionset.css | 8 ++++++++
 js/questionset.js   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/css/questionset.css b/css/questionset.css
index 6da07d3..c1ffbfb 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -7,6 +7,14 @@
 .questionset .h5p-multichoice > .h5p-show-solution, .h5p-blanks .h5p-button {
   display: none;
 }
+.questionset, .intro-page, .questionset-results {
+  position: relative;
+  margin: 1.5em;
+  box-shadow: 0 0 0.625em 0 #515151;
+  background-color: rgba(255,255,255,.75);
+  filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#BFFFFFFF,endColorstr=#BFFFFFFF);
+  zoom: 1;
+}
 .dots-container {
   text-align: center;
   line-height: 2em;
diff --git a/js/questionset.js b/js/questionset.js
index 7ce5e96..725df10 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -269,7 +269,9 @@ H5P.QuestionSet = function (options, contentId) {
     $myDom.html(template.render(params));
     if (params.backgroundImage !== undefined) {
       $myDom.css({
-        background: 'url(' + cp + params.backgroundImage.path + ')'
+        overflow: 'hidden',
+        background: '#000 url(' + cp + params.backgroundImage.path + ') no-repeat 50% 50%',
+        backgroundSize: '100% auto'
       });
     }
 

From 3c9e99cfa31fa39523da8c2828874c2793d13203 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 15 May 2013 14:16:21 +0200
Subject: [PATCH 34/83] Fixed questionset background and contrast issues. Fixed
 boardgame question animation.

---
 css/questionset.css | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index c1ffbfb..e1a55d2 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -9,10 +9,14 @@
 }
 .questionset, .intro-page, .questionset-results {
   position: relative;
-  margin: 1.5em;
-  box-shadow: 0 0 0.625em 0 #515151;
-  background-color: rgba(255,255,255,.75);
-  filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#BFFFFFFF,endColorstr=#BFFFFFFF);
+}
+.h5p-multichoice > .h5p-question {
+  margin: 1em 0.5em 0;
+  padding: 0.5em 0.75em;
+  box-shadow: 0 0 0.5em #e3e3e3;
+  border-radius: 0.5em;
+  background: rgba(255, 255, 255, 0.9);
+  filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6FFFFFF,endColorstr=#e6FFFFFF);
   zoom: 1;
 }
 .dots-container {

From 14817c2c7f47973ea842ce98db29cd952488d2bc Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <falcon@530912.no-reply.drupal.org>
Date: Wed, 22 May 2013 09:04:21 +0200
Subject: [PATCH 35/83] Fix text readability with high contrast backgrounds

---
 css/questionset.css | 2 ++
 library.json        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/css/questionset.css b/css/questionset.css
index e1a55d2..1a6b36a 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -125,6 +125,8 @@
 
 .questionset-results {
   text-align: center;
+  background: rgba(255, 255, 255, 0.9);
+  filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#E6FFFFFF,endColorstr=#E6FFFFFF);
 }
 
 .questionset-results .greeting {
diff --git a/library.json b/library.json
index df1c119..91ba647 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 14,
+  "patchVersion": 15,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From 4e0f99eb2266218edbd6d87e8bdebb5dc29509a9 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Thu, 20 Jun 2013 13:41:13 +0200
Subject: [PATCH 36/83] RDM-1299: Add missing field in norwegian translations

---
 language/nb.json | 7 ++++++-
 language/nn.json | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/language/nb.json b/language/nb.json
index b5ccc5f..32d1f28 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -71,7 +71,7 @@
         {
           "label": "Fremdriftstekst",
           "description": "Tekst brukt hvis tekstlig angivelse av fremdrift er valgt. Variabler: @current og @total",
-          "default": " Deloppgåve @current av @total"
+          "default": "Deloppgåve @current av @total"
         }
       ]
     },
@@ -101,6 +101,11 @@
           "default": "Dette gikk ikke så bra. Prøv igjen!",
           "description": "Denne kommentaren vises dersom brukeren ikke har bestått spørsmålssettet."
         },
+        {
+          "label": "Tekst til \"Fasit\" knapp",
+          "default": "Vis fasit",
+          "description": ""
+        },
         {
           "label": "Tekst til \"Avslutt\" knapp",
           "default": "Avslutt"
diff --git a/language/nn.json b/language/nn.json
index 4754738..b64f8b8 100644
--- a/language/nn.json
+++ b/language/nn.json
@@ -101,6 +101,11 @@
           "default": "Dette gikk ikkje så bra. Prøv igjen!",
           "description": "Denne kommentaren vises dersom brukaren ikkje har bestått spørsmålssettet."
         },
+        {
+          "label": "Tekst til \"Fasit\" knapp",
+          "default": "Vis fasit",
+          "description": ""
+        },
         {
           "label": "Tekst til \"Avslutt\" knapp",
           "default": "Avslutt"

From 0bd174b54aaf2d94f9951137ccc1c92acfb76980 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Mon, 24 Jun 2013 14:27:50 +0200
Subject: [PATCH 37/83] OPPG-407: Removed default list max 15.

---
 semantics.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/semantics.json b/semantics.json
index f85af40..7859cfa 100644
--- a/semantics.json
+++ b/semantics.json
@@ -37,6 +37,7 @@
     "name": "questions",
     "label": "Questions",
     "type": "list",
+    "min": 1,
     "entity": "question",
     "field": {
       "name": "question",

From ecbc6dbbdb44e3617b1ad931be84f248362c6f68 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Thu, 27 Jun 2013 09:46:56 +0200
Subject: [PATCH 38/83] Updated patch versions of modified libs

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 91ba647..5a278aa 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 15,
+  "patchVersion": 16,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From ddb6893d35832d304d22947d62c30b4a9d5cfe67 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Thu, 27 Jun 2013 14:13:00 +0200
Subject: [PATCH 39/83] OPPG-376: Added hook for modifying params. Replace
 getContentPath with getPath to reduce code and display absolute urls.

---
 js/questionset.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 725df10..1fb1559 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -16,7 +16,6 @@ H5P.QuestionSet = function (options, contentId) {
   }
 
   var $ = H5P.jQuery;
-  var cp = H5P.getContentPath(contentId);
 
   var texttemplate =
           '<% if (introPage.showIntroPage) { %>' +
@@ -234,7 +233,7 @@ H5P.QuestionSet = function (options, contentId) {
           fitToWrapper: true,
           controls: false,
           autoplay: true
-        }, cp);
+        }, contentId);
         video.endedCallback = function () {
           displayResults();
           $videoContainer.hide();
@@ -270,7 +269,7 @@ H5P.QuestionSet = function (options, contentId) {
     if (params.backgroundImage !== undefined) {
       $myDom.css({
         overflow: 'hidden',
-        background: '#000 url(' + cp + params.backgroundImage.path + ') no-repeat 50% 50%',
+        background: '#000 url(' + H5P.getPath(contentId, params.backgroundImage.path) + ') no-repeat 50% 50%',
         backgroundSize: '100% auto'
       });
     }

From 67acf39696174f02d56300c24730dd96265ace4a Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Thu, 27 Jun 2013 14:29:56 +0200
Subject: [PATCH 40/83] OPPG-376: The forgotten code!

---
 js/questionset.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index 1fb1559..07bd238 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -269,7 +269,7 @@ H5P.QuestionSet = function (options, contentId) {
     if (params.backgroundImage !== undefined) {
       $myDom.css({
         overflow: 'hidden',
-        background: '#000 url(' + H5P.getPath(contentId, params.backgroundImage.path) + ') no-repeat 50% 50%',
+        background: '#000 url(' + H5P.getPath(params.backgroundImage.path, contentId) + ') no-repeat 50% 50%',
         backgroundSize: '100% auto'
       });
     }

From c1595ec380f238171b30be810f34771121cd34f3 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Fri, 28 Jun 2013 14:24:20 +0200
Subject: [PATCH 41/83] Monkey-updated version number before uploading to the
 mothership.

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 5a278aa..35c2749 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 16,
+  "patchVersion": 17,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From 1ea56b7d4d5149b056b2b596ff35ffb4a5a7098b Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Thu, 4 Jul 2013 11:13:30 +0200
Subject: [PATCH 42/83] E-MAIL: Added api extend dep. for question set. Renamed
 a function to avoid double instances.

---
 library.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library.json b/library.json
index 35c2749..3c21cac 100644
--- a/library.json
+++ b/library.json
@@ -15,6 +15,11 @@
     {"path": "css/questionset.css"}
   ],
   "preloadedDependencies": [
+    {
+      "machineName": "H5P.API",
+      "majorVersion": 1,
+      "minorVersion": 0
+    },
     {
       "machineName": "EmbeddedJS",
       "majorVersion": 1,

From b8a13c8ae162efb6a3324501d9c3b9dd1f691cbc Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Thu, 4 Jul 2013 12:58:20 +0200
Subject: [PATCH 43/83] E-MAIL: Update patch levels. Added API to flashcards.

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 3c21cac..123aba5 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 17,
+  "patchVersion": 18,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From 89b74e7839c0238292306d5b5b0d11dcf5de10e2 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Thu, 4 Jul 2013 13:27:28 +0200
Subject: [PATCH 44/83] E-MAIL: Added core fix to all libraries who need it.
 Updated patch levels.

---
 js/questionset.js | 19 +++++++++++++++++++
 library.json      |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index 07bd238..17e09c0 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -1,5 +1,24 @@
 var H5P = H5P || {};
 
+if (H5P.getPath === undefined) {
+  /**
+   * Find the path to the content files based on the id of the content
+   *
+   * Also identifies and returns absolute paths
+   *
+   * @param {String} path Absolute path to a file, or relative path to a file in the content folder
+   * @param {Number} contentId Identifier of the content requesting the path
+   * @returns {String} The path to use.
+   */
+  H5P.getPath = function (path, contentId) {
+    if (path.substr(0, 7) === 'http://' || path.substr(0, 8) === 'https://') {
+      return path;
+    }
+
+    return H5PIntegration.getContentPath(contentId) + path;
+  };
+}
+
 /**
  * Will render a Question with multiple choices for answers.
  *
diff --git a/library.json b/library.json
index 123aba5..cbafc0a 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 18,
+  "patchVersion": 19,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From 52659a52f76ab1d4d846ed0db105ff60733f42aa Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Mon, 8 Jul 2013 11:37:33 +0200
Subject: [PATCH 45/83] BUGFIX: Flatten Questionset questions array

---
 library.json   |  2 +-
 semantics.json | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/library.json b/library.json
index cbafc0a..9e1eaae 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 19,
+  "patchVersion": 20,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",
diff --git a/semantics.json b/semantics.json
index 7859cfa..f08eee5 100644
--- a/semantics.json
+++ b/semantics.json
@@ -41,20 +41,13 @@
     "entity": "question",
     "field": {
       "name": "question",
-      "type": "group",
-      "label": "Question",
-      "fields": [
-        {
-          "name": "library",
-          "type": "library",
-          "label": "Question type",
-          "description": "Library for this question.",
-          "options": [
-            "H5P.MultiChoice 1.0",
-            "H5P.DragQuestion 1.0",
-            "H5P.Blanks 1.0"
-          ]
-        }
+      "type": "library",
+      "label": "Question type",
+      "description": "Library for this question.",
+      "options": [
+        "H5P.MultiChoice 1.0",
+        "H5P.DragQuestion 1.0",
+        "H5P.Blanks 1.0"
       ]
     }
   },

From 9e436d46a81615cee694a8233ffedab1a57becc1 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Mon, 8 Jul 2013 14:29:13 +0200
Subject: [PATCH 46/83] OPPG-131: First version of Vtabs. Missing tab labels.

---
 library.json   | 7 +++++++
 semantics.json | 1 +
 2 files changed, 8 insertions(+)

diff --git a/library.json b/library.json
index cbafc0a..bfeb8bd 100644
--- a/library.json
+++ b/library.json
@@ -30,5 +30,12 @@
       "majorVersion": 1,
       "minorVersion": 0
     }
+  ],
+  "editorDependencies": [
+    {
+      "machineName": "H5PEditor.VerticalTabs",
+      "majorVersion": 1,
+      "minorVersion": 0
+    }
   ]
 }
diff --git a/semantics.json b/semantics.json
index 7859cfa..88d4450 100644
--- a/semantics.json
+++ b/semantics.json
@@ -37,6 +37,7 @@
     "name": "questions",
     "label": "Questions",
     "type": "list",
+    "widget": "verticalTabs",
     "min": 1,
     "entity": "question",
     "field": {

From 1b9eb78d9a566c133c535a5d584c194fd673f162 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Mon, 8 Jul 2013 18:18:59 +0200
Subject: [PATCH 47/83] Removed virus and unused ejs files.

---
 views/questionset-results.ejs |  6 ------
 views/questionset.ejs         | 31 -------------------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 views/questionset-results.ejs
 delete mode 100644 views/questionset.ejs

diff --git a/views/questionset-results.ejs b/views/questionset-results.ejs
deleted file mode 100644
index 722776d..0000000
--- a/views/questionset-results.ejs
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="questionset-results">
-  <div class="greeting"><%= greeting %></div>
-  <div class="score <%= scoreclass %>"><%= score %></div>
-  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>
-  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>
-</div>
diff --git a/views/questionset.ejs b/views/questionset.ejs
deleted file mode 100644
index 5219d42..0000000
--- a/views/questionset.ejs
+++ /dev/null
@@ -1,31 +0,0 @@
-<% if (introPage.showIntroPage) { %>
-<div class="intro-page">
-  <div class="title"><%= introPage.title %></div>
-  <div class="introduction"><%= introPage.introduction %></div>
-  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>
-</div>
-<%} %>
-<div class="questionset hidden">
-  <div class="title"><%= title %></div>
-  <% for (var i=0; i<questions.length; i++) { %>
-    <div class="question-container" id="q-<%= i %>">
-      <div><%= questions[i].name %></div>
-    </div>
-  <% } %>
-  <div class="qs-footer">
-    <div class="qs-progress">
-      <% if (progressType == "dots") { %>
-        <div class="dots-container">
-          <% for (var i=0; i<questions.length; i++) { %>
-          <span class="progress-dot unanswered" id="qdot-<%= i %>"></span>
-          <%} %>
-        </div>
-      <% } else if (progressType == "textual") { %>
-        <span class="progress-text"></span>
-      <% } %>
-    </div>
-    <a class="prev button"><%= texts.prevButton %></a>
-    <a class="next button"><%= texts.nextButton %></a>
-    <a class="finish button"><%= texts.finishButton %></a>
-  </div>
-</div>

From 6fd7e9fe026b79732ce2662ec632c200ee3191d6 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Tue, 9 Jul 2013 15:51:27 +0200
Subject: [PATCH 48/83] Fixed boardgame validation.

---
 semantics.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/semantics.json b/semantics.json
index 93c92a5..034b4e0 100644
--- a/semantics.json
+++ b/semantics.json
@@ -142,7 +142,7 @@
       {
         "name": "successComment",
         "type": "text",
-        "widget": "textarea",
+        "widget": "html",
         "label": "Passed comment",
         "default": "You did very well!",
         "optional": true,
@@ -159,7 +159,7 @@
       {
         "name": "failComment",
         "type": "text",
-        "widget": "textarea",
+        "widget": "html",
         "label": "Failed comment",
         "default": "This didn't go so well.",
         "optional": true,

From e061b84f12416d17696710a997b42b1c68b2eebb Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Wed, 10 Jul 2013 10:34:17 +0200
Subject: [PATCH 49/83] TST-5185: Make QuestionSet introduction text an HTML
 field. Allow sub/sup and math.

---
 semantics.json | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/semantics.json b/semantics.json
index 034b4e0..5da9ba2 100644
--- a/semantics.json
+++ b/semantics.json
@@ -72,10 +72,19 @@
       {
         "name": "introduction",
         "type": "text",
-        "widget": "textarea",
+        "widget": "html",
         "label": "Introduction text",
         "optional": true,
-        "description": "This text will be displayed before the quiz starts."
+        "description": "This text will be displayed before the quiz starts.",
+        "enterMode": "p",
+        "tags": [
+          "sub",
+          "sup",
+          "math",
+          "strong",
+          "em",
+          "p"
+        ]
       },
       {
         "name": "startButtonText",

From 821c9bd0d54921f5444b05451d799571d863ae31 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Mon, 15 Jul 2013 09:27:13 +0200
Subject: [PATCH 50/83] Updated semantics

Added tags for text fields in Boardgame, Multichoice and QuestionSet.
---
 semantics.json | 45 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/semantics.json b/semantics.json
index 5da9ba2..ea18a31 100644
--- a/semantics.json
+++ b/semantics.json
@@ -67,7 +67,13 @@
         "type": "text",
         "label": "Title",
         "optional": true,
-        "description": "This title will be displayed above the introduction text."
+        "description": "This title will be displayed above the introduction text.",
+        "tags": [
+          "sub",
+          "sup",
+          "strong",
+          "em"
+        ]
       },
       {
         "name": "introduction",
@@ -80,7 +86,6 @@
         "tags": [
           "sub",
           "sup",
-          "math",
           "strong",
           "em",
           "p"
@@ -124,7 +129,11 @@
         "type": "text",
         "label": "Progress text",
         "description": "Text used if textual progress is selected.",
-        "default": "Question: @current of @total questions"
+        "default": "Question: @current of @total questions",
+        "tags": [
+          "strong",
+          "em"
+        ]
       }
     ]
   },
@@ -146,7 +155,11 @@
         "placeholder": "Congratulations!",
         "default": "Congratulations!",
         "optional": true,
-        "description": "This title will be displayed above results if the user has successfully passed the quiz."
+        "description": "This title will be displayed above results if the user has successfully passed the quiz.",
+        "tags": [
+          "strong",
+          "em"
+        ]
       },
       {
         "name": "successComment",
@@ -155,7 +168,14 @@
         "label": "Passed comment",
         "default": "You did very well!",
         "optional": true,
-        "description": "This comment will be displayed after the score if the user has successfully passed the quiz."
+        "description": "This comment will be displayed after the score if the user has successfully passed the quiz.",
+        "tags": [
+          "sub",
+          "sup",
+          "strong",
+          "em",
+          "p"
+        ]
       },
       {
         "name": "failGreeting",
@@ -163,7 +183,11 @@
         "label": "Quiz failed title",
         "default": "Oh, no!",
         "optional": true,
-        "description": "This title will be displayed above the results if the user has failed the quiz."
+        "description": "This title will be displayed above the results if the user has failed the quiz.",
+        "tags": [
+          "strong",
+          "em"
+        ]
       },
       {
         "name": "failComment",
@@ -172,7 +196,14 @@
         "label": "Failed comment",
         "default": "This didn't go so well.",
         "optional": true,
-        "description": "This comment will be displayed after the score if the user has failed the quiz."
+        "description": "This comment will be displayed after the score if the user has failed the quiz.",
+        "tags": [
+          "sub",
+          "sup",
+          "strong",
+          "em",
+          "p"
+        ]
       },
       {
         "name": "solutionButtonText",

From 6214354cb5ddf1b31fcdac6ce1a80bcb0311af92 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <with@amendor.com>
Date: Tue, 16 Jul 2013 20:16:07 +0200
Subject: [PATCH 51/83] Improved styling of multichoice alternatives Hide show
 solutions button in drag and drop Allow some tags in the end message

---
 css/questionset.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/questionset.css b/css/questionset.css
index 1a6b36a..b0b11a8 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -4,7 +4,7 @@
 .questionset.hidden {
   display: none;
 }
-.questionset .h5p-multichoice > .h5p-show-solution, .h5p-blanks .h5p-button {
+.questionset .h5p-multichoice > .h5p-show-solution, .questionset .dragndrop > .h5p-show-solution, .h5p-blanks .h5p-button {
   display: none;
 }
 .questionset, .intro-page, .questionset-results {

From 840bcf19c6fa787c768d7b36884e4e3ae6453681 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <with@amendor.com>
Date: Tue, 16 Jul 2013 22:10:07 +0200
Subject: [PATCH 52/83] OPPG-446: Remove library name from question display

---
 js/questionset.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 17e09c0..2cce20e 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -46,9 +46,7 @@ H5P.QuestionSet = function (options, contentId) {
           '<% } %>' +
           '<div class="questionset<% if (introPage.showIntroPage) { %> hidden<% } %>">' +
           '  <% for (var i=0; i<questions.length; i++) { %>' +
-          '    <div class="question-container">' +
-          '      <div><%= questions[i].library %></div>' +
-          '    </div>' +
+          '    <div class="question-container"></div>' +
           '  <% } %>' +
           '  <div class="qs-footer">' +
           '    <div class="qs-progress">' +

From 3d10a111cd851b7f9953faaa0431a6047c1542f4 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Fri, 19 Jul 2013 10:24:13 +0200
Subject: [PATCH 53/83] OPPG-446: Autoplay video does not work on mobile
 devices, changed to play()

---
 js/questionset.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index 2cce20e..28d0ea0 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -249,13 +249,14 @@ H5P.QuestionSet = function (options, contentId) {
           files: videoData,
           fitToWrapper: true,
           controls: false,
-          autoplay: true
+          autoplay: false
         }, contentId);
         video.endedCallback = function () {
           displayResults();
           $videoContainer.hide();
         };
         video.attach($videoContainer);
+        video.play();
 
         if (params.endGame.skipButtonText) {
           $('<a class="button skip">' + params.endGame.skipButtonText + '</a>').click(function () {

From 936c3c9a62f103a477c0184a21d303c109a61999 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Fri, 19 Jul 2013 13:44:34 +0200
Subject: [PATCH 54/83] OPPG-452: QS now call resize on the question object if
 the function exists.

---
 js/questionset.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/js/questionset.js b/js/questionset.js
index 28d0ea0..2a36324 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -166,6 +166,11 @@ H5P.QuestionSet = function (options, contentId) {
      // Hide all questions
     $('.question-container', $myDom).hide().eq(questionNumber).show();
 
+    // Trigger resize on question in case the size of the QS has changed.
+    if (questionInstances[questionNumber].resize) {
+      questionInstances[questionNumber].resize();
+    }
+
     // Update progress indicator
     // Test if current has been answered.
     if (params.progressType === 'textual') {

From fa96cb75f0ebf1ed70ac2d0e877f50c212c0fb86 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Wed, 24 Jul 2013 12:32:47 +0200
Subject: [PATCH 55/83] Updated patch versions of modified libraries

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index dbc5c52..acc1b94 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 20,
+  "patchVersion": 21,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From a9bd70ff3522c2efb0944db23ce8425ffb4ca798 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Wed, 24 Jul 2013 17:33:41 +0200
Subject: [PATCH 56/83] Quote URLs in css backgrounds from getPath. Nudged
 affected library patchVersions

---
 js/questionset.js | 2 +-
 library.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 2a36324..0c8ea6e 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -292,7 +292,7 @@ H5P.QuestionSet = function (options, contentId) {
     if (params.backgroundImage !== undefined) {
       $myDom.css({
         overflow: 'hidden',
-        background: '#000 url(' + H5P.getPath(params.backgroundImage.path, contentId) + ') no-repeat 50% 50%',
+        background: '#000 url("' + H5P.getPath(params.backgroundImage.path, contentId) + '") no-repeat 50% 50%',
         backgroundSize: '100% auto'
       });
     }
diff --git a/library.json b/library.json
index acc1b94..5ccf9a4 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 21,
+  "patchVersion": 22,
   "runnable": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",

From 2404a2fb87f26a7773c1dc25e79f28abc4ebe610 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Tue, 13 Aug 2013 10:39:49 +0200
Subject: [PATCH 57/83] Added fullscreen support to QuestionSet and
 DragQuestion

---
 library.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 5ccf9a4..8b4394c 100644
--- a/library.json
+++ b/library.json
@@ -3,8 +3,9 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 22,
+  "patchVersion": 23,
   "runnable": 1,
+  "fullscreen": 1,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",
   "license": "cc-by-sa",

From 1f63d523a17295c86bba9ba695d16943ae488685 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Tue, 10 Sep 2013 11:25:45 +0200
Subject: [PATCH 58/83] OPPG-566: Fixed questionset compability bug.

---
 js/questionset.js | 1 +
 library.json      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index 0c8ea6e..40c1090 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -302,6 +302,7 @@ H5P.QuestionSet = function (options, contentId) {
       var question = questionInstances[i];
 
       question.attach($('.question-container:eq(' + i + ')', $myDom));
+      question.$solutionButton.hide();
       $(question).on('h5pQuestionAnswered', function () {
         $('.progress-dot:eq(' + currentQuestion +')', $myDom).removeClass('unanswered').addClass('answered');
         _updateButtons();
diff --git a/library.json b/library.json
index 8b4394c..f70d1dc 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 23,
+  "patchVersion": 24,
   "runnable": 1,
   "fullscreen": 1,
   "machineName": "H5P.QuestionSet",

From 123493c82a10111d349c08477db97ba5064d75dc Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Tue, 10 Sep 2013 15:07:17 +0200
Subject: [PATCH 59/83] OPPG-588: Set dots as default progress.

---
 library.json   | 2 +-
 semantics.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library.json b/library.json
index f70d1dc..4766b3f 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 24,
+  "patchVersion": 25,
   "runnable": 1,
   "fullscreen": 1,
   "machineName": "H5P.QuestionSet",
diff --git a/semantics.json b/semantics.json
index ea18a31..e815ad9 100644
--- a/semantics.json
+++ b/semantics.json
@@ -21,7 +21,7 @@
         "label": "Dots"
       }
     ],
-    "default": "textual"
+    "default": "dots"
   },
   {
     "name": "passPercentage",

From 53fae497b19919dfae0411eb40fa940d79dcce67 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 18 Sep 2013 10:00:02 +0200
Subject: [PATCH 60/83] Fixed language file errors. Fixed resize bug in
 questionset. Fixed missing function on blanks.

---
 js/questionset.js | 1 +
 library.json      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index 40c1090..5e0ca82 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -319,6 +319,7 @@ H5P.QuestionSet = function (options, contentId) {
     $('.qs-startbutton', $myDom).click(function () {
       $(this).parents('.intro-page').hide();
       $('.questionset', $myDom).removeClass('hidden');
+      _showQuestion(currentQuestion);
     });
 
     // Set event listeners.
diff --git a/library.json b/library.json
index 4766b3f..a711e00 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 25,
+  "patchVersion": 26,
   "runnable": 1,
   "fullscreen": 1,
   "machineName": "H5P.QuestionSet",

From fd24edf460233f027dd7e2db27dcb10abc774d1d Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 18 Sep 2013 11:19:47 +0200
Subject: [PATCH 61/83] Removed fullscreen from question set since it can't
 handle it....

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index a711e00..9ef339a 100644
--- a/library.json
+++ b/library.json
@@ -5,7 +5,7 @@
   "minorVersion": 0,
   "patchVersion": 26,
   "runnable": 1,
-  "fullscreen": 1,
+  "fullscreen": 0,
   "machineName": "H5P.QuestionSet",
   "author": "Amendor AS",
   "license": "cc-by-sa",

From aff85ef8968371069ae907efb7b6a0c4c5548279 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 18 Sep 2013 11:22:42 +0200
Subject: [PATCH 62/83] UP

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 9ef339a..2d05b20 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 26,
+  "patchVersion": 27,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From 84e83b6a8f538448b3308a40a2f3e86de125a91b Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Thu, 19 Sep 2013 14:51:17 +0200
Subject: [PATCH 63/83] HJ-14: Added H5P.setFinished to all libraries. Fixed
 bug in dragquestion causing boardgame to not show results.

---
 js/questionset.js | 14 +++++++++++---
 library.json      |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 5e0ca82..a3b8d41 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -105,7 +105,8 @@ H5P.QuestionSet = function (options, contentId) {
       showAnimations: false,
       successVideo: undefined,
       failVideo: undefined
-    }
+    },
+    postUserStatistics: (H5P.postUserStatistics === true)
   };
 
   var template = new EJS({text: texttemplate});
@@ -127,6 +128,10 @@ H5P.QuestionSet = function (options, contentId) {
     // TODO: Render on init, inject in template.
 
     var libraryObject = H5P.libraryFromString(question.library);
+    $.extend(question.params, {
+      displaySolutionsButton: false,
+      postUserStatistics: false
+    });
     var tmp = new (H5P.classFromName(libraryObject.machineName))(question.params, contentId);
     questionInstances.push(tmp);
   }
@@ -167,7 +172,7 @@ H5P.QuestionSet = function (options, contentId) {
     $('.question-container', $myDom).hide().eq(questionNumber).show();
 
     // Trigger resize on question in case the size of the QS has changed.
-    if (questionInstances[questionNumber].resize) {
+    if (questionInstances[questionNumber].resize !== undefined) {
       questionInstances[questionNumber].resize();
     }
 
@@ -217,6 +222,10 @@ H5P.QuestionSet = function (options, contentId) {
       passed: success
     };
     var displayResults = function () {
+      if (params.postUserStatistics === true) {
+        H5P.setFinished(contentId, getScore(), totalScore());
+      }
+
       if (!params.endGame.showResultPage) {
         $(returnObject).trigger('h5pQuestionSetFinished', eventData);
         return;
@@ -302,7 +311,6 @@ H5P.QuestionSet = function (options, contentId) {
       var question = questionInstances[i];
 
       question.attach($('.question-container:eq(' + i + ')', $myDom));
-      question.$solutionButton.hide();
       $(question).on('h5pQuestionAnswered', function () {
         $('.progress-dot:eq(' + currentQuestion +')', $myDom).removeClass('unanswered').addClass('answered');
         _updateButtons();
diff --git a/library.json b/library.json
index 2d05b20..6d344f1 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 27,
+  "patchVersion": 28,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From e766e50b7b8a51e29f08a9734705721ac879ff71 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <with@amendor.com>
Date: Tue, 15 Oct 2013 15:39:17 +0200
Subject: [PATCH 64/83] Remove vertical tabs from questionset, ref
 http://bug.ndla.no/browse/TGP-5585

---
 library.json   | 2 +-
 semantics.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/library.json b/library.json
index 6d344f1..38baedb 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 28,
+  "patchVersion": 29,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",
diff --git a/semantics.json b/semantics.json
index e815ad9..d008917 100644
--- a/semantics.json
+++ b/semantics.json
@@ -37,7 +37,6 @@
     "name": "questions",
     "label": "Questions",
     "type": "list",
-    "widget": "verticalTabs",
     "min": 1,
     "entity": "question",
     "field": {

From 2c26b7692da20c3a8dde08149cc71a57be308baf Mon Sep 17 00:00:00 2001
From: Magnus Vik Magnussen <magnus.magnussen@amendor.com>
Date: Thu, 31 Oct 2013 13:39:51 +0100
Subject: [PATCH 65/83] HFJ-1 Design update to questions set completed. No
 changes made to dragNdrop so far.

---
 css/img/mark-fail.png | Bin 3520 -> 0 bytes
 css/img/mark-pass.png | Bin 3220 -> 0 bytes
 css/questionset.css   | 173 +++++++++++++++++++++++++++++++-----------
 fonts/icomoon.eot     | Bin 0 -> 2364 bytes
 fonts/icomoon.svg     |  14 ++++
 fonts/icomoon.ttf     | Bin 0 -> 2200 bytes
 fonts/icomoon.woff    | Bin 0 -> 2276 bytes
 js/questionset.js     |  26 +++----
 language/nb.json      |   5 ++
 language/nn.json      |   7 +-
 semantics.json        |  19 ++++-
 11 files changed, 182 insertions(+), 62 deletions(-)
 delete mode 100644 css/img/mark-fail.png
 delete mode 100644 css/img/mark-pass.png
 create mode 100644 fonts/icomoon.eot
 create mode 100644 fonts/icomoon.svg
 create mode 100644 fonts/icomoon.ttf
 create mode 100644 fonts/icomoon.woff

diff --git a/css/img/mark-fail.png b/css/img/mark-fail.png
deleted file mode 100644
index cbd3936b1928c0ed73326d13e5253ed980926409..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3520
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

diff --git a/css/img/mark-pass.png b/css/img/mark-pass.png
deleted file mode 100644
index cceccd3eb81b94742b5128229ee04d0691ca0be0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3220
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
GLSTZ1YaaRl

diff --git a/css/questionset.css b/css/questionset.css
index b0b11a8..d3ecdaf 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -1,3 +1,21 @@
+/* IcoMoon font licensed under the GNU General Public License: http://www.gnu.org/licenses/gpl.html */
+@font-face {
+  font-family: 'icomoon';
+  src:url('../fonts/icomoon.eot');
+  src:url('../fonts/icomoon.eot?#iefix') format('embedded-opentype'),
+    url('../fonts/icomoon.woff') format('woff'),
+    url('../fonts/icomoon.ttf') format('truetype'),
+    url('../fonts/icomoon.svg#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+.questionset-results h2 {
+  font-size: 1.2em;
+  font-weight: bold;
+  padding-bottom: 0.5em;
+} 
+
 .questionset, .intro-page, .questionset-results {
   overflow: hidden;
 }
@@ -11,10 +29,9 @@
   position: relative;
 }
 .h5p-multichoice > .h5p-question {
-  margin: 1em 0.5em 0;
-  padding: 0.5em 0.75em;
-  box-shadow: 0 0 0.5em #e3e3e3;
-  border-radius: 0.5em;
+  text-align: left;
+  padding: 1em 0 0.2em;
+  margin: 0 0.5em 0.7em;
   background: rgba(255, 255, 255, 0.9);
   filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6FFFFFF,endColorstr=#e6FFFFFF);
   zoom: 1;
@@ -25,32 +42,22 @@
 }
 .progress-dot {
   display: inline-block;
-  width: 0.75em;
-  height: 0.75em;
+  width: 0.6em;
+  height: 0.6em;
   border-radius: 50%;
   margin: 0 0.25em;
   cursor: pointer;
   background: #fff;
-  border: 0.0625em solid #c7c7c7;
+  background: #cecece;
 }
 .progress-dot:hover {
   box-shadow: 0 0 0.5em #c7c7c7;
 }
 .progress-dot.answered {
-  border: 0.0625em solid #fff;
   background: #bccade;
 }
 .progress-dot.current {
-  width: 1em;
-  height: 1em;
-  border: 0.0625em solid #fff;
-  margin-bottom: -0.125em;
   background: #267ec9;
-  background-image: -webkit-linear-gradient(top, #3999ea, #267ec9);
-  background-image: -moz-linear-gradient(top, #3999ea, #267ec9);
-  background-image: -o-linear-gradient(top, #3999ea, #267ec9);
-  background-image: -ms-linear-gradient(top, #3999ea, #267ec9);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3999ea', endColorstr='#267ec9',GradientType=0);
 }
 .intro-page .title {
   font-size: 2em;
@@ -72,40 +79,75 @@
 }
 
 .qs-footer .button, .qs-startbutton, .qs-finishbutton, .questionset-results .button, .video-container > .button {
-  display: block;
-  line-height: 1.25em;
-  padding: 0.25em 1em;
-  border-radius: 0.75em;
+  display: inline-block;
+  padding: 0.2em 1em;
+  border: 0.2em solid #fff;
+  border-radius: 0.4em;
+  margin: 0 0.5em 1em;
   cursor: pointer;
   color: #fff;
-  box-shadow: 0 0 0.5em #aebdc9;
-  margin: 0.5em;
+  box-shadow: 0 0 0.5em #999;
 
-  background: #267ec9;
-  background-image: -webkit-linear-gradient(top, #3999ea, #267ec9);
-  background-image: -moz-linear-gradient(top, #3999ea, #267ec9);
-  background-image: -o-linear-gradient(top, #3999ea, #267ec9);
-  background-image: -ms-linear-gradient(top, #3999ea, #267ec9);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#3999ea', endColorstr='#267ec9',GradientType=0);
+  background: rgb(100,152,254); /* Old browsers */
+  background: -moz-linear-gradient(top,  rgba(100,152,254,1) 0%, rgba(4,104,206,1) 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(100,152,254,1)), color-stop(100%,rgba(4,104,206,1))); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  rgba(100,152,254,1) 0%,rgba(4,104,206,1) 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  rgba(100,152,254,1) 0%,rgba(4,104,206,1) 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  rgba(100,152,254,1) 0%,rgba(4,104,206,1) 100%); /* IE10+ */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#6498fe', endColorstr='#0468ce',GradientType=0 ); /* IE6-9 */
 }
 .qs-footer .button:hover, .qs-startbutton:hover, .questionset-results .button:hover, .video-container > .button:hover {
   text-decoration: none;
-  color: #fff;
-  box-shadow: 0 0 0.5em #267ec9;
+  box-shadow: 0 0 0.5em #999;
+
+  background: rgb(4,104,206); /* Old browsers */
+  background: -moz-linear-gradient(top,  rgba(4,104,206,1) 0%, rgba(100,152,254,1) 100%); /* FF3.6+ */
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(4,104,206,1)), color-stop(100%,rgba(100,152,254,1))); /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top,  rgba(4,104,206,1) 0%,rgba(100,152,254,1) 100%); /* Chrome10+,Safari5.1+ */
+  background: -o-linear-gradient(top,  rgba(4,104,206,1) 0%,rgba(100,152,254,1) 100%); /* Opera 11.10+ */
+  background: -ms-linear-gradient(top,  rgba(4,104,206,1) 0%,rgba(100,152,254,1) 100%); /* IE10+ */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0468ce', endColorstr='#6498fe',GradientType=0 ); /* IE6-9 */
 }
 .qs-startbutton {
   display: inline-block;
   font-size: 2.5em;
 }
-.qs-footer > .prev, .qs-solutionbutton {
+.qs-footer > .prev {
   float: left;
 }
+
+.qs-footer > .qs-solutionbutton {
+  float: none;
+}
+
 .qs-footer > .next, .qs-footer > .finish, .qs-finishbutton {
   float: right;
 }
+
+.qs-footer a.next.button:after {
+  font-family: FontAwesome;
+  content: " \f054";  
+}
+
+.qs-footer a.prev.button:before {
+  font-family: FontAwesome;
+  content: "\f053  ";  
+}
+
 .questionset-results .qs-finishbutton {
   display: none;
 }
+
+.qs-footer a.finish.button:before {
+  font-family: FontAwesome;
+  content: "\f00c   ";
+}
+
+.questionset-results a.button.qs-solutionbutton:before {
+  font-family: FontAwesome;
+  content: "\f06e   ";
+}
+
 .video-container {
   position: relative;
 }
@@ -127,40 +169,85 @@
   text-align: center;
   background: rgba(255, 255, 255, 0.9);
   filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#E6FFFFFF,endColorstr=#E6FFFFFF);
+  padding: 0.625em;
 }
 
 .questionset-results .greeting {
-  margin: 1em;
+  text-align: left;
+  border-bottom: 0.1em solid #ddd;
+  width: 100%;
 }
 
 .questionset-results .score {
-  font-size: 1.5em;
-  margin: 1em;
+  margin: 0;
+  display: block;
+  margin-bottom: 2em;
 }
 
 .questionset-results .resulttext {
   text-align: left;
   font-size: 1.25em;
   line-height: 1.25em;
-  margin: 1em 3em;
-  padding-left: 3em;
-  min-height: 3em;
+  margin: 1em 0em;
   background-repeat: no-repeat;
   background-position: left center;
 }
 
-.questionset-results .resulttext.fail {
-  background-image: url(img/mark-fail.png);
-}
 .questionset-results .resulttext.fail em {
   font-style: normal;
   color: #b9272d;
 }
 
-.questionset-results .resulttext.success {
-  background-image: url(img/mark-pass.png);
+.questionset-results .score.success .emoticon:before {
+  font-family: IcoMoon;
+  font-size: 5em;
+  content: "\e606";
+  top: 0.5em;
+  position: relative;
+  float: left;
 }
+
+.questionset-results .score.fail .emoticon:before {
+  font-family: IcoMoon;
+  font-size: 5em;
+  content: "\e607";
+  top: 0.5em;
+  position: relative;
+  float: left;
+}
+
+.questionset-results .resulttext.success, 
+.resulttext.almost, 
+.resulttext.fail
+{
+  display: block;
+  background: #eee;
+  padding: 1em;
+  border-radius: 1em;
+  margin-left: 6.5em;
+  position: relative;
+  font-size: 1em;
+}
+
+.questionset-results .resulttext.success:before, 
+.resulttext.fail:before
+{
+  font-family: IcoMoon;
+  content: "";  
+  font-size: 5em;
+  position: absolute;
+  left: -15px;
+  top: 36px;
+  height: 0;
+  width: 0;
+  border-top: 15px solid transparent;
+  border-bottom: 15px solid transparent;
+  border-right: 15px solid #eee;
+  display: inline-block;  
+}
+
 .questionset-results .resulttext.success em {
   font-style: normal;
   color: #6aa81b;
+  text-align: left;
 }
\ No newline at end of file
diff --git a/fonts/icomoon.eot b/fonts/icomoon.eot
new file mode 100644
index 0000000000000000000000000000000000000000..d8cdc1a706bfa01a6aa79621094ce23f38be7a5a
GIT binary patch
literal 2364
zcmb_eO>7%g5T3U`UjLBwzt>6I#EDzQu8LE~brTm8xd<94M5L(*Tq<JRkTi<pv<Xsr
z+appBttx@iibIbeA-K>B<zP`&MGz1t&T#1gj!;h2<{Pg!v7HF}z+3H`neWY;H#<9T
z-pjj)ww*+RBx-MhZV5)-m~F@Rq}w~bhkKIE>2!rkRG~873atUwX^s|Yi9VoJD$+F|
z5t;{bjW(dmIx#v)DZH%PIU6AR;USY`I{D_sv2p#&Khr?I!Mji@7uSFIXW$N$4nxi_
z6*tyFeURS)buO)5f8YH3(dUpCh}6mD#o}c;uYE@3*v9zjWdPc@@?*$9Lq57(-rNd+
zf&3S`=xU`@l)sifCDNXQte1;h>*S^HA@h2%wPJbkW#g+~Am_10ZoRUx2|v-CTRcv(
zLgE&wMA98;2gpr}ia#hL5c@8zK(Qy9T&?4gt5oRFjx}WdalB#(Jx3};3MD`tp!{25
zp<ag^d!p3q_22qy4J`nm0wdmC8BP*S<k$#%T(2sGRYR1dDY{520LQ1K?5UI#AJL_7
zXi&=d#|Oda08$v3k}@iHt>ADc5Hxg|)kh}=<qYgiNVM|c#_a5k2P-z6-@bbG?A7gg
zo7TzgH~RVvzuTt5v^kp==E7&DFPu1WVfsvX&YMi<hK6$Kq_@y&m+i~<S}pSmzqT5-
z&9&0nkLh?W8Hprw@pLqC#OFJbh<3#1d3uT7?j=4!LmibnL$WVM-9z$wr1p9w+v+8M
z#Q|aI{{1z_j5#Cjc8daX0(GJ#Cno6?I*+fuN!UHzGedB~yddz$UlhYeN*+zg*-Y4o
zqnprWEt^3aX<|}Nb52YlH3lW4nIWf6=f!T?9hM?t;KMy@b`NH)nmBhUYi2K<OFT2H
z?qI<0)Wf=FR!#Fmr#}#Mn;PWWfTF32kn~W$uJ^-Rp{SbDz(gQ+JQ_V73y20L%w9En
zNYC0rfgNKH3r`i7r_ZSmjT{T!_f)Hs&OVPzxgR_>GNg-FWyPWBhTrA#8#-8-Wl2?4
zi5+7H8-hL3o901vV7ZsSy)Vbb|B&=%C_Z-R&{#ZVQ?aiw)b<yK?mOVwy;h@aTr7m*
z177a{FLf~G8p(wc??d0t?RUNTr{qx>rJp`3e!NGUJBD`;S88sU!!?~ypt+%Ml-!13
zbq*%1&Kj*R<K(8hA|&b3C*XOegTCXviDs|R5SpD%Uo`Ct9Iy6T68PyRE`vYX<Q4F5
zHF*^Wwcg|%q|tbjcjJ61@oA&DfUr%Aw`^LxWz*s<n-*``w0H;R=9+UYo9&1H!Iy+K
xohzkExl&o{xHYujH`*rPqZe`G;M+%$HbE~_jNYT`=wEBxTV{6eE%59=+rR1-dY1qI

literal 0
HcmV?d00001

diff --git a/fonts/icomoon.svg b/fonts/icomoon.svg
new file mode 100644
index 0000000..1a48364
--- /dev/null
+++ b/fonts/icomoon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="512" />
+<glyph unicode="&#xe604;" d="M512-64c282.77 0 512 229.23 512 512s-229.23 512-512 512-512-229.23-512-512 229.23-512 512-512zM512 864c229.75 0 416-186.25 416-416s-186.25-416-416-416-416 186.25-416 416 186.25 416 416 416zM256 640c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM640 640c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM704.098 332.74l82.328-49.396c-55.962-93.070-157.916-155.344-274.426-155.344s-218.464 62.274-274.426 155.344l82.328 49.396c39.174-65.148 110.542-108.74 192.098-108.74s152.924 43.592 192.098 108.74z" />
+<glyph unicode="&#xe605;" d="M512-64c282.77 0 512 229.23 512 512s-229.23 512-512 512-512-229.23-512-512 229.23-512 512-512zM512 864c229.75 0 416-186.25 416-416s-186.25-416-416-416-416 186.25-416 416 186.25 416 416 416zM745.74 358.38l22.488-76.776-437.008-128.002-22.488 76.776zM256 640c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64zM640 640c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64-35.346 0-64 28.654-64 64z" />
+<glyph unicode="&#xe606;" d="M512-64c282.77 0 512 229.23 512 512s-229.23 512-512 512-512-229.23-512-512 229.23-512 512-512zM512 864c229.75 0 416-186.25 416-416s-186.25-416-416-416-416 186.25-416 416 186.25 416 416 416zM192 448v-64c0-140.8 115.2-256 256-256h128c140.8 0 256 115.2 256 256v64h-640zM384 203.012c-26.538 9.458-50.924 24.822-71.544 45.446-36.406 36.402-56.456 84.54-56.456 135.542h128v-180.988zM576 192h-128v192h128v-192zM711.544 248.458c-20.624-20.624-45.010-35.988-71.544-45.446v180.988h128c0-51.002-20.048-99.14-56.456-135.542zM225.352 576c0.002 0 0 0 0 0 9.768 0 18.108 7.056 19.724 16.69 6.158 36.684 37.668 63.31 74.924 63.31s68.766-26.626 74.924-63.31c1.616-9.632 9.956-16.69 19.722-16.69 9.768 0 18.108 7.056 19.724 16.688 1.082 6.436 1.628 12.934 1.628 19.312 0 63.962-52.038 116-116 116s-116-52.038-116-116c0-6.378 0.548-12.876 1.628-19.312 1.62-9.632 9.96-16.688 19.726-16.688zM609.352 576c0.002 0 0 0 0 0 9.77 0 18.112 7.056 19.724 16.69 6.158 36.684 37.668 63.31 74.924 63.31s68.766-26.626 74.924-63.31c1.616-9.632 9.958-16.69 19.722-16.69s18.108 7.056 19.722 16.688c1.082 6.436 1.628 12.934 1.628 19.312 0 63.962-52.038 116-116 116s-116-52.038-116-116c0-6.378 0.544-12.876 1.626-19.312 1.624-9.632 9.964-16.688 19.73-16.688z" />
+<glyph unicode="&#xe607;" d="M512-64c282.77 0 512 229.23 512 512s-229.23 512-512 512-512-229.23-512-512 229.23-512 512-512zM512 864c229.75 0 416-186.25 416-416s-186.25-416-416-416-416 186.25-416 416 186.25 416 416 416zM384 256c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128-70.692 0-128 57.308-128 128zM640 608c0 53.019 28.654 96 64 96s64-42.981 64-96c0-53.019-28.654-96-64-96-35.346 0-64 42.981-64 96zM256 608c0 53.019 28.654 96 64 96s64-42.981 64-96c0-53.019-28.654-96-64-96-35.346 0-64 42.981-64 96z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/fonts/icomoon.ttf b/fonts/icomoon.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9649f7e4215f6b46e79e2406bf2fbfb5cee35cce
GIT binary patch
literal 2200
zcmb_dO>7%g5T5sT*Xtj$j(^ul+r)`m#jc7|$8{5z5V?ppP!!RoB5<jQNke`V$0-R?
zdfOvX4@F3zwBpbsNC+<ULOEEV3Iqjl;tZD_;0WbJZNAx`;`|8vz_a$veDmgg^WN<2
zm;@1p$RdSKzI=If%=qk&0xVzRnO~??H@^S7{}z!r3_Q71-Q0le1%3_EzqEG!P3y1w
zp8(GjX%owf)vI(t|Cq?PgZ0zPFz8<?-vIvvd~~_CwH<{5{3oW=T799ad?7y~(w_o0
zYSrxx3e$JM9520Itt~!pe*QD?Bw~~|>YH0QCx(BU*GW-Hyh|F9yd@vNa?_FGcPfei
z`~ByrQ2L>+G+Ov64XW(%P1{&v=7@33oT)gel!f#`3X;swY5}Jos;yS**S@Ch1p}nO
zO85!JA&JJzOu{E_HB>^>IOS-HF4HQEV^gwpDlap`hD^i<WHB-}0L6eIkA*2&)Ocz)
z4(&C>OhaM!k?{eg2)=PitM_hPym;f@swd}muAM!5ZD-DtEeb}=o*pw2^rWyn&6Abc
z#F^<!Cr(_NK9iUY=L+S)!EzxNuC((qzjCLYnIrttPVCXO%jOS-OgWcK=E|8uDtn~2
z_eeIiCqGZqbM$IA`H7j@h_W{&`*PGdCBG$`FC|Our{r54ke1H(Z~A7e8F9N)7ElxZ
zT{SU5=jZ}%eUtF@bgm4+1@nx+8-G>|nR#U-uat@jGlOZ|Q1ns}Wu%J<rNA{Yh0++1
zrduJWPEU#_Wp`L66R;0;?b$h*%|`b8m6BDuaz6XmY6N4^h~G#Uy4A3(cl?oPENJP#
z&3;waR3VLcpJDXjv_jQ%)wYRf`gkgJJRKFbO<3J}c2S<q`3fJ5Pgr@R20}f4V{rIb
z>~5&hnDF<60_xq^vEe~Oyr8H))i5K0K*ThlDvYJ3X_61d2eg5=(w*l)ePFqpx4o~%
z#s5(BRy;F$=+I~;?n$w)F*Nr#hR$EW<2&u7OfKf*nf`FNpF<rixkqxN#PfCUgZEw!
zPd=iM%2xXE{ptt*O1F#h*TbEf2ljAJCp2gtnC+Hp184HFV0ZRtf7nhzx-H_;kRL+l
zoj&@OzfBA;f(_ispif<XK?ZD2ED3$u)fMPRU0sF#imPjs1aka+q|=zI2l4;1!2dRC
z02bzSbcfT?9ZpAgI33;LbaWr~mfgJ$=L&f1RKruJb(*6^dW$w`#YSm5NqIcGd{!3f
zwR(Mhw~=PCaf#lhHL8MO*9KgA5!6gvr7g&-l%_Z6I_4Mc;4^M;`&MoW4;KFb1M6wR

literal 0
HcmV?d00001

diff --git a/fonts/icomoon.woff b/fonts/icomoon.woff
new file mode 100644
index 0000000000000000000000000000000000000000..5d29f5d4f9eb1a510f25e82f5a1dc4e2b62c6e8d
GIT binary patch
literal 2276
zcmb_dO>7%Q6n-<i>-CSaj(^ul+r)`m#jc8j<GP7Uh+G5-6h&=Q5x7*uq#-|w<CX-`
z-u76jhax0UT5;%s14tEI=!IS^plSt$BWIAR9^i<|iQ0T`*AAOF!agw8oA)zszIpTf
z_RR-prl&~|hW9ZAY`)F&e&fvf(J><7#o7Xs@ztNX#Y*`SY%9<wnST7c|K@UelWm_t
zXJ4k?<@KxY!ghy9n_#m3x_@V7seF;h^BC(VY&xxfu>vEJeh~U$CjDFG!AfQ83T!3l
z38pZn_39$~y#>)=QofO&SISp#uFkO}Z3@y48|BIpY}ashk?Cdg>t8NaH@6Vh_d9+H
zBt<3hA!$VNrhEkbhQq}llovke|2;~Se4;D027XG7N_(7>wk|RANm0z4@hGX32KRsq
zl8n%3Ku<nV8;!<qeRbOl25^Cu;Es+UiN=cz!Vx!WD&f>9WoU}d(;AFpQ?hV8D^tUU
zj70}zJ~TD}!GIx)g(;cWcyb$u_8KClp|JbN_<)iJ-ngW-d)LpNy?$@4#pky#pE`AU
zd%ndR<PVuWJ!Z(?;=*c4Enb?7ot!y$?AW=Pld-vACRZFBEao!7k{g%tmD_G)KH*n4
za0|}O>p$gE#Y{Y&DW-CX^r7C~L+Qkx{5(f5(VN}mCt_+N%HEW;<*0K?evj8*j~Cog
z@-6mBOXvI7J+s!VxYa2Os0n;=u9}#jSLifueS;o!b92E3^Mb%X{-PK%v&u+TDdb~j
z3e&iu=!HDWNEZ`Ij%#8Hr7<AQW`!I-F)4P+?x2jvU?1w*vvV@*we<9bf>pRMoqlH3
z{E=|TYs3uQs#(@GZzvq`TRQZ5zp87hkVdr6F!~U!P&Hk(Z6cgJnn)Z?hJ|etR=1vA
zlxKaR#DQ^yrKhSd(Bm}*hmS<=25PklZ%@Fd-i;g?9yG+Oit14fGvxDyOar3Ay3{mH
za$p>wt+ZCU^W3iwpbvKL18p@f{)eKsqN&jX2S!uT78h-eq2AsYI)4GrZo5GlTr5OW
z{lQ>AAGJT{9?6Xo^j+_xkKPVWKBa)lR{Htl@+bfD<`=_X4|i%F*uy=Y(4cu>wp*^P
zIFpANyR(Oz*iL@BC8E-hpF-xH9(riMhRzoDa1VpNY~l<1O>@qYkY}291@hshtU`XH
zDQgsm=J<O^r?IB&$NRF#uZ`-1h2Kd>b}${;!E|H?(~%uaNA_TEvANg5Tm^2GDxfND
z&^#^Cd$dWbww9#lDGS==v$|NVRI3}ijWmai%k)02QyBoeHsI1rfM(z_ZGm5;B)vmd
SF~4RXKHEIpzLh(VZSp@SaBdF(

literal 0
HcmV?d00001

diff --git a/js/questionset.js b/js/questionset.js
index a3b8d41..72db963 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -69,8 +69,10 @@ H5P.QuestionSet = function (options, contentId) {
   var resulttemplate =
           '<div class="questionset-results">' +
           '  <div class="greeting"><%= greeting %></div>' +
-          '  <div class="score <%= scoreclass %>"><%= score %></div>' +
-          '  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>' +
+          '  <div class="score <%= scoreclass %>">' +
+          '     <div class="emoticon"></div>' +
+          '     <div class="resulttext <%= scoreclass %>"><h2><%= comment %></h2><%= score %><br><%= resulttext %></div>' +
+          '  </div>' +
           '  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a><a class="button qs-solutionbutton"><%= solutionButtonText %></a></div>' +
           '</div>';
 
@@ -95,18 +97,18 @@ H5P.QuestionSet = function (options, contentId) {
     },
     endGame: {
       showResultPage: true,
+      greeting: 'Your result:',
       successGreeting: 'Congratulations!',
       successComment: 'You have enough correct answers to pass the test.',
       failGreeting: 'Sorry!',
       failComment: "You don't have enough correct answers to pass this test.",
-      scoreString: '@score/@total',
+      scoreString: 'You got @score of @total questions correct.',
       finishButtonText: 'Finish',
       solutionButtonText: 'Show solution',
       showAnimations: false,
       successVideo: undefined,
       failVideo: undefined
-    },
-    postUserStatistics: (H5P.postUserStatistics === true)
+    }
   };
 
   var template = new EJS({text: texttemplate});
@@ -128,10 +130,6 @@ H5P.QuestionSet = function (options, contentId) {
     // TODO: Render on init, inject in template.
 
     var libraryObject = H5P.libraryFromString(question.library);
-    $.extend(question.params, {
-      displaySolutionsButton: false,
-      postUserStatistics: false
-    });
     var tmp = new (H5P.classFromName(libraryObject.machineName))(question.params, contentId);
     questionInstances.push(tmp);
   }
@@ -172,7 +170,7 @@ H5P.QuestionSet = function (options, contentId) {
     $('.question-container', $myDom).hide().eq(questionNumber).show();
 
     // Trigger resize on question in case the size of the QS has changed.
-    if (questionInstances[questionNumber].resize !== undefined) {
+    if (questionInstances[questionNumber].resize) {
       questionInstances[questionNumber].resize();
     }
 
@@ -222,17 +220,14 @@ H5P.QuestionSet = function (options, contentId) {
       passed: success
     };
     var displayResults = function () {
-      if (params.postUserStatistics === true) {
-        H5P.setFinished(contentId, getScore(), totalScore());
-      }
-
       if (!params.endGame.showResultPage) {
         $(returnObject).trigger('h5pQuestionSetFinished', eventData);
         return;
       }
 
       var eparams = {
-        greeting: (success ? params.endGame.successGreeting : params.endGame.failGreeting),
+        greeting: params.endGame.greeting,
+        comment: (success ? params.endGame.successGreeting : params.endGame.failGreeting),
         score: scoreString,
         scoreclass: (success ? 'success' : 'fail'),
         resulttext: (success ? params.endGame.successComment : params.endGame.failComment),
@@ -311,6 +306,7 @@ H5P.QuestionSet = function (options, contentId) {
       var question = questionInstances[i];
 
       question.attach($('.question-container:eq(' + i + ')', $myDom));
+      question.$solutionButton.hide();
       $(question).on('h5pQuestionAnswered', function () {
         $('.progress-dot:eq(' + currentQuestion +')', $myDom).removeClass('unanswered').addClass('answered');
         _updateButtons();
diff --git a/language/nb.json b/language/nb.json
index 32d1f28..4e496eb 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -81,6 +81,11 @@
         {
           "label": "Vis resultater"
         },
+        {
+          "label": "Overskrift over tilbakemeldinger",
+          "default": "Ditt resultat:",
+          "description": "Denne overskriften vises over tilbakemeldingene på slutten av spørsmålssettet."
+        },
         {
           "label": "Tittel ved bestått",
           "default": "Gratulerer!",
diff --git a/language/nn.json b/language/nn.json
index b64f8b8..fe5d97f 100644
--- a/language/nn.json
+++ b/language/nn.json
@@ -79,7 +79,12 @@
       "label": "Spørsmålssett avslutning",
       "fields": [
         {
-          "label": "Vis resultater"
+          "label": "Vis resultat"
+        },
+        {
+          "label": "Overskrift over tilbakemeldingar",
+          "default": "Ditt resultat:",
+          "description": "Denne overskriften vises over tilbakemeldingane på slutten av spørsmålssettet."
         },
         {
           "label": "Tittel ved bestått",
diff --git a/semantics.json b/semantics.json
index d008917..83df6d9 100644
--- a/semantics.json
+++ b/semantics.json
@@ -37,6 +37,7 @@
     "name": "questions",
     "label": "Questions",
     "type": "list",
+    "widget": "verticalTabs",
     "min": 1,
     "entity": "question",
     "field": {
@@ -147,14 +148,26 @@
         "label": "Display results",
         "default": true
       },
+      {
+        "name": "message",
+        "type": "text",
+        "label": "Feedback heading",
+        "default": "Your result:",
+        "optional": true,
+        "description": "This heading will be displayed at the end of the quiz when the user has answered all questions.",
+        "tags": [
+          "strong",
+          "em"
+        ]
+      },
       {
         "name": "successGreeting",
         "type": "text",
-        "label": "Quiz passed title",
+        "label": "Quiz passed greeting",
         "placeholder": "Congratulations!",
         "default": "Congratulations!",
         "optional": true,
-        "description": "This title will be displayed above results if the user has successfully passed the quiz.",
+        "description": "This text will be displayed above the score if the user has successfully passed the quiz.",
         "tags": [
           "strong",
           "em"
@@ -182,7 +195,7 @@
         "label": "Quiz failed title",
         "default": "Oh, no!",
         "optional": true,
-        "description": "This title will be displayed above the results if the user has failed the quiz.",
+        "description": "This text will be displayed above the score if the user has failed the quiz.",
         "tags": [
           "strong",
           "em"

From 2fe311acdaf794d22f3cf92fcaaca949511c7e90 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 6 Nov 2013 09:16:43 +0100
Subject: [PATCH 66/83] Patch up.

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 38baedb..f0fbf14 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 29,
+  "patchVersion": 30,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From 711e55c42e1bb06194d42a30bbe15e030537df8a Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Wed, 6 Nov 2013 11:48:36 +0100
Subject: [PATCH 67/83] HFJ-1,2,3,4: Fixed FontAwesome dependencies

---
 css/questionset.css | 12 ++++++------
 library.json        |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index d3ecdaf..6cf187e 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -125,13 +125,13 @@
 }
 
 .qs-footer a.next.button:after {
-  font-family: FontAwesome;
-  content: " \f054";  
+  font-family: H5PFontAwesome;
+  content: " \f054";
 }
 
 .qs-footer a.prev.button:before {
-  font-family: FontAwesome;
-  content: "\f053  ";  
+  font-family: H5PFontAwesome;
+  content: "\f053  ";
 }
 
 .questionset-results .qs-finishbutton {
@@ -139,12 +139,12 @@
 }
 
 .qs-footer a.finish.button:before {
-  font-family: FontAwesome;
+  font-family: H5PFontAwesome;
   content: "\f00c   ";
 }
 
 .questionset-results a.button.qs-solutionbutton:before {
-  font-family: FontAwesome;
+  font-family: H5PFontAwesome;
   content: "\f06e   ";
 }
 
diff --git a/library.json b/library.json
index 38baedb..da8986f 100644
--- a/library.json
+++ b/library.json
@@ -26,6 +26,11 @@
       "majorVersion": 1,
       "minorVersion": 0
     },
+    {
+      "machineName": "FontAwesome",
+      "majorVersion": 3,
+      "minorVersion": 1
+    },
     {
       "machineName": "H5P.Video",
       "majorVersion": 1,

From f4d1fde0e8d944f54e2d17614b463220fa50b104 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Thu, 7 Nov 2013 11:43:52 +0100
Subject: [PATCH 68/83] HFJ-1: Re-added postUserStatistics stuff lost in
 QuestionSet

---
 js/questionset.js | 13 +++++++++++--
 library.json      |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 72db963..c661543 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -108,7 +108,8 @@ H5P.QuestionSet = function (options, contentId) {
       showAnimations: false,
       successVideo: undefined,
       failVideo: undefined
-    }
+    },
+    postUserStatistics: (H5P.postUserStatistics === true)
   };
 
   var template = new EJS({text: texttemplate});
@@ -130,6 +131,10 @@ H5P.QuestionSet = function (options, contentId) {
     // TODO: Render on init, inject in template.
 
     var libraryObject = H5P.libraryFromString(question.library);
+    $.extend(question.params, {
+      displaySolutionsButton: false,
+      postUserStatistics: false
+    });
     var tmp = new (H5P.classFromName(libraryObject.machineName))(question.params, contentId);
     questionInstances.push(tmp);
   }
@@ -170,7 +175,7 @@ H5P.QuestionSet = function (options, contentId) {
     $('.question-container', $myDom).hide().eq(questionNumber).show();
 
     // Trigger resize on question in case the size of the QS has changed.
-    if (questionInstances[questionNumber].resize) {
+    if (questionInstances[questionNumber].resize !== undefined) {
       questionInstances[questionNumber].resize();
     }
 
@@ -220,6 +225,10 @@ H5P.QuestionSet = function (options, contentId) {
       passed: success
     };
     var displayResults = function () {
+      if (params.postUserStatistics === true) {
+        H5P.setFinished(contentId, getScore(), totalScore());
+      }
+
       if (!params.endGame.showResultPage) {
         $(returnObject).trigger('h5pQuestionSetFinished', eventData);
         return;
diff --git a/library.json b/library.json
index 5a2978a..b9a2937 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 30,
+  "patchVersion": 31,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From a33f7f13632f4a6bf0e1f8b78a60a87df42e27a6 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Thu, 7 Nov 2013 13:39:27 +0100
Subject: [PATCH 69/83] BFB-1: Fixed IcoMoon family names

---
 css/questionset.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 6cf187e..e13e34d 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -1,6 +1,6 @@
 /* IcoMoon font licensed under the GNU General Public License: http://www.gnu.org/licenses/gpl.html */
 @font-face {
-  font-family: 'icomoon';
+  font-family: 'icomoon-questionset';
   src:url('../fonts/icomoon.eot');
   src:url('../fonts/icomoon.eot?#iefix') format('embedded-opentype'),
     url('../fonts/icomoon.woff') format('woff'),
@@ -199,7 +199,7 @@
 }
 
 .questionset-results .score.success .emoticon:before {
-  font-family: IcoMoon;
+  font-family: icomoon-questionset;
   font-size: 5em;
   content: "\e606";
   top: 0.5em;
@@ -208,7 +208,7 @@
 }
 
 .questionset-results .score.fail .emoticon:before {
-  font-family: IcoMoon;
+  font-family: icomoon-questionset;
   font-size: 5em;
   content: "\e607";
   top: 0.5em;
@@ -232,7 +232,7 @@
 .questionset-results .resulttext.success:before, 
 .resulttext.fail:before
 {
-  font-family: IcoMoon;
+  font-family: icomoon-questionset;
   content: "";  
   font-size: 5em;
   position: absolute;

From 0f5bdbade5fbb44c9a32b69f6fca65e1ea061704 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Thu, 7 Nov 2013 14:32:38 +0100
Subject: [PATCH 70/83] BFB-3: Merged more lost code in QuestionSet and
 MultiChoice

---
 js/questionset.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/questionset.js b/js/questionset.js
index c661543..44a8936 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -315,7 +315,6 @@ H5P.QuestionSet = function (options, contentId) {
       var question = questionInstances[i];
 
       question.attach($('.question-container:eq(' + i + ')', $myDom));
-      question.$solutionButton.hide();
       $(question).on('h5pQuestionAnswered', function () {
         $('.progress-dot:eq(' + currentQuestion +')', $myDom).removeClass('unanswered').addClass('answered');
         _updateButtons();

From cc02101416234385b1d67f68202a2a327245dc77 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Fri, 8 Nov 2013 10:00:57 +0100
Subject: [PATCH 71/83] Patch levels increased for libs committed lately

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index b9a2937..58f315a 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 31,
+  "patchVersion": 32,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From 9cc925045190d192988e19e3b112711c593b8632 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Fri, 8 Nov 2013 10:25:49 +0100
Subject: [PATCH 72/83] HFJ-1: Changed default score string. Also make score
 string editable and translatable

---
 js/questionset.js | 2 +-
 language/nb.json  | 5 +++++
 language/nn.json  | 5 +++++
 library.json      | 2 +-
 semantics.json    | 8 ++++++++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 44a8936..3029194 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -102,7 +102,7 @@ H5P.QuestionSet = function (options, contentId) {
       successComment: 'You have enough correct answers to pass the test.',
       failGreeting: 'Sorry!',
       failComment: "You don't have enough correct answers to pass this test.",
-      scoreString: 'You got @score of @total questions correct.',
+      scoreString: 'You got @score points of @total possible.',
       finishButtonText: 'Finish',
       solutionButtonText: 'Show solution',
       showAnimations: false,
diff --git a/language/nb.json b/language/nb.json
index 4e496eb..78d5451 100644
--- a/language/nb.json
+++ b/language/nb.json
@@ -86,6 +86,11 @@
           "default": "Ditt resultat:",
           "description": "Denne overskriften vises over tilbakemeldingene på slutten av spørsmålssettet."
         },
+        {
+          "label": "Poengvisningstekst",
+          "default": "Du fikk @score poeng av @total mulige.",
+          "description": "Tekst som viser brukerens oppnådde poeng. \"@score\" blir erstattet med utregnet resultat, \"@total\" blir erstattet med høyest mulige resultat."
+        },
         {
           "label": "Tittel ved bestått",
           "default": "Gratulerer!",
diff --git a/language/nn.json b/language/nn.json
index fe5d97f..0720be7 100644
--- a/language/nn.json
+++ b/language/nn.json
@@ -86,6 +86,11 @@
           "default": "Ditt resultat:",
           "description": "Denne overskriften vises over tilbakemeldingane på slutten av spørsmålssettet."
         },
+        {
+          "label": "Poengvisningstekst",
+          "default": "Du fikk @score poeng av @total mulige.",
+          "description": "Tekst som viser brukerens oppnådde poeng. \"@score\" blir erstatta med utregna resultat, \"@total\" blir erstatta med høgest mulig resultat."
+        },
         {
           "label": "Tittel ved bestått",
           "default": "Gratulerer!",
diff --git a/library.json b/library.json
index 58f315a..1fd444a 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 32,
+  "patchVersion": 33,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",
diff --git a/semantics.json b/semantics.json
index 83df6d9..b63bc42 100644
--- a/semantics.json
+++ b/semantics.json
@@ -160,6 +160,14 @@
           "em"
         ]
       },
+      {
+        "name": "scoreString",
+        "type": "text",
+        "label": "Score display text",
+        "description": "Text used to display total user score. \"@score\" will be replaced by calculated score, \"@total\" will be replaced by maximum possible score. ",
+        "default": "You got @score points of @total possible.",
+        "optional": true
+      },
       {
         "name": "successGreeting",
         "type": "text",

From 84c9e73b300b014309cdcf0631e10f5e529ecea1 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Fri, 8 Nov 2013 11:42:08 +0100
Subject: [PATCH 73/83] HFJ-1: Style tweaks

Decreased start-button size in QS intro.
Removed H2 on QS end if not set.
Adjusted QuestionSet end emoticon.
Removed background on multichoice feedback field.
---
 css/questionset.css | 27 +++++++++++----------------
 js/questionset.js   |  2 +-
 library.json        |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index e13e34d..cb0e914 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -14,7 +14,7 @@
   font-size: 1.2em;
   font-weight: bold;
   padding-bottom: 0.5em;
-} 
+}
 
 .questionset, .intro-page, .questionset-results {
   overflow: hidden;
@@ -85,7 +85,7 @@
   border-radius: 0.4em;
   margin: 0 0.5em 1em;
   cursor: pointer;
-  color: #fff;
+  color: #ffffff;
   box-shadow: 0 0 0.5em #999;
 
   background: rgb(100,152,254); /* Old browsers */
@@ -99,6 +99,7 @@
 .qs-footer .button:hover, .qs-startbutton:hover, .questionset-results .button:hover, .video-container > .button:hover {
   text-decoration: none;
   box-shadow: 0 0 0.5em #999;
+  color: #ffffff;
 
   background: rgb(4,104,206); /* Old browsers */
   background: -moz-linear-gradient(top,  rgba(4,104,206,1) 0%, rgba(100,152,254,1) 100%); /* FF3.6+ */
@@ -108,10 +109,6 @@
   background: -ms-linear-gradient(top,  rgba(4,104,206,1) 0%,rgba(100,152,254,1) 100%); /* IE10+ */
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0468ce', endColorstr='#6498fe',GradientType=0 ); /* IE6-9 */
 }
-.qs-startbutton {
-  display: inline-block;
-  font-size: 2.5em;
-}
 .qs-footer > .prev {
   float: left;
 }
@@ -202,7 +199,6 @@
   font-family: icomoon-questionset;
   font-size: 5em;
   content: "\e606";
-  top: 0.5em;
   position: relative;
   float: left;
 }
@@ -211,14 +207,13 @@
   font-family: icomoon-questionset;
   font-size: 5em;
   content: "\e607";
-  top: 0.5em;
   position: relative;
   float: left;
 }
 
-.questionset-results .resulttext.success, 
-.resulttext.almost, 
-.resulttext.fail
+.questionset-results .resulttext.success,
+.questionset-results .resulttext.almost,
+.questionset-results .resulttext.fail
 {
   display: block;
   background: #eee;
@@ -229,21 +224,21 @@
   font-size: 1em;
 }
 
-.questionset-results .resulttext.success:before, 
-.resulttext.fail:before
+.questionset-results .resulttext.success:before,
+.questionset-results .resulttext.fail:before
 {
   font-family: icomoon-questionset;
-  content: "";  
+  content: "";
   font-size: 5em;
   position: absolute;
   left: -15px;
-  top: 36px;
+  top: 22px;
   height: 0;
   width: 0;
   border-top: 15px solid transparent;
   border-bottom: 15px solid transparent;
   border-right: 15px solid #eee;
-  display: inline-block;  
+  display: inline-block;
 }
 
 .questionset-results .resulttext.success em {
diff --git a/js/questionset.js b/js/questionset.js
index 3029194..91678aa 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -71,7 +71,7 @@ H5P.QuestionSet = function (options, contentId) {
           '  <div class="greeting"><%= greeting %></div>' +
           '  <div class="score <%= scoreclass %>">' +
           '     <div class="emoticon"></div>' +
-          '     <div class="resulttext <%= scoreclass %>"><h2><%= comment %></h2><%= score %><br><%= resulttext %></div>' +
+          '     <div class="resulttext <%= scoreclass %>"><% if (comment) { %><h2><%= comment %></h2><% } %><%= score %><br><%= resulttext %></div>' +
           '  </div>' +
           '  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a><a class="button qs-solutionbutton"><%= solutionButtonText %></a></div>' +
           '</div>';
diff --git a/library.json b/library.json
index 1fd444a..b228267 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 33,
+  "patchVersion": 34,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From 0f371320f700554fe37413a82f60b9582f2b3497 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Fri, 8 Nov 2013 13:56:58 +0100
Subject: [PATCH 74/83] HFJ-1: Fixed emoticon positioning on QS endGame

---
 css/questionset.css | 6 +++---
 library.json        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index cb0e914..c9f02a3 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -198,16 +198,16 @@
 .questionset-results .score.success .emoticon:before {
   font-family: icomoon-questionset;
   font-size: 5em;
+  line-height: 100%;
   content: "\e606";
-  position: relative;
   float: left;
 }
 
 .questionset-results .score.fail .emoticon:before {
   font-family: icomoon-questionset;
   font-size: 5em;
+  line-height: 100%;
   content: "\e607";
-  position: relative;
   float: left;
 }
 
@@ -232,7 +232,7 @@
   font-size: 5em;
   position: absolute;
   left: -15px;
-  top: 22px;
+  top: 36px;
   height: 0;
   width: 0;
   border-top: 15px solid transparent;
diff --git a/library.json b/library.json
index b228267..7300936 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 34,
+  "patchVersion": 35,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From d5e7207e5bf797e4621b819b650782da38abad28 Mon Sep 17 00:00:00 2001
From: Frank Ronny Larsen <frank.larsen@amendor.no>
Date: Wed, 20 Nov 2013 10:58:00 +0100
Subject: [PATCH 75/83] HFJ-50: Use border-box to keep padding within size.

---
 css/questionset.css | 2 ++
 library.json        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/css/questionset.css b/css/questionset.css
index c9f02a3..2a76d34 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -167,6 +167,8 @@
   background: rgba(255, 255, 255, 0.9);
   filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#E6FFFFFF,endColorstr=#E6FFFFFF);
   padding: 0.625em;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 .questionset-results .greeting {
diff --git a/library.json b/library.json
index 7300936..44dc36b 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 35,
+  "patchVersion": 36,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From c678f5bbde24fe4a3065ea85284ce6e9ff53dfa4 Mon Sep 17 00:00:00 2001
From: Magnus Vik Magnussen <magnuma@855208.no-reply.drupal.org>
Date: Thu, 28 Nov 2013 13:23:09 +0100
Subject: [PATCH 76/83] HFJ-45 Done minor changes to various css files when
 working on the editor. -Changed background on intro text and question in
 Question Set. -Changed some minor css in interactive video editor -Improved
 vertical tabs (replaced image arrow with css arrow and change bitmap icons to
 Font Awesome icons)

Please note that verticalTabs needs review as it has a minor visual bug.
---
 css/questionset.css | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 2a76d34..88bbaf7 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -30,8 +30,8 @@
 }
 .h5p-multichoice > .h5p-question {
   text-align: left;
-  padding: 1em 0 0.2em;
-  margin: 0 0.5em 0.7em;
+  padding: 0.5em 0.5em 0.4em;
+  margin: 0.5em 0.5em 0.7em;
   background: rgba(255, 255, 255, 0.9);
   filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6FFFFFF,endColorstr=#e6FFFFFF);
   zoom: 1;
@@ -59,6 +59,12 @@
 .progress-dot.current {
   background: #267ec9;
 }
+
+.intro-page {
+  background: rgba(255, 255, 255, 0.9);
+  filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6FFFFFF,endColorstr=#e6FFFFFF);
+}
+
 .intro-page .title {
   font-size: 2em;
   line-height: 2em;
@@ -73,11 +79,9 @@
   margin: 3em auto;
   text-align: center;
 }
-
 .qs-footer {
   overflow: hidden;
 }
-
 .qs-footer .button, .qs-startbutton, .qs-finishbutton, .questionset-results .button, .video-container > .button {
   display: inline-block;
   padding: 0.2em 1em;
@@ -167,8 +171,6 @@
   background: rgba(255, 255, 255, 0.9);
   filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#E6FFFFFF,endColorstr=#E6FFFFFF);
   padding: 0.625em;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
 }
 
 .questionset-results .greeting {

From 8d3c5032de415c491e966d907b1708eebd634060 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Mon, 2 Dec 2013 13:19:40 +0100
Subject: [PATCH 77/83] Upped patch version.

---
 library.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library.json b/library.json
index 44dc36b..574d61c 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 36,
+  "patchVersion": 37,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From 7044c644bfc03d72ec3ae76ecd9074a58a8ea18f Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <with@amendor.com>
Date: Mon, 9 Dec 2013 10:13:17 +0100
Subject: [PATCH 78/83] Remove white fader on the intro page of the
 questionsets. This was requested by ndla

---
 css/questionset.css | 5 -----
 library.json        | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 88bbaf7..0f6bf83 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -60,11 +60,6 @@
   background: #267ec9;
 }
 
-.intro-page {
-  background: rgba(255, 255, 255, 0.9);
-  filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6FFFFFF,endColorstr=#e6FFFFFF);
-}
-
 .intro-page .title {
   font-size: 2em;
   line-height: 2em;
diff --git a/library.json b/library.json
index 574d61c..698195f 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 37,
+  "patchVersion": 38,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From bf3f3d0518fba2cad9be9b6a427ccf925bc6cce9 Mon Sep 17 00:00:00 2001
From: Svein-Tore Griff With <with@amendor.com>
Date: Wed, 15 Jan 2014 20:35:48 +0100
Subject: [PATCH 79/83] Fix a bug so that result heading in questionset
 translateable

---
 js/questionset.js | 6 +++---
 library.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index 91678aa..be05071 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -68,7 +68,7 @@ H5P.QuestionSet = function (options, contentId) {
 
   var resulttemplate =
           '<div class="questionset-results">' +
-          '  <div class="greeting"><%= greeting %></div>' +
+          '  <div class="greeting"><%= message %></div>' +
           '  <div class="score <%= scoreclass %>">' +
           '     <div class="emoticon"></div>' +
           '     <div class="resulttext <%= scoreclass %>"><% if (comment) { %><h2><%= comment %></h2><% } %><%= score %><br><%= resulttext %></div>' +
@@ -97,7 +97,7 @@ H5P.QuestionSet = function (options, contentId) {
     },
     endGame: {
       showResultPage: true,
-      greeting: 'Your result:',
+      message: 'Your result:',
       successGreeting: 'Congratulations!',
       successComment: 'You have enough correct answers to pass the test.',
       failGreeting: 'Sorry!',
@@ -235,7 +235,7 @@ H5P.QuestionSet = function (options, contentId) {
       }
 
       var eparams = {
-        greeting: params.endGame.greeting,
+        message: params.endGame.message,
         comment: (success ? params.endGame.successGreeting : params.endGame.failGreeting),
         score: scoreString,
         scoreclass: (success ? 'success' : 'fail'),
diff --git a/library.json b/library.json
index 698195f..4e2bf6b 100644
--- a/library.json
+++ b/library.json
@@ -3,7 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 38,
+  "patchVersion": 39,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From 06b0ecaa20d742d73871df36eef40f60e8ce4e4f Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 26 Feb 2014 10:59:53 +0100
Subject: [PATCH 80/83] HFJ-170: Removed question padding. Removed unused
 outdated content example.

Conflicts:
	example_content/boardgame/H5P.Boardgame/library.json
	example_content/boardgame/H5P.QuestionSet/library.json
---
 css/questionset.css | 3 +--
 library.json        | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/questionset.css b/css/questionset.css
index 0f6bf83..e63b276 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -30,7 +30,6 @@
 }
 .h5p-multichoice > .h5p-question {
   text-align: left;
-  padding: 0.5em 0.5em 0.4em;
   margin: 0.5em 0.5em 0.7em;
   background: rgba(255, 255, 255, 0.9);
   filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#e6FFFFFF,endColorstr=#e6FFFFFF);
@@ -244,4 +243,4 @@
   font-style: normal;
   color: #6aa81b;
   text-align: left;
-}
\ No newline at end of file
+}
diff --git a/library.json b/library.json
index 4e2bf6b..d42f9db 100644
--- a/library.json
+++ b/library.json
@@ -4,6 +4,7 @@
   "majorVersion": 1,
   "minorVersion": 0,
   "patchVersion": 39,
+  "patchVersion": 42,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From 6c9634eae7ce5dab41e981de8738a30944b4146a Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Fri, 21 Mar 2014 09:37:39 +0100
Subject: [PATCH 81/83] HFJ-187: Fixed copyrights for boardgame and libraries
 used there.

---
 js/questionset.js | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 library.json      |  3 +--
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/js/questionset.js b/js/questionset.js
index be05071..2809703 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -375,6 +375,47 @@ H5P.QuestionSet = function (options, contentId) {
     }
     return score;
   };
+  
+  /**
+   * Gather copyright information for the current content.
+   *
+   * @returns {H5P.ContentCopyrights}
+   */
+  var getCopyrights = function () {
+    var info = new H5P.ContentCopyrights();
+  
+    // Background
+    if (params.backgroundImage.copyright !== undefined) {
+      var background = new H5P.MediaCopyright(params.backgroundImage.copyright);
+      background.setThumbnail(new H5P.Thumbnail(H5P.getPath(params.backgroundImage.path, contentId), params.backgroundImage.width, params.backgroundImage.height));
+      info.addMedia(background);
+    }
+    
+    // Questions
+    for (var i = 0; i < questionInstances.length; i++) {
+      var questionInstance = questionInstances[i];
+      if (questionInstance.getCopyrights !== undefined) {
+        var rights = questionInstance.getCopyrights();
+        if (rights !== undefined) {
+          info.addContent(rights);
+        }
+      }
+    }
+    
+    // Success video
+    var video = params.endGame.successVideo[0];
+    if (video.copyright !== undefined) {
+      info.addMedia(new H5P.MediaCopyright(video.copyright));
+    }
+    
+    // Fail video
+    video = params.endGame.failVideo[0];
+    if (video.copyright !== undefined) {
+      info.addMedia(new H5P.MediaCopyright(video.copyright));
+    }
+  
+    return info;
+  }
 
   // Masquerade the main object to hide inner properties and functions.
   var returnObject = {
@@ -386,7 +427,8 @@ H5P.QuestionSet = function (options, contentId) {
     },
     totalScore: totalScore,
     reRender: reRender,
-    defaults: defaults // Provide defaults for inspection
+    defaults: defaults, // Provide defaults for inspection
+    getCopyrights: getCopyrights
   };
   return returnObject;
-};
\ No newline at end of file
+};
diff --git a/library.json b/library.json
index d42f9db..f172de4 100644
--- a/library.json
+++ b/library.json
@@ -3,8 +3,7 @@
   "contentType": "question",
   "majorVersion": 1,
   "minorVersion": 0,
-  "patchVersion": 39,
-  "patchVersion": 42,
+  "patchVersion": 43,
   "runnable": 1,
   "fullscreen": 0,
   "machineName": "H5P.QuestionSet",

From 7eca1c8c0b28391061925524592e05b61a7974f5 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Sun, 23 Mar 2014 01:27:49 +0100
Subject: [PATCH 82/83] HFJ-256: Added missing copyrights to boardgame.

---
 js/questionset.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/questionset.js b/js/questionset.js
index 2809703..3985f57 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -397,6 +397,7 @@ H5P.QuestionSet = function (options, contentId) {
       if (questionInstance.getCopyrights !== undefined) {
         var rights = questionInstance.getCopyrights();
         if (rights !== undefined) {
+          rights.setLabel('Question '+(i+1));
           info.addContent(rights);
         }
       }

From 1c749e63ecd4687a08d72f89d4c4acc60572db58 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Wed, 26 Mar 2014 15:56:54 +0100
Subject: [PATCH 83/83] Added README files.

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..75e49ea
--- /dev/null
+++ b/README.md
@@ -0,0 +1,16 @@
+H5P Question Set
+==========
+
+Test your users with by putting together multiple tasks into a question set(quiz).
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2012-2014 Amendor AS
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.