moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +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

11
mod/attendance/lib.php
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

7
mod/attendance/mod.html
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>

2
mod/attendance/version.php
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)
?>