Skip to content
Snippets Groups Projects
Commit 1443715f authored by gnaegi's avatar gnaegi
Browse files

OO-1693 beautify lti talk back message at end of module

parent 0269e09b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 10 deletions
src/main/java/org/olat/course/nodes/basiclti/LTIRunController.java
+ 1
− 1
View file @ 1443715f
......@@ -403,7 +403,7 @@ public class LTIRunController extends BasicController {
container.contextPut("sourcedId", sourcedId);
OLATResource courseResource = courseEnv.getCourseGroupManager().getCourseResource();
Mapper talkbackMapper = new TalkBackMapper();
Mapper talkbackMapper = new TalkBackMapper(getLocale(), getWindowControl().getWindowBackOffice().getWindow().getGuiTheme().getBaseURI());
String backMapperUrl = registerCacheableMapper(ureq, sourcedId + "_talkback", talkbackMapper);
String backMapperUri = serverUri + backMapperUrl + "/";
......
src/main/java/org/olat/course/nodes/basiclti/_content/run.html
+ 1
− 1
View file @ 1443715f
......@@ -8,7 +8,7 @@
</div>
#end
<div class="o_iframedisplay">
<iframe id="IMSBasicLTIFrame" src="${mapperUri}?$r.uuid" marginwidth="0" marginheight="0" #if($width!='auto') width="${width}px" #end height="#if($height!='auto')${height}#else 400#{end}px" style="#if($width!='auto') width:${width}px;#end #if($height!='auto')height:${height}px;#{end}"></iframe>
<iframe id="IMSBasicLTIFrame" src="${mapperUri}?$r.uuid" marginwidth="0" marginheight="0" #if($width!='auto') width="${width}px" #end height="#if($height!='auto')${height}#else 400#{end}px" frameborder="0" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" style="#if($width!='auto') width:${width}px;#end #if($height!='auto')height:${height}px;#{end}"></iframe>
</div>
#if(!$height || 'auto' == $height)
<script type="text/javascript">
......
src/main/java/org/olat/ims/lti/ui/TalkBackMapper.java
+ 48
− 7
View file @ 1443715f
......@@ -20,12 +20,19 @@
package org.olat.ims.lti.ui;
import java.io.Serializable;
import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import org.olat.core.dispatcher.mapper.Mapper;
import org.olat.core.gui.media.MediaResource;
import org.olat.core.gui.media.ServletUtil;
import org.olat.core.gui.media.StringMediaResource;
import org.olat.core.gui.translator.Translator;
import org.olat.core.logging.OLog;
import org.olat.core.logging.Tracing;
import org.olat.core.util.StringHelper;
import org.olat.core.util.Util;
/**
*
......@@ -36,18 +43,52 @@ import org.olat.core.gui.media.StringMediaResource;
public class TalkBackMapper implements Mapper, Serializable {
private static final long serialVersionUID = -8319259842325597955L;
private static final OLog log = Tracing.createLoggerFor(TalkBackMapper.class);
private Translator trans;
private String themeBaseUri;
public TalkBackMapper(Locale loc, String themeBaseUri) {
this.trans = Util.createPackageTranslator(this.getClass(), loc);
this.themeBaseUri = themeBaseUri;
}
@Override
public MediaResource handle(String relPath, HttpServletRequest request) {
StringMediaResource mediares = new StringMediaResource();
StringBuilder sb = new StringBuilder();
sb.append("<html><head><title>").append("LTI talk back").append("</title></head><body>")
.append("lti_msg: ").append(request.getParameter("lti_msg")).append("<br/>")
.append("lti_errormsg: ").append(request.getParameter("lti_errormsg")).append("<br/>")
.append("lti_log: ").append(request.getParameter("lti_log")).append("<br/>")
.append("lti_errorlog: ").append(request.getParameter("lti_errorlog")).append("<br/>")
.append("</body></html>");
//ServletUtil.printOutRequestParameter(request);
sb.append("<html><head>")
.append("\n<link rel=\"stylesheet\" type=\"text/css\" id=\"ocontentcss\" href=\"").append(themeBaseUri).append("content.css\" />\n")
.append("<title>").append(trans.translate("talkback.title")).append("</title></head><body>")
.append("<div class='o_lti_talkback'>")
.append("<h1>").append(trans.translate("talkback.title")).append("</h1>")
.append("<p class='o_info'>").append(trans.translate("talkback.info")).append("</p>");
String lti_msg = request.getParameter("lti_msg");
if (StringHelper.containsNonWhitespace(lti_msg)) {
sb.append("<div class='o_note'><h3>").append(trans.translate("talkback.msg")).append("</h3><p>")
.append(request.getParameter("lti_msg")).append("</p></div>");
}
String lti_errormsg = request.getParameter("lti_errormsg");
if (StringHelper.containsNonWhitespace(lti_errormsg)) {
sb.append("<div class='o_error'><h3>").append(trans.translate("talkback.errormsg")).append("</h3><p>")
.append(lti_errormsg).append("</p></div>");
}
String lti_log = request.getParameter("lti_log");
if (StringHelper.containsNonWhitespace(lti_log)) {
sb.append("<h3>").append(trans.translate("talkback.log")).append("</h3><pre>\n")
.append(lti_log).append("\n</pre>");
}
String lti_errorlog = request.getParameter("lti_errorlog");
if (StringHelper.containsNonWhitespace(lti_errorlog)) {
sb.append("<h3>").append(trans.translate("talkback.errorlog")).append("</h3><pre>\n")
.append(lti_errorlog).append("\n</pre>");
}
sb.append("</div></body></html>");
if (log.isDebug()) {
ServletUtil.printOutRequestParameters(request);
}
mediares.setData(sb.toString());
mediares.setContentType("text/html");
mediares.setEncoding("UTF-8");
......
src/main/java/org/olat/ims/lti/ui/_i18n/LocalStrings_de.properties
+ 6
− 0
View file @ 1443715f
......@@ -3,3 +3,9 @@ table.header.action=Aktion
table.header.key=Key
table.header.value=Wert
talkback.title=Abschluss Lernmodul
talkback.info=Sie sind zurck vom Lernmodul. Das Lernmodul hat die folgenden Informationen bereitgestellt:
talkback.msg=Mitteilung
talkback.errormsg=Fehlermeldung
talkback.log=Protokoll
talkback.errorlog=Fehlerprotokoll
src/main/java/org/olat/ims/lti/ui/_i18n/LocalStrings_en.properties
+ 8
− 1
View file @ 1443715f
table.header.date=Date
table.header.action=Action
table.header.key=Key
table.header.value=Value
\ No newline at end of file
table.header.value=Value
talkback.title=Learning module finished
talkback.info=You are back from the learning module. The learning module delivered the following information:
talkback.msg=Message
talkback.errormsg=Error message
talkback.log=Log
talkback.errorlog=Error log
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