mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

Very quick fix to remove notices (but loses some colors)

Browse Source
This commit is contained in:
moodler 2005-05-17 19:55:37 +00:00
parent 9b73eabc82
commit be27364137
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/journal/edit.html
View File

@ -1,6 +1,6 @@
<form name="theform" method="post" action="edit.php">
<table cellpadding="10" cellspacing="0" class="generalbox">
<tr><td align="right" bgcolor="<?php echo $THEME->cellheading2 ?>">
<tr><td align="right">
<?php
helpbutton('reading', get_string('helpreading'), 'moodle', true, true);
echo '<br />';
@ -14,10 +14,10 @@
echo '<br />';
?>
</td></tr>
<tr><td align="center" bgcolor="<?php echo $THEME->cellheading2 ?>">
<tr><td align="center">
<?php print_textarea($usehtmleditor, 20, 60, 630, 400, "text", $entry->text); ?>
</td></tr>
<tr><td align="center" bgcolor="<?php echo $THEME->cellheading2 ?>">
<tr><td align="center">
<?php
print_string('formattexttype');
echo ':&nbsp;';
@ -25,7 +25,7 @@
helpbutton('textformat', get_string('helpformatting'));
?>
</td></tr>
<tr><td align="center" bgcolor="<?php echo $THEME->cellheading2 ?>" class="generalboxcontent">
<tr><td align="center" class="generalboxcontent">
<input type="hidden" name="id" value="<?php echo $cm->id ?>" />
<input type="submit" value="<?php print_string('savechanges') ?>" />
<input type="reset" value="<?php print_string('revert') ?>" />

18
mod/journal/lib.php
View File

@ -418,27 +418,21 @@ function journal_log_info($log) {
function journal_print_user_entry($course, $user, $entry, $teachers, $grades) {
global $THEME, $USER;
if ($entry->timemarked < $entry->modified) {
$colour = $THEME->cellheading2;
} else {
$colour = $THEME->cellheading;
}
global $USER;
echo "\n<table border=\"1\" cellspacing=\"0\" valign=\"top\" cellpadding=\"10\">";
echo "\n<tr>";
echo "\n<td rowspan=\"2\" bgcolor=\"$THEME->body\" width=\"35\" valign=\"top\">";
echo "\n<td rowspan=\"2\" width=\"35\" valign=\"top\">";
print_user_picture($user->id, $course->id, $user->picture);
echo "</td>";
echo "<td nowrap=\"nowrap\" width=\"100%\" bgcolor=\"$colour\">".fullname($user);
echo "<td nowrap=\"nowrap\" width=\"100%\">".fullname($user);
if ($entry) {
echo "&nbsp;&nbsp;<font size=\"1\">".get_string("lastedited").": ".userdate($entry->modified)."</font>";
}
echo "</tr>";
echo "\n<tr><td width=\"100%\" bgcolor=\"$THEME->cellcontent\">";
echo "\n<tr><td width=\"100%\">";
if ($entry) {
echo format_text($entry->text, $entry->format);
} else {
@ -453,7 +447,7 @@ function journal_print_user_entry($course, $user, $entry, $teachers, $grades) {
$entry->teacher = $USER->id;
}
print_user_picture($entry->teacher, $course->id, $teachers[$entry->teacher]->picture);
echo "<td bgcolor=\"$colour\">".get_string("feedback").":";
echo "<td>".get_string("feedback").":";
choose_from_menu($grades, "r$entry->id", $entry->rating, get_string("nograde")."...");
if ($entry->timemarked) {
echo "&nbsp;&nbsp;<font size=\"1\">".userdate($entry->timemarked)."</font>";
@ -516,7 +510,7 @@ function journal_delete_instance($id) {
function journal_print_feedback($course, $entry, $grades) {
global $CFG, $THEME;
global $CFG;
if (! $teacher = get_record('user', 'id', $entry->teacher)) {
error('Weird journal error');