From 34a2293e082cc418a0de6e93e45ccb5f648d2447 Mon Sep 17 00:00:00 2001 From: moodler Date: Wed, 14 Jan 2004 02:24:42 +0000 Subject: [PATCH] Journal questions can now use HTML editor, plus new field 'introformat' --- mod/journal/backuplib.php | 1 + mod/journal/db/mysql.php | 4 ++++ mod/journal/db/mysql.sql | 1 + mod/journal/db/postgres7.php | 4 ++++ mod/journal/db/postgres7.sql | 1 + mod/journal/edit.php | 2 +- mod/journal/lib.php | 2 +- mod/journal/mod.html | 42 +++++++++++++++++++++++++++++++----- mod/journal/restorelib.php | 1 + mod/journal/version.php | 2 +- mod/journal/view.php | 2 +- 11 files changed, 53 insertions(+), 9 deletions(-) diff --git a/mod/journal/backuplib.php b/mod/journal/backuplib.php index 321608fcd32..bdc85c4a10b 100644 --- a/mod/journal/backuplib.php +++ b/mod/journal/backuplib.php @@ -38,6 +38,7 @@ fwrite ($bf,full_tag("MODTYPE",4,false,"journal")); fwrite ($bf,full_tag("NAME",4,false,$journal->name)); fwrite ($bf,full_tag("INTRO",4,false,$journal->intro)); + fwrite ($bf,full_tag("INTROFORMAT",4,false,$journal->introformat)); fwrite ($bf,full_tag("DAYS",4,false,$journal->days)); fwrite ($bf,full_tag("ASSESSED",4,false,$journal->assessed)); fwrite ($bf,full_tag("TIMEMODIFIED",4,false,$journal->timemodified)); diff --git a/mod/journal/db/mysql.php b/mod/journal/db/mysql.php index a79ac07bae3..e82d4fc5dc3 100644 --- a/mod/journal/db/mysql.php +++ b/mod/journal/db/mysql.php @@ -42,6 +42,10 @@ function journal_upgrade($oldversion) { $result = false; } } + + if ($oldversion < 2004011400) { + table_column("journal", "", "introformat", "integer", "2", "", "1", "not null", "intro"); + } return $result; } diff --git a/mod/journal/db/mysql.sql b/mod/journal/db/mysql.sql index 18aaa7cf77e..e1c259aa4f2 100755 --- a/mod/journal/db/mysql.sql +++ b/mod/journal/db/mysql.sql @@ -19,6 +19,7 @@ CREATE TABLE prefix_journal ( course int(10) unsigned NOT NULL default '0', name varchar(255) default NULL, intro text, + introformat tinyint(2) NOT NULL default '0', days smallint(5) unsigned NOT NULL default '7', assessed int(10) NOT NULL default '0', timemodified int(10) unsigned NOT NULL default '0', diff --git a/mod/journal/db/postgres7.php b/mod/journal/db/postgres7.php index 7791526f55e..58bf01b8763 100644 --- a/mod/journal/db/postgres7.php +++ b/mod/journal/db/postgres7.php @@ -26,5 +26,9 @@ function journal_upgrade($oldversion) { } } + if ($oldversion < 2004011400) { + table_column("journal", "", "introformat", "integer", "2", "", "1", "not null", "intro"); + } + return $result; } diff --git a/mod/journal/db/postgres7.sql b/mod/journal/db/postgres7.sql index 933d2426351..8b5dbecc6b0 100755 --- a/mod/journal/db/postgres7.sql +++ b/mod/journal/db/postgres7.sql @@ -19,6 +19,7 @@ CREATE TABLE prefix_journal ( course integer NOT NULL default '0', name varchar(255) default NULL, intro text, + introformat integer NOT NULL default '0', days integer NOT NULL default '7', assessed integer NOT NULL default '0', timemodified integer NOT NULL default '0' diff --git a/mod/journal/edit.php b/mod/journal/edit.php index 1f296c6d0d6..548d5c0ed8f 100644 --- a/mod/journal/edit.php +++ b/mod/journal/edit.php @@ -83,7 +83,7 @@ echo "
\n"; - print_simple_box( format_text($journal->intro) , "center"); + print_simple_box( format_text($journal->intro, $journal->introformat) , "center"); echo "
"; diff --git a/mod/journal/lib.php b/mod/journal/lib.php index 67b87675338..0d2494bb385 100644 --- a/mod/journal/lib.php +++ b/mod/journal/lib.php @@ -57,7 +57,7 @@ function journal_user_complete_index($course, $user, $journal, $journalopen, $he } print_simple_box_start("left", "90%"); - echo format_text($journal->intro); + echo format_text($journal->intro, $journal->introformat); print_simple_box_end(); echo "
"; echo "
"; diff --git a/mod/journal/mod.html b/mod/journal/mod.html index 4e86822954d..2c9e3f8071b 100644 --- a/mod/journal/mod.html +++ b/mod/journal/mod.html @@ -1,4 +1,10 @@ name)) { $form->name = ""; } @@ -25,24 +31,42 @@ +

:

- + "; helpbutton("questions", get_string("helpquestions"), "moodle", true, true); echo "
"; - emoticonhelpbutton("form", "intro"); + if ($usehtmleditor) { + helpbutton("richtext", get_string("helprichtext"), "moodle", true, true); + } else { + emoticonhelpbutton("form", "intro"); + } ?>
- - + - + intro); + + 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 "

"; + ?> + +

:

@@ -83,3 +107,11 @@ ">
+ + + + diff --git a/mod/journal/restorelib.php b/mod/journal/restorelib.php index 9aa6f8edfa7..7c3dca7e971 100644 --- a/mod/journal/restorelib.php +++ b/mod/journal/restorelib.php @@ -42,6 +42,7 @@ $journal->course = $restore->course_id; $journal->name = backup_todb($info['MOD']['#']['NAME']['0']['#']); $journal->intro = backup_todb($info['MOD']['#']['INTRO']['0']['#']); + $journal->introformat = backup_todb($info['MOD']['#']['INTROFORMAT']['0']['#']); $journal->days = backup_todb($info['MOD']['#']['DAYS']['0']['#']); $journal->assessed = backup_todb($info['MOD']['#']['ASSESSED']['0']['#']); $journal->timemodified = backup_todb($info['MOD']['#']['TIMEMODIFIED']['0']['#']); diff --git a/mod/journal/version.php b/mod/journal/version.php index 5ad15c41df9..bc39e112a3e 100644 --- a/mod/journal/version.php +++ b/mod/journal/version.php @@ -5,7 +5,7 @@ // This fragment is called by /admin/index.php //////////////////////////////////////////////////////////////////////////////// -$module->version = 2003081705; +$module->version = 2004011400; $module->cron = 60; ?> diff --git a/mod/journal/view.php b/mod/journal/view.php index 7e7982cd67d..2fbc904254c 100644 --- a/mod/journal/view.php +++ b/mod/journal/view.php @@ -45,7 +45,7 @@ echo "
\n"; - print_simple_box( text_to_html($journal->intro) , "center"); + print_simple_box( text_to_html($journal->intro, $journal->introformat) , "center"); echo "
";