Skip to content

Commit

Permalink
Merge branch 'release-48.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed May 28, 2024
2 parents 62b0876 + c479a42 commit 74d7a79
Show file tree
Hide file tree
Showing 12 changed files with 434 additions and 40 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"oat-sa/oatbox-extension-installer": "~1.1||dev-master",
"qtism/qtism": ">=0.28.3",
"oat-sa/generis" : ">=15.22",
"oat-sa/tao-core": ">=54.0.0",
"oat-sa/tao-core": ">=54.14.0",
"oat-sa/extension-tao-item" : ">=12.1.0",
"oat-sa/extension-tao-itemqti" : ">=30.10.0",
"oat-sa/extension-tao-test" : ">=16.0.0",
Expand Down
2 changes: 1 addition & 1 deletion views/css/creator.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/css/creator.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions views/js/controller/creator/templates/itemref-props.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</div>

<!-- assessmentTest/testPart/assessmentSection/sectionPart/required -->
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-required">{{__ 'Required'}}</label>
</div>
Expand All @@ -55,7 +55,7 @@
</div>

<!-- assessmentTest/testPart/assessmentSection/sectionPart/fixed -->
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-fixed">{{__ 'Fixed'}}</label>
</div>
Expand Down Expand Up @@ -154,7 +154,7 @@

<!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/showFeedback -->
{{#if itemSessionShowFeedback}}
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-show-feedback">{{__ 'Show Feedback'}}</label>
</div>
Expand All @@ -175,7 +175,7 @@

{{!-- Property not yet available in delivery
<!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/allowReview -->
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-show-allow-review">{{__ 'Allow Review'}}</label>
</div>
Expand All @@ -196,7 +196,7 @@

{{!-- Property not yet available in delivery
<!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/showSolution -->
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-show-solution">{{__ 'Show Solution'}}</label>
</div>
Expand All @@ -217,7 +217,7 @@

<!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/allowComment -->
{{#if itemSessionAllowComment}}
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-allow-comment">{{__ 'Allow Comment'}}</label>
</div>
Expand All @@ -238,7 +238,7 @@

<!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/allowSkipping -->
{{#if itemSessionAllowSkipping}}
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-allow-skipping">{{__ 'Allow Skipping'}}</label>
</div>
Expand All @@ -258,7 +258,7 @@
{{/if}}

<!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/validateResponses -->
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-validate-responses">{{__ 'Validate Responses'}}</label>
</div>
Expand Down Expand Up @@ -314,7 +314,7 @@
</div>
</div>
</div>

<!-- assessmentTest/testPart/assessmentSection/sectionPart/timeLimits/maxTime -->
<div class="grid-row maxtime-container {{#if isLinear}}hidden{{/if}}">
<div class="col-5">
Expand Down Expand Up @@ -348,7 +348,7 @@
</div>

<!-- assessmentTest/testPart/assessmentSection/sectionPart/timeLimits/allowLateSubmission -->
<div class="grid-row pseudo-label-box">
<div class="grid-row pseudo-label-box checkbox-row">
<div class="col-5">
<label for="itemref-allow-late-submission">{{__ 'Late submission allowed'}}</label>
</div>
Expand Down
4 changes: 2 additions & 2 deletions views/js/controller/creator/templates/rubricblock-props.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<div class="rubric-feedback toggled">

<!--assessmentTest/testPart/assessmentSection/sectionPart/rubricBlock/feedback/activated -->
<div class="grid-row rubric-feedback-activated">
<div class="grid-row rubric-feedback-activated checkbox-row">
<div class="col-5">
<label for="activated">{{__ 'Activated'}}</label>
</div>
Expand Down Expand Up @@ -118,4 +118,4 @@
</div>
</div>
{{/with}}
</div>
</div>
Loading

0 comments on commit 74d7a79

Please sign in to comment.