Modified Greg's work to:

- rename the main_frame variable to framename, because it
       - might have caused some confusion
       - none of the global variables have underscores
  - put the config in the config table, with a default of _top
This commit is contained in:
moodler 2003-03-12 07:36:22 +00:00
parent 2ea9027bc4
commit f82c2d428a
12 changed files with 50 additions and 24 deletions

View file

@ -1,8 +1,17 @@
<?PHP // $Id$
$JOURNAL_RATING = array ("3" => get_string("journalrating3", "journal"),
"2" => get_string("journalrating2", "journal"),
"1" => get_string("journalrating1", "journal") );
//$JOURNAL_RATING = array ("3" => get_string("journalrating3", "journal"),
// "2" => get_string("journalrating2", "journal"),
// "1" => get_string("journalrating1", "journal") );
// Hack to use 0-x grades
$JOURNAL_MAX = 30;
$JOURNAL_RATING = array();
for ($journal_i=$JOURNAL_MAX; $journal_i>=0; $journal_i--) {
$JOURNAL_RATING["$journal_i"] = "$journal_i";
}
@ -155,7 +164,7 @@ function journal_print_recent_activity(&$logs, $isteacher=false) {
function journal_grades($journalid) {
/// Must return an array of grades, indexed by user, and a max grade.
global $JOURNAL_RATING;
global $JOURNAL_RATING, $JOURNAL_MAX;
if ($return->grades = get_records_menu("journal_entries", "journal", $journalid, "", "userid,rating")) {
foreach ($return->grades as $key => $value) {
@ -165,7 +174,7 @@ function journal_grades($journalid) {
$return->grades[$key] = "-";
}
}
$return->maxgrade = "";
$return->maxgrade = $JOURNAL_MAX;
}
return $return;
}
@ -312,7 +321,7 @@ function journal_delete_instance($id) {
function journal_print_feedback($course, $entry) {
global $CFG, $THEME, $JOURNAL_RATING;
global $CFG, $THEME, $JOURNAL_RATING, $JOURNAL_MAX;
if (! $teacher = get_record("user", "id", $entry->teacher)) {
error("Weird journal error");
@ -335,6 +344,7 @@ function journal_print_feedback($course, $entry) {
if ($JOURNAL_RATING[$entry->rating]) {
echo get_string("overallrating", "journal").": ";
echo $JOURNAL_RATING[$entry->rating];
echo " / $JOURNAL_MAX";
} else {
print_string("noratinggiven", "journal");
}

View file

@ -23,10 +23,10 @@
if ($course->category) {
require_login($course->id);
$navigation = "<A TARGET=\"{$CFG->main_frame}\" HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->
<A TARGET=\"{$CFG->main_frame}\" HREF=\"index.php?id=$course->id\">$strresources</A> ->";
$navigation = "<A TARGET=\"{$CFG->framename}\" HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->
<A TARGET=\"{$CFG->framename}\" HREF=\"index.php?id=$course->id\">$strresources</A> ->";
} else {
$navigation = "<A TARGET=\"{$CFG->main_frame}\" HREF=\"index.php?id=$course->id\">$strresources</A> ->";
$navigation = "<A TARGET=\"{$CFG->framename}\" HREF=\"index.php?id=$course->id\">$strresources</A> ->";
}
@ -54,7 +54,7 @@
case WEBPAGE:
if (!empty($frameset)) {
print_header("$course->shortname: $resource->name", "$course->fullname",
"$navigation <A TARGET=\"{$CFG->main_frame}\" HREF=\"$resource->reference\" TITLE=\"$resource->reference\">$resource->name</A>",
"$navigation <A TARGET=\"{$CFG->framename}\" HREF=\"$resource->reference\" TITLE=\"$resource->reference\">$resource->name</A>",
"", "", true, update_module_button($cm->id, $course->id, $strresource), navmenu($course, $cm));
echo "<CENTER><FONT SIZE=-1>".text_to_html($resource->summary, true, false)."</FONT></CENTER>";

View file

@ -61,12 +61,12 @@
switch ($action) {
case "top":
if ($course->category) {
$navigation = "<A TARGET=\"{$CFG->main_frame}\" HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->
<A TARGET=\"{$CFG->main_frame}\" HREF=\"index.php?id=$course->id\">$strsurveys</A> ->
<A TARGET=\"{$CFG->main_frame}\" HREF=\"view.php?id=$cm->id\">$survey->name</A> -> ";
$navigation = "<A TARGET=\"{$CFG->framename}\" HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->
<A TARGET=\"{$CFG->framename}\" HREF=\"index.php?id=$course->id\">$strsurveys</A> ->
<A TARGET=\"{$CFG->framename}\" HREF=\"view.php?id=$cm->id\">$survey->name</A> -> ";
} else {
$navigation = "<A TARGET=\"{$CFG->main_frame}\" HREF=\"index.php?id=$course->id\">$strsurveys</A> ->
<A TARGET=\"{$CFG->main_frame}\" HREF=\"view.php?id=$cm->id\">$survey->name</A> -> ";
$navigation = "<A TARGET=\"{$CFG->framename}\" HREF=\"index.php?id=$course->id\">$strsurveys</A> ->
<A TARGET=\"{$CFG->framename}\" HREF=\"view.php?id=$cm->id\">$survey->name</A> -> ";
}
print_header("$course->shortname: $survey->name", "$course->fullname", "$navigation $strreport");
break;