Skip to content
Snippets Groups Projects
Commit 20e71f4e authored by Florian Gnaegi - frentix GmbH's avatar Florian Gnaegi - frentix GmbH
Browse files

OO-1068 restyle start page for st, iq and lti

parent e446a47c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 207 additions and 207 deletions
src/main/java/org/olat/course/nodes/basiclti/_content/overview.html
+ 43
− 48
View file @ 20e71f4e
#if ($isassessable)
<div class="o_personal row">
<h4 class="col-sm-12">$r.translate("score.title")</h4>
#if($attempts > 0)
<div class="col-sm-12 col-md-6">
<table class="table">
<tbody>
#if ($hasPassed)
<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("passed.yes")
#elseif($hasPassedValue && !$passed)
<i class="o_icon o_icon_failed"></i>
$r.translate("passed.no")
#else
$r.translate("passed.noinfo")
#end
</td>
</tr>
#if($attempts > 0)
<div class="panel panel-default o_personal">
<div class="panel-heading">$r.translate("score.title")</div>
<table class="table">
<tbody>
<tr class="o_attempts">
<th>$r.translate("attempts.yourattempts")</th>
<td>
$attempts
</td>
</tr>
#if ($hasScore)
<tr class="o_score">
<th>$r.translate("score.yourscore")</th>
<td>
$score
</td>
</tr>
#end
#if ($hasPassed)
<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("passed.yes")
#elseif($hasPassedValue && !$passed)
<i class="o_icon o_icon_failed"></i>
$r.translate("passed.no")
#else
$r.translate("passed.noinfo")
#end
#if ($hasScore)
<tr class="o_score">
<th>$r.translate("score.yourscore")</th>
<td>
$score
</td>
</tr>
#end
<tr class="o_attempts">
<th>$r.translate("attempts.yourattempts")</th>
<td>
$attempts
</td>
</tr>
</tbody>
</table>
</td>
</tr>
#end
</tbody>
</table>
</div>
#else
<div class="o_no_scoreinfo">
$r.translate("score.noscoreinfoyet")
</div>
#else
<div class="col-sm-12">
<div class="o_no_scoreinfo">
$r.translate("score.noscoreinfoyet")
</div>
</div>
#end
</div>
#end
#end
<div class="o_button_group">
$r.render("start")
......
src/main/java/org/olat/course/nodes/iq/IQRunController.java
+ 1
− 0
View file @ 20e71f4e
......@@ -307,6 +307,7 @@ public class IQRunController extends BasicController implements GenericEventList
private void init(UserRequest ureq) {
startButton = LinkFactory.createButton("start", myContent, this);
startButton.setPrimary(true);
// fetch disclaimer file
String sDisclaimer = (String)modConfig.get(IQEditController.CONFIG_KEY_DISCLAIMER);
if (sDisclaimer != null) {
......
src/main/java/org/olat/course/nodes/iq/_content/testrun.html
+ 115
− 99
View file @ 20e71f4e
#if ($enableScoreInfo)
<div class="o_course_run_scoreinfo">
<h4>$r.translate("score.title")</h4>
<table>
#if($attempts > 0)
<div class="panel panel-default o_personal">
<div class="panel-heading">$r.translate("score.title")</div>
<table class="table">
<tbody>
<tr>
<td>
$r.translate("qti.form.attempts"):
</td>
<tr class="o_attempts_config">
<th>$r.translate("qti.form.attempts")</th>
<td>
#if ($attemptsConfig && $attemptsConfig > 0)
$attemptsConfig
#else
$r.translate("qti.form.attempts.noLimit")
#end
</td>
</tr>
<tr>
<td>
$r.translate("attempts.yourattempts"):
</td>
</td>
</tr>
<tr class="o_attempts">
<th>$r.translate("attempts.yourattempts")</th>
<td>
$attempts
</td>
</tr>
#if ($attempts >0)
<tr>
<td>
$r.translate("score.yourscore"):
</td>
</td>
</tr>
<tr class="o_score">
<th>$r.translate("score.yourscore")</th>
<td>
$score
</td>
</tr>
<tr>
<td>
$r.translate("passed.yourpassed"):
</td>
</td>
</tr>
<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 == true)
<span class="o_passed">$r.translate("passed.yes")</span>
#elseif($hasPassedValue && $passed == false)
<span class="o_notpassed">$r.translate("passed.no")</span>
#end
</td>
</tr>
#if ($comment)
<tr>
<td>
$r.translate("comment.yourcomment"):
</td>
<td>
$comment
#if($hasPassedValue && $passed)
<i class="o_icon o_icon_passed"></i>
$r.translate("passed.yes")
#elseif($hasPassedValue && !$passed)
<i class="o_icon o_icon_failed"></i>
$r.translate("passed.no")
#else
$r.translate("passed.noinfo")
#end
</td>
</tr>
#end ##END of if comment...
</tbody>
</table>
#else
</tbody>
</table>
<div class="o_course_run_scoreinfo_noinfo">$r.translate("score.noscoreinfoyet")</div>
#end ##END of if attempts...
</div>##END o_course_run_scoreinfo
#end ##END of if enableScoreInfo ...
</table>
</div>
#if($showResultsOnHomePage && $attempts >0)
<h4>$r.translate("showResults.title")</h4>
#if($showResultsVisible)
#if ($showResults)
$r.render("command.hideResults")
#else
$r.render("command.showResults")
#end
#if ($showResults)
#if ($displayreporting)
<br />
<h4>$r.translate("showResults.detailed")</h4>
<div id="o_qti_results" class="b_small">
$!resreporting
</div>
#end
#end
#else
$visibilityPeriod
#end
#end ##END of if showResultsOnHomePage ...
#if (($attemptsConfig && $attemptsConfig > 0 && ($attemptsConfig <= $attempts)) || $blockAfterSuccess)
<div class="o_course_run_statusinfo">$r.translate("attempts.nomoreattempts")</div>
#if ($hasDisc)
<div class="o_course_run_disclaimer">
$r.render("disc")
#if ($comment)
<div class="panel panel-default o_comment">
<div class="panel-heading">$r.translate("comment.yourcomment")</div>
<div class="panel-body">
$comment
</div>
</div>
#end
#else
#if ($hasDisc)
<div class="o_course_run_disclaimer">
$r.render("disc")
</div>
#end
<div class="o_course_run_statusinfo">
<p>
$r.translate("Intro.test")
</p>
<p>
$r.translate("info.assessment")
</p>
#if ($hasChatWindowOpen)
<div class="o_no_scoreinfo">
$r.translate("score.noscoreinfoyet")
<p>
$r.translate("close.chat.windows.for.test")
$r.translate("qti.form.attempts"):
#if ($attemptsConfig && $attemptsConfig > 0)
$attemptsConfig
#else
$r.translate("qti.form.attempts.noLimit")
#end
</p>
#end
</div>
<div class="b_button_group">
$r.render("start")
</div>
#end
#end
#if($showResultsOnHomePage && $attempts >0)
<div class="panel panel-default o_results">
<div class="panel-heading">$r.translate("showResults.title")</div>
<div class="panel-body">
#if($showResultsVisible)
#if ($showResults)
$r.render("command.hideResults")
#else
$r.render("command.showResults")
#end
#if ($showResults)
#if ($displayreporting)
<br />
<h4>$r.translate("showResults.detailed")</h4>
<div id="o_qti_results" class="small">
$!resreporting
</div>
#end
#end
#else
$visibilityPeriod
#end
</div>
</div>
#end
#if (($attemptsConfig && $attemptsConfig > 0 && ($attemptsConfig <= $attempts)) || $blockAfterSuccess)
<div class="o_statusinfo">
$r.translate("attempts.nomoreattempts")
</div>
#if ($hasDisc)
<div class="panel panel-default o_disclaimer">
<div class="panel-heading">$r.translate("disclaimer")</div>
<div class="panel-body">
$r.render("disc")
</div>
</div>
#end
#else
#if ($hasDisc)
<div class="panel panel-default o_disclaimer">
<div class="panel-heading">$r.translate("disclaimer")</div>
<div class="panel-body">
$r.render("disc")
</div>
</div>
#end
<div class="o_statusinfo">
<p>
$r.translate("Intro.test")
</p>
<p>
$r.translate("info.assessment")
</p>
#if ($hasChatWindowOpen)
<p>
$r.translate("close.chat.windows.for.test")
</p>
#end
</div>
<div class="o_button_group">
$r.render("start")
</div>
#end
#if ($log && $showChangelog)
<p />
#o_togglebox_start("o_course_run_log" $r.translate("log.title"))
<pre>
<pre class="small">
$log
</pre>
#o_togglebox_end()
......@@ -133,7 +149,7 @@ $log
#if($changeLog)
<p />
#o_togglebox_start("o_course_run_changelog" $r.translate("changelog.title"))
<pre>
<pre class="small">
$changeLog
</pre>
#o_togglebox_end()
......
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties
+ 1
− 0
View file @ 20e71f4e
......@@ -130,6 +130,7 @@ condition.accessibility.title=Zugang
preview=Vorschau
correcttest=Test korrigieren
coursefolder=Ablageordner Kurs "{0}"
disclaimer=Rechtliche Hinweise
disclaimer.file.invalid=Gewisse Informationen k\u00F6nnen nicht angezeigt werden weil die referenzierte Datei {0} nicht mehr vorhanden ist. Bitte benachrichtigen Sie die Kursleitung.
error.entry.locked=Die gew\u00E4hlte Lernressource wird momentan von {0} editiert. Bitte w\u00E4hlen Sie eine andere Lernressource oder versuchen Sie es sp\u00E4ter nochmals.
error.self.undefined.long=Es ist kein Selbsttest f\u00FCr "{0}" definiert. W\u00E4hlen Sie einen unter "Selbsttest-Konfiguration" aus.
......
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_en.properties
+ 1
− 0
View file @ 20e71f4e
......@@ -94,6 +94,7 @@ comment.yourcomment=Comment from your tutor
condition.accessibility.title=Access
correcttest=Correct test
coursefolder=Storage folder of course "{0}"
disclaimer=Disclaimer
disclaimer.file.invalid=Some information cannot be displayed because the referenced file {0} is not available anymore. Please contact your course administrator.
error.assessment.stopped=Your tutor pull your test.
error.entry.locked=The learning resource selected is currently edited by {0}. Please select another learning resource or try again later.
......
src/main/java/org/olat/course/nodes/st/_content/run.html
+ 35
− 37
View file @ 20e71f4e
<div id="$r.getCId()" class="o_course_run">
#if ($hasScore || $hasPassed)
<div class="o_personal row">
<h4 class="col-sm-12">$r.translate("score.title")</h4>
<div class="col-sm-12 col-md-6">
<table class="table">
<tbody>
#if ($hasPassed)
<tr class="o_state #if ($hasPassedValue && $scorePassed) o_passed #elseif($hasPassedValue && !$scorePassed) o_failed #else o_unknown #end">
<th>$r.translate("calcedpassed")</th>
<td>
#if($hasPassedValue && $scorePassed)
<i class="o_icon o_icon_passed"></i>
$r.translate("passed.yes")
#elseif($hasPassedValue && !$scorePassed)
<i class="o_icon o_icon_failed"></i>
$r.translate("passed.no")
#else
$r.translate("passed.noinfo")
#end
</td>
</tr>
<div class="panel panel-default o_personal">
<div class="panel-heading">$r.translate("score.title")</div>
<table class="table">
<tbody>
#if ($hasScore)
<tr class="o_score">
<th>$r.translate("calcedscore")</th>
<td>
#if($scoreScore)
$scoreScore
#else
$r.translate("score.noinfo")
#end
#if ($hasScore)
<tr class="o_score">
<th>$r.translate("calcedscore")</th>
<td>
#if($scoreScore)
$scoreScore
#else
$r.translate("score.noinfo")
#end
</td>
</tr>
#end
</tbody>
</table>
</div>
</div>
</td>
</tr>
#end
#if ($hasPassed)
<tr class="o_state #if ($hasPassedValue && $scorePassed) o_passed #elseif($hasPassedValue && !$scorePassed) o_failed #else o_unknown #end">
<th>$r.translate("calcedpassed")</th>
<td>
#if($hasPassedValue && $scorePassed)
<i class="o_icon o_icon_passed"></i>
$r.translate("passed.yes")
#elseif($hasPassedValue && !$scorePassed)
<i class="o_icon o_icon_failed"></i>
$r.translate("passed.no")
#else
$r.translate("passed.noinfo")
#end
</td>
</tr>
#end
</tbody>
</table>
</div>
#end
#if ($children.size() > 0)
......
src/main/webapp/static/themes/light/modules/_course.scss
+ 4
− 14
View file @ 20e71f4e
......@@ -66,7 +66,6 @@
.o_entry {
@extend .small;
@extend .o_block;
.o_shorttitle {
border-bottom: 1px solid $gray-light;
}
......@@ -78,23 +77,14 @@
margin-top: $padding-large-vertical;
font-style: italic;
}
.o_peekview {}
}
}
.o_personal {
.o_label {
@extend .text-muted;
}
.o_status {
}
}
}
.o_no_scoreinfo {
@extend .o_important;
}
.o_statusinfo {
@extend .o_note;
}
}
......
src/main/webapp/static/themes/light/modules/_form.scss
+ 4
− 6
View file @ 20e71f4e
......@@ -100,19 +100,17 @@ $toggle-size: 16px !default;
@include border-bottom-radius($toggle-size/2 + 1px);
background: $gray-lighter;
display: inline-block;
padding: 0;
margin: 0;
height: $toggle-size + 2px;
line-height: $toggle-size;
font-size: $toggle-size;
text-align: left;
@extend .o_undecorated;
padding: 0 0.5em 0 0;
margin: 0;
@extend .o_undecorated;
i {
color: $gray-light;
text-shadow: 2px 0 2px rgba(0,0,0,.25);
text-shadow: 1px 0 2px rgba(0,0,0,.25);
}
span {
line-height: $toggle-size;
......@@ -126,7 +124,7 @@ $toggle-size: 16px !default;
padding: 0 0 0 0.5em;
i {
color: $brand-primary;
text-shadow: -2px 0 2px rgba(0,0,0,.25);
text-shadow: -1px 0 2px rgba(0,0,0,.25);
}
}
}
src/main/webapp/static/themes/light/theme.css
+ 3
− 3
View file @ 20e71f4e
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment