From d36dfe9ffde4963b23201fe0ee2f39d275c123a1 Mon Sep 17 00:00:00 2001
From: dfurrer <none@none>
Date: Thu, 29 Oct 2015 16:12:08 +0100
Subject: [PATCH] OO-1658: contextHelp cleanup
---
.../provider/adobe/_chelp/ced-vc-config.html | 4 --
.../provider/wimba/_chelp/ced-vc-config.html | 5 --
.../velocity/VelocityRenderDecorator.java | 17 +++++-
.../olat/gui/control/_content/dmztopnav.html | 4 +-
.../org/olat/login/_chelp/browsercheck.html | 58 -------------------
src/main/java/org/olat/login/_chelp/dmz.html | 19 ------
6 files changed, 17 insertions(+), 90 deletions(-)
delete mode 100644 src/main/java/de/bps/course/nodes/vc/provider/adobe/_chelp/ced-vc-config.html
delete mode 100644 src/main/java/de/bps/course/nodes/vc/provider/wimba/_chelp/ced-vc-config.html
delete mode 100644 src/main/java/org/olat/login/_chelp/browsercheck.html
delete mode 100644 src/main/java/org/olat/login/_chelp/dmz.html
diff --git a/src/main/java/de/bps/course/nodes/vc/provider/adobe/_chelp/ced-vc-config.html b/src/main/java/de/bps/course/nodes/vc/provider/adobe/_chelp/ced-vc-config.html
deleted file mode 100644
index 0abcd75c4c1..00000000000
--- a/src/main/java/de/bps/course/nodes/vc/provider/adobe/_chelp/ced-vc-config.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- <OLATCE-103> -->
-<p>$r.translate("chelp.vc1")</p>
-<p>$r.translate("chelp.vc2")</p>
-<!-- </OLATCE-103> -->
\ No newline at end of file
diff --git a/src/main/java/de/bps/course/nodes/vc/provider/wimba/_chelp/ced-vc-config.html b/src/main/java/de/bps/course/nodes/vc/provider/wimba/_chelp/ced-vc-config.html
deleted file mode 100644
index adc858afa76..00000000000
--- a/src/main/java/de/bps/course/nodes/vc/provider/wimba/_chelp/ced-vc-config.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- <OLATCE-103> -->
-<p>$r.translate("chelp.vc1")</p>
-<p>$r.translate("chelp.vc2")</p>
-<p>$r.translate("chelp.vc3")</p>
-<!-- </OLATCE-103> -->
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java b/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
index c2936f98f99..381e0af488c 100644
--- a/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
+++ b/src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java
@@ -406,9 +406,22 @@ public class VelocityRenderDecorator implements Closeable {
}
return sb;
}
+
+ /**
+ * create a link to open a specifc context help page
+ * @param page
+ */
-
-
+ public StringOutput contextHelpLink(String page) {
+ StringOutput sb = new StringOutput(100);
+ if (ContextHelpModule.isContextHelpEnabled()) {
+ HelpModule helpModule = CoreSpringFactory.getImpl(HelpModule.class);
+ String url = helpModule.getHelpProvider().getURL(renderer.getTranslator().getLocale(), page);
+ sb.append(url);
+ }
+ return sb;
+ }
+
/**
* Create a link that can be used within a context help page to link to
* another context help page from the same package.
diff --git a/src/main/java/org/olat/gui/control/_content/dmztopnav.html b/src/main/java/org/olat/gui/control/_content/dmztopnav.html
index c033c766527..ea79fb48dcd 100644
--- a/src/main/java/org/olat/gui/control/_content/dmztopnav.html
+++ b/src/main/java/org/olat/gui/control/_content/dmztopnav.html
@@ -9,14 +9,14 @@
</a>
<ul class="dropdown-menu dropdown-menu-right">
#if ($isContextHelpEnabled)
- <li><a href="javascript:contextHelpWindow('$r.relLink("help/${r.getLanguageCode()}/org.olat.login/dmz.html")')" title="$r.translateInAttribute("topnav.help.alt")">
+ <li><a href="$r.contextHelpLink("Login Page")" target="_blank" title="$r.translateInAttribute("topnav.help.alt")">
<i class="o_icon o_icon_help o_icon-fw"></i> <span>$r.translate("topnav.help")</span></a></li>
#if($r.available("topnav.help"))
<li id="o_navbar_help">
$r.render("topnav.help")
</li>
#end
- <li><a href="javascript:$r.contextHelpJSCommand("org.olat.login","browsercheck.html")" title="$r.translateWithPackage("org.olat.login","menu.check.alt")">
+ <li><a href="$r.contextHelpLink("Login Page#login_browsercheck")" target="_blank" title="$r.translateWithPackage("org.olat.login","menu.check.alt")">
<i class="o_icon o_icon_browsercheck o_icon-fw"></i> <span>$r.translateWithPackage("org.olat.login","menu.check")</span></a></li>
#else
#if($r.available("topnav.help"))
diff --git a/src/main/java/org/olat/login/_chelp/browsercheck.html b/src/main/java/org/olat/login/_chelp/browsercheck.html
deleted file mode 100644
index 687236e8789..00000000000
--- a/src/main/java/org/olat/login/_chelp/browsercheck.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<script type="text/javascript">
-/* <![CDATA[ */
-function check() {
- document.write(
- "<tr><td>$r.translate("browsercheck.yourbrowser.name")</td><td><b>"+navigator.appName+"</b></td></tr>"+
- "<tr'><td>$r.translate("browsercheck.yourbrowser.generation")</td><td>"+navigator.appVersion+"</td></tr>"+
- "<tr><td>$r.translate("browsercheck.yourbrowser.language")</td><td>"+navigator.language+"</td></tr>"+
- "<tr><td>$r.translate("browsercheck.yourbrowser.codename")</td><td>"+navigator.appCodeName+"</td></tr>"+
- "<tr><td>$r.translate("browsercheck.yourbrowser.os")</td><td>"+navigator.platform+"</td></tr>"+
- "<tr><td>$r.translate("browsercheck.yourbrowser.usragent")</td><td>"+ navigator.userAgent+"</td></tr>"+
- "<tr><td>$r.translate("browsercheck.yourbrowser.cookies")</td><td>" + ( navigator.cookieEnabled ? "$r.translate("browsercheck.yes")" : "$r.translate("browsercheck.no")") + "</td></tr>"+
- "<tr><td>$r.translate("browsercheck.yourbrowser.js")</td><td>$r.translate("browsercheck.yes")</tr>"
- );
-}
-
-/* ]]> */
-</script>
-
-<h3>$r.translate("browsercheck.title")</h3>
-<h4>$r.translate("browsercheck.minimum.title")</h4>
-<ul class="list-unstyled">
- <li>$r.translate("browsercheck.minimum.first")</li>
- <li>$r.translate("browsercheck.minimum.second")</li>
-</ul>
-<p>
- <span>
- <a href="https://www.google.com/chrome">
- <img src="$r.staticLink("images/chrome-button.png")" title="Get google Chrome!" alt="Get google Chrome!" border="0" width="150" height="50" />
- </a>
- </span>
- <br />
- <span>
- <a href="http://www.mozilla.org/firefox" target="_blank">
- <img border="0" alt="Get Firefox!" title="Get Firefox!" src="$r.staticLink("images/getfirefox.gif")" width="150" />
- </a>
- </span>
-</p>
-<h4>$r.translate("browsercheck.bestresults.title")</h4>
-<ul class="list-unstyled">
- <li><a href="http://www.google.com/chrome/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> Google Chrome 28</a> $r.translate("browsercheck.bestresults.newerversion") $r.translate("browsercheck.bestresults.recommended") ($r.translate("browsercheck.since","10"))</li>
- <li><a href="http://www.apple.com/safari/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> Apple Safari 6</a> $r.translate("browsercheck.bestresults.newerversion") ($r.translate("browsercheck.since","5"))</li>
- <li><a href="http://www.mozilla.org/firefox/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> Firefox 23</a> $r.translate("browsercheck.bestresults.newerversion") ($r.translate("browsercheck.since","10"))</li>
- <li><a href="http://www.microsoft.com/internetexplorer/" target="_blank"><i class="o_icon o_icon_link_extern"> </i> Microsoft Internet Explorer 9</a> $r.translate("browsercheck.bestresults.newerversion") ($r.translate("browsercheck.since","8"))</li>
-</ul>
-
-<h4>$r.translate("browsercheck.others.title")</h4>
-<p>$r.translate("browsercheck.others.others")</p>
-<p>
- $r.translate("browsercheck.others.IE6")
- <a href="http://ie6countdown.com/">IE6 countdown</a>
-</p>
-
-<h4>$r.translate("browsercheck.yourbrowser.title")</h4>
-<table class="table"><tbody>
- <script type="text/javascript">
- check();
- </script>
-</tbody></table>
diff --git a/src/main/java/org/olat/login/_chelp/dmz.html b/src/main/java/org/olat/login/_chelp/dmz.html
deleted file mode 100644
index 3f080dd66b3..00000000000
--- a/src/main/java/org/olat/login/_chelp/dmz.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<br />
-<b>$r.translate("menu.login"):</b>
- $r.translate("chelp.log1") $r.translate("chelp.log2") $r.translate("chelp.log3")
-<br />
-<br />
-<b>$r.translate("menu.guest"):</b>
- $r.translate("chelp.guest1") $r.translate("chelp.guest2")
-<br />
-<br />
-<b>$r.translate("menu.check"):</b>
- $r.translate("chelp.check1")
-<br />
-<br />
-<b>$r.translate("menu.about"):</b>
- $r.translate("chelp.about1")
-<br />
-<br />
-<b>$r.translate("menu.pw"):</b>
- $r.translate("chelp.forg1")
--
GitLab