From fb047b34e9a881a2294924790861342fb7deb11a Mon Sep 17 00:00:00 2001
From: dfurrer <none@none>
Date: Fri, 23 Oct 2015 11:52:11 +0200
Subject: [PATCH] OO-1658: contextHelp changes
---
.../olatmovieviewer/_chelp/movie-editor.html | 11 ------
.../iframe/_chelp/display-options.html | 37 -------------------
.../course/archiver/_chelp/course-log.html | 28 --------------
.../ui/_chelp/admin-certificates.html | 1 -
.../_chelp/ced-password.html | 1 -
.../dayofweek/_chelp/statistic_dayofweek.html | 2 -
.../hourofday/_chelp/statistic_hourofday.html | 2 -
.../orgtype/_chelp/statistic_orgtype.html | 2 -
.../_chelp/statistic_studybranch3.html | 2 -
.../_chelp/statistic_studylevel.html | 2 -
.../coach/ui/CoachAdminController.java | 1 -
.../modules/coach/ui/_chelp/coaching.html | 3 --
.../coach/ui/_i18n/LocalStrings_de.properties | 2 -
.../coach/ui/_i18n/LocalStrings_en.properties | 2 -
.../coach/ui/_i18n/LocalStrings_fr.properties | 4 +-
.../ui/_i18n/LocalStrings_pt_BR.properties | 2 -
.../olat/modules/vitero/ui/_chelp/module.html | 22 -----------
.../portfolio/ui/_content/adminconfig.html | 3 +-
18 files changed, 2 insertions(+), 125 deletions(-)
delete mode 100644 src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/_chelp/movie-editor.html
delete mode 100644 src/main/java/org/olat/core/gui/control/generic/iframe/_chelp/display-options.html
delete mode 100644 src/main/java/org/olat/course/archiver/_chelp/course-log.html
delete mode 100644 src/main/java/org/olat/course/certificate/ui/_chelp/admin-certificates.html
delete mode 100644 src/main/java/org/olat/course/condition/additionalconditions/_chelp/ced-password.html
delete mode 100644 src/main/java/org/olat/course/statistic/dayofweek/_chelp/statistic_dayofweek.html
delete mode 100644 src/main/java/org/olat/course/statistic/hourofday/_chelp/statistic_hourofday.html
delete mode 100644 src/main/java/org/olat/course/statistic/orgtype/_chelp/statistic_orgtype.html
delete mode 100644 src/main/java/org/olat/course/statistic/studybranch3/_chelp/statistic_studybranch3.html
delete mode 100644 src/main/java/org/olat/course/statistic/studylevel/_chelp/statistic_studylevel.html
delete mode 100644 src/main/java/org/olat/modules/coach/ui/_chelp/coaching.html
delete mode 100644 src/main/java/org/olat/modules/vitero/ui/_chelp/module.html
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/_chelp/movie-editor.html b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/_chelp/movie-editor.html
deleted file mode 100644
index 05cfdd3e6a7..00000000000
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/_chelp/movie-editor.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<fieldset>
- <legend>$r.translate("olatmovieviewer.config.title")</legend>
- <b>$r.translate("olatmovieviewer.provider")</b> $r.translate("chelp.1provider")<br/><br/>
- <b>$r.translate("olatmovieviewer.streamer")</b> $r.translate("chelp.1streamer")<br/><br/>
- <b>$r.translate("olatmovieviewer.address")</b> $r.translate("chelp.1address")<br/><br/>
- <b>$r.translate("olatmovieviewer.size")</b> $r.translate("chelp.1size")<br/><br/>
- <b>$r.translate("olatmovieviewer.starttime")</b> $r.translate("chelp.1starttime")<br/><br/>
- <b>$r.translate("olatmovieviewer.autostart")</b> $r.translate("chelp.1autostart")<br/><br/>
- <b>$r.translate("olatmovieviewer.repeat")</b> $r.translate("chelp.1repeat")<br/><br/>
- <b>$r.translate("olatmovieviewer.controlbar")</b> $r.translate("chelp.1controlbar")<br/><br/>
-</fieldset>
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/gui/control/generic/iframe/_chelp/display-options.html b/src/main/java/org/olat/core/gui/control/generic/iframe/_chelp/display-options.html
deleted file mode 100644
index 6beb29bc41b..00000000000
--- a/src/main/java/org/olat/core/gui/control/generic/iframe/_chelp/display-options.html
+++ /dev/null
@@ -1,37 +0,0 @@
- <p>
- <b>$r.translate("inherit.label"):</b>
- $r.translate("chelp.inherit")
- <hr />
-</p>
- <p>
- <b>$r.translate("mode"):</b>
- $r.translate("chelp.raw")
- <hr />
-</p>
- <p>
- <b>$r.translate("option.js"):</b>
- $r.translate("chelp.js")
-</p>
- <p>
- <b>$r.translate("option.glossary"):</b>
- $r.translate("chelp.glossary")
-</p>
-<p>
- <b>$r.translate("height.label"):</b>
- $r.translate("chelp.height")
-</p>
- <p>
- <b>$r.translate("option.css"):</b>
- $r.translate("chelp.css")
- <hr />
-</p>
-<p>
- <b>$r.translate("encoding.content"):</b>
- $r.translate("chelp.encoding.content")
-</p>
-<p>
- <b>$r.translate("encoding.js"):</b>
- $r.translate("chelp.encoding.js")
-</p>
-
-
diff --git a/src/main/java/org/olat/course/archiver/_chelp/course-log.html b/src/main/java/org/olat/course/archiver/_chelp/course-log.html
deleted file mode 100644
index efdf9d2bcc7..00000000000
--- a/src/main/java/org/olat/course/archiver/_chelp/course-log.html
+++ /dev/null
@@ -1,28 +0,0 @@
- <br/>$r.translate("chelp.log1")
-<br />
-$r.translate("chelp.log2") $r.translate("chelp.log3")
-<br />
-<br />
-$r.translate("chelp.log4")
-<br />
-$r.translate("chelp.log5") $r.translate("chelp.log6")
-<br />
-<br />
-
-<table class="table table-bordered">
-<thead>
- <tr>
- <th>actionVerb</th>
- <th>actionObject</th>
- </tr>
-</thead>
-<tbody valign="top">
- <tr>
- <td>add<br/>copy<br/>denied<br/>do<br/>edit<br/>exit<br/>hide<br/>launch<br/>lock<br/>move<br/>open<br/>remove<br/>view</td>
- <td>calendart<br/>chat<br/>course<br/>cpgetfile<br/>editor<br/>efficency<br/>feed<br/>feeditem<br/>file<br/>folder<br/>forummessage<br/>forumthread<br/>glossar<br/>gotonode<br/>groupmanagement<br/>group<br/>grouparea<br/>groupareaempty<br/>help<br/>layout<br/>node<br/>owner<br/>participant<br/>publisher<br/>quota<br/>resource<br/>rights<br/>rightsempty<br/>sharedfolder<br/>spgetfile<br/>testattempts<br/>testcomment<br/>testid<br/>testscore<br/>testsuccess<br/>tools<br/>toolsempty<br/>waitingperson</td>
- </tr>
- <tr>
- <td colspan="2" style="border: 0">$r.translate("chelp.table1")</td>
- </tr>
-</tbody>
-</table>
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/certificate/ui/_chelp/admin-certificates.html b/src/main/java/org/olat/course/certificate/ui/_chelp/admin-certificates.html
deleted file mode 100644
index 1e3006c3f50..00000000000
--- a/src/main/java/org/olat/course/certificate/ui/_chelp/admin-certificates.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>[placeholders]</p>
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/condition/additionalconditions/_chelp/ced-password.html b/src/main/java/org/olat/course/condition/additionalconditions/_chelp/ced-password.html
deleted file mode 100644
index 2fb19877c05..00000000000
--- a/src/main/java/org/olat/course/condition/additionalconditions/_chelp/ced-password.html
+++ /dev/null
@@ -1 +0,0 @@
-$r.translate("chelp.password.1")
diff --git a/src/main/java/org/olat/course/statistic/dayofweek/_chelp/statistic_dayofweek.html b/src/main/java/org/olat/course/statistic/dayofweek/_chelp/statistic_dayofweek.html
deleted file mode 100644
index ee441b6ab0c..00000000000
--- a/src/main/java/org/olat/course/statistic/dayofweek/_chelp/statistic_dayofweek.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<br/>$r.translate("chelp.statistic_dayofweek.text")<br/><br/>
-$r.translateWithPackage("org.olat.course.statistic", "chelp.statistic.alldates")
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/statistic/hourofday/_chelp/statistic_hourofday.html b/src/main/java/org/olat/course/statistic/hourofday/_chelp/statistic_hourofday.html
deleted file mode 100644
index 96e2b2c7fb6..00000000000
--- a/src/main/java/org/olat/course/statistic/hourofday/_chelp/statistic_hourofday.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<br/>$r.translate("chelp.statistic_hourofday.text")<br/><br/>
-$r.translateWithPackage("org.olat.course.statistic", "chelp.statistic.alldates")
diff --git a/src/main/java/org/olat/course/statistic/orgtype/_chelp/statistic_orgtype.html b/src/main/java/org/olat/course/statistic/orgtype/_chelp/statistic_orgtype.html
deleted file mode 100644
index 593e08c0f43..00000000000
--- a/src/main/java/org/olat/course/statistic/orgtype/_chelp/statistic_orgtype.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<br/>$r.translate("chelp.statistic_orgtype.text")<br/><br/>
-$r.translateWithPackage("org.olat.course.statistic", "chelp.statistic.alldates")
diff --git a/src/main/java/org/olat/course/statistic/studybranch3/_chelp/statistic_studybranch3.html b/src/main/java/org/olat/course/statistic/studybranch3/_chelp/statistic_studybranch3.html
deleted file mode 100644
index df47148d266..00000000000
--- a/src/main/java/org/olat/course/statistic/studybranch3/_chelp/statistic_studybranch3.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<br/>$r.translate("chelp.statistic_studybranch3.text")<br/><br/>
-$r.translateWithPackage("org.olat.course.statistic", "chelp.statistic.alldates")
diff --git a/src/main/java/org/olat/course/statistic/studylevel/_chelp/statistic_studylevel.html b/src/main/java/org/olat/course/statistic/studylevel/_chelp/statistic_studylevel.html
deleted file mode 100644
index 9d2ddf655dd..00000000000
--- a/src/main/java/org/olat/course/statistic/studylevel/_chelp/statistic_studylevel.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<br/>$r.translate("chelp.statistic_studylevel.text")<br/><br/>
-$r.translateWithPackage("org.olat.course.statistic", "chelp.statistic.alldates")
diff --git a/src/main/java/org/olat/modules/coach/ui/CoachAdminController.java b/src/main/java/org/olat/modules/coach/ui/CoachAdminController.java
index 99aeeed9353..e73b0d2a1af 100644
--- a/src/main/java/org/olat/modules/coach/ui/CoachAdminController.java
+++ b/src/main/java/org/olat/modules/coach/ui/CoachAdminController.java
@@ -50,7 +50,6 @@ public class CoachAdminController extends FormBasicController {
@Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
setFormTitle("coaching.title");
- setFormContextHelp(CoachAdminController.class.getPackage().getName(), "coaching.html", "help.hover.coaching");
boolean restEnabled = coachingModule.isEnabled();
String[] values = new String[] { translate("coaching.on") };
diff --git a/src/main/java/org/olat/modules/coach/ui/_chelp/coaching.html b/src/main/java/org/olat/modules/coach/ui/_chelp/coaching.html
deleted file mode 100644
index 806025a61dd..00000000000
--- a/src/main/java/org/olat/modules/coach/ui/_chelp/coaching.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
- $r.translate("chelp.coaching.intro")
-</p>
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_de.properties
index 068d750237a..6dcd912e2a6 100644
--- a/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_de.properties
@@ -1,6 +1,4 @@
#Mon Mar 02 09:54:03 CET 2009
-chelp.coaching.intro=Coaching help introduction
-chelp.coaching.title=Coaching help title
coaching.enabled=Coaching Zugang
coaching.on=ein
coaching.title=Coaching title
diff --git a/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_en.properties
index 3a8329ac752..fae7369096c 100644
--- a/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_en.properties
@@ -1,6 +1,4 @@
#Wed Dec 17 15:24:45 CET 2014
-chelp.coaching.intro=If you are coaching a learning group or a course and your course creates an efficiency statement triggered by assessment data, the coaching tool will appear in the top navigation. The coaching tool grants a course comprehensive view to learners assessment status. \r\n<br/>Use the navigation in the menu to examine the learning stats of individual users, groups or even entire courses. A progress bare indicates if a user, group or course met all the required assessments or if something is missing of users did not pass the assessments. In the list view, use the column ordering to sort by users which needs the most attention. \r\n<br />Once in the user view you can use the arrow navigation to cycle through your users to simplify navigation. In the users detail view you will see the users efficiency statement as it is also seen by the user. Switch to the assessment tool view to adjust the users score or to leave him a comment.
-chelp.coaching.title=Coaching tool
coaching.enabled=Coaching enable
coaching.on=on
coaching.title=Coaching title
diff --git a/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_fr.properties
index edfc04fa6cd..6a4e747ea6f 100644
--- a/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_fr.properties
@@ -1,6 +1,4 @@
-#Thu Sep 03 11:24:42 CEST 2015
-chelp.coaching.intro=Aide \u00E0 l'outil de coaching
-chelp.coaching.title=Aide de l'outil de coaching
+#Fri Oct 23 09:09:56 CEST 2015
coaching.enabled=Acc\u00E8s coaching
coaching.on=on
coaching.title=Coaching
diff --git a/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_pt_BR.properties
index 071211521aa..2bd0b445ec6 100644
--- a/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/modules/coach/ui/_i18n/LocalStrings_pt_BR.properties
@@ -1,6 +1,4 @@
#Thu Sep 03 11:24:42 CEST 2015
-chelp.coaching.intro=Se voc\u00EA est\u00E1 treinando um grupo de estudo ou um curso, e o mesmo possui um comprovante de conclus\u00E3o, a ferramenta de Coaching ir\u00E1 aparecer na barra de navega\u00E7\u00E3o superior. A ferramenta de Coaching concede uma vis\u00E3o abrangente da situa\u00E7\u00E3o dos alunos nos cursos.\r\n<br/>Use a navega\u00E7\u00E3o no menu para examinar informa\u00E7\u00F5es sobre a aprendizagem dos usu\u00E1rios\: individualmente, por grupos ou por cursos. A barra de progresso indica se um usu\u00E1rio, grupo ou curso cumpriu todas as avalia\u00E7\u00F5es exigidas ou se algo est\u00E1 faltando e os usu\u00E1rios n\u00E3o passaram nas avalia\u00E7\u00F5es. Na vis\u00E3o de lista, use a ordem das colunas para ordenar por usu\u00E1rios que precisam de mais aten\u00E7\u00E3o.\r\n<br />Uma vez na vis\u00E3o por usu\u00E1rio voc\u00EA pode usar a seta de navega\u00E7\u00E3o para percorrer os seus usu\u00E1rios e simplificar a navega\u00E7\u00E3o. Na vista de detalhes de usu\u00E1rios voc\u00EA vai ver os comprovantes de conclus\u00E3o deles, como eles mesmos v\u00EAem. Alterne para a exibi\u00E7\u00E3o de ferramenta de avalia\u00E7\u00E3o para ajustar a pontua\u00E7\u00E3o usu\u00E1rios ou para deixar-lhe um coment\u00E1rio.
-chelp.coaching.title=Ferramenta Coaching
coaching.enabled=Coaching ativo
coaching.on=Ativo
coaching.title=T\u00EDtulo do Treinador
diff --git a/src/main/java/org/olat/modules/vitero/ui/_chelp/module.html b/src/main/java/org/olat/modules/vitero/ui/_chelp/module.html
deleted file mode 100644
index e8476bc3163..00000000000
--- a/src/main/java/org/olat/modules/vitero/ui/_chelp/module.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<p>
- $r.translate("chelp.vitero1")
- <br />
- <a href="http://www.vitero.de" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://www.vitero.de</a>
-</p>
-<p>
- $r.translate("chelp.module1")
-</p>
-<p>
- $r.translate("chelp.module2")
-</p>
-<p>
- $r.translate("chelp.module3")
-</p>
-<p>
- $r.translate("chelp.module4")
-</p>
-<p class="o_note">
- $r.translate("chelp.module5")
-</p>
-
-
diff --git a/src/main/java/org/olat/portfolio/ui/_content/adminconfig.html b/src/main/java/org/olat/portfolio/ui/_content/adminconfig.html
index f17fdcb252b..b88b8a8db0e 100644
--- a/src/main/java/org/olat/portfolio/ui/_content/adminconfig.html
+++ b/src/main/java/org/olat/portfolio/ui/_content/adminconfig.html
@@ -1,6 +1,5 @@
<fieldset>
- <legend>$r.translate("portfolio.title")</legend>
- $r.contextHelpWithWrapper("Module: ePortfolio")
+ <legend>$r.translate("portfolio.title") $r.contextHelpWithWrapper("Module: ePortfolio")</legend>
<p>$r.translate("portfolio.intro")</p>
$r.render("flc_module")
--
GitLab