From c2d534387ba5b5ec74a348e4507719e02e05bbe8 Mon Sep 17 00:00:00 2001
From: dfurrer <none@none>
Date: Tue, 3 Nov 2015 08:43:26 +0100
Subject: [PATCH] OO-1658: contextHelp cleanup
---
.../java/de/bps/course/nodes/den/DENDatesForm.java | 7 +++----
.../course/nodes/den/_chelp/ced-den-dates-multi.html | 9 ---------
.../course/nodes/den/_chelp/ced-den-dates-singl.html | 10 ----------
.../gui/control/generic/portal/_content/welcome.html | 2 +-
src/main/java/org/olat/home/_content/welcome.html | 2 +-
.../olat/modules/qpool/ui/metadata/_content/view.html | 1 -
.../org/olat/portal/shiblogin/_content/portlet.html | 9 +--------
.../org/olat/shibboleth/_chelp/help-shib-login1.html | 5 -----
.../org/olat/shibboleth/_chelp/help-shib-login2.html | 3 ---
.../org/olat/shibboleth/_chelp/help-shib-login3.html | 3 ---
10 files changed, 6 insertions(+), 45 deletions(-)
delete mode 100644 src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-multi.html
delete mode 100644 src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-singl.html
delete mode 100644 src/main/java/org/olat/shibboleth/_chelp/help-shib-login1.html
delete mode 100644 src/main/java/org/olat/shibboleth/_chelp/help-shib-login2.html
delete mode 100644 src/main/java/org/olat/shibboleth/_chelp/help-shib-login3.html
diff --git a/src/main/java/de/bps/course/nodes/den/DENDatesForm.java b/src/main/java/de/bps/course/nodes/den/DENDatesForm.java
index acf8d0c2b36..54f6083c3a7 100644
--- a/src/main/java/de/bps/course/nodes/den/DENDatesForm.java
+++ b/src/main/java/de/bps/course/nodes/den/DENDatesForm.java
@@ -77,16 +77,15 @@ public class DENDatesForm extends FormBasicController {
showDurationTE = true;
showPauseTE = true;
showRetakeTE = true;
- setFormContextHelp("Other#_addentry");
} else if(layout == EDIT_SINGLE_DATE_LAYOUT) {
showBeginDateChooser = true;
showDurationTE = true;
- setFormContextHelp("de.bps.course.nodes.den","ced-den-dates-singl.html","help.hover.den");
} else if(layout == EDIT_MULTIPLE_DATES_LAYOUT) {
showMoveTE = true;
- setFormContextHelp("de.bps.course.nodes.den","ced-den-dates-multi.html","help.hover.den");
}
-
+ setFormContextHelp("Other#_addentry");
+
+
initForm(this.flc, this, ureq);
}
diff --git a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-multi.html b/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-multi.html
deleted file mode 100644
index 259d315552f..00000000000
--- a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-multi.html
+++ /dev/null
@@ -1,9 +0,0 @@
-$r.translate("chelp.changeDates") <br/><br/>
-<fieldset>
- <legend>$r.translate("chelp.defaultValues") </legend>
- <b>$r.translate("config.dates.subject"):</b> $r.translate("chelp.inputTitle") <br/><br/>
- <b>$r.translate("config.dates.participants"):</b> $r.translate("chelp.inputParts") <br/><br/>
- <b>$r.translate("config.dates.move"):</b> $r.translate("chelp.inputMove") $r.translate("chelp.must") <br/><br/>
- <b>$r.translate("config.dates.location"):</b> $r.translate("chelp.inputLocation") <br/><br/>
- <b>$r.translate("config.dates.comment"):</b> $r.translate("chelp.inputComment")
-</fieldset>
\ No newline at end of file
diff --git a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-singl.html b/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-singl.html
deleted file mode 100644
index dfb99eac109..00000000000
--- a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-singl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-$r.translate("chelp.changeDate") <br/><br/>
-<fieldset>
- <legend>$r.translate("config.default.values")</legend>
- <b>$r.translate("config.dates.subject"):</b> $r.translate("chelp.inputTitle") <br/><br/>
- <b>$r.translate("config.dates.begin"):</b> $r.translate("chelp.inputBegin") $r.translate("chelp.must") <br/><br/>
- <b>$r.translate("config.dates.duration.single"):</b> $r.translate("chelp.inputDurationSingle") $r.translate("chelp.must") <br/><br/>
- <b>$r.translate("config.dates.participants"):</b> $r.translate("chelp.inputParts") <br/><br/>
- <b>$r.translate("config.dates.location"):</b> $r.translate("chelp.inputLocation") <br/><br/>
- <b>$r.translate("config.dates.comment"):</b> $r.translate("chelp.inputComment")
-</fieldset>
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/gui/control/generic/portal/_content/welcome.html b/src/main/java/org/olat/core/gui/control/generic/portal/_content/welcome.html
index 934879f978d..f7b6724b20c 100644
--- a/src/main/java/org/olat/core/gui/control/generic/portal/_content/welcome.html
+++ b/src/main/java/org/olat/core/gui/control/generic/portal/_content/welcome.html
@@ -3,7 +3,7 @@
<a class="o_link" href="$rssLink" title="$r.translate("welcome.rss")" target="_blank">
<i class="o_icon o_icon-fw o_icon_rss"> </i>
</a>
- $r.contextHelp("Personal Menu#_rss")
+ $r.contextHelpWithWrapper("Personal Menu#_rss")
</div>
<h1>$r.translate("welcome.header")</h1>
diff --git a/src/main/java/org/olat/home/_content/welcome.html b/src/main/java/org/olat/home/_content/welcome.html
index 0aa60a4a797..6a458d09ab0 100644
--- a/src/main/java/org/olat/home/_content/welcome.html
+++ b/src/main/java/org/olat/home/_content/welcome.html
@@ -16,7 +16,7 @@
$r.render("myPortal")
<div class="o_home_rsslink">
- $r.contextHelp("Personal Menu#_rss")
+ $r.contextHelpWithWrapper("Personal Menu#_rss")
<a class="o_home_rsslink" href="$rssLink" title="$r.translateInAttribute("welcome.rss")" target="_blank"></a>
</div>
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_content/view.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_content/view.html
index f89e7f6aafd..20bc1d939ef 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/_content/view.html
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_content/view.html
@@ -5,7 +5,6 @@
#if($r.available("edit"))
$r.render("edit")
#end
- #if($off_chelp_package) $r.contextHelp("$off_chelp_package","$off_chelp_page","$off_chelp_hover") #end
</div>
</div>
<table class="table table-condensed"><tbody>
diff --git a/src/main/java/org/olat/portal/shiblogin/_content/portlet.html b/src/main/java/org/olat/portal/shiblogin/_content/portlet.html
index d6048d9b55f..76c41255587 100644
--- a/src/main/java/org/olat/portal/shiblogin/_content/portlet.html
+++ b/src/main/java/org/olat/portal/shiblogin/_content/portlet.html
@@ -2,7 +2,7 @@
<script type="text/javascript"><!--
// To use this JavaScript, please access:
// https://wayf.switch.ch/SWITCHaai/WAYF/embedded-wayf.js/snippet.html
-// and copy/paste the resulting HTML snippet to an unprotected web page that
+// and copy/paste the resulting HTML snippet to an unprotected web page that
// you want the embedded WAYF to be displayed
// Technical contact for this Resource: developers@olat.uzh.ch
@@ -167,10 +167,3 @@ wayf_additional_idps = [$additionalIDPs];
</noscript>
<!-- EMBEDDED-WAYF-END -->
-
-<a href="javascript:contextHelpWindow('$r.relLink("help/${r.getLanguageCode()}/org.olat.shibboleth/help-shib-login1.html")')" title="$r.translateInAttribute("wayf.help.alt")">$r.translate("wayf.help")</a>
-<br/>
-<a href="javascript:contextHelpWindow('$r.relLink("help/${r.getLanguageCode()}/org.olat.shibboleth/help-shib-login2.html")')" title="$r.translateInAttribute("wayf.help.js.alt")"> $r.translate("wayf.help.js")</a>
-<br/>
-<a href="javascript:contextHelpWindow('$r.relLink("help/${r.getLanguageCode()}/org.olat.shibboleth/help-shib-login3.html")')" title="$r.translateInAttribute("wayf.password")">$r.translate("wayf.password")</a>
-<br/>
\ No newline at end of file
diff --git a/src/main/java/org/olat/shibboleth/_chelp/help-shib-login1.html b/src/main/java/org/olat/shibboleth/_chelp/help-shib-login1.html
deleted file mode 100644
index 77b217f42d4..00000000000
--- a/src/main/java/org/olat/shibboleth/_chelp/help-shib-login1.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<br/>
- $r.translate("chelp.line1_1")
-<br/>
- $r.translate("chelp.line1_2")
-<br/>
\ No newline at end of file
diff --git a/src/main/java/org/olat/shibboleth/_chelp/help-shib-login2.html b/src/main/java/org/olat/shibboleth/_chelp/help-shib-login2.html
deleted file mode 100644
index f16e8336346..00000000000
--- a/src/main/java/org/olat/shibboleth/_chelp/help-shib-login2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<br/>
- $r.translate("chelp.line3_1")
-<br/>
\ No newline at end of file
diff --git a/src/main/java/org/olat/shibboleth/_chelp/help-shib-login3.html b/src/main/java/org/olat/shibboleth/_chelp/help-shib-login3.html
deleted file mode 100644
index 3b7f4307925..00000000000
--- a/src/main/java/org/olat/shibboleth/_chelp/help-shib-login3.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<br/>
-<b>$r.translate("chelp.line2_1"):</b> $r.translate("chelp.line2_2")<br/><br/>
-<b>$r.translate("chelp.line2_3"):</b> $r.translate("chelp.line2_4")<br/><br/>
\ No newline at end of file
--
GitLab