L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OK, for bug fixes this is a pretty big checkin!! :-/

Browse Source 
I finally was able to see the HTML Editor bug in IE/XP that everyone
was talking about, and it's a very serious bug as it makes Moodle 1.3
almost unusable for these people.  :-(  :-(

So, I eventually found out that the problem is that the Javascript that
attaches the editor has troubles when it is embedded within the table                                                   that course/mod.php puts around the mod.html forms in each module.
(Only in IE and only sometimes, mind you).

While testing I also had a good look at a long standing issue which is the
inconsistency of the mod.html forms when using the editor.

So, to fix both I decided to put the HTML editor calls OUTSIDE the mod.html
in the mod.php file.  This means that all modules get the HTML editor by default
on all text areas during activity module setup by default.

I've been running through this for the past few hours and it seems
pretty stable now and a lot more consistent, so I'm checking it in
as big fix towards the Moodle 1.3.1 we have to have.

Unfortunately it also means the API has changed a bit  ... I had to
update all the module dependencies to this exact version (or later).

Please test this "stable" version hard using the standard modules only
and I'll merge these changes over to the trunk in a day or so and update
all known third-party modules.
This commit is contained in:
moodler
2004-06-03 13:07:49 +00:00
parent 507ee65e59
commit 031dd5f017
44 changed files with 165 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/edit.php
+1 -1
View File
@@ -184,7 +184,7 @@
print_footer($course);
if ($usehtmleditor) {
use_html_editor();
use_html_editor("summary");
}
exit;
course/editsection.php
+1 -1
View File
@@ -58,7 +58,7 @@
print_simple_box_end();
if ($usehtmleditor) {
use_html_editor();
use_html_editor("summary");
}
print_footer($course);
course/group.php
+1 -1
View File
@@ -95,7 +95,7 @@
include('group-edit.html');
if ($usehtmleditor) {
use_html_editor();
use_html_editor("description");
}
print_footer();
course/mod.php
+10
View File
@@ -527,6 +527,12 @@
if (file_exists($modform)) {
if ($usehtmleditor = can_use_html_editor()) {
$defaultformat = FORMAT_HTML;
} else {
$defaultformat = FORMAT_MOODLE;
}
$icon = "<img align=absmiddle height=16 width=16 src=\"$CFG->modpixpath/$module->name/icon.gif\">&nbsp;";
print_heading_with_help($pageheading, "mods", $module->name, $icon);
@@ -534,6 +540,10 @@
include_once($modform);
print_simple_box_end();
if ($usehtmleditor and empty($nohtmleditorneeded)) {
use_html_editor();
}
} else {
notice("This module cannot be added to this course yet! (No file found at: $modform)", "$CFG->wwwroot/course/view.php?id=$course->id");
}
lib/weblib.php
+3 -3
View File
@@ -1649,11 +1649,11 @@ function use_html_editor($name="") {
echo "<script language=\"javascript\" type=\"text/javascript\" defer=\"1\">\n";
if (empty($name)) {
echo "HTMLArea.replaceAll();";
echo "HTMLArea.replaceAll();\n";
} else {
echo "HTMLArea.replace('$name')";
echo "HTMLArea.replace('$name');\n";
}
echo "</script>";
echo "</script>\n";
}
mod/assignment/mod.html
+27 -35
View File
@@ -1,9 +1,4 @@
<?php
if ($usehtmleditor = can_use_richtext_editor()) {
$defaultformat = FORMAT_HTML;
} else {
$defaultformat = FORMAT_MOODLE;
}
if (empty($form->name)) {
$form->name = "";
}
@@ -30,15 +25,15 @@
}
?>
<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
<table cellpadding=5>
<tr valign=top>
<form name="form" method="post" action="mod.php">
<table cellpadding="5">
<tr valign="top">
<td align=right><p><b><?php print_string("assignmentname", "assignment") ?>:</b></p></td>
<td>
<input type="text" name="name" size=60 value="<?php p($form->name) ?>">
</td>
</tr>
<tr valign=top>
<tr valign="top">
<td align=right><p><b><?php print_string("description", "assignment") ?>:</b></p>
<font size="1">
<?php
@@ -59,23 +54,27 @@
<?php
print_textarea($usehtmleditor, 20, 60, 680, 400, "description", $form->description);
echo "<p align=right>";
helpbutton("textformat", get_string("formattexttype"));
print_string("formattexttype");
echo ":&nbsp;";
if (!$form->format) {
$form->format = $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->format) {
$form->format = $defaultformat;
}
choose_from_menu(format_text_menu(), "format", $form->format, "");
echo '</p>';
}
choose_from_menu(format_text_menu(), "format", $form->format, "");
echo "</p>";
?>
</td>
</tr>
<tr valign=top>
<tr valign="top">
<td align=right><p><b><?php print_string("assignmenttype", "assignment") ?>:</b></p></td>
<td>
<?php
require("$CFG->dirroot/mod/assignment/lib.php");
require_once("$CFG->dirroot/mod/assignment/lib.php");
asort($ASSIGNMENT_TYPE);
choose_from_menu($ASSIGNMENT_TYPE, "type", $form->type, "");
helpbutton("assignmenttype", get_string("assignmenttype", "assignment"), "assignment");
@@ -119,21 +118,14 @@
</table>
<br />
<center>
<input type="hidden" name=course value="<?php p($form->course) ?>">
<input type="hidden" name=coursemodule value="<?php p($form->coursemodule) ?>">
<input type="hidden" name=section value="<?php p($form->section) ?>">
<input type="hidden" name=module value="<?php p($form->module) ?>">
<input type="hidden" name=modulename value="<?php p($form->modulename) ?>">
<input type="hidden" name=instance value="<?php p($form->instance) ?>">
<input type="hidden" name=mode value="<?php p($form->mode) ?>">
<input type="submit" value="<?php print_string("savechanges") ?>">
<input type="submit" name=cancel value="<?php print_string("cancel") ?>">
<input type="hidden" name=course value="<?php p($form->course) ?>" />
<input type="hidden" name=coursemodule value="<?php p($form->coursemodule) ?>" />
<input type="hidden" name=section value="<?php p($form->section) ?>" />
<input type="hidden" name=module value="<?php p($form->module) ?>" />
<input type="hidden" name=modulename value="<?php p($form->modulename) ?>" />
<input type="hidden" name=instance value="<?php p($form->instance) ?>" />
<input type="hidden" name=mode value="<?php p($form->mode) ?>" />
<input type="submit" value="<?php print_string("savechanges") ?>" />
<input type="submit" name=cancel value="<?php print_string("cancel") ?>" />
</center>
</form>
<?php
if ($usehtmleditor) {
print_richedit_javascript("form", "description", "yes");
}
?>
mod/assignment/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004040100;
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 60;
?>
mod/attendance/lib.php
+6 -5
View File
@@ -40,10 +40,11 @@ function attendance_add_instance($attendance) {
$attendance->day = make_timestamp($attendance->theyear,
$attendance->themonth, $attendance->theday);
}
$attendance->notes = $attendance->name;
$attendance->name=userdate($attendance->day, get_string("strftimedate"));
if (isset($attendance->notes)) {
$attendance->name = $attendance->name . " - " . $attendance->notes;
}
if ($attendance->notes) {
$attendance->name = $attendance->name . " - " . $attendance->notes;
}
$attendance->edited = 0;
if ($attendance->dynsection) {
if ($mod->course) {
@@ -78,10 +79,10 @@ function attendance_update_instance($attendance) {
$attendance->day = make_timestamp($attendance->theyear,
$attendance->themonth, $attendance->theday);
$attendance->notes = $attendance->name;
$attendance->name=userdate($attendance->day, get_string("strftimedate"));
if ($attendance->notes) {
$attendance->name = $attendance->name . " - " .
$attendance->notes;
$attendance->name = $attendance->name . " - " . $attendance->notes;
}
if ($attendance->dynsection) {
//get info about the course
mod/attendance/mod.html
+3 -4
View File
@@ -4,6 +4,7 @@
<!-- RJJ I'm using inline CSS styles for some stuff in this page because I want to centralize -->
<!-- the logic and styles in a single directory -->
<?php @include_once("$CFG->dirroot/mod/attendance/lib.php");
$nohtmleditorneeded = true;
//require_once("lib.php")
// error_reporting(E_ALL);
@@ -20,8 +21,6 @@ if (empty($form->id)) {
?>
<FORM name="form" method="post" action="<?php echo $ME ?>">
<CENTER>
<INPUT type="submit" value="<?php print_string("savechanges") ?>">
<INPUT type="submit" name="cancel" value="<?php print_string("cancel") ?>">
<TABLE cellpadding=5>
<!-- <?php $options[0] = get_string("no"); $options[1] = get_string("yes"); ?> -->
@@ -30,9 +29,9 @@ if (empty($form->id)) {
<!-- <TD align=left><?php choose_from_menu($options, "roll", $form->roll, "") ?></td> -->
<!-- </tr> -->
<tr valign=top>
<td align=right><p><b><?php print_string("notes", "attendance") ?>:</b></p></td>
<td align=right><p><b><?php print_string("name") ?>:</b></p></td>
<td colspan="3">
<input type="text" name="notes" size=60 value="<?php p($form->notes)?>">
<input type="text" name="name" size=60 value="<?php p($form->notes)?>">
</td>
</tr>
mod/attendance/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
/////////////////////////////////////////////////////////////////////////////////
$module->version = 2004050301; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 3600; // Period for cron to check this module (secs)
?>
mod/chat/mod.html
+2 -2
View File
@@ -12,7 +12,7 @@
$form->studentlogs = 0;
}
?>
<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
<form name="form" method="post" action="mod.php">
<table cellpadding=5>
<tr>
<tr valign=top>
@@ -35,7 +35,7 @@
</font>
</td>
<td>
<textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
<?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
</td>
</tr>
<tr valign=top>
mod/chat/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
/////////////////////////////////////////////////////////////////////////////////
$module->version = 2004043000; // The (date) version of this module
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 300; // How often should cron check this module (seconds)?
?>
mod/choice/mod.html
+13 -23
View File
@@ -33,16 +33,8 @@
$form->showunanswered = 0;
}
if ($usehtmleditor = can_use_richtext_editor()) {
$defaultformat = FORMAT_HTML;
$onsubmit = "onsubmit=\"copyrichtext(document.form.text);\"";
} else {
$defaultformat = FORMAT_MOODLE;
$onsubmit = "";
}
?>
<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
<form name="form" method="post" action="mod.php">
<table cellpadding=5>
@@ -74,15 +66,19 @@
<?php
print_textarea($usehtmleditor, 20, 60, 680, 400, "text", $form->text);
echo "<p align=right>";
helpbutton("textformat", get_string("formattexttype"));
print_string("formattexttype");
echo ":&nbsp;";
if (!$form->format) {
$form->format = $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->format) {
$form->format = $defaultformat;
}
choose_from_menu(format_text_menu(), "format", $form->format, "");
echo "</p>";
}
choose_from_menu(format_text_menu(), "format", $form->format, "");
echo "</p>";
?>
</td>
</tr>
@@ -167,9 +163,3 @@
<input type="submit" name=cancel value="<?php print_string("cancel") ?>">
</center>
</form>
<?php
if ($usehtmleditor) {
print_richedit_javascript("form", "text", "yes");
}
?>
mod/choice/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004021700;
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 0;
?>
mod/dialogue/mod.html
+2 -11
View File
@@ -1,13 +1,4 @@
<?php
// set the defaults...
if ($usehtmleditor = can_use_richtext_editor()) {
$defaultformat = FORMAT_HTML;
$onsubmit = "onsubmit=\"copyrichtext(document.form.description);\"";
} else {
$defaultformat = FORMAT_MOODLE;
$onsubmit = "";
}
// ...and fill the form if needed
if (!isset($form->name)) {
$form->name = "";
}
@@ -29,7 +20,7 @@
print_heading_with_help(get_string("furtherinformation", "dialogue"), "info", "dialogue");
?>
<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("dialoguename", "dialogue") ?>:</b></p></td>
@@ -50,7 +41,7 @@ print_heading_with_help(get_string("furtherinformation", "dialogue"), "info", "d
</TD>
<td>
<textarea name="intro" rows=15 cols=30 wrap="virtual"><?php p($form->intro) ?></textarea>
<?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
</td>
</tr>
<tr valign=top>
mod/dialogue/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004013101;
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 60;
?>
mod/exercise/mod.html
+4 -2
View File
@@ -22,6 +22,8 @@
if (empty($form->deadline)) {
$form->deadline = "";
}
$nohtmleditorneeded = true;
?>
<form name="form" method="post" action="mod.php">
@@ -49,7 +51,7 @@
$grades[$i] = $i;
}
choose_from_menu($grades, "grade", "$form->grade", "");
helpbutton("grade", get_string("maximumgrade", "exercise"), "exercise");
helpbutton("grade", get_string("maximumgrade", "exercise"), "exercise");
?>
</td>
</tr>
@@ -83,7 +85,7 @@
$numbers[$i] = $i;
}
choose_from_menu($numbers, "nelements", "$form->nelements", "");
helpbutton("nelements", get_string("numberofassessmentelements", "exercise"), "exercise");
helpbutton("nelements", get_string("numberofassessmentelements", "exercise"), "exercise");
?>
</td>
</tr>
mod/exercise/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004013101;
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 60;
?>
mod/forum/mod.html
+2 -2
View File
@@ -30,7 +30,7 @@
$form->rssarticles = 0;
}
?>
<form name="form" method="post" <?php echo $onsubmit ?> action="mod.php">
<form name="form" method="post" action="mod.php">
<table cellpadding=5>
<tr>
<tr valign=top>
@@ -77,7 +77,7 @@
</font>
</td>
<td>
<textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
<?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
</td>
</tr>
mod/forum/post.php
+1 -1
View File
@@ -403,7 +403,7 @@
print_simple_box_end();
if ($usehtmleditor) {
use_html_editor();
use_html_editor("message");
}
print_footer($course);
mod/forum/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004050300;
$module->requires = 2004050300; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 60;
?>
mod/glossary/comment.php
+1 -1
View File
@@ -178,7 +178,7 @@
include("comment.html");
if ($usehtmleditor) {
use_html_editor();
use_html_editor("text");
}
}
}
mod/glossary/mod.html
+1 -3
View File
@@ -1,7 +1,5 @@
<?PHP // $Id$
global $CFG;
if (!isset($form->studentcanpost)) {
$form->studentcanpost = $CFG->glossary_studentspost;
}
@@ -74,7 +72,7 @@ if (!isset($form->showspecial)) {
</font>
</td>
<td>
<textarea name="intro" rows=5 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
<?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
</td>
</tr>
<TR valign=top>
mod/glossary/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
/////////////////////////////////////////////////////////////////////////////////
$module->version = 2004051400; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2004050300; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 0; // Period for cron to check this module (secs)
$release = "0.5 development"; // User-friendly version number
mod/journal/edit.php
+1 -1
View File
@@ -90,7 +90,7 @@
include("edit.html");
if ($usehtmleditor) {
use_html_editor();
use_html_editor("text");
}
print_footer($course);
mod/journal/mod.html
+13 -23
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");
}
?>
mod/journal/version.php
+1 -1
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;
?>
mod/label/mod.html
-14
View File
@@ -1,14 +1,6 @@
<!-- This page defines the form to create or edit an instance of this module -->
<!-- It is used from /course/mod.php. The whole instance is available as $form. -->
<?php
if ($usehtmleditor = can_use_html_editor()) {
$defaultformat = FORMAT_HTML;
} else {
$defaultformat = FORMAT_MOODLE;
}
?>
<form name="form" method="post" action="mod.php">
<center>
<table cellpadding=5>
@@ -46,9 +38,3 @@
<input type="submit" value="<?php print_string("savechanges") ?>">
</center>
</form>
<?php
if ($usehtmleditor) {
use_html_editor();
}
?>
mod/label/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
/////////////////////////////////////////////////////////////////////////////////
$module->version = 2004021900; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 0; // Period for cron to check this module (secs)
?>
mod/lesson/mod.html
+3 -1
View File
@@ -2,7 +2,8 @@
<!-- It is used from /course/mod.php. The whole instance is available as $form. -->
<?php
require("$CFG->dirroot/mod/lesson/lib.php"); // for parameter array
require_once("$CFG->dirroot/mod/lesson/lib.php"); // for parameter array
$nohtmleditorneeded = true;
// set the defaults
if (empty($form->name)) {
@@ -38,6 +39,7 @@ require("$CFG->dirroot/mod/lesson/lib.php"); // for parameter array
if (!isset($form->deadline)) {
$form->deadline = 0;
}
?>
<FORM name="form" method="post" action="<?php echo $ME ?>">
mod/lesson/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
/////////////////////////////////////////////////////////////////////////////////
$module->version = 2004032700; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 0; // Period for cron to check this module (secs)
?>
mod/quiz/mod.html
+17 -3
View File
@@ -60,11 +60,25 @@
</td>
</tr>
<tr valign=top>
<td align=right><p><b><?php print_string("introduction", "quiz") ?>:</b></p></td>
<td align=right><p><b><?php print_string("introduction", "quiz") ?>:</b></p>
<br />
<font size="1">
<?php
if ($usehtmleditor) {
helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
} else {
helpbutton("text", get_string("helptext"), "moodle", true, true);
echo '<br />';
emoticonhelpbutton("form", "description");
echo '<br />';
}
?>
<br />
</font>
</td>
<td>
<textarea name="intro" rows=4 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
<?php
helpbutton("text", get_string("helptext"));
print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro);
?>
</td>
</tr>
mod/quiz/report/fullstat/report.php
+1 -1
View File
@@ -91,7 +91,7 @@ class quiz_report extends quiz_default_report {
$user_resps = qr_quiz_responses($thisquizid);
// //print_object($user_resps);
foreach($user_resps as $thiskey => $thisresp){
$userdata[$thisresp->userid][$thisresp->attemptno]['response'][$thisresp->question]=$thisresp->answer;
$userdata[$thisresp->userid][$thisresp->attemptno]['response'][$thisresp->question]=s($thisresp->answer);
$userdata[$thisresp->userid][$thisresp->attemptno]['grade']=$thisresp->sumgrades;
$userdata[$thisresp->userid][$thisresp->attemptno]['name']=fullname($thisresp);
$userdata[$thisresp->userid][$thisresp->attemptno]['attemptid']=$thisresp->aid;
mod/quiz/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004051700; // The (date) version of this module
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 0; // How often should cron check this module (seconds)?
?>
mod/resource/details.php
+1 -1
View File
@@ -451,7 +451,7 @@
</form>
<?php
if ($usehtmleditor and $form->type == HTML) {
use_html_editor();
use_html_editor("alltext");
}
print_simple_box_end();
print_footer($course);
mod/resource/mod.html
+2 -1
View File
@@ -14,6 +14,7 @@
if (empty($form->alltext)) {
$form->alltext = "";
}
$nohtmleditorneeded = true;
?>
@@ -54,7 +55,7 @@
</font>
</td>
<td>
<textarea name="summary" rows=5 cols=50 wrap="virtual"><?php p($form->summary) ?></textarea>
<?php print_textarea(false, 7, 50, 680, 400, "summary", $form->summary); ?>
</td>
</tr>
</table>
mod/resource/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004013101;
$module->requires = 2004051600; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 0;
?>
mod/scorm/mod.html
+1 -1
View File
@@ -52,7 +52,7 @@
</font>
</td>
<td>
<textarea name="summary" rows=5 cols=50 wrap="virtual"><?php p($form->summary) ?></textarea>
<?php print_textarea($usehtmleditor, 20, 50, 680, 400, "summary", $form->summary); ?>
</td>
</tr>
<tr valign=top>
mod/scorm/version.php
+1
View File
@@ -6,6 +6,7 @@
/////////////////////////////////////////////////////////////////////////////////
$module->version = 2004040900; // The (date) version of this module
$module->requires = 2004051600; // The version of Moodle that is required
$module->cron = 0; // How often should cron check this module (seconds)?
?>
mod/survey/mod.html
+1
View File
@@ -8,6 +8,7 @@
if (!isset($form->intro)) {
$form->intro = "";
}
$nohtmleditorneeded = true;
?>
<form name="form" method="post" action="../mod/survey/details.php">
mod/survey/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004021900;
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004051600; // Requires this Moodle version
$module->cron = 0;
?>
mod/workshop/mod.html
+29 -30
View File
@@ -1,12 +1,4 @@
<?php
// set the defaults...
if ($usehtmleditor = can_use_richtext_editor()) {
$defaultformat = FORMAT_HTML;
$onsubmit = "onsubmit=\"copyrichtext(document.form.description);\"";
} else {
$defaultformat = FORMAT_MOODLE;
$onsubmit = "";
}
// ...and fill the form if needed
if (empty($form->name)) {
$form->name = "";
@@ -49,7 +41,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("title", "workshop") ?>:</B></P></TD>
@@ -58,25 +50,39 @@
</td>
</tr>
<tr valign=top>
<td align=right><P><B><?php print_string("description", "workshop") ?>:</B></P></TD>
<td align=right><p><b><?php print_string("description", "workshop") ?>:</b></p>
<font size="1">
<?php
helpbutton("writing", get_string("helpwriting"), "moodle", true, true);
echo "<br />";
if ($usehtmleditor) {
helpbutton("richtext", get_string("helprichtext"), "moodle", true, true);
} else {
helpbutton("text", get_string("helptext"), "moodle", true, true);
echo "<br />";
emoticonhelpbutton("form", "description", "moodle", true, true);
echo "<br />";
}
?>
<br />
</font>
<td>
<?php
print_textarea($usehtmleditor, 20, 60, 595, 400, "description", $form->description);
if ($usehtmleditor) {
helpbutton("richtext", get_string("helprichtext"));
} else {
helpbutton("text", get_string("helptext"));
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->format) {
$form->format = $defaultformat;
}
choose_from_menu(format_text_menu(), "format", $form->format, "");
echo '</p>';
}
echo "<P align=right>";
print_string("formattexttype");
echo ":&nbsp;";
if (!$form->format) {
$form->format = $defaultformat;
}
choose_from_menu(format_text_menu(), "format", $form->format, "");
helpbutton("textformat", get_string("formattexttype"));
echo "</P>";
?>
</td>
</tr>
@@ -242,10 +248,3 @@
</CENTER>
</FORM>
<?php
if ($usehtmleditor) {
print_richedit_javascript("form", "description", "no");
}
?>
mod/workshop/version.php
+1 -1
View File
@@ -6,7 +6,7 @@
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004052100;
$module->requires = 2004013101; // Requires this Moodle version
$module->requires = 2004051600; // Requires this Moodle version
$module->cron = 60;
?>
version.php
+2 -3
View File
@@ -5,8 +5,7 @@
// database to determine whether upgrades should
// be performed (see lib/db/*.php)
$version = 2004052500; // The current version is a date (YYYYMMDDXX)
$version = 2004052501; // The current version is a date (YYYYMMDDXX)
$release = "1.3 Stable (001)"; // User-friendly version number
// Bugfix sequence number between brackets
$release = "1.3 Stable +2"; // User-friendly version number
?>