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 b91f12596226dbc429881624785c6e0ac1a68908..6b4323a562f09a9abbf320e12c483b0214073818 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
@@ -1,78 +1,73 @@
-<div class="o_course_run_scoreinfo">
- #if ($hasScoreField)
- <h4>$r.translate("score.title")</h4>
- <table>
- <tbody>
- <tr>
- <td>
- $r.translate("score.min"):
- </td>
- <td>
- $scoreMin
- </td>
- </tr>
- <tr>
- <td>
- $r.translate("score.max"):
- </td>
- <td>
- $scoreMax
- </td>
- </tr>
- <tr>
- <td>
- $r.translate("score.yourscore"):
- </td>
- <td>
- #if($score)
- $score
- #else
- <div class="o_course_run_scoreinfo_noinfo">$r.translate("score.noscore")</div>
- #end
- </td>
- </tr>
- </tbody>
- </table>
- #end
-
- #if ($hasPassedField)
- <h4>$r.translate("passed.title")</h4>
- <table>
- <tbody>
- #if ($passedCutValue)
- <tr>
- <td>
- $r.translate("passed.cut"):
- </td>
- <td>
- $passedCutValue
- </td>
- </tr>
+#if ($hasScoreField || $hasPassedField)
+
+<div class="panel panel-default o_personal">
+ <div class="panel-heading">
+ <h4 class="panel-title">$r.translate("score.title")</h4>
+ </div>
+ <table class="table">
+ <tbody>
+ #if ($hasScoreField)
+ <tr class="o_score_config_min">
+ <th>$r.translate("score.min")</th>
+ <td>$scoreMin</td>
+ </tr>
+ <tr class="o_score_config_max">
+ <th>$r.translate("score.max")</th>
+ <td>$scoreMax</td>
+ </tr>
+ <tr class="o_score">
+ <th>$r.translate("score.yourscore")</th>
+ <td>
+ #if($score)
+ $score
+ #else
+ <div class="o_noinfo">$r.translate("score.noscore")</div>
+ #end
+ </td>
+ </tr>
+ #end
+
+ #if ($hasPassedField)
+ #if ($passedCutValue)
+ <tr class="o_cutval">
+ <th>$r.translate("passed.cut")</th>
+ <td>$passedCutValue</td>
+ </tr>
+ #end
+ <tr class="o_state #if ($hasPassedValue && $passed) o_passed #elseif($hasPassedValue && !$passed) o_failed #else o_unknown #end">
+ <th>$r.translate("passed.yourpassed")</th>
+ <td>
+ #if($hasPassedValue && $passed)
+ <i class="o_icon o_icon_passed"></i> $r.translate("map.passed")
+ #elseif($hasPassedValue && !$passed)
+ <i class="o_icon o_icon_failed"></i> $r.translate("map.not.passed")
+ #else
+ <div class="o_noinfo">$r.translate("map.not.rated.yet")</div>
#end
- <tr>
- <td>
- $r.translate("passed.yourpassed"):
- </td>
- <td>
- #if($hasPassedValue && $passed == true)
- <span class="o_state o_passed">$r.translate("map.passed")</span>
- #elseif($hasPassedValue && $passed == false)
- <span class="o_state o_failed"><i class="o_icon o_icon_failed"> </i> $r.translate("map.not.passed")</span>
- #else
- <div class="o_course_run_scoreinfo_noinfo">$r.translate("map.not.rated.yet")</div>
- #end
- </td>
- </tr>
- </tbody>
- </table>
- #end
-
- #if ($hasCommentField)
- <h4>$r.translate("map.comment")</h4>
- #if ($comment)
- $comment
- #else
- <div class="o_course_run_scoreinfo_noinfo">$r.translate("comment.nocomment")</div>
+ </td>
+ </tr>
#end
- #end
-</div>
\ No newline at end of file
+ </tbody>
+ </table>
+</div>
+#end
+
+#if ($comment && !$comment.isEmpty())
+<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 o_icon_close_togglebox"> </i> $r.translate("map.comment")</h4>
+ </div>
+ <div id="collapseComment" class="panel-collapse collapse in"><div class="panel-body">$comment</div></div>
+</div>
+<script type="text/javascript">
+ /* <![CDATA[ */
+ jQuery('#collapseComment').on('hide.bs.collapse', function () {
+ jQuery('#collapseCommentToggler').removeClass('o_icon_close_togglebox').addClass('o_icon_open_togglebox');
+ })
+ jQuery('#collapseComment').on('show.bs.collapse', function () {
+ jQuery('#collapseCommentToggler').removeClass('o_icon_open_togglebox').addClass('o_icon_close_togglebox');
+ })
+ /* ]]> */
+</script>
+#end
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/portfolio/_content/run.html b/src/main/java/org/olat/course/nodes/portfolio/_content/run.html
index a955095c37075c178fe3524cd4e0f99983632281..8d4386aad30b4b393e9475244394cc3b202b2eca 100644
--- a/src/main/java/org/olat/course/nodes/portfolio/_content/run.html
+++ b/src/main/java/org/olat/course/nodes/portfolio/_content/run.html
@@ -1,2 +1,2 @@
-$r.render("infos")
-$r.render("assessmentInfos")
\ No newline at end of file
+$r.render("assessmentInfos")
+$r.render("infos")
\ No newline at end of file
diff --git a/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java b/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
index 6ebb35beb3cb69efb76ea84d306fbc02f7dca499..68c5a00f23c33b87b335c71314d7e7e9d6630bd1 100644
--- a/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
+++ b/src/main/java/org/olat/repository/ui/RepositoryEntryRuntimeController.java
@@ -554,8 +554,8 @@ public class RepositoryEntryRuntimeController extends MainLayoutBasicController
if(event instanceof LeavingEvent) {
doClose(ureq);
} else if(event == Event.DONE_EVENT) {
- popToRoot(ureq).cleanUp();
- doRun(ureq, reSecurity);
+ popToRoot(ureq);
+ cleanUp();
}
} else if(closeCtrl == source) {
if(event == Event.CANCELLED_EVENT || event == Event.DONE_EVENT || event == Event.CHANGED_EVENT) {