MDL-14635 remove tags from glossary block help, merged from 19

This commit is contained in:
jerome 2008-06-25 03:26:08 +00:00
parent f836189a70
commit 293076e9ce
4 changed files with 13 additions and 3 deletions

View File

@ -26,8 +26,7 @@
<td align="right"><?php print_string("type","block_glossary_random") ?>:</td>
<td><?php
choose_from_menu($type, "type", $this->config->type, "");
helpbutton("",get_string("type","block_glossary_random"),"moodle",true,false,get_string("typehelp","block_glossary_random"));
// helpbutton("type_help", get_string("type_help", "block_glossary_random"), "block/glossary_random");
helpbutton('newentry', get_string("type","block_glossary_random"), 'glossary');
?></td>
</tr>

View File

@ -20,7 +20,6 @@ $string['select_glossary'] = 'Take entries from this glossary';
$string['showconcept'] = 'Show concept (heading) for each entry';
$string['title'] = 'Title';
$string['type'] = 'How a new entry is chosen';
$string['typehelp'] = '<b>Last modified entry</b> will always display the entry that was last modified, and <b>Random entry</b> will choose a new one at random every time. The option <b>Next entry</b> will cycle through the entries in order. This last option is especially useful when a number of days is also chosen, allowing you to make a <i>Quote of the week</i> or a <i>Tip of the day</i> that everyone sees.';
$string['viewglossary'] = 'More quotes...';
$string['whichfooter'] = 'You can display links to actions of the glossary this block is associated with. The block will only display links to actions which are enabled for that glossary.';

View File

@ -0,0 +1,5 @@
<b>Last modified entry</b> will always display the entry that was last modified,
and <b>Random entry</b> will choose a new one at random every time. The option
<b>Next entry</b> will cycle through the entries in order. This last option is
especially useful when a number of days is also chosen, allowing you to make a
<i>Quote of the week</i> or a <i>Tip of the day</i> that everyone sees.

View File

@ -5873,6 +5873,13 @@ function helpbutton ($page, $title, $module='moodle', $image=true, $linktext=fal
$imagetext='') {
global $CFG, $COURSE;
//warning if ever $text parameter is used
//$text option won't work properly because the text needs to be always cleaned and,
// when cleaned... html tags always break, so it's unusable.
if ( isset($text) && $text!='') {
debugging('Warning: it\'s not recommended to use $text parameter in helpbutton ($page=' . $page . ', $module=' . $module . ') function');
}
// fix for MDL-7734
if (!empty($COURSE->lang)) {
$forcelang = $COURSE->lang;