Merge branch 'api-1.1' into api-1.2

pull/1/head
Pål Jørgensen 2014-04-15 11:33:31 +02:00
commit 0bc40d1ef2
2 changed files with 4 additions and 2 deletions

View File

@ -21,7 +21,9 @@ H5P.QuestionSet = function (options, contentId) {
'<% if (introPage.showIntroPage) { %>' + '<% if (introPage.showIntroPage) { %>' +
'<div class="intro-page">' + '<div class="intro-page">' +
' <div class="title"><span><%= introPage.title %></span></div>' + ' <div class="title"><span><%= introPage.title %></span></div>' +
' <div class="introduction"><%= introPage.introduction %></div>' + ' <% if (introPage.introduction) { %>' +
' <div class="introduction"><%= introPage.introduction %></div>' +
' <% } %>' +
' <div class="buttons"><a class="qs-startbutton button"><%= introPage.startButtonText %></a></div>' + ' <div class="buttons"><a class="qs-startbutton button"><%= introPage.startButtonText %></a></div>' +
'</div>' + '</div>' +
'<% } %>' + '<% } %>' +

View File

@ -3,7 +3,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 0, "minorVersion": 0,
"patchVersion": 47, "patchVersion": 48,
"runnable": 1, "runnable": 1,
"fullscreen": 0, "fullscreen": 0,
"machineName": "H5P.QuestionSet", "machineName": "H5P.QuestionSet",