From 15e11df3f1eb613db0d9b77f65e9984b0a4b263e Mon Sep 17 00:00:00 2001 From: dfurrer <none@none> Date: Fri, 23 Oct 2015 12:35:14 +0200 Subject: [PATCH] OO-1658: contextHelp changes --- .../de/bps/course/nodes/den/DENDatesForm.java | 2 +- .../course/nodes/den/_chelp/ced-den-conf.html | 7 - .../nodes/den/_chelp/ced-den-dates-creat.html | 13 - .../bps/course/nodes/den/_content/edit.html | 2 +- .../glossary/_chelp/glossary-flexion.html | 9 - .../glossary/_content/editFlexion.html | 2 +- .../core/util/mail/_chelp/mail-templ.html | 12 - .../util/mail/_content/mailnotification.html | 1 - .../_chelp/projectbroker-accountmgmt.html | 4 - .../_chelp/projectbroker-editModules.html | 3 - .../_chelp/projectbroker-editProject.html | 14 - .../_chelp/projectbroker-leader.html | 2 - .../_chelp/projectbroker-member.html | 2 - .../projectbroker-optionsCustomfields.html | 6 - .../projectbroker-optionsFormDates.html | 6 - .../projectbroker-optionsFormSettings.html | 6 - .../_chelp/_static/openolat_logo_72_de.png | Bin 3071 -> 0 bytes .../_chelp/_static/openolat_logo_72_en.png | Bin 3071 -> 0 bytes .../course/nodes/wiki/_chelp/ced-wiked.html | 248 ------------------ .../course/nodes/wiki/_chelp/ced-wiki.html | 3 - .../ui/wizard/_content/mailnotification.html | 1 - 21 files changed, 3 insertions(+), 340 deletions(-) delete mode 100644 src/main/java/de/bps/course/nodes/den/_chelp/ced-den-conf.html delete mode 100644 src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-creat.html delete mode 100644 src/main/java/org/olat/core/commons/modules/glossary/_chelp/glossary-flexion.html delete mode 100644 src/main/java/org/olat/core/util/mail/_chelp/mail-templ.html delete mode 100644 src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-accountmgmt.html delete mode 100644 src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editModules.html delete mode 100644 src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editProject.html delete mode 100644 src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-leader.html delete mode 100644 src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-member.html delete mode 100644 src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsCustomfields.html delete mode 100644 src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormDates.html delete mode 100644 src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormSettings.html delete mode 100644 src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_de.png delete mode 100644 src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_en.png delete mode 100644 src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiked.html delete mode 100644 src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiki.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 ddbef89130c..acf8d0c2b36 100644 --- a/src/main/java/de/bps/course/nodes/den/DENDatesForm.java +++ b/src/main/java/de/bps/course/nodes/den/DENDatesForm.java @@ -77,7 +77,7 @@ public class DENDatesForm extends FormBasicController { showDurationTE = true; showPauseTE = true; showRetakeTE = true; - setFormContextHelp("de.bps.course.nodes.den","ced-den-dates-creat.html","help.hover.den"); + setFormContextHelp("Other#_addentry"); } else if(layout == EDIT_SINGLE_DATE_LAYOUT) { showBeginDateChooser = true; showDurationTE = true; diff --git a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-conf.html b/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-conf.html deleted file mode 100644 index e7610354f17..00000000000 --- a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-conf.html +++ /dev/null @@ -1,7 +0,0 @@ -$r.translate("chelp.denConf") <br/><br/><br/> -<fieldset> - <legend>$r.translate("config.header")</legend> - <b>$r.translate("config.dates")</b> $r.translate("chelp.btnConfDates") <br/><br/> - <b>$r.translate("run.enrollment.list")</b> $r.translate("chelp.btnManageParts") <br/><br/> - <b>$r.translate("form.enableCancelEnroll"):</b> $r.translate("chelp.optCancEnr") -</fieldset> \ No newline at end of file diff --git a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-creat.html b/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-creat.html deleted file mode 100644 index 44c07317ca0..00000000000 --- a/src/main/java/de/bps/course/nodes/den/_chelp/ced-den-dates-creat.html +++ /dev/null @@ -1,13 +0,0 @@ -$r.translate("chelp.createDatesGen") <br/><br/> -$r.translate("chelp.btnCreateDates") <br/><br/> -<fieldset> - <legend>$r.translate("config.default.values")</legend> - <b>$r.translate("config.dates.subject"):</b> $r.translate("chelp.inputTitle") $r.translate("chelp.must") <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"):</b> $r.translate("chelp.inputDuration") $r.translate("chelp.must") <br/><br/> - <b>$r.translate("config.dates.pause"):</b> $r.translate("chelp.inputPause") $r.translate("chelp.must") <br/><br/> - <b>$r.translate("config.dates.retakes"):</b> $r.translate("chelp.inputRetakes") $r.translate("chelp.must") <br/><br/> - <b>$r.translate("config.dates.participants"):</b> $r.translate("chelp.inputParts") $r.translate("chelp.must") <br/><br/> - <b>$r.translate("config.dates.location"):</b> $r.translate("chelp.inputLocation") $r.translate("chelp.must") <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/_content/edit.html b/src/main/java/de/bps/course/nodes/den/_content/edit.html index 51e95d03f1d..d4b72e10dfe 100644 --- a/src/main/java/de/bps/course/nodes/den/_content/edit.html +++ b/src/main/java/de/bps/course/nodes/den/_content/edit.html @@ -1,6 +1,6 @@ <fieldset> <legend>$r.translate("config.header")</legend> - $r.contextHelpWithWrapper("de.bps.course.nodes.den","ced-den-conf.html","help.hover.den") + $r.contextHelpWithWrapper("Other#_terminvergabe") <div>$r.render("config.dates") $r.render("run.enrollment.list")</div> <br /> <div>$r.render("dateform")</div> diff --git a/src/main/java/org/olat/core/commons/modules/glossary/_chelp/glossary-flexion.html b/src/main/java/org/olat/core/commons/modules/glossary/_chelp/glossary-flexion.html deleted file mode 100644 index 470e3e2cc8e..00000000000 --- a/src/main/java/org/olat/core/commons/modules/glossary/_chelp/glossary-flexion.html +++ /dev/null @@ -1,9 +0,0 @@ -<br/> -$r.translate("chelp.flexion.define") <br/><br/> -$r.translate("chelp.flexions.get.button") <br/><br/> -$r.translate("chelp.no.morph.service") <br/><br/> -$r.translate("chelp.morph.service") <br/><br/> -$r.translate("chelp.morph.service.example") <br/><br/> -<br/> -$r.translate("chelp.morph.intro") <br/><br/> -$r.translate("chelp.morph.example") <br/><br/> \ No newline at end of file diff --git a/src/main/java/org/olat/core/commons/modules/glossary/_content/editFlexion.html b/src/main/java/org/olat/core/commons/modules/glossary/_content/editFlexion.html index 4de551c3e5e..f4e5a30751f 100644 --- a/src/main/java/org/olat/core/commons/modules/glossary/_content/editFlexion.html +++ b/src/main/java/org/olat/core/commons/modules/glossary/_content/editFlexion.html @@ -1,5 +1,5 @@ <br/> -<div style="padding-right:1em; padding-top:0.5em;">$r.contextHelpWithWrapper("org.olat.core.commons.modules.glossary","glossary-flexion.html","help.hover.flexion")</div> +<div style="padding-right:1em; padding-top:0.5em;"></div> $r.translate("flexions.intro") $r.translate("flexions.intro.ms") <br/><br/> $r.translate("choose.morph.service") diff --git a/src/main/java/org/olat/core/util/mail/_chelp/mail-templ.html b/src/main/java/org/olat/core/util/mail/_chelp/mail-templ.html deleted file mode 100644 index 4bb266cd83c..00000000000 --- a/src/main/java/org/olat/core/util/mail/_chelp/mail-templ.html +++ /dev/null @@ -1,12 +0,0 @@ -<br /> - <b>$r.translate("mailtemplateform.sendMailSwitchElem"):</b> $r.translate("chelp.sendMail1")<br /><br /> - <b>$r.translate("mailtemplateform.subject"):</b>$r.translate("chelp.mailtempsubject")<br /><br /> - <b>$r.translate("mailtemplateform.body"):</b>$r.translate("chelp.mailtemplateformbody")<br /><br /> - $r.translate("chelp.sendMail5") - <ul> - <li><b>$</b><b>groupname</b> : $r.translate("chelp.sendMail6")</li> - <li><b>$</b><b>groupdescription</b> : $r.translate("chelp.sendMail7")</li> - <li><b>$</b><b>courselist</b> : $r.translate("chelp.sendMail8")</li> - </ul> - <b>$r.translate("contact.cp.from") :</b> $r.translate("chelp.sendMail2")<br /><br /> - \ No newline at end of file diff --git a/src/main/java/org/olat/core/util/mail/_content/mailnotification.html b/src/main/java/org/olat/core/util/mail/_content/mailnotification.html index 0357ed4f616..0b98e3b96d1 100644 --- a/src/main/java/org/olat/core/util/mail/_content/mailnotification.html +++ b/src/main/java/org/olat/core/util/mail/_content/mailnotification.html @@ -1,5 +1,4 @@ <fieldset> <legend>$r.translate("mailnotification.title")</legend> - $r.contextHelpWithWrapper("org.olat.core.util.mail","mail-templ.html","help.hover.mail-templ") $r.render("mailForm") </fieldset> diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-accountmgmt.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-accountmgmt.html deleted file mode 100644 index e2b4069416e..00000000000 --- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-accountmgmt.html +++ /dev/null @@ -1,4 +0,0 @@ - <br/> - - $r.translate("chelp.projectbroker.themenverantwortliche") <br/> - $r.translate("chelp.projectbroker.themenverantwortlicheDelete") <br/> diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editModules.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editModules.html deleted file mode 100644 index 552f49bf7e4..00000000000 --- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editModules.html +++ /dev/null @@ -1,3 +0,0 @@ - <br/> - $r.translate("chelp.projectbroker.editModules") <br/><br/> -<br/> diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editProject.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editProject.html deleted file mode 100644 index 5538d9d4878..00000000000 --- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-editProject.html +++ /dev/null @@ -1,14 +0,0 @@ - <br/> - <b>$r.translate("chelp.projectbroker.themaSg"):</b> $r.translate("chelp.projectbroker.editProjectTheme") <br/> <br/> - <b>$r.translate("detailsform.projectleaders.label"):</b> $r.translate("chelp.projectbroker.editProjectResponsible") <br/> <br/> - <b>$r.translate("detailsform.description.label"):</b> $r.translate("chelp.projectbroker.editProjectDescription") <br/> <br/> - <b>$r.translate("chelp.projectbroker-optionsCustomfields.title"):</b> $r.translate("chelp.projectbroker.editProjectCustomFields") <br/> <br/> - <b>$r.translate("enrollment_event.label"):</b> $r.translate("chelp.projectbroker.editProjectEnrollmentEvent") <br/> <br/> - <b>$r.translate("handout_event.label"):</b> $r.translate("chelp.projectbroker.editProjectHandoutEvent") <br/> <br/> - $r.translate("chelp.projectbroker.editProjectTermine") <br/> <br/> - <b>$r.translate("detailsform.state.label"):</b> $r.translate("chelp.projectbroker.editProjectStateLabelParticipant") <br/> <br/> - $r.translate("chelp.projectbroker.descriptionProjectStateLabelProjectManager") <br/> - $r.translate("chelp.projectbroker.editProjectStateLabelGeneral") <br/> <br/> - <b>$r.translate("detailsform.places.label"):</b> $r.translate("chelp.projectbroker.editProjectPlacesLabel") <br/> <br/> - <b>$r.translate("detailsform.attachmentfilename.label"):</b> $r.translate("chelp.projectbroker.editProjectAttachmentfilename") <br/> <br/> - <b>$r.translate("detailsform.mail.notification.label"):</b> $r.translate("chelp.projectbroker.editProjectDetailsformMailNnotification") <br/> <br/> diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-leader.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-leader.html deleted file mode 100644 index 942b04eeb92..00000000000 --- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-leader.html +++ /dev/null @@ -1,2 +0,0 @@ - <br/> - $r.translate("chelp.projectbroker.leaderVerantwortliche") <br/> <br/> diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-member.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-member.html deleted file mode 100644 index b3728d954ff..00000000000 --- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-member.html +++ /dev/null @@ -1,2 +0,0 @@ - <br/> - $r.translate("chelp.projectbroker.memberAkzeptierteTeilnehmer") <br/> <br/> diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsCustomfields.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsCustomfields.html deleted file mode 100644 index 47c1247c085..00000000000 --- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsCustomfields.html +++ /dev/null @@ -1,6 +0,0 @@ - <br/> - $r.translate("chelp.projectbroker.customfieldAddFieldLink")<br/> - $r.translate("chelp.projectbroker.customfieldAddFieldLinkCustomfieldNameLabel")<br/> - $r.translate("chelp.projectbroker.customfieldAddFieldLinkCustomfieldValueLabel")<br/> - $r.translate("chelp.projectbroker.customfieldAddFieldLinkCustomfieldTableEnabled")<br/> - $r.translate("chelp.projectbroker.customfieldDeleteLink")<br/> diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormDates.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormDates.html deleted file mode 100644 index b324b0db771..00000000000 --- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormDates.html +++ /dev/null @@ -1,6 +0,0 @@ - <br/> - $r.translate("chelp.projectbroker.formOptionsDateLegend")<br/><br/> -<b>$r.translate("projectlist.tableheader.event.enrollment_event"):</b> $r.translate("chelp.projectbroker.projectlistTableheaderEventEnrollmentEvent") <br/> <br/> - -<b>$r.translate("projectlist.tableheader.event.handout_event"):</b> $r.translate("chelp.projectbroker.projectlistTableheaderEventHandoutEvent") <br/> <br/> -$r.translate("chelp.projectbroker.eventTableViewEnabled")<br/> diff --git a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormSettings.html b/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormSettings.html deleted file mode 100644 index faba92686d5..00000000000 --- a/src/main/java/org/olat/course/nodes/projectbroker/_chelp/projectbroker-optionsFormSettings.html +++ /dev/null @@ -1,6 +0,0 @@ - <br/> - <b>$r.translate("form.options.number.of.topics.per.participant"):</b> $r.translate("chelp.projectbroker.numberOfTopicsPerParticipant") <br/> <br/> - <b>$r.translate("form.options.selection.accept"):</b> - $r.translate("chelp.projectbroker.selectionAccept")<br/> - $r.translate("chelp.projectbroker.noSelectionAccept")<br/><br/> - <b>$r.translate("form.options.auto.sign.out"):</b> $r.translate("chelp.projectbroker.optionsAutoSignOut")<br/> diff --git a/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_de.png b/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_de.png deleted file mode 100644 index 376f0689fac7b769c0b53f6a153daf4851a5cdd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3071 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 N002ovPDHLkV1gf~)@T3# diff --git a/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_en.png b/src/main/java/org/olat/course/nodes/wiki/_chelp/_static/openolat_logo_72_en.png deleted file mode 100644 index 376f0689fac7b769c0b53f6a153daf4851a5cdd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3071 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 N002ovPDHLkV1gf~)@T3# diff --git a/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiked.html b/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiked.html deleted file mode 100644 index da555aaa1f4..00000000000 --- a/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiked.html +++ /dev/null @@ -1,248 +0,0 @@ -$r.translate("chelp.wiked1") -$r.translate("chelp.wiked10") -<br/> -<a href="http://jamwiki.org/wiki/en/Wiki_Syntax" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://jamwiki.org/wiki/en/Wiki_Syntax</a> -<br/><br/> -$r.translate("chelp.caution") <br/> -$r.translate("chelp.wiked13") $r.translate("chelp.wiked14") <br/><br/> - - -<table class="table table-bordered"> - <thead> - <tr> - <th width="50%">$r.translateWithPackage("org.olat.course.editor","chelp.synt")</th> - <th width="50%">$r.translate("chelp.format") </th> - </tr> - </thead> - <tbody> - <tr> - <td colspan="2"><br/> - <b>$r.translate("chelp.subtit1") </b></td> - </tr> - - <tr> - <td>'''$r.translateWithPackage("org.olat.modules.wiki","button.bold") '''</td> - <td><b>$r.translateWithPackage("org.olat.modules.wiki","button.bold")</b></td> - </tr> - - <tr> - <td>''$r.translateWithPackage("org.olat.modules.wiki","button.italic")''</td> - <td><i>$r.translateWithPackage("org.olat.modules.wiki","button.italic")</i></td> - </tr> - - <tr> - <td>==$r.translateWithPackage("org.olat.modules.wiki","button.headline")==</td> - <td> - <h2>$r.translateWithPackage("org.olat.modules.wiki","button.headline")</h2> - </td> - </tr> - - <tr> - <td>* $r.translateWithPackage("org.olat.modules.wiki","button.list")</td> - <td> - <ul> - <li>$r.translateWithPackage("org.olat.modules.wiki","button.list")</li> - </ul> - </td> - </tr> - - <tr> - <td># $r.translateWithPackage("org.olat.modules.wiki","button.numlist")</td> - <td> - <ol> - <li>$r.translateWithPackage("org.olat.modules.wiki","button.numlist") - </td> - </tr> - - <tr> - <td colspan="2"><br/> - <b>$r.translate("chelp.subtit2") </b></td> - </tr> - - <tr> - <td colspan="2">$r.translate("chelp.wiked2") $r.translate("chelp.wiked3") - $r.translate("chelp.wiked4") $r.translate("chelp.wiked5") </td> - </tr> - - <tr> - <td>[[$r.translateWithPackage("org.olat.modules.wiki","button.link")]]</td> - <td><a name="linktext"></a>$r.translateWithPackage("org.olat.modules.wiki","button.link")</td> - </tr> - - <tr> - <td>[[$r.translate("chelp.link") | $r.translate("chelp.text")]]</td> - <td><a name="linkandtext"></a><a href="#linkandtext">$r.translate("chelp.text")</a></td> - </tr> - - <tr> - <td colspan="2">$r.translate("chelp.wiked6") $r.translate("chelp.wiked7") </td> - </tr> - - <tr> - <td>$r.translate("chelp.extlink") </td> - <td>$r.translate("chelp.extlinkF") </td> - </tr> - - <tr> - <td>[$r.translate("chelp.extlink") $r.translate("chelp.oorg")]</td> - <td><a href="$r.translate("chelp.extlink")" target="_blank">$r.translate("chelp.oorg")</a></td> - </tr> - - <tr> - <td colspan="2"><br/> - <b>$r.translate("chelp.subtit3") </b></td> - </tr> - - <tr> - <td>{|<br/> - |$r.translate("chelp.cell") 1<br/> - |$r.translate("chelp.cell") 2<br/> - |} </td> - <td> - <table border="0"> - <tr> - <td>$r.translate("chelp.cell") 1</td> - <td>$r.translate("chelp.cell") 2</td> - </tr> - </table></td> - </tr> - - <tr> - <td>{| <br/> - |$r.translate("chelp.cell") 1<br/> - |$r.translate("chelp.cell") 2<br/> - |- <br/> - |$r.translate("chelp.cell") 3<br/> - |$r.translate("chelp.cell") 4<br/> - |}</td> - <td> - <table border="0"> - <tr> - <td>$r.translate("chelp.cell") 1</td> - <td>$r.translate("chelp.cell") 2</td> - </tr><tr> - <td>$r.translate("chelp.cell") 3</td> - <td>$r.translate("chelp.cell") 4</td> - </tr> - </table></td> - </tr> - - <tr> - <td>{| border="1" <br/> - |$r.translate("chelp.cell") 1<br/> - |$r.translate("chelp.cell") 2<br/> - |- <br/> - |$r.translate("chelp.cell") 3<br/> - |$r.translate("chelp.cell") 4<br/> - |}</td> - <td> - <table border="1"> - <tr> - <td>$r.translate("chelp.cell") 1</td> - <td>$r.translate("chelp.cell") 2</td> - </tr> - <tr> - <td>$r.translate("chelp.cell") 3</td> - <td>$r.translate("chelp.cell") 4</td> - </tr> - </table></td> - </tr> - - <tr> - <td colspan="2"><br/> - <b>$r.translate("chelp.subtit4") </b></td> - </tr> - - <tr> - <td colspan="2">$r.translate("chelp.wiked8") $r.translate("chelp.wiked9") </td> - </tr> - - <tr> - <td>[[Image:openolat_logo_72.png]]</td> - <td><img src="$chelpStaticDirUrl/openolat_logo_72.png" /></td> - </tr> - - <tr> - <td colspan="2"><br/> - $r.translate("chelp.wiked91") </td> - </tr> - - <tr> - <td>$r.translate("chelp.wiked92") <br/> - [[Image:openolat_logo_72.png|$r.translate("chelp.wiked922")]]</td> - <td><img src="$chelpStaticDirUrl/openolat_logo_72.png" /><br/> - $r.translate("chelp.wiked922") </td> - </tr> - - <tr> - <td>$r.translate("chelp.wiked93") <br/> - [[Image:openolat_logo_72.png|right]]</td> - <td> - <div align="right"><img src="$chelpStaticDirUrl/openolat_logo_72.png" /></div> - </td> - </tr> - - <tr> - <td>$r.translate("chelp.wiked94") <br/> - [[Image:openolat_logo_72.png|120px]]</td> - <td><img src="$chelpStaticDirUrl/openolat_logo_72.png" width="120px" /></td> - </tr> - - <tr> - <td>$r.translate("chelp.wiked95") $r.translate("chelp.wiked96") <br/> - [[Image:openolat_logo_72.png|thumb|20px]]</td> - <td><a href="$chelpStaticDirUrl/openolat_logo_72.png" target="_blank"><img - src="$chelpStaticDirUrl/openolat_logo_72.png" width="20px" /></a></td> - </tr> - - <tr> - <td>$r.translate("chelp.wiked97")<br/> - [[Image:olat_logo.png|right|30px|thumb|$r.translate("chelp.wiked922") ]]</td> - <td> - <div align="right"><a href="$chelpStaticDirUrl/openolat_logo_72.png" - target="_blank"><img src="$chelpStaticDirUrl/openolat_logo_72.png" width="30px" /></a><br /> - $r.translate("chelp.wiked922") </div> - </td> - </tr> - - <tr> - <td>[[Media:any.pdf]]</td> - <td><a name="pdf"></a><a href="#pdf">any.pdf</a></td> - </tr> - - <tr> - <td colspan="2"><br /> - <b>$r.translateWithPackage("org.olat.modules.wiki","button.math") </b><br /> - $r.translate("chelp.wiked121") - <br /> - $r.translate("chelp.wiked122") - <br /> - <a href="http://www.math.union.edu/~dpvc/jsMath/download/jsMath-fonts.html" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://www.math.union.edu/~dpvc/jsMath/download/jsMath-fonts.html</a> - </td> - </tr> - - <tr> - <td><math>$r.translateWithPackage("org.olat.modules.wiki","enter.math")</math></td> - <td> - $r.translate("chelp.wiked12") - <br /> - <a href="http://meta.wikimedia.org/wiki/Help:Formula" target="_blank"><i class="o_icon o_icon_link_extern"> </i> http://meta.wikimedia.org/wiki/Help:Formula</a> - </td> - </tr> - - <tr> - <td colspan="2"><br/> - <b>$r.translate("chelp.subtit5") </b></td> - </tr> - - <tr> - <td><nowiki>$r.translateWithPackage("org.olat.modules.wiki","enter.nowiki")</nowiki></td> - <td>$r.translateWithPackage("org.olat.modules.wiki","enter.nowiki")</td> - </tr> - - <tr> - <td colspan="2"><br/> - <b>$r.translate("chelp.subtit6") </b></td> - </tr> - </tbody> -</table> \ No newline at end of file diff --git a/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiki.html b/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiki.html deleted file mode 100644 index 4cfead5dc93..00000000000 --- a/src/main/java/org/olat/course/nodes/wiki/_chelp/ced-wiki.html +++ /dev/null @@ -1,3 +0,0 @@ -<br/> - $r.translate("chelp.wiki1") $r.translate("chelp.wiki2") <br/><br/> - $r.translate("chelp.wiki3") $r.translate("chelp.wiki4") diff --git a/src/main/java/org/olat/group/ui/wizard/_content/mailnotification.html b/src/main/java/org/olat/group/ui/wizard/_content/mailnotification.html index 0357ed4f616..0b98e3b96d1 100644 --- a/src/main/java/org/olat/group/ui/wizard/_content/mailnotification.html +++ b/src/main/java/org/olat/group/ui/wizard/_content/mailnotification.html @@ -1,5 +1,4 @@ <fieldset> <legend>$r.translate("mailnotification.title")</legend> - $r.contextHelpWithWrapper("org.olat.core.util.mail","mail-templ.html","help.hover.mail-templ") $r.render("mailForm") </fieldset> -- GitLab