From 7a29f97f8d66558d97e9192291ae4f8af8110947 Mon Sep 17 00:00:00 2001
From: dfurrer <none@none>
Date: Wed, 30 Sep 2015 12:13:54 +0200
Subject: [PATCH] OO-1658: updated various context help pages
---
.../repository/_content/editproptabpub.html | 2 +-
.../AuthoringEntryPublishController.java | 2 +-
.../RepositoryEditDescriptionController.java | 2 +-
.../paypal/ui/_chelp/paypalMasterAccount.html | 1 -
.../ui/AccessConfigurationController.java | 3 +--
.../ui/_chelp/accesscontrol.html | 22 -------------------
6 files changed, 4 insertions(+), 28 deletions(-)
delete mode 100644 src/main/java/org/olat/resource/accesscontrol/ui/_chelp/accesscontrol.html
diff --git a/src/main/java/org/olat/repository/_content/editproptabpub.html b/src/main/java/org/olat/repository/_content/editproptabpub.html
index b9e6362c3e7..9e376a09d60 100644
--- a/src/main/java/org/olat/repository/_content/editproptabpub.html
+++ b/src/main/java/org/olat/repository/_content/editproptabpub.html
@@ -1,6 +1,6 @@
<fieldset>
<legend>$r.translate("rentry.prop")</legend>
- $r.contextHelpWithWrapper("org.olat.repository","rep-meta-olatauthorEd.html", "help.hover.rep.detail")
+ $r.contextHelpWithWrapper("Course Settings#_zugriff")
$r.render("proppupform")
#if($r.available("accesscontrol") && $isGuestAccess)
diff --git a/src/main/java/org/olat/repository/ui/author/AuthoringEntryPublishController.java b/src/main/java/org/olat/repository/ui/author/AuthoringEntryPublishController.java
index 3df10da29dc..c8ed1af5a36 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthoringEntryPublishController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthoringEntryPublishController.java
@@ -184,7 +184,7 @@ public class AuthoringEntryPublishController extends FormBasicController {
@Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
setFormTitle("rentry.publish");
- setFormContextHelp("org.olat.repository", "rep-meta-olatauthorEd.html", "help.hover.rep.detail");
+ setFormContextHelp("Course Settings#_zugriff");
formLayout.setElementCssClass("o_sel_repositoryentry_access");
String resourceType = entry.getOlatResource().getResourceableTypeName();
diff --git a/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java b/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java
index 6d0b67eb05e..bc99019d223 100644
--- a/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java
+++ b/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java
@@ -137,7 +137,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
descCont = FormLayoutContainer.createDefaultFormLayout("desc", getTranslator());
- descCont.setFormContextHelp("org.olat.repository","rep-meta-desc.html","help.hover.lifecycle");
+ descCont.setFormContextHelp("Info Page: Add Meta Data");
descCont.setRootForm(mainForm);
formLayout.add("desc", descCont);
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/_chelp/paypalMasterAccount.html b/src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/_chelp/paypalMasterAccount.html
index 7a16464aec8..4536a634e9d 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/_chelp/paypalMasterAccount.html
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/paypal/ui/_chelp/paypalMasterAccount.html
@@ -11,7 +11,6 @@
</h5>
<p>
$r.translate("chelp.paypalMasterAccount.courses")
- $r.contextHelpRelativeLink("org.olat.resource.accesscontrol.ui", "accesscontrol.html")
</p>
<p class="o_warning">
diff --git a/src/main/java/org/olat/resource/accesscontrol/ui/AccessConfigurationController.java b/src/main/java/org/olat/resource/accesscontrol/ui/AccessConfigurationController.java
index 605d53aeaf9..827753e0ed3 100644
--- a/src/main/java/org/olat/resource/accesscontrol/ui/AccessConfigurationController.java
+++ b/src/main/java/org/olat/resource/accesscontrol/ui/AccessConfigurationController.java
@@ -151,8 +151,7 @@ public class AccessConfigurationController extends FormBasicController {
if(!embbed) {
setFormTitle("accesscontrol.title");
- setFormContextHelp(AccessConfigurationController.class.getPackage().getName(), "accesscontrol.html", "chelp.accesscontrol.hover");
-
+
if(editable) {
final FormLayoutContainer buttonGroupLayout = FormLayoutContainer.createButtonLayout("buttonLayout", getTranslator());
buttonGroupLayout.setRootForm(mainForm);
diff --git a/src/main/java/org/olat/resource/accesscontrol/ui/_chelp/accesscontrol.html b/src/main/java/org/olat/resource/accesscontrol/ui/_chelp/accesscontrol.html
deleted file mode 100644
index 0a07368b8f5..00000000000
--- a/src/main/java/org/olat/resource/accesscontrol/ui/_chelp/accesscontrol.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<p>
- $r.translate("chelp.accesscontrol.intro")
-</p>
-<p>
- $r.translate("chelp.accesscontrol.access")
- <ol>
- <li>$r.translate("chelp.accesscontrol.access.free")</li>
- <li>$r.translate("chelp.accesscontrol.access.order")</li>
- </ol>
-</p>
-<p>$r.translate("chelp.accesscontrol.access.member")</p>
-<p>$r.translate("chelp.accesscontrol.methods")</p>
-<div class="o_access_create">
- <ul>
- <li><b><i class="o_icon o_ac_free_icon o_icon-lg"></i> $r.translate("free.method")</b>: $r.translate("chelp.accesscontrol.method.free")</li>
- <li><b><i class="o_icon o_ac_token_icon o_icon-lg"></i> $r.translate("token.method")</b>: $r.translate("chelp.accesscontrol.method.token")</li>
- <li><b><i class="o_icon o_ac_paypal_icon o_icon-lg"></i> $r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "paypal.method")</b>: $r.translateWithPackage("org.olat.resource.accesscontrol.provider.paypal.ui", "chelp.accesscontrol_group.method.paypal")</li>
- </ul>
-</div>
-<p>$r.translate("chelp.accesscontrol.dates")</p>
-<p>$r.translate("chelp.accesscontrol.manual")</p>
-<p>$r.translate("chelp.accesscontrol.delete")</p>
\ No newline at end of file
--
GitLab