From 8e9b47edc965c99f7f83b30f31d750ebadba01f9 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 18 Jan 2019 10:01:38 +0100
Subject: [PATCH] OO-3813: replace illegal velocity variable names
---
.../nodes/cl/ui/CheckListRunController.java | 6 +++---
.../olat/course/nodes/cl/ui/_content/run.html | 12 ++++++------
.../olat/course/nodes/iq/IQRunController.java | 6 +++---
.../nodes/iq/QTI21AssessmentRunController.java | 6 +++---
.../nodes/iq/_content/assessment_disclaimer.html | 4 ++--
.../course/nodes/iq/_content/assessment_run.html | 8 ++++----
.../olat/course/nodes/iq/_content/testrun.html | 16 ++++++++--------
.../nodes/ms/MSCourseNodeRunController.java | 6 +++---
.../org/olat/course/nodes/ms/_content/run.html | 12 ++++++------
.../PortfolioCourseNodeRunController.java | 4 ++--
.../portfolio/_content/assessment_infos.html | 8 ++++----
11 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java b/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java
index cbf74aaa659..1f4eee48726 100644
--- a/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java
+++ b/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java
@@ -191,7 +191,7 @@ public class CheckListRunController extends FormBasicController implements Contr
String infoTextUser = (String) config.get(MSCourseNode.CONFIG_KEY_INFOTEXT_USER);
if(StringHelper.containsNonWhitespace(infoTextUser)) {
layoutCont.contextPut(MSCourseNode.CONFIG_KEY_INFOTEXT_USER, infoTextUser);
- layoutCont.contextPut("in-disclaimer", isPanelOpen(ureq, "disclaimer", true));
+ layoutCont.contextPut("indisclaimer", isPanelOpen(ureq, "disclaimer", true));
}
layoutCont.contextPut(MSCourseNode.CONFIG_KEY_PASSED_CUT_VALUE, AssessmentHelper.getRoundedScore((Float)config.get(MSCourseNode.CONFIG_KEY_PASSED_CUT_VALUE)));
layoutCont.contextPut(MSCourseNode.CONFIG_KEY_SCORE_MIN, AssessmentHelper.getRoundedScore((Float)config.get(MSCourseNode.CONFIG_KEY_SCORE_MIN)));
@@ -216,14 +216,14 @@ public class CheckListRunController extends FormBasicController implements Contr
if(courseNode.hasCommentConfigured()) {
StringBuilder comment = Formatter.stripTabsAndReturns(scoreEval.getComment());
layoutCont.contextPut("comment", StringHelper.xssScan(comment));
- layoutCont.contextPut("in-comment", isPanelOpen(ureq, "comment", true));
+ layoutCont.contextPut("incomment", isPanelOpen(ureq, "comment", true));
}
if(courseNode.hasIndividualAsssessmentDocuments()) {
List<File> docs = courseNode.getIndividualAssessmentDocuments(userCourseEnv);
String mapperUri = registerCacheableMapper(ureq, null, new DocumentsMapper(docs));
layoutCont.contextPut("docsMapperUri", mapperUri);
layoutCont.contextPut("docs", docs);
- layoutCont.contextPut("in-assessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
+ layoutCont.contextPut("inassessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
}
} else {
layoutCont.contextPut("comment", null);
diff --git a/src/main/java/org/olat/course/nodes/cl/ui/_content/run.html b/src/main/java/org/olat/course/nodes/cl/ui/_content/run.html
index a6078734409..24dac7e1190 100644
--- a/src/main/java/org/olat/course/nodes/cl/ui/_content/run.html
+++ b/src/main/java/org/olat/course/nodes/cl/ui/_content/run.html
@@ -69,11 +69,11 @@
<div class="panel panel-default o_comment">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseComment">
<h4 class="panel-title">
- <i id="collapseCommentToggler" class="o_icon o_icon-fw #if($r.isTrue($in-comment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseCommentToggler" class="o_icon o_icon-fw #if($r.isTrue($incomment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("comment.title")
</h4>
</div>
- <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($in-comment)) in #end"><div class="panel-body">
+ <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($incomment)) in #end"><div class="panel-body">
$comment
</div></div>
</div>
@@ -95,11 +95,11 @@
<div class="panel panel-default o_assessment_docs">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseAssessmentDocuments">
<h4 class="panel-title">
- <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($in-assessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($inassessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("assessment.documents.title")
</h4>
</div>
- <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($in-assessmentDocuments)) in #end"><div class="panel-body">
+ <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($inassessmentDocuments)) in #end"><div class="panel-body">
<ul class="list-unstyled">
#foreach($doc in $docs)
<li><a href="$docsMapperUri/$doc.name" target="_blank"><i class="o_icon o_icon-fw $r.getFiletypeIconCss($doc.name)"> </i> $r.escapeHtml($doc.name) ($r.formatBytes(${doc.length()}))</a></li>
@@ -125,11 +125,11 @@
<div class="panel panel-default o_disclaimer">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseDisclaimer">
<h4 class="panel-title">
- <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($in-disclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($indisclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("info.title")
</h4>
</div>
- <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($in-disclaimer)) in #end"><div class="panel-body">
+ <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($indisclaimer)) in #end"><div class="panel-body">
$r.formatLatexFormulas($infoTextUser)
</div></div>
</div>
diff --git a/src/main/java/org/olat/course/nodes/iq/IQRunController.java b/src/main/java/org/olat/course/nodes/iq/IQRunController.java
index 028a218ee9a..3e46c174faa 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQRunController.java
@@ -368,7 +368,7 @@ public class IQRunController extends BasicController implements GenericEventList
myContent.put("disc", iFrameCtr.getInitialComponent());
iFrameCtr.setCurrentURI(sDisclaimer);
myContent.contextPut("hasDisc", Boolean.TRUE);
- myContent.contextPut("in-disclaimer", isPanelOpen(ureq, "disclaimer", true));
+ myContent.contextPut("indisclaimer", isPanelOpen(ureq, "disclaimer", true));
}
}
}
@@ -657,7 +657,7 @@ public class IQRunController extends BasicController implements GenericEventList
if(acn.hasCommentConfigured()) {
StringBuilder comment = Formatter.stripTabsAndReturns(assessmentEntry.getComment());
myContent.contextPut("comment", StringHelper.xssScan(comment));
- myContent.contextPut("in-comment", isPanelOpen(ureq, "comment", true));
+ myContent.contextPut("incomment", isPanelOpen(ureq, "comment", true));
}
if(acn.hasIndividualAsssessmentDocuments()) {
@@ -665,7 +665,7 @@ public class IQRunController extends BasicController implements GenericEventList
String mapperUri = registerCacheableMapper(ureq, null, new DocumentsMapper(docs));
myContent.contextPut("docsMapperUri", mapperUri);
myContent.contextPut("docs", docs);
- myContent.contextPut("in-assessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
+ myContent.contextPut("inassessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
}
}
myContent.contextPut("attempts", assessmentEntry.getAttempts() == null ? 0 : assessmentEntry.getAttempts());
diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
index a9cd8136382..dbf5c15c562 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
@@ -208,7 +208,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
disclaimerVC.put("disc", iFrameCtr.getInitialComponent());
iFrameCtr.setCurrentURI(sDisclaimer);
disclaimerVC.contextPut("hasDisc", Boolean.TRUE);
- disclaimerVC.contextPut("in-disclaimer", isPanelOpen(ureq, "disclaimer", true));
+ disclaimerVC.contextPut("indisclaimer", isPanelOpen(ureq, "disclaimer", true));
}
}
}
@@ -298,7 +298,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
StringBuilder comment = Formatter.stripTabsAndReturns(testCourseNode.getUserUserComment(userCourseEnv));
if (comment != null && comment.length() > 0) {
mainVC.contextPut("comment", StringHelper.xssScan(comment));
- mainVC.contextPut("in-comment", isPanelOpen(ureq, "comment", true));
+ mainVC.contextPut("incomment", isPanelOpen(ureq, "comment", true));
}
}
@@ -307,7 +307,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
String mapperUri = registerCacheableMapper(ureq, null, new DocumentsMapper(docs));
mainVC.contextPut("docsMapperUri", mapperUri);
mainVC.contextPut("docs", docs);
- mainVC.contextPut("in-assessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
+ mainVC.contextPut("inassessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
}
}
Integer attempts = assessmentEntry.getAttempts();
diff --git a/src/main/java/org/olat/course/nodes/iq/_content/assessment_disclaimer.html b/src/main/java/org/olat/course/nodes/iq/_content/assessment_disclaimer.html
index 354382e9d4c..fb35b729a2a 100644
--- a/src/main/java/org/olat/course/nodes/iq/_content/assessment_disclaimer.html
+++ b/src/main/java/org/olat/course/nodes/iq/_content/assessment_disclaimer.html
@@ -2,11 +2,11 @@
<div class="panel panel-default o_disclaimer">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseDisclaimer">
<h4 class="panel-title">
- <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($in-disclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($indisclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("disclaimer")
</h4>
</div>
- <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($in-disclaimer)) in #end"><div class="panel-body">
+ <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($indisclaimer)) in #end"><div class="panel-body">
$r.render("disc")
</div></div>
<script>
diff --git a/src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html b/src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html
index d181271b76a..34c3b354e3f 100644
--- a/src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html
+++ b/src/main/java/org/olat/course/nodes/iq/_content/assessment_run.html
@@ -72,10 +72,10 @@
<div class="panel panel-default o_comment">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseComment">
<h4 class="panel-title">
- <i id="collapseCommentsToggler" class="o_icon o_icon-fw #if($r.isTrue($in-comment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseCommentsToggler" class="o_icon o_icon-fw #if($r.isTrue($incomment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("comment.yourcomment")</h4>
</div>
- <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($in-comment)) in #end"><div class="panel-body">
+ <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($incomment)) in #end"><div class="panel-body">
$comment
</div>
</div></div>
@@ -97,11 +97,11 @@
<div class="panel panel-default o_assessment_docs">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseAssessmentDocuments">
<h4 class="panel-title">
- <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($in-assessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($inassessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("assessment.documents.title")
</h4>
</div>
- <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($in-assessmentDocuments)) in #end"><div class="panel-body">
+ <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($inassessmentDocuments)) in #end"><div class="panel-body">
<ul class="list-unstyled">
#foreach($doc in $docs)
<li><a href="$docsMapperUri/$doc.name" target="_blank"><i class="o_icon o_icon-fw $r.getFiletypeIconCss($doc.name)"> </i> $r.escapeHtml($doc.name) ($r.formatBytes(${doc.length()}))</a></li>
diff --git a/src/main/java/org/olat/course/nodes/iq/_content/testrun.html b/src/main/java/org/olat/course/nodes/iq/_content/testrun.html
index f5e85abc3c9..406a12ee58c 100644
--- a/src/main/java/org/olat/course/nodes/iq/_content/testrun.html
+++ b/src/main/java/org/olat/course/nodes/iq/_content/testrun.html
@@ -64,11 +64,11 @@
<div class="panel panel-default o_comment">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseComment">
<h4 class="panel-title">
- <i id="collapseCommentsToggler" class="o_icon o_icon-fw #if($r.isTrue($in-comment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseCommentsToggler" class="o_icon o_icon-fw #if($r.isTrue($incomment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("comment.yourcomment")
</h4>
</div>
- <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($in-comment)) in #end"><div class="panel-body">
+ <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($incomment)) in #end"><div class="panel-body">
$comment
</div></div>
</div>
@@ -90,11 +90,11 @@
<div class="panel panel-default o_assessment_docs">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseAssessmentDocuments">
<h4 class="panel-title">
- <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($in-assessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($inassessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("assessment.documents.title")
</h4>
</div>
- <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($in-assessmentDocuments)) in #end"><div class="panel-body">
+ <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($inassessmentDocuments)) in #end"><div class="panel-body">
<ul class="list-unstyled">
#foreach($doc in $docs)
<li><a href="$docsMapperUri/$doc.name" target="_blank"><i class="o_icon o_icon-fw $r.getFiletypeIconCss($doc.name)"> </i> $r.escapeHtml($doc.name) ($r.formatBytes(${doc.length()}))</a></li>
@@ -185,11 +185,11 @@
<div class="panel panel-default o_disclaimer">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseDisclaimer">
<h4 class="panel-title">
- <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($in-disclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($indisclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("disclaimer")
</h4>
</div>
- <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($in-disclaimer)) in #end"><div class="panel-body">
+ <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($indisclaimer)) in #end"><div class="panel-body">
$r.render("disc")
</div></div>
<script type="text/javascript">
@@ -211,11 +211,11 @@
<div class="panel panel-default o_disclaimer">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseDisclaimer">
<h4 class="panel-title">
- <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($in-disclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($indisclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("disclaimer")
</h4>
</div>
- <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($in-disclaimer)) in #end"><div class="panel-body">
+ <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($indisclaimer)) in #end"><div class="panel-body">
$r.render("disc")
</div></div>
<script type="text/javascript">
diff --git a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java
index f383cb3e4c3..7bcf30c36b7 100644
--- a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java
+++ b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java
@@ -200,7 +200,7 @@ public class MSCourseNodeRunController extends BasicController implements Activa
String infoTextUser = (String) config.get(MSCourseNode.CONFIG_KEY_INFOTEXT_USER);
if(StringHelper.containsNonWhitespace(infoTextUser)) {
myContent.contextPut(MSCourseNode.CONFIG_KEY_INFOTEXT_USER, infoTextUser);
- myContent.contextPut("in-disclaimer", isPanelOpen(ureq, "disclaimer", true));
+ myContent.contextPut("indisclaimer", isPanelOpen(ureq, "disclaimer", true));
}
myContent.contextPut(MSCourseNode.CONFIG_KEY_PASSED_CUT_VALUE, AssessmentHelper.getRoundedScore((Float)config.get(MSCourseNode.CONFIG_KEY_PASSED_CUT_VALUE)));
myContent.contextPut(MSCourseNode.CONFIG_KEY_SCORE_MIN, AssessmentHelper.getRoundedScore((Float)config.get(MSCourseNode.CONFIG_KEY_SCORE_MIN)));
@@ -231,7 +231,7 @@ public class MSCourseNodeRunController extends BasicController implements Activa
if(hasComment) {
StringBuilder comment = Formatter.stripTabsAndReturns(rawComment);
myContent.contextPut("comment", StringHelper.xssScan(comment));
- myContent.contextPut("in-comment", isPanelOpen(ureq, "comment", true));
+ myContent.contextPut("incomment", isPanelOpen(ureq, "comment", true));
}
if(courseNode.hasIndividualAsssessmentDocuments()) {
@@ -239,7 +239,7 @@ public class MSCourseNodeRunController extends BasicController implements Activa
mapperUri = registerCacheableMapper(ureq, null, new DocumentsMapper(docs));
myContent.contextPut("docsMapperUri", mapperUri);
myContent.contextPut("docs", docs);
- myContent.contextPut("in-assessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
+ myContent.contextPut("inassessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
if(download == null) {
download = new DisplayOrDownloadComponent("", null);
myContent.put("download", download);
diff --git a/src/main/java/org/olat/course/nodes/ms/_content/run.html b/src/main/java/org/olat/course/nodes/ms/_content/run.html
index 4104256a4ab..2ee765f5c42 100644
--- a/src/main/java/org/olat/course/nodes/ms/_content/run.html
+++ b/src/main/java/org/olat/course/nodes/ms/_content/run.html
@@ -67,11 +67,11 @@
<div class="panel panel-default o_comment">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseComment">
<h4 class="panel-title">
- <i id="collapseCommentToggler" class="o_icon o_icon-fw #if($r.isTrue($in-comment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseCommentToggler" class="o_icon o_icon-fw #if($r.isTrue($incomment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("comment.title")
</h4>
</div>
- <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($in-comment)) in #end"><div class="panel-body">
+ <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($incomment)) in #end"><div class="panel-body">
$comment
</div></div>
</div>
@@ -93,11 +93,11 @@
<div class="panel panel-default o_assessment_docs">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseAssessmentDocuments">
<h4 class="panel-title">
- <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($in-assessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($inassessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("assessment.documents.title")
</h4>
</div>
- <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($in-assessmentDocuments)) in #end"><div class="panel-body">
+ <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($inassessmentDocuments)) in #end"><div class="panel-body">
<ul class="list-unstyled">
#foreach($doc in $docs)
<li><a href="$docsMapperUri/$doc.name" target="_blank"><i class="o_icon o_icon-fw $r.getFiletypeIconCss($doc.name)"> </i> $r.escapeHtml($doc.name) ($r.formatBytes(${doc.length()}))</a></li>
@@ -123,11 +123,11 @@
<div class="panel panel-default o_disclaimer">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseDisclaimer">
<h4 class="panel-title">
- <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($in-disclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseDisclaimerToggler" class="o_icon o_icon-fw #if($r.isTrue($indisclaimer)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("info.title")
</h4>
</div>
- <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($in-disclaimer)) in #end"><div class="panel-body">
+ <div id="collapseDisclaimer" class="panel-collapse collapse #if($r.isTrue($indisclaimer)) in #end"><div class="panel-body">
$r.formatLatexFormulas($infoTextUser)
</div></div>
</div>
diff --git a/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeRunController.java b/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeRunController.java
index 3ca73e4ab83..d1243452866 100644
--- a/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeRunController.java
+++ b/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeRunController.java
@@ -338,7 +338,7 @@ public class PortfolioCourseNodeRunController extends FormBasicController {
AssessmentManager am = userCourseEnv.getCourseEnvironment().getAssessmentManager();
String comment = am.getNodeComment(courseNode, getIdentity());
assessmentInfosContainer.contextPut("comment", comment);
- assessmentInfosContainer.contextPut("in-comment", isPanelOpen(ureq, "comment", true));
+ assessmentInfosContainer.contextPut("incomment", isPanelOpen(ureq, "comment", true));
}
if(courseNode.hasIndividualAsssessmentDocuments()) {
@@ -346,7 +346,7 @@ public class PortfolioCourseNodeRunController extends FormBasicController {
String mapperUri = registerCacheableMapper(ureq, null, new DocumentsMapper(docs));
assessmentInfosContainer.contextPut("docsMapperUri", mapperUri);
assessmentInfosContainer.contextPut("docs", docs);
- assessmentInfosContainer.contextPut("in-assessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
+ assessmentInfosContainer.contextPut("inassessmentDocuments", isPanelOpen(ureq, "assessmentDocuments", true));
}
}
assessmentInfosContainer.setVisible(true);
diff --git a/src/main/java/org/olat/course/nodes/portfolio/_content/assessment_infos.html b/src/main/java/org/olat/course/nodes/portfolio/_content/assessment_infos.html
index 103cf602113..6aa57e27726 100644
--- a/src/main/java/org/olat/course/nodes/portfolio/_content/assessment_infos.html
+++ b/src/main/java/org/olat/course/nodes/portfolio/_content/assessment_infos.html
@@ -70,9 +70,9 @@
<div class="panel panel-default o_comment">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseComment">
<h4 class="panel-title">
- <i id="collapseCommentToggler" class="o_icon o_icon-fw #if($r.isTrue($in-comment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i> $r.translate("map.comment")</h4>
+ <i id="collapseCommentToggler" class="o_icon o_icon-fw #if($r.isTrue($incomment)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i> $r.translate("map.comment")</h4>
</div>
- <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($in-comment)) in #end"><div class="panel-body">$comment</div></div>
+ <div id="collapseComment" class="panel-collapse collapse #if($r.isTrue($incomment)) in #end"><div class="panel-body">$comment</div></div>
</div>
<script type="text/javascript">
/* <![CDATA[ */
@@ -92,11 +92,11 @@
<div class="panel panel-default o_assessment_docs">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseAssessmentDocuments">
<h4 class="panel-title">
- <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($in-assessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
+ <i id="collapseAssessmentDocumentsToggler" class="o_icon o_icon-fw #if($r.isTrue($inassessmentDocuments)) o_icon_close_togglebox #else o_icon_open_togglebox #end"> </i>
$r.translate("assessment.documents.title")
</h4>
</div>
- <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($in-assessmentDocuments)) in #end"><div class="panel-body">
+ <div id="collapseAssessmentDocuments" class="panel-collapse collapse #if($r.isTrue($inassessmentDocuments)) in #end"><div class="panel-body">
<ul class="list-unstyled">
#foreach($doc in $docs)
<li><a href="$docsMapperUri/$doc.name" target="_blank"><i class="o_icon o_icon-fw $r.getFiletypeIconCss($doc.name)"> </i> $r.escapeHtml($doc.name) ($r.formatBytes(${doc.length()}))</a></li>
--
GitLab