diff --git a/css/questionset.css b/css/questionset.css index e2bb0fd..8a884ea 100644 --- a/css/questionset.css +++ b/css/questionset.css @@ -32,13 +32,14 @@ } .progress-dot { display: inline-block; - width: 0.6em; - height: 0.6em; + width: 0.5625em; + height: 0.5625em; border-radius: 50%; margin: 0 0.25em; cursor: pointer; - background: #fff; - background: #cecece; + border: 1px solid #1356a3; + position: relative; + transition: transform 0.2s; } .progress-dot.disabled { @@ -46,32 +47,43 @@ } .progress-dot:not(.disabled):hover { - box-shadow: 0 0 0.5em #c7c7c7; + transform: scale(1.25); } .progress-dot.answered { - background: #73a2d5; + background: #1356a3; +} +.progress-dot:before { + display: block; + content: ""; + border: 2px solid transparent; + width: calc(100% + 10px); + height: calc(100% + 10px); + border-radius: 50%; + position: absolute; + box-sizing: border-box; + left: -5px; + top: -5px; + transition: border-color 0.5s; } -.progress-dot.current { - background: #285585; + +.progress-dot.current:before { + border-color: #285585; } -.progress-dot.disabled:focus { +.progress-dot.disabled:focus-visible { outline: none } .progress-dot:focus { - outline-color: rgb(40, 130, 211); - outline-width: thin; - outline-style: solid; + transform: scale(1.15); } .intro-page .title { - font-size: 2em; - line-height: 2em; + line-height: 1.5; font-weight: bold; text-align: center; } -.intro-page .title > span { +.intro-page .title > h1 { padding: 0.125em 0.5em; border-radius: 0.125em; background: rgb(255,255,255); /* Fallback for browsers not supporting rgba */ diff --git a/js/questionset.js b/js/questionset.js index a1e6202..5afd6c9 100644 --- a/js/questionset.js +++ b/js/questionset.js @@ -40,18 +40,21 @@ H5P.QuestionSet = function (options, contentId, contentData) { prevButton: 'Previous question', nextButton: 'Next question', finishButton: 'Finish', + submitButton: 'Submit', textualProgress: 'Question: @current of @total questions', jumpToQuestion: 'Question %d of %total', questionLabel: 'Question', readSpeakerProgress: 'Question @current of @total', unansweredText: 'Unanswered', answeredText: 'Answered', - currentQuestionText: 'Current question' + currentQuestionText: 'Current question', + navigationLabel: 'Questions' }, endGame: { showResultPage: true, noResultMessage: 'Finished', message: 'Your result:', + scoreBarLabel: 'You got @finals out of @totals points', oldFeedback: { successGreeting: '', successComment: '', @@ -60,6 +63,7 @@ H5P.QuestionSet = function (options, contentId, contentData) { }, overallFeedback: [], finishButtonText: 'Finish', + submitButtonText: 'Submit', solutionButtonText: 'Show solution', retryButtonText: 'Retry', submitButtonText: 'Submit', @@ -77,29 +81,31 @@ H5P.QuestionSet = function (options, contentId, contentData) { }, disableBackwardsNavigation: false }; + this.isSubmitting = contentData + && (contentData.isScoringEnabled || contentData.isReportingEnabled); var params = $.extend(true, {}, defaults, options); var texttemplate = - '<% if (introPage.showIntroPage) { %>' + + '<% if (introPage.showIntroPage && noOfQuestionAnswered === 0) { %>' + '
' + ' <% if (introPage.title) { %>' + - '
<%= introPage.title %>
' + + '

<%= introPage.title %>

' + ' <% } %>' + ' <% if (introPage.introduction) { %>' + '
<%= introPage.introduction %>
' + ' <% } %>' + - '
<%= introPage.startButtonText %>
' + + '
' + '
' + '<% } %>' + '
' + - '
' + + '
' + ' <% for (var i=0; i' + '
' + ' <% } %>' + '