moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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

7
calendar/event.php
View file

@ -214,6 +214,8 @@
print_header(get_string('calendar', 'calendar').': '.$title, $site->fullname, $nav.' -> '.$title,
$focus, '', true, '', '<p class="logininfo">'.user_login_string($site).'</p>');
echo calendar_overlib_html();
echo '<table border="0" cellpadding="3" cellspacing="0" width="100%"><tr valign="top">';
echo '<td valign="top" width="100%">';
@ -281,7 +283,7 @@
include('event_edit.html');
print_side_block_end();
if ($usehtmleditor) {
use_html_editor();
use_html_editor("description");
}
break;
@ -425,7 +427,7 @@
else {
include('event_new.html');
if ($usehtmleditor) {
use_html_editor();
use_html_editor("description");
}
}
print_side_block_end();
@ -437,7 +439,6 @@
echo '<td style="vertical-align: top; width: 180px;">';
$defaultcourses = calendar_get_default_courses();
echo calendar_overlib_html();
calendar_set_filters($courses, $groups, $users, $defaultcourses, $defaultcourses);
print_side_block_start(get_string('monthlyview', 'calendar'));

2
calendar/event_edit.html
View file

@ -19,7 +19,7 @@
</td>
<td>
<?php
print_textarea($usehtmleditor, 10, 65, 630, 400, "description", $form->description);
print_textarea($usehtmleditor, 20, 65, 630, 300, "description", $form->description);
if (isset($err['description'])) formerr($err['description']);
?>
</td>

2
calendar/event_new.html
View file

@ -19,7 +19,7 @@
</td>
<td>
<?php
print_textarea($usehtmleditor, 10, 65, 630, 200, "description", $form->description);
print_textarea($usehtmleditor, 20, 65, 630, 300, "description", $form->description);
if (isset($err['description'])) formerr($err['description']);
?>
</td>