From 07de5370741160d0bbe3f3ae8d077a6f96e11466 Mon Sep 17 00:00:00 2001
From: dfurrer <none@none>
Date: Thu, 29 Oct 2015 14:13:44 +0100
Subject: [PATCH] OO-1658: contextHelp cleanup
---
.../olat/commons/calendar/ui/_content/indexWeekly.html | 4 +---
.../course/nodes/dialog/_chelp/ced-dialog-display.html | 2 --
.../org/olat/course/nodes/dialog/_chelp/ced-dialog.html | 3 ---
.../olat/course/nodes/iq/_chelp/ced-qti-append-self.html | 3 ---
.../olat/course/nodes/iq/_chelp/ced-qti-append-surv.html | 3 ---
.../olat/course/nodes/iq/_chelp/ced-qti-start-self.html | 5 -----
.../olat/course/nodes/iq/_chelp/ced-qti-start-surv.html | 5 -----
.../olat/course/nodes/iq/_chelp/ced-qti-start-test.html | 5 -----
src/main/java/org/olat/course/nodes/ta/ModulesForm.java | 3 +--
.../org/olat/course/nodes/ta/_chelp/ced-ta-assign.html | 8 --------
.../java/org/olat/course/nodes/ta/_chelp/ced-ta-conf.html | 3 ---
.../org/olat/course/nodes/ta/_chelp/ced-ta-select.html | 3 ---
.../java/org/olat/course/nodes/ta/_chelp/ced-ta-sol.html | 2 --
.../java/org/olat/course/nodes/ta/_chelp/ced-ta-upl.html | 3 ---
14 files changed, 2 insertions(+), 50 deletions(-)
delete mode 100644 src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog-display.html
delete mode 100644 src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog.html
delete mode 100644 src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-self.html
delete mode 100644 src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-surv.html
delete mode 100644 src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-self.html
delete mode 100644 src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-surv.html
delete mode 100644 src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-test.html
delete mode 100644 src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-assign.html
delete mode 100644 src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-conf.html
delete mode 100644 src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-select.html
delete mode 100644 src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-sol.html
delete mode 100644 src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-upl.html
diff --git a/src/main/java/org/olat/commons/calendar/ui/_content/indexWeekly.html b/src/main/java/org/olat/commons/calendar/ui/_content/indexWeekly.html
index 2f1a95cd0a8..7ac2f4ce4bc 100644
--- a/src/main/java/org/olat/commons/calendar/ui/_content/indexWeekly.html
+++ b/src/main/java/org/olat/commons/calendar/ui/_content/indexWeekly.html
@@ -1,8 +1,6 @@
<div id="o_cal_config_below_cal_container">
<div class="o_cal_toptoolbar clearfix">
- <div class="o_cal_toptoolbar_help">
- $r.contextHelp("Calendar")
- </div>
+ $r.contextHelpWithWrapper("Calendar")
#if ($r.available("calsubscription"))
$r.render("calsubscription")
#end
diff --git a/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog-display.html b/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog-display.html
deleted file mode 100644
index 83722921238..00000000000
--- a/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog-display.html
+++ /dev/null
@@ -1,2 +0,0 @@
- <br/>
- <b>$r.translate("selection.forumAsPopup.label"):</b> $r.translate("chelp.inl")
diff --git a/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog.html b/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog.html
deleted file mode 100644
index 28c99d12aef..00000000000
--- a/src/main/java/org/olat/course/nodes/dialog/_chelp/ced-dialog.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
- $r.translate("chelp.upl1") $r.translate("chelp.upl2")
-
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-self.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-self.html
deleted file mode 100644
index be6336cd191..00000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-self.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/><b>$r.translate("file.name"):</b> $r.translate("chelp.qtiFile1-self") <br/><br/>
- $r.translate("chelp.qtiFile2-self") <br/><br/>
- $r.translate("chelp.caution") $r.translate("chelp.qtiFile3-self")<br/>
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-surv.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-surv.html
deleted file mode 100644
index 099464ddff5..00000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-append-surv.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/><b>$r.translate("file.name"):</b> $r.translate("chelp.qtiFile1-surv") <br/><br/>
- $r.translate("chelp.qtiFile2-surv") <br/><br/>
- $r.translate("chelp.caution") $r.translate("chelp.qtiFile3-surv")<br/>
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-self.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-self.html
deleted file mode 100644
index f800e6c6e86..00000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-self.html
+++ /dev/null
@@ -1,5 +0,0 @@
- <br/>$r.translate("chelp.start1-self")<br/><br/>
-
- <b>$r.translateWithPackage("org.olat.commons.file.filechooser","file"):</b>
- $r.translateWithPackage("org.olat.course.nodes.iq","chelp.sp1") <br/><br/>
- $r.translateWithPackage("org.olat.course.nodes.sp","chelp.sp3")
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-surv.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-surv.html
deleted file mode 100644
index b91ef6e917e..00000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-surv.html
+++ /dev/null
@@ -1,5 +0,0 @@
- <br/>$r.translate("chelp.start1-surv")<br/><br/>
-
- <b>$r.translateWithPackage("org.olat.commons.file.filechooser","file"):</b>
- $r.translateWithPackage("org.olat.course.nodes.iq","chelp.sp1") <br/><br/>
- $r.translateWithPackage("org.olat.course.nodes.sp","chelp.sp3")
diff --git a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-test.html b/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-test.html
deleted file mode 100644
index e427138ed5f..00000000000
--- a/src/main/java/org/olat/course/nodes/iq/_chelp/ced-qti-start-test.html
+++ /dev/null
@@ -1,5 +0,0 @@
- <br/>$r.translate("chelp.start1-test")<br/><br/>
-
- <b>$r.translateWithPackage("org.olat.commons.file.filechooser","file"):</b>
- $r.translateWithPackage("org.olat.course.nodes.iq","chelp.sp1") <br/><br/>
- $r.translateWithPackage("org.olat.course.nodes.sp","chelp.sp3")
diff --git a/src/main/java/org/olat/course/nodes/ta/ModulesForm.java b/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
index 1909d6dc938..20d527afcfa 100644
--- a/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
+++ b/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
@@ -90,8 +90,7 @@ public class ModulesForm extends FormBasicController {
@Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
setFormTitle("form.modules.title");
- setFormContextHelp("org.olat.course.nodes.ta","ced-ta-select.html","help.hover.ta-module");
-
+
task = uifactory.addCheckboxesHorizontal("task", "form.modules.task", formLayout, new String[]{"xx"}, new String[]{""});
dropbox = uifactory.addCheckboxesHorizontal("dropbox", "form.modules.dropbox", formLayout, new String[]{"xx"}, new String[]{""});
returnbox = uifactory.addCheckboxesHorizontal("returnbox", "form.modules.returnbox", formLayout, new String[]{"xx"}, new String[]{""});
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-assign.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-assign.html
deleted file mode 100644
index 9b338d405b1..00000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-assign.html
+++ /dev/null
@@ -1,8 +0,0 @@
- <br/>
- $r.translate("chelp.ass1")<br/><br/>
- <b>$r.translate("form.task.text"):</b> $r.translate("chelp.ass2")<br/><br/>
- <b>$r.translate("form.task.type"):</b> $r.translate("chelp.ass3")<br/><br/>
- <b>$r.translate("form.task.sampling"):</b> <i>«$r.translate("form.task.sampling.with")»</i> $r.translate("chelp.ass4")<br/>
- <i>«$r.translate("form.task.sampling.without")»</i> $r.translate("chelp.ass5")<br/><br/>
- <b>$r.translate("form.task.preview"):</b> $r.translate("chelp.ass6")<br/>
- $r.translate("chelp.ass7")
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-conf.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-conf.html
deleted file mode 100644
index 0aad076a8bc..00000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-conf.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
- <b>$r.translate("form.dropbox.confirmation"):</b> $r.translate("chelp.conf1")<br/><br/>
- <b>$r.translate("form.dropbox.enablemail"):</b> $r.translate("chelp.conf2")
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-select.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-select.html
deleted file mode 100644
index da4d6479708..00000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-select.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
- $r.translate("chelp.sel1")<br/>
- $r.translate("chelp.sel2")
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-sol.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-sol.html
deleted file mode 100644
index a1bd8d87d81..00000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-sol.html
+++ /dev/null
@@ -1,2 +0,0 @@
- <br/>
- $r.translate("chelp.sol1")
diff --git a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-upl.html b/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-upl.html
deleted file mode 100644
index 7b22c8e3eb2..00000000000
--- a/src/main/java/org/olat/course/nodes/ta/_chelp/ced-ta-upl.html
+++ /dev/null
@@ -1,3 +0,0 @@
- <br/>
- $r.translate("chelp.upl1")<br/><br/>
- $r.translate("chelp.upl2")
--
GitLab