From 76138908518339b2a62e6c24c4d097905583d2a4 Mon Sep 17 00:00:00 2001 From: moodler Date: Fri, 4 Jun 2004 06:17:30 +0000 Subject: [PATCH] BRANCH MERGE 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 --- admin/admin.php | 6 +-- admin/creators.php | 6 +-- calendar/event.php | 7 ++-- calendar/event_edit.html | 2 +- calendar/event_new.html | 2 +- course/edit.php | 2 +- course/editsection.php | 2 +- course/group.php | 2 +- course/mod.php | 10 +++++ lib/weblib.php | 6 +-- mod/assignment/mod.html | 62 +++++++++++++---------------- mod/assignment/version.php | 2 +- mod/attendance/lib.php | 11 ++--- mod/attendance/mod.html | 7 ++-- mod/attendance/version.php | 2 +- mod/chat/mod.html | 4 +- mod/chat/version.php | 2 +- mod/choice/mod.html | 36 ++++++----------- mod/choice/version.php | 2 +- mod/dialogue/mod.html | 13 +----- mod/dialogue/version.php | 2 +- mod/exercise/mod.html | 6 ++- mod/exercise/version.php | 2 +- mod/forum/mod.html | 4 +- mod/forum/post.php | 2 +- mod/glossary/comment.php | 2 +- mod/glossary/mod.html | 4 +- mod/glossary/version.php | 2 +- mod/journal/edit.php | 2 +- mod/journal/mod.html | 36 ++++++----------- mod/journal/version.php | 2 +- mod/label/mod.html | 14 ------- mod/label/version.php | 2 +- mod/lesson/mod.html | 4 +- mod/lesson/version.php | 2 +- mod/quiz/mod.html | 20 ++++++++-- mod/quiz/report/fullstat/report.php | 2 +- mod/quiz/version.php | 2 +- mod/resource/details.php | 2 +- mod/resource/mod.html | 3 +- mod/resource/version.php | 2 +- mod/scorm/mod.html | 2 +- mod/scorm/version.php | 1 + mod/survey/mod.html | 1 + mod/survey/version.php | 2 +- mod/workshop/mod.html | 59 ++++++++++++++------------- mod/workshop/version.php | 2 +- rss/file.php | 2 +- version.php | 1 - 49 files changed, 175 insertions(+), 198 deletions(-) diff --git a/admin/admin.php b/admin/admin.php index dd2855d9e7..cb0f3b554d 100644 --- a/admin/admin.php +++ b/admin/admin.php @@ -102,7 +102,7 @@ if ($primaryadmin->id == $admin->id){ print_spacer(10, 9, false); } else { - echo "id\" + echo "id\" title=\"$strremoveadmin\">"; } @@ -136,14 +136,14 @@ } foreach ($users as $user) { - echo "

id\"". + echo "

id\"". "title=\"$straddadmin\">  ".fullname($user).", $user->email"; } } if ($search or $usercount > MAX_USERS_PER_PAGE) { - echo "

"; + echo ""; echo ""; echo ""; echo "
"; diff --git a/admin/creators.php b/admin/creators.php index 3421acc342..5a5b03f6d7 100755 --- a/admin/creators.php +++ b/admin/creators.php @@ -95,7 +95,7 @@ foreach ($creators as $creator) { $creatorarray[] = $creator->id; echo "

".fullname($creator, true).", $creator->email    "; - echo "id\" + echo "id\" title=\"$strremovecreator\">"; echo "

"; @@ -128,14 +128,14 @@ foreach ($users as $user) { $fullname = fullname($user, TRUE); - echo "

id\"". + echo "

id\"". "title=\"$straddcreator\">  $fullname, $user->email"; } } if ($search or $usercount > MAX_USERS_PER_PAGE) { - echo "

"; + echo ""; echo ""; echo ""; echo "
"; diff --git a/calendar/event.php b/calendar/event.php index eb4ba6db9f..008ac9cbe1 100644 --- a/calendar/event.php +++ b/calendar/event.php @@ -214,6 +214,8 @@ print_header(get_string('calendar', 'calendar').': '.$title, $site->fullname, $nav.' -> '.$title, $focus, '', true, '', '

'.user_login_string($site).'

'); + echo calendar_overlib_html(); + echo ''; echo ' diff --git a/calendar/event_new.html b/calendar/event_new.html index 2f18dc0654..ec22db8ceb 100644 --- a/calendar/event_new.html +++ b/calendar/event_new.html @@ -19,7 +19,7 @@ diff --git a/course/edit.php b/course/edit.php index d4a1424db7..b33445ad3c 100644 --- a/course/edit.php +++ b/course/edit.php @@ -184,7 +184,7 @@ print_footer($course); if ($usehtmleditor) { - use_html_editor(); + use_html_editor("summary"); } exit; diff --git a/course/editsection.php b/course/editsection.php index 274b3e15a3..16c5c744df 100644 --- a/course/editsection.php +++ b/course/editsection.php @@ -58,7 +58,7 @@ print_simple_box_end(); if ($usehtmleditor) { - use_html_editor(); + use_html_editor("summary"); } print_footer($course); diff --git a/course/group.php b/course/group.php index 0debfe12de..65c9141c70 100644 --- a/course/group.php +++ b/course/group.php @@ -95,7 +95,7 @@ include('group-edit.html'); if ($usehtmleditor) { - use_html_editor(); + use_html_editor("description"); } print_footer(); diff --git a/course/mod.php b/course/mod.php index f161f0517f..94d06c7257 100644 --- a/course/mod.php +++ b/course/mod.php @@ -622,6 +622,12 @@ if (file_exists($modform)) { + if ($usehtmleditor = can_use_html_editor()) { + $defaultformat = FORMAT_HTML; + } else { + $defaultformat = FORMAT_MOODLE; + } + $icon = "modpixpath/$module->name/icon.gif\"> "; print_heading_with_help($pageheading, "mods", $module->name, $icon); @@ -629,6 +635,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"); } diff --git a/lib/weblib.php b/lib/weblib.php index 27849216dc..0effc063f9 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -1654,11 +1654,11 @@ function use_html_editor($name="") { echo ""; + echo "\n"; } diff --git a/mod/assignment/mod.html b/mod/assignment/mod.html index b5ab9c85e3..c4c9d0e7fa 100644 --- a/mod/assignment/mod.html +++ b/mod/assignment/mod.html @@ -1,9 +1,4 @@ name)) { $form->name = ""; } @@ -30,15 +25,15 @@ } ?> - action="mod.php"> -
'; @@ -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 ''; $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')); diff --git a/calendar/event_edit.html b/calendar/event_edit.html index 8bd4464cca..4350060aec 100644 --- a/calendar/event_edit.html +++ b/calendar/event_edit.html @@ -19,7 +19,7 @@ description); + print_textarea($usehtmleditor, 20, 65, 630, 300, "description", $form->description); if (isset($err['description'])) formerr($err['description']); ?> description); + print_textarea($usehtmleditor, 20, 65, 630, 300, "description", $form->description); if (isset($err['description'])) formerr($err['description']); ?>
- + +
+ - + - +

:

:

description); - echo "

"; - helpbutton("textformat", get_string("formattexttype")); - print_string("formattexttype"); - echo ": "; - if (!$form->format) { - $form->format = $defaultformat; + if ($usehtmleditor) { + echo ''; + } else { + echo '

'; + helpbutton("textformat", get_string("formattexttype")); + print_string("formattexttype"); + echo ': '; + if (!$form->format) { + $form->format = $defaultformat; + } + choose_from_menu(format_text_menu(), "format", $form->format, ""); + echo '

'; } - choose_from_menu(format_text_menu(), "format", $form->format, ""); - echo "

"; ?>

:

 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 @@

- - - - - - - -"> -"> + + + + + + + +" /> +" />
- - - diff --git a/mod/assignment/version.php b/mod/assignment/version.php index 4941aa98b5..3fc0cdc055 100644 --- a/mod/assignment/version.php +++ b/mod/assignment/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004040100; -$module->requires = 2004013101; // Requires this Moodle version +$module->requires = 2004052501; // Requires this Moodle version $module->cron = 60; ?> diff --git a/mod/attendance/lib.php b/mod/attendance/lib.php index 276da0d09e..f37b96264b 100755 --- a/mod/attendance/lib.php +++ b/mod/attendance/lib.php @@ -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 diff --git a/mod/attendance/mod.html b/mod/attendance/mod.html index 578c4e8281..75a5e9e5a2 100755 --- a/mod/attendance/mod.html +++ b/mod/attendance/mod.html @@ -4,6 +4,7 @@ dirroot/mod/attendance/lib.php"); + $nohtmleditorneeded = true; //require_once("lib.php") // error_reporting(E_ALL); @@ -20,8 +21,6 @@ if (empty($form->id)) { ?>
-"> -"> @@ -30,9 +29,9 @@ if (empty($form->id)) { - + diff --git a/mod/attendance/version.php b/mod/attendance/version.php index 872742bd13..5013856bd9 100644 --- a/mod/attendance/version.php +++ b/mod/attendance/version.php @@ -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) ?> diff --git a/mod/chat/mod.html b/mod/chat/mod.html index 4024248db2..9c93912a87 100644 --- a/mod/chat/mod.html +++ b/mod/chat/mod.html @@ -12,7 +12,7 @@ $form->studentlogs = 0; } ?> - action="mod.php"> +

:

:

 - +
@@ -35,7 +35,7 @@ diff --git a/mod/chat/version.php b/mod/chat/version.php index 56f054ea51..a9366a5718 100644 --- a/mod/chat/version.php +++ b/mod/chat/version.php @@ -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)? ?> diff --git a/mod/choice/mod.html b/mod/choice/mod.html index 169ef37c89..64c5c32cdc 100644 --- a/mod/choice/mod.html +++ b/mod/choice/mod.html @@ -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 = ""; - } - ?> - action="mod.php"> +
- + intro); ?>
@@ -74,15 +66,19 @@ text); - echo "

"; - helpbutton("textformat", get_string("formattexttype")); - print_string("formattexttype"); - echo ": "; - if (!$form->format) { - $form->format = $defaultformat; + if ($usehtmleditor) { + echo ''; + } else { + echo "

"; + helpbutton("textformat", get_string("formattexttype")); + print_string("formattexttype"); + echo ": "; + if (!$form->format) { + $form->format = $defaultformat; + } + choose_from_menu(format_text_menu(), "format", $form->format, ""); + echo "

"; } - choose_from_menu(format_text_menu(), "format", $form->format, ""); - echo "

"; ?> @@ -167,9 +163,3 @@ "> - - diff --git a/mod/choice/version.php b/mod/choice/version.php index 08aa622b24..f648d98bf9 100644 --- a/mod/choice/version.php +++ b/mod/choice/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004021700; -$module->requires = 2004013101; // Requires this Moodle version +$module->requires = 2004052501; // Requires this Moodle version $module->cron = 0; ?> diff --git a/mod/dialogue/mod.html b/mod/dialogue/mod.html index 2f3831bd6f..176e97610b 100644 --- a/mod/dialogue/mod.html +++ b/mod/dialogue/mod.html @@ -1,13 +1,4 @@ name)) { $form->name = ""; } @@ -29,7 +20,7 @@ print_heading_with_help(get_string("furtherinformation", "dialogue"), "info", "dialogue"); ?> - action="mod.php"> +
@@ -50,7 +41,7 @@ print_heading_with_help(get_string("furtherinformation", "dialogue"), "info", "d diff --git a/mod/dialogue/version.php b/mod/dialogue/version.php index 660a96ab37..330286cfe1 100644 --- a/mod/dialogue/version.php +++ b/mod/dialogue/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004013101; -$module->requires = 2004013101; // Requires this Moodle version +$module->requires = 2004052501; // Requires this Moodle version $module->cron = 60; ?> diff --git a/mod/exercise/mod.html b/mod/exercise/mod.html index 999b74e7bd..c0b7f21a20 100644 --- a/mod/exercise/mod.html +++ b/mod/exercise/mod.html @@ -22,6 +22,8 @@ if (empty($form->deadline)) { $form->deadline = ""; } + + $nohtmleditorneeded = true; ?> @@ -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"); ?> @@ -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"); ?> diff --git a/mod/exercise/version.php b/mod/exercise/version.php index 660a96ab37..330286cfe1 100644 --- a/mod/exercise/version.php +++ b/mod/exercise/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004013101; -$module->requires = 2004013101; // Requires this Moodle version +$module->requires = 2004052501; // Requires this Moodle version $module->cron = 60; ?> diff --git a/mod/forum/mod.html b/mod/forum/mod.html index d6a02edc67..e6384b1c19 100644 --- a/mod/forum/mod.html +++ b/mod/forum/mod.html @@ -30,7 +30,7 @@ $form->rssarticles = 0; } ?> - action="mod.php"> +

:

 - + intro); ?>
@@ -77,7 +77,7 @@ diff --git a/mod/forum/post.php b/mod/forum/post.php index b5dc779c88..1d767dabbe 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -481,7 +481,7 @@ print_simple_box_end(); if ($usehtmleditor) { - use_html_editor(); + use_html_editor("message"); } print_footer($course); diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php index 9b36d84e14..2c4e8dd916 100644 --- a/mod/glossary/comment.php +++ b/mod/glossary/comment.php @@ -178,7 +178,7 @@ include("comment.html"); if ($usehtmleditor) { - use_html_editor(); + use_html_editor("text"); } } } diff --git a/mod/glossary/mod.html b/mod/glossary/mod.html index b6e82c7949..150a989c9f 100644 --- a/mod/glossary/mod.html +++ b/mod/glossary/mod.html @@ -1,7 +1,5 @@ studentcanpost)) { $form->studentcanpost = $CFG->glossary_studentspost; } @@ -74,7 +72,7 @@ if (!isset($form->showspecial)) { diff --git a/mod/glossary/version.php b/mod/glossary/version.php index 44a1ac8702..0c6d8f9d4f 100644 --- a/mod/glossary/version.php +++ b/mod/glossary/version.php @@ -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 diff --git a/mod/journal/edit.php b/mod/journal/edit.php index cec5fcd98d..b2310da668 100644 --- a/mod/journal/edit.php +++ b/mod/journal/edit.php @@ -90,7 +90,7 @@ include("edit.html"); if ($usehtmleditor) { - use_html_editor(); + use_html_editor("text"); } print_footer($course); diff --git a/mod/journal/mod.html b/mod/journal/mod.html index 2c9e3f8071..48e1c61c2d 100644 --- a/mod/journal/mod.html +++ b/mod/journal/mod.html @@ -1,10 +1,4 @@ name)) { $form->name = ""; } @@ -23,7 +17,7 @@ } ?> - action="mod.php"> +
- + intro); ?>
- + intro); ?>
@@ -53,15 +47,19 @@ intro); - echo "

"; - helpbutton("textformat", get_string("formattexttype")); - print_string("formattexttype"); - echo ": "; - if (!$form->introformat) { - $form->introformat = $defaultformat; + if ($usehtmleditor) { + echo ''; + } else { + echo "

"; + helpbutton("textformat", get_string("formattexttype")); + print_string("formattexttype"); + echo ": "; + if (!$form->introformat) { + $form->introformat = $defaultformat; + } + choose_from_menu(format_text_menu(), "introformat", $form->introformat, ""); + echo "

"; } - choose_from_menu(format_text_menu(), "introformat", $form->introformat, ""); - echo "

"; ?> @@ -107,11 +105,3 @@ "> - - - - diff --git a/mod/journal/version.php b/mod/journal/version.php index b36114e597..f4d4408bac 100644 --- a/mod/journal/version.php +++ b/mod/journal/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004020500; -$module->requires = 2004013101; // Requires this Moodle version +$module->requires = 2004052501; // Requires this Moodle version $module->cron = 60; ?> diff --git a/mod/label/mod.html b/mod/label/mod.html index c72afecc20..93d3af09c9 100644 --- a/mod/label/mod.html +++ b/mod/label/mod.html @@ -1,14 +1,6 @@ - -

:
@@ -46,9 +38,3 @@ "> - - diff --git a/mod/label/version.php b/mod/label/version.php index f95b2e1e9e..e26dc308ea 100644 --- a/mod/label/version.php +++ b/mod/label/version.php @@ -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) ?> diff --git a/mod/lesson/mod.html b/mod/lesson/mod.html index 224bfc6df5..92d58bcc56 100644 --- a/mod/lesson/mod.html +++ b/mod/lesson/mod.html @@ -2,7 +2,8 @@ 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; } + ?> diff --git a/mod/lesson/version.php b/mod/lesson/version.php index 45896bdd51..b55aa0f8be 100644 --- a/mod/lesson/version.php +++ b/mod/lesson/version.php @@ -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) ?> diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html index aa6d6a144a..77d4ffd067 100644 --- a/mod/quiz/mod.html +++ b/mod/quiz/mod.html @@ -60,11 +60,25 @@ - + diff --git a/mod/quiz/report/fullstat/report.php b/mod/quiz/report/fullstat/report.php index 192c313c7f..4bd366e9a3 100755 --- a/mod/quiz/report/fullstat/report.php +++ b/mod/quiz/report/fullstat/report.php @@ -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; diff --git a/mod/quiz/version.php b/mod/quiz/version.php index a9ac318ff4..5fc03bb173 100644 --- a/mod/quiz/version.php +++ b/mod/quiz/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004060200; // 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)? ?> diff --git a/mod/resource/details.php b/mod/resource/details.php index 0836c1572b..f2e38e4e42 100644 --- a/mod/resource/details.php +++ b/mod/resource/details.php @@ -451,7 +451,7 @@ type == HTML) { - use_html_editor(); + use_html_editor("alltext"); } print_simple_box_end(); print_footer($course); diff --git a/mod/resource/mod.html b/mod/resource/mod.html index 1ae7bb196b..28831b939d 100644 --- a/mod/resource/mod.html +++ b/mod/resource/mod.html @@ -14,6 +14,7 @@ if (empty($form->alltext)) { $form->alltext = ""; } + $nohtmleditorneeded = true; ?> @@ -54,7 +55,7 @@

:

:

+
+ + '; + emoticonhelpbutton("form", "description"); + echo '
'; + } + ?> +
+ + 		- intro); ?>
- + summary); ?>
diff --git a/mod/resource/version.php b/mod/resource/version.php index 023a439645..b99b92a0bf 100644 --- a/mod/resource/version.php +++ b/mod/resource/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004013101; -$module->requires = 2004051600; // Requires this Moodle version +$module->requires = 2004052501; // Requires this Moodle version $module->cron = 0; ?> diff --git a/mod/scorm/mod.html b/mod/scorm/mod.html index 07f2ef093f..ad7db3c930 100755 --- a/mod/scorm/mod.html +++ b/mod/scorm/mod.html @@ -52,7 +52,7 @@ - + summary); ?> diff --git a/mod/scorm/version.php b/mod/scorm/version.php index e3ee06f79d..826d36bff6 100755 --- a/mod/scorm/version.php +++ b/mod/scorm/version.php @@ -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)? ?> diff --git a/mod/survey/mod.html b/mod/survey/mod.html index 60f3902201..06e8e9143d 100644 --- a/mod/survey/mod.html +++ b/mod/survey/mod.html @@ -8,6 +8,7 @@ if (!isset($form->intro)) { $form->intro = ""; } + $nohtmleditorneeded = true; ?>
diff --git a/mod/survey/version.php b/mod/survey/version.php index 9bea028409..fbddeddc2f 100644 --- a/mod/survey/version.php +++ b/mod/survey/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004021900; -$module->requires = 2004013101; // Requires this Moodle version +$module->requires = 2004051600; // Requires this Moodle version $module->cron = 0; ?> diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html index 26d09a369f..cec406c85d 100644 --- a/mod/workshop/mod.html +++ b/mod/workshop/mod.html @@ -1,12 +1,4 @@ name)) { $form->name = ""; @@ -49,7 +41,7 @@ } ?> - action="mod.php"> + @@ -58,25 +50,39 @@ - + @@ -242,10 +248,3 @@ - - - diff --git a/mod/workshop/version.php b/mod/workshop/version.php index 0072334947..48be810ae8 100644 --- a/mod/workshop/version.php +++ b/mod/workshop/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004052100; -$module->requires = 2004013101; // Requires this Moodle version +$module->requires = 2004051600; // Requires this Moodle version $module->cron = 60; ?> diff --git a/rss/file.php b/rss/file.php index 39135a0b85..4715b99e4c 100644 --- a/rss/file.php +++ b/rss/file.php @@ -1,4 +1,4 @@ - -- 2.39.5

:

:

:

+ + "; + if ($usehtmleditor) { + helpbutton("richtext", get_string("helprichtext"), "moodle", true, true); + } else { + helpbutton("text", get_string("helptext"), "moodle", true, true); + echo "
"; + emoticonhelpbutton("form", "description", "moodle", true, true); + echo "
"; + } + ?> +
+ 		description); - if ($usehtmleditor) { - helpbutton("richtext", get_string("helprichtext")); - } else { - helpbutton("text", get_string("helptext")); - } - echo "

"; - print_string("formattexttype"); - echo ": "; - if (!$form->format) { - $form->format = $defaultformat; + if ($usehtmleditor) { + echo ''; + } else { + echo '

'; + helpbutton("textformat", get_string("formattexttype")); + print_string("formattexttype"); + echo ': '; + if (!$form->format) { + $form->format = $defaultformat; + } + choose_from_menu(format_text_menu(), "format", $form->format, ""); + echo '

'; } - choose_from_menu(format_text_menu(), "format", $form->format, ""); - helpbutton("textformat", get_string("formattexttype")); - echo "

"; ?>