Skip to content
Snippets Groups Projects
Commit c2d53438 authored by dfurrer's avatar dfurrer
Browse files

OO-1658: contextHelp cleanup

parent 4ad4b01c
No related branches found
No related tags found
No related merge requests found
Showing
with 6 additions and 45 deletions
...@@ -77,16 +77,15 @@ public class DENDatesForm extends FormBasicController { ...@@ -77,16 +77,15 @@ public class DENDatesForm extends FormBasicController {
showDurationTE = true; showDurationTE = true;
showPauseTE = true; showPauseTE = true;
showRetakeTE = true; showRetakeTE = true;
setFormContextHelp("Other#_addentry");
} else if(layout == EDIT_SINGLE_DATE_LAYOUT) { } else if(layout == EDIT_SINGLE_DATE_LAYOUT) {
showBeginDateChooser = true; showBeginDateChooser = true;
showDurationTE = true; showDurationTE = true;
setFormContextHelp("de.bps.course.nodes.den","ced-den-dates-singl.html","help.hover.den");
} else if(layout == EDIT_MULTIPLE_DATES_LAYOUT) { } else if(layout == EDIT_MULTIPLE_DATES_LAYOUT) {
showMoveTE = true; showMoveTE = true;
setFormContextHelp("de.bps.course.nodes.den","ced-den-dates-multi.html","help.hover.den");
} }
setFormContextHelp("Other#_addentry");
initForm(this.flc, this, ureq); initForm(this.flc, this, ureq);
} }
......
$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
$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
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<a class="o_link" href="$rssLink" title="$r.translate("welcome.rss")" target="_blank"> <a class="o_link" href="$rssLink" title="$r.translate("welcome.rss")" target="_blank">
<i class="o_icon o_icon-fw o_icon_rss"> </i> <i class="o_icon o_icon-fw o_icon_rss"> </i>
</a> </a>
$r.contextHelp("Personal Menu#_rss") $r.contextHelpWithWrapper("Personal Menu#_rss")
</div> </div>
<h1>$r.translate("welcome.header")</h1> <h1>$r.translate("welcome.header")</h1>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
$r.render("myPortal") $r.render("myPortal")
<div class="o_home_rsslink"> <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> <a class="o_home_rsslink" href="$rssLink" title="$r.translateInAttribute("welcome.rss")" target="_blank"></a>
</div> </div>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#if($r.available("edit")) #if($r.available("edit"))
$r.render("edit") $r.render("edit")
#end #end
#if($off_chelp_package) $r.contextHelp("$off_chelp_package","$off_chelp_page","$off_chelp_hover") #end
</div> </div>
</div> </div>
<table class="table table-condensed"><tbody> <table class="table table-condensed"><tbody>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<script type="text/javascript"><!-- <script type="text/javascript"><!--
// To use this JavaScript, please access: // To use this JavaScript, please access:
// https://wayf.switch.ch/SWITCHaai/WAYF/embedded-wayf.js/snippet.html // 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 // you want the embedded WAYF to be displayed
// Technical contact for this Resource: developers@olat.uzh.ch // Technical contact for this Resource: developers@olat.uzh.ch
...@@ -167,10 +167,3 @@ wayf_additional_idps = [$additionalIDPs]; ...@@ -167,10 +167,3 @@ wayf_additional_idps = [$additionalIDPs];
</noscript> </noscript>
<!-- EMBEDDED-WAYF-END --> <!-- 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
<br/>
$r.translate("chelp.line1_1")
<br/>
$r.translate("chelp.line1_2")
<br/>
\ No newline at end of file
<br/>
$r.translate("chelp.line3_1")
<br/>
\ No newline at end of file
<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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment