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 cbf74aaa65935fc4c3fe413dec5076ebcc2a61ba..1f4eee48726cab02ccd2048ce8b2278b6ba18920 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 a60787344097a6864dd1d68dc76e30d68c362ef1..24dac7e119001bb87e2862ec49b40c37587c4c16 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 028a218ee9a4b3fd4da0f309b8677495a88c22d9..3e46c174faab3df35dffbcfaad251a0d4bc2523f 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 a9cd8136382f5f9d68f2abc1d2c71211407fd7ec..dbf5c15c562ad920e5216c37a5afdbdef48a45c9 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 354382e9d4c1bde459b36acf53a795bad22502e7..fb35b729a2a4ca6eb9da6d42963d364516fa7a45 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 d181271b76ab232b72b37509bd2e1d7d04498328..34c3b354e3f383124ef3a631ce2385eba01fbb6c 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 f5e85abc3c97bfc52095e6467faddff9e8a83d38..406a12ee58c3c5eae1b61a98d4b50556687d2aa8 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 f383cb3e4c37c2f17c3eb2c5f545fc0a0c673821..7bcf30c36b7029d8fe84dbd83788fb25dc19564c 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 4104256a4ab5f37d03253bc6e9d80f88aed14183..2ee765f5c424245471c1df47d9d0c2ad2ba43377 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 3ca73e4ab83d74bd365399bc8b15ed58a5cf8ddb..d1243452866b08b13a792c698ac4427993f709ad 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 103cf602113035c9a3155cc6d5e514fc8fd83e73..6aa57e2772627d2168e6d25e7c8389cd5248e546 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>