assignment->name supports filterall again. :-P
This commit is contained in:
@@ -69,10 +69,10 @@
|
||||
$due = userdate($assignment->timedue);
|
||||
if (!$assignment->visible) {
|
||||
//Show dimmed if the mod is hidden
|
||||
$link = "<a class=\"dimmed\" href=\"view.php?id=$assignment->coursemodule\">$assignment->name</a>";
|
||||
$link = "<a class=\"dimmed\" href=\"view.php?id=$assignment->coursemodule\">".format_string($assignment->name,true)."</a>";
|
||||
} else {
|
||||
//Show normal if the mod is visible
|
||||
$link = "<a href=\"view.php?id=$assignment->coursemodule\">$assignment->name</a>";
|
||||
$link = "<a href=\"view.php?id=$assignment->coursemodule\">".format_string($assignment->name,true)."</a>";
|
||||
}
|
||||
|
||||
$printsection = "";
|
||||
|
||||
@@ -66,7 +66,7 @@ class assignment_base {
|
||||
$this->navigation = "<a target=\"{$CFG->framename}\" href=\"index.php?id={$this->course->id}\">$this->strassignments</a> ->";
|
||||
}
|
||||
|
||||
$this->pagetitle = strip_tags($this->course->shortname.': '.$this->strassignment.': '.$this->assignment->name);
|
||||
$this->pagetitle = strip_tags($this->course->shortname.': '.$this->strassignment.': '.format_string($this->assignment->name,true));
|
||||
|
||||
if (!$this->cm->visible and !isteacher($this->course->id)) {
|
||||
$pagetitle = strip_tags($this->course->shortname.': '.$this->strassignment);
|
||||
@@ -125,9 +125,9 @@ class assignment_base {
|
||||
|
||||
if ($subpage) {
|
||||
$extranav = '<a target="'.$CFG->framename.'" href="view.php?id='.$this->cm->id.'">'.
|
||||
$this->assignment->name.'</a> -> '.$subpage;
|
||||
format_string($this->assignment->name,true).'</a> -> '.$subpage;
|
||||
} else {
|
||||
$extranav = ' '.$this->assignment->name;
|
||||
$extranav = ' '.format_string($this->assignment->name,true);
|
||||
}
|
||||
|
||||
print_header($this->pagetitle, $this->course->fullname, $this->navigation.$extranav, '', '',
|
||||
@@ -229,7 +229,7 @@ class assignment_base {
|
||||
|
||||
$strname = get_string('name');
|
||||
$strassignments = get_string('modulenameplural', 'assignment');
|
||||
$strheading = empty($form->name) ? get_string("type$form->assignmenttype",'assignment') : s($form->name);
|
||||
$strheading = empty($form->name) ? get_string("type$form->assignmenttype",'assignment') : s(format_string(stripslashes($form->name),true));
|
||||
|
||||
print_header($this->course->shortname.': '.$strheading, "$strheading",
|
||||
"<a href=\"$CFG->wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname} </a> -> ".
|
||||
@@ -404,7 +404,7 @@ class assignment_base {
|
||||
$subtype = 'assignmentold';
|
||||
}
|
||||
|
||||
print_header(get_string('feedback', 'assignment').':'.fullname($user, true).':'.$this->assignment->name);
|
||||
print_header(get_string('feedback', 'assignment').':'.fullname($user, true).':'.format_string($this->assignment->name));
|
||||
|
||||
|
||||
echo '<table cellspacing="0" class="feedback '.$subtype.'" >';
|
||||
@@ -511,7 +511,7 @@ class assignment_base {
|
||||
|
||||
add_to_log($course->id, 'assignment', 'view submission', 'submissions.php?id='.$this->assignment->id, $this->assignment->id, $this->cm->id);
|
||||
|
||||
print_header_simple($this->assignment->name, "", '<a href="index.php?id='.$course->id.'">'.$this->strassignments.'</a> -> <a href="view.php?a='.$this->assignment->id.'">'.$this->assignment->name.'</a> -> '. $this->strsubmissions, '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm));
|
||||
print_header_simple(format_string($this->assignment->name,true), "", '<a href="index.php?id='.$course->id.'">'.$this->strassignments.'</a> -> <a href="view.php?a='.$this->assignment->id.'">'.format_string($this->assignment->name,true).'</a> -> '. $this->strsubmissions, '', '', true, update_module_button($cm->id, $course->id, $this->strassignment), navmenu($course, $cm));
|
||||
|
||||
|
||||
$tablecolumns = array('picture', 'fullname', 'grade', 'comment', 'timemodified', 'timemarked', 'status');
|
||||
|
||||
@@ -23,9 +23,9 @@
|
||||
$strassignment = get_string("modulename", "assignment");
|
||||
$strupload = get_string("upload");
|
||||
|
||||
print_header_simple("$assignment->name : $strupload", "",
|
||||
print_header_simple(format_string($assignment->name)." : $strupload", "",
|
||||
"<a href=index.php?id=$course->id>$strassignments</a> ->
|
||||
<a href=\"view.php?a=$assignment->id\">$assignment->name</a> -> $strupload",
|
||||
<a href=\"view.php?a=$assignment->id\">".format_string($assignment->name,true)."</a> -> $strupload",
|
||||
"", "", true);
|
||||
|
||||
if ($submission = get_record("assignment_submissions", "assignment", $assignment->id, "userid", $USER->id)) {
|
||||
|
||||
Reference in New Issue
Block a user