moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

BRANCH MERGE

Browse source 
These are the changes from MOODLE_13_STABLE, merged into trunk

The tag MOODLE_13_MERGED on the MOODLE_13_STABLE branch now refers to this point

The biggest changes here are the fixes for HTML editor in all standard modules
This commit is contained in:
moodler 2004-06-04 06:17:30 +00:00
parent 308214e87e
commit 7613890851
49 changed files with 175 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/journal/edit.php
View file

@ -90,7 +90,7 @@
include("edit.html");
if ($usehtmleditor) {
use_html_editor();
use_html_editor("text");
}
print_footer($course);

36
mod/journal/mod.html
View file

@ -1,10 +1,4 @@
<?php
if ($usehtmleditor = can_use_richtext_editor()) {
$defaultformat = FORMAT_HTML;
} else {
$defaultformat = FORMAT_MOODLE;
}
if (!isset($form->name)) {
$form->name = "";
}
@ -23,7 +17,7 @@
}
?>
<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
<form name="form" method="post" action="mod.php">
<table cellpadding=5>
<tr valign=top>
<td align=right><p><b><?php print_string("journalname", "journal") ?>:</b></p></td>
@ -53,15 +47,19 @@
<?php
print_textarea($usehtmleditor, 20, 60, 680, 400, "intro", $form->intro);
echo "<p align=right>";
helpbutton("textformat", get_string("formattexttype"));
print_string("formattexttype");
echo ":&nbsp;";
if (!$form->introformat) {
$form->introformat = $defaultformat;
if ($usehtmleditor) {
echo '<input type="hidden" name="format" value="'.FORMAT_HTML.'" />';
} else {
echo "<p align=right>";
helpbutton("textformat", get_string("formattexttype"));
print_string("formattexttype");
echo ":&nbsp;";
if (!$form->introformat) {
$form->introformat = $defaultformat;
}
choose_from_menu(format_text_menu(), "introformat", $form->introformat, "");
echo "</p>";
}
choose_from_menu(format_text_menu(), "introformat", $form->introformat, "");
echo "</p>";
?>
</td>
</tr>
@ -107,11 +105,3 @@
<input type="submit" name=cancel value="<?php print_string("cancel") ?>">
</form>
</center>
<?php
if ($usehtmleditor) {
print_richedit_javascript("form", "intro", "yes");
}
?>

2
mod/journal/version.php
View file

@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004020500;
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 60;
?>