From: gustav_delius Date: Sun, 12 Sep 2004 12:21:27 +0000 (+0000) Subject: towards XHTML compliance X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=24f2b65a4d94014bf17d6a4ad8771efecd7b8f37;p=moodle.git towards XHTML compliance --- diff --git a/course/category.php b/course/category.php index 5eca4e6dda..3c07cb23e0 100644 --- a/course/category.php +++ b/course/category.php @@ -1,4 +1,4 @@ -"; + echo ""; echo "
"; unset($displaylist[$category->id]); choose_from_menu ($displaylist, "moveto", "", get_string("moveselectedcoursesto"), "javascript:document.movecourses.submit()"); diff --git a/course/delete.php b/course/delete.php index d0cee3315b..9310b25424 100644 --- a/course/delete.php +++ b/course/delete.php @@ -1,4 +1,4 @@ -category\">$category->name -> ". "$strdeletecheck"); - notice_yesno("$strdeletecoursecheck

$course->fullname ($course->shortname)", + notice_yesno("$strdeletecoursecheck

$course->fullname ($course->shortname)", "delete.php?id=$course->id&delete=".md5($course->timemodified), "category.php?id=$course->category"); exit; diff --git a/course/edit.html b/course/edit.html index b08c11fb16..f11e6ccb3e 100644 --- a/course/edit.html +++ b/course/edit.html @@ -1,4 +1,4 @@ -showreports)) { $form->showreports = 0; @@ -16,10 +16,10 @@ $form->enrolperiod = 0; } ?> -
- - - + +

:

+ + - - - + + - - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - - + + - - - + + - - - + + - - + + - +

:

:

 +

:

:

 +

:

:

 +

:

:

:

 summary); helpbutton("text", get_string("helptext")); @@ -59,23 +59,23 @@ ?>

:

:

 courseformats, "format", "$form->format", ""); helpbutton("courseformats", get_string("courseformats")); ?>

:

:

 startdate); helpbutton("coursestartdate", get_string("startdate")); ?>

:

:

:

:

:

:

:

:

:

 +

:

:

:

 enrol != 'internal') { ?> -

:

 +

:

:

:

:

:

:

:

:

:

:

:

 maxbytes); choose_from_menu ($choices, "maxbytes", $form->maxbytes, ""); helpbutton("courseuploadsize", get_string("maximumupload")); ?>

:

 +

:

 ()

:

 +

:

 ()

:

 +

:

 ()

:

 +

:

 ()

:

:
">" />
- +
diff --git a/course/edit.php b/course/edit.php index 10764dee6c..719efc5504 100644 --- a/course/edit.php +++ b/course/edit.php @@ -1,4 +1,4 @@ -
- - - "; - echo ""; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; - echo ""; + echo ""; + echo ""; if (isset($result->time)) { $timeago = format_time(time() - $result->time); - echo ""; + echo ""; } - echo ""; + echo ""; } ?> diff --git a/course/quickreport.php b/course/quickreport.php index 865536c0c7..19233a35a9 100644 --- a/course/quickreport.php +++ b/course/quickreport.php @@ -1,4 +1,4 @@ -forumid] = $user_data[$forumval][$rec->forumid] . ",$rec->userid,"; -// echo "
" . $rec->forumid . $rec->name . "
"; +// echo "
" . $rec->forumid . $rec->name . "
"; } } @@ -240,32 +240,32 @@ $modname_value = array_flip($modnames); //printer header line with weeks $options["id"] = $course->id; $options["download"] = "xls"; - print ( ""); if ($course->format == "weeks") {$formatname = "Week";} else {$formatname = "Section";} foreach($mods_week as $week=>$wkcount){ print ""; } - echo ""; + echo ""; //get the names of each module instance and put in header foreach($mod_info as $thiscat=>$thismod){ $modname = ucwords($modnames[$thismod[module]]); - print (""); + print (""); } echo "\n"; foreach ($user_contribs as $userid=>$thisuser){ $quick_bgcount++; if ($quick_bgcount%3 == 0) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } $fullname = ucwords($allusers[$userid]->lastname) . ", " . ucwords($allusers[$userid]->firstname); if (!$isstudent){ - $fullname = "id&user=$userid>$fullname"; + $fullname = "id&user=$userid>$fullname\""; } - echo ""; + echo ""; $picture = print_user_picture($userid, $course->id, $allusers[$userid]->picture, false, true); echo ""; if (strlen($allusers[$userid]->description) > 10) {quick_show("X");} else {quick_show("-");} @@ -330,7 +330,7 @@ function quick_findposts($courseid){ function quick_moduleorder($courseid){ //using course_sections which gives the sections & sequence, build an array with each section + item pair -// echo "
Course= " . $courseid . "
"; +// echo "
Course= " . $courseid . "
"; $allmods = get_records("course_sections","course",$courseid,"section","id,section,sequence"); // print_object($allmods); // $modsequence @@ -344,7 +344,7 @@ function quick_moduleorder($courseid){ } // print_object($weeklist); } else { -// print ("
No modules this week
"); +// print ("
No modules this week
"); } } return $all_list; @@ -353,12 +353,12 @@ function quick_moduleorder($courseid){ function quick_headers($course){ global $CFG; print_header("$course->shortname: 'Quick Report'", "$course->fullname", - "wwwroot/course/view.php?id=$course->id\">$course->shortname + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> 'Quick Report'"); } function quick_show($x){ - echo ""; } diff --git a/course/recent.php b/course/recent.php index b359972f5b..5aff27f8bc 100644 --- a/course/recent.php +++ b/course/recent.php @@ -1,4 +1,4 @@ -"; + echo "
"; $i = 0; if (!empty($filter)) { @@ -266,7 +266,7 @@ $linkformat = ''; } $image = "modpixpath/" . $activity->content->modname . "/icon.gif\"" . - "height=16 width=16 alt=\"" . $activity->content->modfullname . "\">"; + "height=\"16\" width=\"16\" alt=\"" . $activity->content->modfullname . "\">"; echo "

:

+ + +

:


- -"> + +" /> diff --git a/course/editsection.php b/course/editsection.php index 16c5c744df..d56cd22568 100644 --- a/course/editsection.php +++ b/course/editsection.php @@ -1,4 +1,4 @@ -section"); print_header("$course->shortname: $stredit", "$course->fullname", - "wwwroot/course/view.php?id=$course->id\">$course->shortname + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $stredit"); print_heading(get_string("summaryof", "", "$sectionname $form->section")); diff --git a/course/enrol.html b/course/enrol.html index 13fe31ee22..c194bcaac9 100644 --- a/course/enrol.html +++ b/course/enrol.html @@ -1,45 +1,90 @@ - - - - - - - - - -
-

- id&course=$site->id\">". - "$teacher->firstname $teacher->lastname."; - } else { - $teachername = get_string("yourteacher", "", strtolower($course->teacher)); - } - print_string("enrolmentkeyfrom", "", $teachername); - ?> -

-
-
- - - - - - - -

:

 - - -
  - - - - - - -
">  
- ">
-
-
- + + + + + + + + + + + + + + + + + + +
+ +

+ + id&course=$site->id\">". + + "$teacher->firstname $teacher->lastname."; + + } else { + + $teachername = get_string("yourteacher", "", strtolower($course->teacher)); + + } + + print_string("enrolmentkeyfrom", "", $teachername); + + ?> + +

+ +
+ +
+ + + + + + + + + + + + + + + +

:

 + + + + + +
  + + + + + + + + + + + + + +
" />  
+ + " />
+ +
+ +
+ + + diff --git a/course/enrol.php b/course/enrol.php index 43596f6d8b..85df0e86a7 100644 --- a/course/enrol.php +++ b/course/enrol.php @@ -1,4 +1,4 @@ -"; + echo ""; - echo "\n"; + echo "\n"; /// The left column ... @@ -72,13 +72,13 @@ $stractivityclipboard = strip_tags(get_string("activityclipboard", "", addslashes($USER->activitycopyname))); $strcancel= get_string("cancel"); echo ""; - echo ""; echo ""; - echo ""; + echo ""; } /// Print Section 0 with general activities @@ -88,16 +88,16 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) { echo ""; - echo ""; - echo ""; + echo ""; - echo ""; - echo ""; + echo ""; } @@ -171,11 +171,11 @@ } echo ""; - echo ""; - echo ""; } - echo ""; echo ""; - echo ""; + echo ""; } $section++; diff --git a/course/grade.php b/course/grade.php index 9a66ab269c..0e3656a623 100644 --- a/course/grade.php +++ b/course/grade.php @@ -1,4 +1,4 @@ -instance)) { - $image = "wwwroot/mod/$mod->modname/view.php?id=$mod->id\"". - " TITLE=\"$mod->modfullname\">". - "modname/icon.gif\" ". - "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\">"; + $image = "wwwroot/mod/$mod->modname/view.php?id=$mod->id\"". + " title=\"$mod->modfullname\">". + "modname/icon.gif\" ". + "height=\"16\" width=\"16\" alt=\"$mod->modfullname\">"; $columnhtml[] = "$image ". - "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". + "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". "$instance->name". - ""; + ""; if (empty($modgrades->grades[$USER->id])) { $grades[] = ""; @@ -88,7 +88,7 @@ /// OK, we have all the data, now present it to the user print_header("$course->shortname: $strgrades", "$course->fullname", - "wwwroot/course/view.php?id=$course->id\">$course->shortname + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $strgrades"); print_heading($strgrades); diff --git a/course/grades.php b/course/grades.php index d0b2cab471..692d29f209 100644 --- a/course/grades.php +++ b/course/grades.php @@ -1,4 +1,4 @@ -shortname: $strgrades", "$course->fullname", - "wwwroot/course/view.php?id=$course->id\">$course->shortname + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $strgrades"); print_heading(get_string("nostudentsyet")); print_footer($course); @@ -84,30 +84,30 @@ if (!empty($modgrades->maxgrade)) { if ($mod->visible) { $maxgrade = "$strmax: $modgrades->maxgrade"; - $maxgradehtml = "
$strmax: $modgrades->maxgrade"; + $maxgradehtml = "
$strmax: $modgrades->maxgrade"; } else { $maxgrade = "$strmax: $modgrades->maxgrade"; - $maxgradehtml = "
$strmax: $modgrades->maxgrade"; + $maxgradehtml = "
$strmax: $modgrades->maxgrade"; } } else { $maxgrade = ""; $maxgradehtml = ""; } - $image = "wwwroot/mod/$mod->modname/view.php?id=$mod->id\"". - " TITLE=\"$mod->modfullname\">". - "modname/icon.gif\" ". - "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\">"; + $image = "wwwroot/mod/$mod->modname/view.php?id=$mod->id\"". + " title=\"$mod->modfullname\">". + "modname/icon.gif\" ". + "height=\"16\" width=\"16\" alt=\"$mod->modfullname\">"; if ($mod->visible) { $columnhtml[] = "$image ". - "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". + "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". "$instance->name". - "$maxgradehtml"; + "$maxgradehtml"; } else { $columnhtml[] = "$image ". - "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". + "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". "$instance->name". - "$maxgradehtml"; + "$maxgradehtml"; } $columns[] = "$mod->modfullname: $instance->name - $maxgrade"; @@ -117,9 +117,9 @@ if ($mod->visible) { $gradeshtml[$student->id][] = $modgrades->grades[$student->id]; } else { - $gradeshtml[$student->id][] = "". + $gradeshtml[$student->id][] = "". $modgrades->grades[$student->id]. - ""; + ""; } } else { $grades[$student->id][] = $currentstudentgrade = ""; @@ -243,22 +243,22 @@ } else { // Just print the web page print_header("$course->shortname: $strgrades", "$course->fullname", - "wwwroot/course/view.php?id=$course->id\">$course->shortname + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $strgrades"); print_heading($strgrades); setup_and_print_groups($course, $groupmode, "grades.php?id=$course->id"); - echo "
cellcontent\" class=\"weeklyoutlineclip\" width=\"100%\">"; - echo "

"; + echo "

cellcontent\" class=\"weeklyoutlineclip\" width=\"100%\">"; + echo "

"; echo "$stractivityclipboard  ($strcancel)"; echo "

"; echo "
cellheading\" class=\"weeklyoutlineside\" valign=top width=20> cellcontent\" class=\"weeklyoutlinecontent\" width=\"100%\">"; + echo "cellheading\" class=\"weeklyoutlineside\" valign=\"top\" width=\"20\"> cellcontent\" class=\"weeklyoutlinecontent\" width=\"100%\">"; $summaryformatoptions->noclean = true; echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); if (isediting($course->id)) { echo " id\">pixpath/t/edit.gif\" ". - " border=0 alt=\"$streditsummary\">
"; + " href=\"editsection.php?id=$thissection->id\">pixpath/t/edit.gif\" ". + " border=\"0\" alt=\"$streditsummary\">
"; } echo '
'; @@ -109,9 +109,9 @@ } echo "		cellheading\" class=\"weeklyoutlineside\" valign=top align=center width=10>"; + echo "cellheading\" class=\"weeklyoutlineside\" valign=\"top\" align=\"center\" width=\"10\">"; echo " 
"; - echo "

$section

"; + echo "		"; + echo "

$section

"; echo "		"; + echo ""; if (!isteacher($course->id) and !$thissection->visible) { // Hidden for students echo "

$weekday - $endweekday "; @@ -192,7 +192,7 @@ if (isediting($course->id)) { echo " id\">". - "pixpath/t/edit.gif\" height=11 width=11 border=0>
"; + "pixpath/t/edit.gif\" height=\"11\" width=\"11\" border=\"0\">
"; } echo '
'; @@ -205,42 +205,42 @@ echo "

"; - echo ""; + echo ""; + echo ""; if ($displaysection == $section) { echo "id&week=all\" title=\"$strshowallweeks\">". - "pixpath/i/all.gif\" height=25 width=16 border=0>
"; + "pixpath/i/all.gif\" height=\"25\" width=\"16\" border=\"0\">
"; } else { $strshowonlyweek = get_string("showonlyweek", "", $section); echo "id&week=$section\" title=\"$strshowonlyweek\">". - "pixpath/i/one.gif\" height=16 width=16 border=0>
"; + "pixpath/i/one.gif\" height=\"16\" width=\"16\" border=\"0\">
"; } if (isediting($course->id)) { if ($thissection->visible) { // Show the hide/show eye echo "id&hide=$section\" title=\"$strweekhide\">". - "pixpath/i/hide.gif\" vspace=3 height=16 width=16 border=0>
"; + "pixpath/i/hide.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\">
"; } else { echo "id&show=$section\" title=\"$strweekshow\">". - "pixpath/i/show.gif\" vspace=3 height=16 width=16 border=0>
"; + "pixpath/i/show.gif\" vspace=\"3\" height=\"16\" width=\"16\" border=\"0\">
"; } if ($section > 1) { // Add a arrow to move section up echo "id§ion=$section&move=-1\" title=\"$strmoveup\">". - "pixpath/t/up.gif\" vspace=3 height=11 width=11 border=0>
"; + "pixpath/t/up.gif\" vspace=\"3\" height=\"11\" width=\"11\" border=\"0\">
"; } if ($section < $course->numsections) { // Add a arrow to move section down echo "id§ion=$section&move=1\" title=\"$strmovedown\">". - "pixpath/t/down.gif\" vspace=3 height=11 width=11 border=0>
"; + "pixpath/t/down.gif\" vspace=\"3\" height=\"11\" width=\"11\" border=\"0\">
"; } } echo "
"; - echo "
"; + echo ""; + echo "
"; $options["id"] = "$course->id"; $options["download"] = "xls"; print_single_button("grades.php", $options, get_string("downloadexcel")); - echo ""; + echo ""; $options["download"] = "txt"; print_single_button("grades.php", $options, get_string("downloadtext")); - echo "
"; + echo "
"; $table->head = array_merge(array ("", get_string("firstname"), get_string("lastname")), $columnhtml, array(get_string("total"))); diff --git a/course/group-edit.html b/course/group-edit.html index 3fcac9fafb..f022bc576b 100644 --- a/course/group-edit.html +++ b/course/group-edit.html @@ -1,13 +1,13 @@
- +
- - - + + - - + + + - +

:

 +

:

:

 description); helpbutton("text", get_string("helptext")); @@ -16,8 +16,8 @@

:

:

 maxbytes, $course->maxbytes); if (!empty($CFG->gdversion) and $maxbytes) { ?> -

:

 - - + +
">" />
- - + +
diff --git a/course/index.php b/course/index.php index 393048226e..0cc0c07080 100644 --- a/course/index.php +++ b/course/index.php @@ -1,4 +1,4 @@ -"; echo "
"; - echo ""; - echo ""; + echo ""; + echo ""; echo "
"; echo ""; @@ -272,7 +272,7 @@ $displaylist[0] = get_string("top"); make_categories_list($displaylist, $parentlist, ""); - echo ""; + echo "
"; echo ""; echo ""; echo ""; @@ -336,23 +336,23 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $ echo ""; diff --git a/course/info.php b/course/info.php index 0844edec5f..cca770212d 100644 --- a/course/info.php +++ b/course/info.php @@ -1,4 +1,4 @@ -"; if ($course->guest) { $strallowguests = get_string("allowguests"); - echo "

\"\" $strallowguests

"; + echo "

\"\" $strallowguests

"; } if ($course->password) { $strrequireskey = get_string("requireskey"); - echo "

\"\" $strrequireskey

"; + echo "

\"\" $strrequireskey

"; } if ($teachers = get_course_teachers($course->id)) { - echo "
$strcategories$strcourses$stredit"; /// Print little icons echo "delete\" href=\"index.php?delete=$category->id\"> "; + " src=\"$pixpath/t/delete.gif\" height=\"11\" width=\"11\" border=\"0\"> "; if (!empty($category->visible)) { echo "hide\" href=\"index.php?hide=$category->id\"> "; + " src=\"$pixpath/t/hide.gif\" height=\"11\" width=\"11\" border=\"0\"> "; } else { echo "show\" href=\"index.php?show=$category->id\"> "; + " src=\"$pixpath/t/show.gif\" height=\"11\" width=\"11\" border=\"0\"> "; } if ($up) { echo "moveup\" href=\"index.php?moveup=$category->id\"> "; + " src=\"$pixpath/t/up.gif\" height=\"11\" width=\"11\" border=\"0\"> "; } if ($down) { echo "movedown\" href=\"index.php?movedown=$category->id\"> "; + " src=\"$pixpath/t/down.gif\" height=\"11\" width=\"11\" border=\"0\"> "; } echo "
"; + echo "'; } - echo ''; + echo ''; echo ''; echo '\n\n\n\n"; } diff --git a/course/log.php b/course/log.php index fe74f886d3..30178d6e26 100644 --- a/course/log.php +++ b/course/log.php @@ -1,4 +1,4 @@ -fullname: $strloginas $student_name", "$course->fullname", - "wwwroot/course/view.php?id=$course->id\">$course->shortname -> + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $strloginas $student_name"); notice($strloggedinas, "$CFG->wwwroot/course/view.php?id=$course->id"); diff --git a/course/loglive.php b/course/loglive.php index 587ec251ae..cc8022ea19 100644 --- a/course/loglive.php +++ b/course/loglive.php @@ -1,4 +1,4 @@ -"); + ""); $user=0; $date=time() - 3600; diff --git a/course/mod.php b/course/mod.php index 0692432864..9f55fcc559 100644 --- a/course/mod.php +++ b/course/mod.php @@ -1,4 +1,4 @@ -category) { print_header("$course->shortname: $streditinga", "$course->fullname", - "wwwroot/course/view.php?id=$course->id\">$course->shortname -> - wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural -> + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> + wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural -> $streditinga", $focuscursor, "", false); } else { print_header("$course->shortname: $streditinga", "$course->fullname", @@ -600,7 +600,7 @@ $defaultformat = FORMAT_MOODLE; } - $icon = "modpixpath/$module->name/icon.gif\"> "; + $icon = "modpixpath/$module->name/icon.gif\"> "; print_heading_with_help($pageheading, "mods", $module->name, $icon); print_simple_box_start("center", "", "$THEME->cellheading"); diff --git a/course/mod_delete.html b/course/mod_delete.html index 6e9c736696..5bad6f3230 100644 --- a/course/mod_delete.html +++ b/course/mod_delete.html @@ -1,13 +1,13 @@ wwwroot/course/mod.php" ?>"> - - - - - - + + + + + + - "> - " onclick="javascript:history.go(-1);"> + " /> + " onclick="javascript:history.go(-1);" /> diff --git a/course/outline_rep.php b/course/outline_rep.php index d995b67ba1..6e824c0ac3 100644 --- a/course/outline_rep.php +++ b/course/outline_rep.php @@ -1,4 +1,4 @@ -category) { print_header("$course->shortname: $stractivityreport", "$course->fullname", - "id\">$course->shortname -> + "id\">$course->shortname -> $stractivityreport"); } else { print_header("$course->shortname: $stractivityreport ($mode)", "$course->fullname", - "id&course=$course->id\">$user->firstname $user->lastname -> + "id&course=$course->id\">$user->firstname $user->lastname -> $stractivityreport -> $strmode"); } print_heading("$course->fullname"); - echo "
"; echo "

\n"; foreach ($teachers as $teacher) { if ($teacher->authority > 0) { diff --git a/course/lib.php b/course/lib.php index 9cc5d3b5cb..e101f97080 100644 --- a/course/lib.php +++ b/course/lib.php @@ -531,7 +531,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per if (! $course->category) { echo '

'.$courses[$log->course].''.userdate($log->time, '%a').''.userdate($log->time, '%a').''.userdate($log->time, $strftimedatetime).''; link_to_popup_window("/lib/ipatlas/plot.php?address=$log->ip&user=$log->userid", 'ipatlas',$log->ip, 400, 700); @@ -633,12 +633,12 @@ function print_recent_activity($course) { switch ($log->action) { case "add mod": $stradded = get_string("added", "moodle", get_string("modulename", $info[0])); - $changelist["$log->info"] = array ("operation" => "add", "text" => "$stradded:
wwwroot/course/$log->url\">$modname"); + $changelist["$log->info"] = array ("operation" => "add", "text" => "$stradded:
wwwroot/course/$log->url\">$modname"); break; case "update mod": $strupdated = get_string("updated", "moodle", get_string("modulename", $info[0])); if (empty($changelist["$log->info"])) { - $changelist["$log->info"] = array ("operation" => "update", "text" => "$strupdated:
wwwroot/course/$log->url\">$modname"); + $changelist["$log->info"] = array ("operation" => "update", "text" => "$strupdated:
wwwroot/course/$log->url\">$modname"); } break; case "delete mod": @@ -1167,25 +1167,25 @@ function print_category_info($category, $depth) { echo "
 "; echo ""; echo "wwwroot/course/view.php?id=$course->id\">$course->fullname"; - echo ""; + echo ""; if ($course->guest ) { echo "wwwroot/course/view.php?id=$course->id\">"; - echo "\"$strallowguests\"pixpath/i/guest.gif\">"; + echo "\"$strallowguests\"pixpath/i/guest.gif\">"; } else { - echo "\"\"pixpath/spacer.gif\">"; + echo "\"\"pixpath/spacer.gif\">"; } if ($course->password) { echo "wwwroot/course/view.php?id=$course->id\">"; - echo "\"$strrequireskey\"pixpath/i/key.gif\">"; + echo "\"$strrequireskey\"pixpath/i/key.gif\">"; } else { - echo "\"\"pixpath/spacer.gif\">"; + echo "\"\"pixpath/spacer.gif\">"; } if ($course->summary) { link_to_popup_window ("/course/info.php?id=$course->id", "courseinfo", - "\"$strsummary\"pixpath/i/info.gif\">", + "\"$strsummary\"pixpath/i/info.gif\">", 400, 500, $strsummary); } else { - echo "\"\"pixpath/spacer.gif\">"; + echo "\"\"pixpath/spacer.gif\">"; } echo "
"; + echo "
"; echo ""; echo "
$stractivityreport:
"; @@ -56,18 +56,18 @@ $section = $sections[$i]; if ($section->sequence) { - echo "
"; - echo "

"; + echo "
"; + echo "

"; switch ($course->format) { case "weeks": print_string("week"); break; case "topics": print_string("topic"); break; default: print_string("section"); break; } - echo " $i

"; + echo " $i"; - echo "
    "; + echo "
      "; - echo ""; + echo "
      "; $sectionmods = explode(",", $section->sequence); foreach ($sectionmods as $sectionmod) { @@ -92,10 +92,10 @@ print_outline_row($mod, $instance, $result); } - echo "
      "; + echo "
"; print_simple_box_end(); - echo ""; + echo ""; } } } @@ -104,27 +104,27 @@ function print_outline_row($mod, $instance, $result) { - $image = "modname/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\">"; - - echo "
$image"; - echo " modfullname\""; - echo " HREF=\"../mod/$mod->modname/view.php?id=$mod->id\">$instance->name   "; + $image = "modname/icon.gif\" height=\"16\" width=\"16\" alt=\"$mod->modfullname\">"; + + echo "
$image"; + echo " modfullname\""; + echo " href=\"../mod/$mod->modname/view.php?id=$mod->id\">$instance->name   "; if (isset($result->info)) { echo "$result->info"; } else { - echo "

-

"; + echo "

-

"; } - echo "		      ".userdate($result->time)." ($timeago)".userdate($result->time)." ($timeago)
"); + print ( "
"); print_single_button("quickreport.php", $options, get_string("downloadexcel")); print ("$formatname $week
StudentPictureProfile
StudentPictureProfile $modname
$thismod[name]		 $modname
$thismod[name]
$fullname$fullname" . $picture . ""; + echo ""; print ("$x"); echo "
"; - echo ""; + echo "
"; + echo ""; if (!empty($errors[$scale->id]->name)) { $class = "class=\"highlight\""; } else { $class = ""; } echo ""; - echo ""; echo ""; - echo ""; + echo ""; if (!empty($errors[$scale->id]->scalescale)) { $class = "class=\"highlight\""; } else { $class = ""; } echo ""; - echo ""; echo ""; - echo ""; + echo ""; echo ""; - echo ""; echo ""; echo ""; if ($scale->id) { - echo ""; + echo ""; echo ""; echo ""; } echo ""; - echo "

$strname:

name)."\">"; + echo "name)."\" />"; echo "

$strscale:

"; + echo ""; echo "

$strdescription:

"; helpbutton("text", $strhelptext); echo "		"; + echo ""; echo "
"; echo "".get_string("usedinnplaces","",$scale_uses); @@ -214,12 +214,12 @@ echo "
"; - echo "id\">"; - echo "courseid\">"; - echo "id\">"; - echo ""; - echo ""; + echo ""; + echo "id\" />"; + echo "courseid\" />"; + echo "id\" />"; + echo ""; + echo ""; echo "
"; echo ""; echo "
"; @@ -377,7 +377,7 @@ /// Print out the main page print_header("$course->shortname: $strscales", "$course->fullname", - "id\">$course->shortname + "id\">$course->shortname -> $strscales"); print_heading_with_help($strscales, "scales"); @@ -432,7 +432,7 @@ $data[] = $line; } $line = array(); - $line[] = "name\" href=\"$CFG->wwwroot/course/scales.php?id=$course->id&scaleid=$scale->id&action=details\" "."onClick=\"return openpopup('/course/scales.php?id=$course->id\&scaleid=$scale->id&action=details', 'scale', 'menubar=0,location=0,scrollbars,resizable,width=600,height=450', 0);\">".$scale->name."
".str_replace(",",", ",$scale->scale).""; + $line[] = "name\" href=\"$CFG->wwwroot/course/scales.php?id=$course->id&scaleid=$scale->id&action=details\" "."onClick=\"return openpopup('/course/scales.php?id=$course->id\&scaleid=$scale->id&action=details', 'scale', 'menubar=0,location=0,scrollbars,resizable,width=600,height=450', 0);\">".$scale->name."
".str_replace(",",", ",$scale->scale).""; if (!empty($scale->courseid)) { $scales_uses = course_scale_used($course->id,$scale->id); } else { @@ -447,17 +447,17 @@ $buttons = ""; if (empty($scales_uses) && ($incustom || isadmin())) { $buttons .= "id&scaleid=$scale->id&action=edit\"> "; + " src=\"$pixpath/t/edit.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\"> "; if ($incustom && isadmin()) { $buttons .= "id&scaleid=$scale->id&action=down\"> "; + " src=\"$pixpath/t/down.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\"> "; } if (!$incustom && isadmin()) { $buttons .= "id&scaleid=$scale->id&action=up\"> "; + " src=\"$pixpath/t/up.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\"> "; } $buttons .= "id&scaleid=$scale->id&action=delete\"> "; + " src=\"$pixpath/t/delete.gif\" hspace=\"2\" height=\"11\" width=\"11\" border=\"0\"> "; } $line[] = $buttons; diff --git a/course/search.php b/course/search.php index 9a5d4843d6..2964e122fe 100644 --- a/course/search.php +++ b/course/search.php @@ -1,4 +1,4 @@ - - - + +
@@ -17,7 +17,7 @@ id\" type=\"hidden\" value=\"1\">$stryes"; + $editall = "id\" type=\"hidden\" value=\"1\" />$stryes"; } else { $editall = choose_from_menu ($editmenu, "e$teacher->id", $teacher->editall, "", "", "", true); } @@ -157,15 +157,15 @@ } $table->data[] = array ($picture, fullname($teacher, true), $authority, - "id\" value=\"$teacher->role\" size=30>", + "id\" value=\"$teacher->role\" size=\"30\" />", $editall, $removelink); } $teacherlist = implode(",",$teacherarray); unset($teacherarray); print_table($table); - echo "id\">"; - echo "
"; + echo "id\" />"; + echo "
"; echo "
"; echo ""; echo "
"; @@ -179,15 +179,15 @@ $usercount = get_users(false, $search, true, $teacherlist); if ($usercount == 0) { - echo "

$strnopotentialteachers

"; + echo "

$strnopotentialteachers

"; } else if ($usercount > MAX_USERS_PER_PAGE) { - echo "

$strtoomanytoshow ($usercount)

"; + echo "

$strtoomanytoshow ($usercount)

"; } else { if ($search) { - echo "

($strsearchresults : $search)

"; + echo "

($strsearchresults : $search)

"; } if (!$users = get_users(true, $search, true, $teacherlist)) { @@ -210,10 +210,10 @@ if ($search or $usercount > MAX_USERS_PER_PAGE) { echo "
"; - echo "
"; - echo "id\">"; - echo ""; - echo ""; + echo ""; + echo "id\" />"; + echo ""; + echo ""; echo "
"; echo "
"; } diff --git a/course/unenrol.php b/course/unenrol.php index d3927dcb8e..ef419cc374 100644 --- a/course/unenrol.php +++ b/course/unenrol.php @@ -1,4 +1,4 @@ -shortname: $strunenrol", "$course->fullname", - "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $strunenrol"); + "wwwroot/course/view.php?id=$course->id\">$course->shortname -> $strunenrol"); if ($user->id == $USER->id) { $strunenrolsure = get_string("unenrolsure", "", get_string("yourself")); diff --git a/course/user.php b/course/user.php index 692a0ce497..657caa40d9 100644 --- a/course/user.php +++ b/course/user.php @@ -1,4 +1,4 @@ -category) { print_header("$course->shortname: $stractivityreport ($mode)", "$course->fullname", - "id\">$course->shortname -> - id\">$strparticipants -> - id&course=$course->id\">$fullname -> + "id\">$course->shortname -> + id\">$strparticipants -> + id&course=$course->id\">$fullname -> $stractivityreport -> $strmode"); } else { print_header("$course->shortname: $stractivityreport ($mode)", "$course->fullname", - "id&course=$course->id\">$fullname -> + "id&course=$course->id\">$fullname -> $stractivityreport -> $strmode"); } print_heading($fullname); - echo ""; + echo "
"; echo ""; foreach ($modes as $listmode) { @@ -59,7 +59,7 @@ if ($mode == $listmode) { echo ""; } else { - echo ""; + echo ""; } } echo "
$stractivityreport: $strmodeid&user=$user->id&mode=$listmode>$strmodeid&user=$user->id&mode=$listmode>$strmode\"
"; @@ -68,17 +68,17 @@ switch ($mode) { case "todaylogs" : - echo "
"; + echo "
"; print_log_graph($course, $user->id, "userday.png"); - echo "
"; + echo "
"; print_log($course, $user->id, usergetmidnight(time()), "l.time DESC", $page, $perpage, "user.php?id=$course->id&user=$user->id&mode=$mode"); break; case "alllogs" : - echo "
"; + echo "
"; print_log_graph($course, $user->id, "usercourse.png"); - echo "
"; + echo "
"; print_log($course, $user->id, 0, "l.time DESC", $page, $perpage, "user.php?id=$course->id&user=$user->id&mode=$mode"); break; @@ -95,19 +95,19 @@ $section = $sections[$i]; if ($section->sequence) { - echo "
"; - echo "

"; + echo "
"; + echo "

"; switch ($course->format) { case "weeks": print_string("week"); break; case "topics": print_string("topic"); break; default: print_string("section"); break; } - echo " $i

"; + echo " $i"; - echo "
    "; + echo "
      "; if ($mode == "outline") { - echo ""; + echo "
      "; } $sectionmods = explode(",", $section->sequence); @@ -133,14 +133,14 @@ case "complete": $user_complete = $mod->modname."_user_complete"; if (function_exists($user_complete)) { - $image = "modname/icon.gif\" ". - "HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\">"; - echo "

      $image $mod->modfullname: ". - "wwwroot/mod/$mod->modname/view.php?id=$mod->id\">". - "$instance->name

      "; - echo ""; } break; } @@ -148,10 +148,10 @@ } if ($mode == "outline") { - echo "
      "; + echo "
"; print_simple_box_end(); } - echo ""; + echo ""; } @@ -165,27 +165,27 @@ function print_outline_row($mod, $instance, $result) { - $image = "modname/icon.gif\" HEIGHT=16 WIDTH=16 ALT=\"$mod->modfullname\">"; - - echo ""; - echo "$image"; - echo ""; - echo " modfullname\""; - echo " HREF=\"../mod/$mod->modname/view.php?id=$mod->id\">$instance->name"; - echo "   "; - echo ""; + $image = "modname/icon.gif\" height=\"16\" width=\"16\" alt=\"$mod->modfullname\">"; + + echo ""; + echo "$image"; + echo ""; + echo " modfullname\""; + echo " href=\"../mod/$mod->modname/view.php?id=$mod->id\">$instance->name"; + echo "   "; + echo ""; if (isset($result->info)) { echo "$result->info"; } else { - echo "

-

"; + echo "

-

"; } - echo ""; - echo "   "; + echo ""; + echo "   "; if (isset($result->time)) { $timeago = format_time(time() - $result->time); - echo "".userdate($result->time)." ($timeago)"; + echo "".userdate($result->time)." ($timeago)"; } - echo ""; + echo ""; } ?> diff --git a/course/view.php b/course/view.php index 61d51dcc36..84fdc67011 100644 --- a/course/view.php +++ b/course/view.php @@ -1,4 +1,4 @@ -