Skip to content
Snippets Groups Projects
Commit 9ccd0898 authored by gnaegi's avatar gnaegi
Browse files

OO-2781 Add velocity method for tool tips, add info about review status for student view

parent c901af74
No related branches found
No related tags found
No related merge requests found
Showing
with 111 additions and 26 deletions
...@@ -451,6 +451,30 @@ public class VelocityRenderDecorator implements Closeable { ...@@ -451,6 +451,30 @@ public class VelocityRenderDecorator implements Closeable {
return sb; return sb;
} }
/**
* Add some mouse-over help text to an element, ideally an icon
*
* @param domElem The DOM id of the element that triggers the mouse-over
* @param i18nKey The text to be displayed (including HTML formatting)
* @param position Optional param, values: top, bottom, left right. Default is "top"
* @return
*/
public StringOutput mouseoverHelp(String... args) {
String domElem = args[0];
String i18nKey = args[1];
String position = "top"; // default
if (args.length > 2 && args[2] != null) {
position = args[2];
}
StringOutput sb = new StringOutput(100);
sb.append("<script>jQuery(function () {jQuery('#").append(domElem).append("').tooltip({placement:\"").append(position).append("\",container: \"body\",html:true,title:\"");
if (i18nKey != null) {
sb.append(StringHelper.escapeJavaScript(translate(i18nKey)));
}
sb.append("\"});})</script>");
return sb;
}
/** /**
* @param componentName * @param componentName
* @param arg1 * @param arg1
......
...@@ -36,4 +36,4 @@ personal.title=Leistungs\u00fcbersicht ...@@ -36,4 +36,4 @@ personal.title=Leistungs\u00fcbersicht
title_video=Video title_video=Video
freezenoaccess.title=Kein Zugang freezenoaccess.title=Kein Zugang
freezenoaccess.message=Dieses Kurs ist im read-only Modus. freezenoaccess.message=Dieses Kurs ist im read-only Modus.
assessment.review.explanation=Die Beurteilung Ihrer Leistung durch Ihren Betreuer ist noch nicht abgeschlossen. Sobald die Bewertung freigegeben ist, wird diese hier angezeigt.
\ No newline at end of file
...@@ -36,3 +36,4 @@ title_ta=<s>Task (deprecated)</s> ...@@ -36,3 +36,4 @@ title_ta=<s>Task (deprecated)</s>
title_tu=External page title_tu=External page
title_video=Video title_video=Video
title_wiki=Wiki title_wiki=Wiki
assessment.review.explanation=The assessment of your performance has not yet been completed by your coach. Once the assessment is released, it will be displayed here.
...@@ -21,7 +21,11 @@ ...@@ -21,7 +21,11 @@
#if($resultsVisible) #if($resultsVisible)
$score $score
#else #else
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_score_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_score_in_review", "assessment.review.explanation")
#end #end
#else #else
<div class="o_noinfo">$r.translateWithPackage("org.olat.course.nodes.ms", "score.noscore")</div> <div class="o_noinfo">$r.translateWithPackage("org.olat.course.nodes.ms", "score.noscore")</div>
...@@ -35,7 +39,11 @@ ...@@ -35,7 +39,11 @@
<th>$r.translate("passed.yourpassed")</th> <th>$r.translate("passed.yourpassed")</th>
<td> <td>
#if($hasPassedValue && !$resultsVisible) #if($hasPassedValue && !$resultsVisible)
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_passed_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_passed_in_review", "assessment.review.explanation")
#elseif($hasPassedValue && $passed) #elseif($hasPassedValue && $passed)
<i class="o_icon o_icon_passed"> </i> $r.translate("passed.yes") <i class="o_icon o_icon_passed"> </i> $r.translate("passed.yes")
#elseif($hasPassedValue && !$passed) #elseif($hasPassedValue && !$passed)
......
...@@ -21,7 +21,11 @@ ...@@ -21,7 +21,11 @@
#if($resultsVisible) #if($resultsVisible)
$score $score
#else #else
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_score_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_score_in_review", "assessment.review.explanation")
#end #end
#else #else
<div class="o_noinfo">$r.translate("score.noscore")</div> <div class="o_noinfo">$r.translate("score.noscore")</div>
...@@ -41,7 +45,11 @@ ...@@ -41,7 +45,11 @@
<th>$r.translate("passed.yourpassed")</th> <th>$r.translate("passed.yourpassed")</th>
<td> <td>
#if($hasPassedValue && !$resultsVisible) #if($hasPassedValue && !$resultsVisible)
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_passed_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_passed_in_review", "assessment.review.explanation")
#elseif($hasPassedValue && $passed) #elseif($hasPassedValue && $passed)
<i class="o_icon o_icon_passed"> </i> $r.translate("passed.yes") <i class="o_icon o_icon_passed"> </i> $r.translate("passed.yes")
#elseif($hasPassedValue && !$passed) #elseif($hasPassedValue && !$passed)
......
...@@ -27,7 +27,11 @@ ...@@ -27,7 +27,11 @@
#if($resultsVisible) #if($resultsVisible)
$score $score
#else #else
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_score_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_score_in_review", "assessment.review.explanation")
#end #end
#end #end
</td> </td>
...@@ -36,7 +40,11 @@ ...@@ -36,7 +40,11 @@
<th>$r.translate("passed.yourpassed")</th> <th>$r.translate("passed.yourpassed")</th>
<td> <td>
#if($hasPassedValue && !$resultsVisible) #if($hasPassedValue && !$resultsVisible)
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_passed_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_passed_in_review", "assessment.review.explanation")
#elseif($hasPassedValue && $passed) #elseif($hasPassedValue && $passed)
<i class="o_icon o_icon_passed"></i> <i class="o_icon o_icon_passed"></i>
$r.translate("passed.yes") $r.translate("passed.yes")
......
...@@ -27,7 +27,11 @@ ...@@ -27,7 +27,11 @@
#if($resultsVisible) #if($resultsVisible)
$score $score
#else #else
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_score_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_score_in_review", "assessment.review.explanation")
#end #end
#end #end
</td> </td>
...@@ -36,7 +40,11 @@ ...@@ -36,7 +40,11 @@
<th>$r.translate("passed.yourpassed")</th> <th>$r.translate("passed.yourpassed")</th>
<td> <td>
#if($hasPassedValue && !$resultsVisible) #if($hasPassedValue && !$resultsVisible)
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_passed_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_passed_in_review", "assessment.review.explanation")
#elseif($hasPassedValue && $passed) #elseif($hasPassedValue && $passed)
<i class="o_icon o_icon_passed"></i> <i class="o_icon o_icon_passed"></i>
$r.translate("passed.yes") $r.translate("passed.yes")
......
...@@ -20,7 +20,11 @@ ...@@ -20,7 +20,11 @@
#if($resultsVisible) #if($resultsVisible)
$score $score
#else #else
$r.translate("in.review") <span id="o_score_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translate("in.review")
</span>
$r.mouseoverHelp("o_score_in_review", "assessment.review.explanation")
#end #end
#else #else
<div class="o_noinfo">$r.translate("score.noscore")</div> <div class="o_noinfo">$r.translate("score.noscore")</div>
...@@ -40,7 +44,11 @@ ...@@ -40,7 +44,11 @@
<th>$r.translate("passed.yourpassed")</th> <th>$r.translate("passed.yourpassed")</th>
<td> <td>
#if($hasPassedValue && !$resultsVisible) #if($hasPassedValue && !$resultsVisible)
$r.translate("in.review") <span id="o_passed_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translate("in.review")
</span>
$r.mouseoverHelp("o_passed_in_review", "assessment.review.explanation")
#elseif($hasPassedValue && $passed) #elseif($hasPassedValue && $passed)
<i class="o_icon o_icon_passed"> </i> $r.translate("passed.yes") <i class="o_icon o_icon_passed"> </i> $r.translate("passed.yes")
#elseif($hasPassedValue && !$passed) #elseif($hasPassedValue && !$passed)
......
...@@ -22,7 +22,11 @@ ...@@ -22,7 +22,11 @@
#if($resultsVisible) #if($resultsVisible)
$score $score
#else #else
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_score_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_score_in_review", "assessment.review.explanation")
#end #end
#else #else
<div class="o_noinfo">$r.translate("score.noscore")</div> <div class="o_noinfo">$r.translate("score.noscore")</div>
...@@ -42,7 +46,11 @@ ...@@ -42,7 +46,11 @@
<th>$r.translate("passed.yourpassed")</th> <th>$r.translate("passed.yourpassed")</th>
<td> <td>
#if($hasPassedValue && !$resultsVisible) #if($hasPassedValue && !$resultsVisible)
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_passed_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_passed_in_review", "assessment.review.explanation")
#elseif($hasPassedValue && $passed) #elseif($hasPassedValue && $passed)
<i class="o_icon o_icon_passed"> </i> $r.translate("map.passed") <i class="o_icon o_icon_passed"> </i> $r.translate("map.passed")
#elseif($hasPassedValue && !$passed) #elseif($hasPassedValue && !$passed)
......
...@@ -17,7 +17,11 @@ ...@@ -17,7 +17,11 @@
#if($resultsVisible) #if($resultsVisible)
$score $score
#else #else
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_score_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_score_in_review", "assessment.review.explanation")
#end #end
#end #end
</td> </td>
...@@ -26,7 +30,11 @@ ...@@ -26,7 +30,11 @@
<th>$r.translate("passed.yourpassed")</th> <th>$r.translate("passed.yourpassed")</th>
<td> <td>
#if($hasPassedValue && !$resultsVisible) #if($hasPassedValue && !$resultsVisible)
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review") <span id="o_passed_in_review" class="o_in_review">
<i class="o_icon o_icon-fw o_icon_warn"> </i>
$r.translateWithPackage("org.olat.course.nodes.ms", "in.review")
</span>
$r.mouseoverHelp("o_passed_in_review", "top", "$r.translateInAttribute("assessment.review.explanation")")
#elseif($hasPassedValue && $passed) #elseif($hasPassedValue && $passed)
<i class="o_icon o_icon_passed"> </i> $r.translate("passed.yes") <i class="o_icon o_icon_passed"> </i> $r.translate("passed.yes")
#elseif($hasPassedValue && !$passed) #elseif($hasPassedValue && !$passed)
......
...@@ -79,6 +79,10 @@ ...@@ -79,6 +79,10 @@
.o_statusinfo { .o_statusinfo {
@extend %o_note; @extend %o_note;
} }
.o_in_review {
font-style: italic;
position: relative;
}
@if not $o-course-show-icon-title { @if not $o-course-show-icon-title {
// hide icons in title, too much fuzz // hide icons in title, too much fuzz
......
This diff is collapsed.
source diff could not be displayed: it is too large. Options to address this: view the blob.
source diff could not be displayed: it is too large. Options to address this: view the blob.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment