moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 00:16:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-10870 All files updated to new build_navigation() method.

Browse source
This commit is contained in:
nicolasconnault 2007-08-16 15:01:25 +00:00
parent 5bf243d131
commit 73c24ef80b
12 changed files with 161 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/lang.php
View file

@ -80,8 +80,6 @@
$title = $strlanguage; $title = $strlanguage;
break; break;
} }
$navigation = "<a href=\"lang.php\">$strlanguage</a> -> $title";
$crumbs[] = array('name' => $strlanguage, 'link' => "$CFG->wwwroot/admin/lang.php"); $crumbs[] = array('name' => $strlanguage, 'link' => "$CFG->wwwroot/admin/lang.php");
$navigation = build_navigation($crumbs); $navigation = build_navigation($crumbs);

29
admin/pagelib.php
View file

@ -15,7 +15,7 @@ define('BLOCK_L_MIN_WIDTH', $lmin);
define('BLOCK_L_MAX_WIDTH', $lmax); define('BLOCK_L_MAX_WIDTH', $lmax);
define('BLOCK_R_MIN_WIDTH', $rmin); define('BLOCK_R_MIN_WIDTH', $rmin);
define('BLOCK_R_MAX_WIDTH', $rmax); define('BLOCK_R_MAX_WIDTH', $rmax);
page_map_class(PAGE_ADMIN, 'page_admin'); page_map_class(PAGE_ADMIN, 'page_admin');
class page_admin extends page_base { class page_admin extends page_base {
@ -27,7 +27,7 @@ class page_admin extends page_base {
// hack alert! // hack alert!
// this function works around the inability to store the section name // this function works around the inability to store the section name
// in default block, maybe we should "improve" the blocks a bit? // in default block, maybe we should "improve" the blocks a bit?
function init_extra($section) { function init_extra($section) {
global $CFG; global $CFG;
if($this->full_init_done) { if($this->full_init_done) {
@ -40,7 +40,7 @@ class page_admin extends page_base {
$this->section = $section; $this->section = $section;
$this->visiblepathtosection = array(); $this->visiblepathtosection = array();
// this part is (potentially) processor-intensive... there's gotta be a better way // this part is (potentially) processor-intensive... there's gotta be a better way
// of handling this // of handling this
if ($this->pathtosection = $adminroot->path($this->section)) { if ($this->pathtosection = $adminroot->path($this->section)) {
@ -54,24 +54,24 @@ class page_admin extends page_base {
// all done // all done
$this->full_init_done = true; $this->full_init_done = true;
} }
function blocks_get_default() { function blocks_get_default() {
return 'admin_tree,admin_bookmarks'; return 'admin_tree,admin_bookmarks';
} }
// seems reasonable that the only people that can edit blocks on the admin pages // seems reasonable that the only people that can edit blocks on the admin pages
// are the admins... but maybe we want a role for this? // are the admins... but maybe we want a role for this?
function user_allowed_editing() { function user_allowed_editing() {
return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID)); return has_capability('moodle/site:manageblocks', get_context_instance(CONTEXT_SYSTEM, SITEID));
} }
// has to be fixed. i know there's a "proper" way to do this // has to be fixed. i know there's a "proper" way to do this
function user_is_editing() { function user_is_editing() {
global $USER; global $USER;
return $USER->adminediting; return $USER->adminediting;
} }
function url_get_path() { function url_get_path() {
global $CFG; global $CFG;
$adminroot = admin_get_root(); $adminroot = admin_get_root();
@ -88,11 +88,11 @@ class page_admin extends page_base {
return array('section' => (isset($this->section) ? $this->section : '')); return array('section' => (isset($this->section) ? $this->section : ''));
} }
function blocks_get_positions() { function blocks_get_positions() {
return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT); return array(BLOCK_POS_LEFT, BLOCK_POS_RIGHT);
} }
function blocks_default_position() { function blocks_default_position() {
return BLOCK_POS_LEFT; return BLOCK_POS_LEFT;
} }
@ -116,7 +116,7 @@ class page_admin extends page_base {
$this->init_full($section); // we're trusting that init_full() has already been called by now; it should have. $this->init_full($section); // we're trusting that init_full() has already been called by now; it should have.
// if not, print_header() has to be called with a $section parameter // if not, print_header() has to be called with a $section parameter
// The search page currently doesn't handle block editing // The search page currently doesn't handle block editing
if ($this->section != 'search' and $this->user_allowed_editing()) { if ($this->section != 'search' and $this->user_allowed_editing()) {
$buttons = '<div><form '.$CFG->frametarget.' method="get" action="' . $this->url_get_path() . '">'. $buttons = '<div><form '.$CFG->frametarget.' method="get" action="' . $this->url_get_path() . '">'.
'<div><input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'. '<div><input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
@ -126,8 +126,13 @@ class page_admin extends page_base {
$buttons = '&nbsp;'; $buttons = '&nbsp;';
} }
print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, $navlinks = array();
implode(" -> ",$this->visiblepathtosection),'', '', true, $buttons, ''); foreach ($this->visiblepathtosection as $element) {
$navlinks[] = array('name' => $element, 'link' => null, 'type' => 'misc');
}
$navigation = build_navigation($navlinks);
print_header("$SITE->shortname: " . implode(": ",$this->visiblepathtosection), $SITE->fullname, $navigation,'', '', true, $buttons, '');
} }
function get_type() { function get_type() {

60
admin/roles/tabs.php
View file

@ -7,6 +7,7 @@ if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
} }
$navlinks = array();
if ($currenttab != 'update') { if ($currenttab != 'update') {
switch ($context->contextlevel) { switch ($context->contextlevel) {
@ -27,8 +28,16 @@ if ($currenttab != 'update') {
$strcategories = get_string("categories"); $strcategories = get_string("categories");
$strcategory = get_string("category"); $strcategory = get_string("category");
$strcourses = get_string("courses"); $strcourses = get_string("courses");
print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses",
"<a href=\"$CFG->wwwroot/course/index.php\">$strcategories</a> -> <a href=\"$CFG->wwwroot/course/category.php?id=$category->id\">$category->name</a> -> $straction", "", "", true); $navlinks[] = array('name' => $strcategories,
'link' => "$CFG->wwwroot/course/index.php",
'type' => 'misc');
$navlinks[] = array('name' => $category->name,
'link' => "$CFG->wwwroot/course/category.php?id=$category->id",
'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$SITE->shortname: $category->name", "$SITE->fullname: $strcourses", $navigation, "", "", true);
break; break;
case CONTEXT_COURSE: case CONTEXT_COURSE:
@ -38,9 +47,11 @@ if ($currenttab != 'update') {
$course = get_record('course', 'id', $context->instanceid); $course = get_record('course', 'id', $context->instanceid);
require_login($course); require_login($course);
$navlinks[] = array('name' => $course->shortname,
print_header($streditcoursesettings, $course->fullname, 'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $straction"); 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header($streditcoursesettings, $course->fullname, $navigation);
} }
break; break;
@ -64,9 +75,8 @@ if ($currenttab != 'update') {
require_login($course); require_login($course);
$strnav = "<a href=\"$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id\">$instance->name</a> ->"; $fullmodulename = get_string("modulename", $module->name);
$fullmodulename = get_string("modulename", $module->name); $streditinga = get_string("editinga", "moodle", $fullmodulename);
$streditinga = get_string("editinga", "moodle", $fullmodulename);
$strmodulenameplural = get_string("modulenameplural", $module->name); $strmodulenameplural = get_string("modulenameplural", $module->name);
if ($module->name == "label") { if ($module->name == "label") {
@ -75,9 +85,21 @@ if ($currenttab != 'update') {
$focuscursor = "form.name"; $focuscursor = "form.name";
} }
print_header_simple($streditinga, '', $navlinks[] = array('name' => $strmodulenameplural,
"<a href=\"$CFG->wwwroot/mod/$module->name/index.php?id=$course->id\">$strmodulenameplural</a> -> 'link' => "$CFG->wwwroot/mod/$module->name/index.php?id=$course->id",
$strnav <a href=\"$CFG->wwwroot/course/mod.php?update=$cm->id&amp;sesskey=".sesskey()."\">$streditinga</a> -> $straction", $focuscursor, "", false); 'type' => 'misc');
$navlinks[] = array('name' => $instance->name,
'link' => "$CFG->wwwroot/mod/$module->name/view.php?id=$cm->id";
'type' => 'misc');
$navlinks[] = array('name' => $streditinga,
'link' => "$CFG->wwwroot/course/mod.php?update=$cm->id&amp;sesskey=".sesskey(),
'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header_simple($streditinga, '', $navigation, $focuscursor, "", false);
break; break;
@ -85,7 +107,10 @@ if ($currenttab != 'update') {
if ($blockinstance = get_record('block_instance', 'id', $context->instanceid)) { if ($blockinstance = get_record('block_instance', 'id', $context->instanceid)) {
if ($block = get_record('block', 'id', $blockinstance->blockid)) { if ($block = get_record('block', 'id', $blockinstance->blockid)) {
$blockname = print_context_name($context); $blockname = print_context_name($context);
$navigation = $blockname. ' -> '.$straction;
// Prepare the last part of the breadcrumbs first
$navlinks[98] = array('name' => $blockname, 'link' => null, 'type' => 'misc');
$navlinks[99] = array('name' => $straction, 'link' => null, 'type' => 'misc');
switch ($blockinstance->pagetype) { switch ($blockinstance->pagetype) {
case 'course-view': case 'course-view':
@ -94,16 +119,21 @@ if ($currenttab != 'update') {
require_login($course); require_login($course);
if ($course->id != SITEID) { if ($course->id != SITEID) {
$navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $navigation"; $navlinks[0] = array('name' => $course->shortname,
'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
'type' => 'misc');
} }
$navigation = build_navigation($navlinks);
print_header("$straction: $blockname", $course->fullname, $navigation); print_header("$straction: $blockname", $course->fullname, $navigation);
} }
break; break;
case 'blog-view': case 'blog-view':
$strblogs = get_string('blogs','blog'); $strblogs = get_string('blogs','blog');
$navigation = '<a href="'.$CFG->wwwroot.'/blog/index.php">'. $navlinks[0] = array('name' => $strblogs,
$strblogs.'</a> -> '.$navigation; 'link' => $CFG->wwwroot.'/blog/index.php',
'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$straction: $strblogs", $SITE->fullname, $navigation); print_header("$straction: $strblogs", $SITE->fullname, $navigation);
break; break;

13
blocks/rss_client/block_rss_client_action.php
View file

@ -57,7 +57,7 @@ if (!defined('MAGPIE_OUTPUT_ENCODING')) {
if (!empty($id)) { if (!empty($id)) {
// we get the complete $course object here because print_header assumes this is // we get the complete $course object here because print_header assumes this is
// a complete object (needed for proper course theme settings) // a complete object (needed for proper course theme settings)
if ($course = get_record('course', 'id', $id)) { if ($course = get_record('course', 'id', $id)) {
$context = get_context_instance(CONTEXT_COURSE, $id); $context = get_context_instance(CONTEXT_COURSE, $id);
@ -68,13 +68,12 @@ if (!empty($id)) {
$straddedit = get_string('feedsaddedit', 'block_rss_client'); $straddedit = get_string('feedsaddedit', 'block_rss_client');
$link = $CFG->wwwroot.'/course/view.php?id='.$id;
if (!empty($course)) { if (empty($course)) {
$navigation = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$id.'">'.$course->shortname.'</a> -> '.$straddedit; $link = '';
} else {
$navigation = $straddedit;
} }
// $navlinks = array(array('name' => $course->shortname, 'link' => $link, 'type' => 'misc'));
$navigation = build_navigation($navlinks);
print_header($straddedit, $straddedit, $navigation); print_header($straddedit, $straddedit, $navigation);

5
blog/preferences.php
View file

@ -42,8 +42,9 @@
$strpreferences = get_string('preferences'); $strpreferences = get_string('preferences');
$strblogs = get_string('blogs', 'blog'); $strblogs = get_string('blogs', 'blog');
$navlinks = array(array('name' => $strblogs, 'link' => "$CFG->wwwroot/blog/", 'type' => 'misc'));
$navigation = "<a href='".$CFG->wwwroot."/blog/'>$strblogs</a> -> $strpreferences"; $navlinks[] = array('name' => $strpreferences, 'link' => null, 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$site->shortname: $strblogs : $strpreferences", $strblogs, $navigation); print_header("$site->shortname: $strblogs : $strpreferences", $strblogs, $navigation);
print_heading($strpreferences); print_heading($strpreferences);

13
calendar/preferences.php
View file

@ -15,7 +15,7 @@
} }
// Initialize the session variables // Initialize the session variables
calendar_session_vars(); calendar_session_vars();
/// If data submitted, then process and store. /// If data submitted, then process and store.
if ($form = data_submitted()) { if ($form = data_submitted()) {
@ -58,13 +58,14 @@
$strcalendar = get_string('calendar', 'calendar'); $strcalendar = get_string('calendar', 'calendar');
$strpreferences = get_string('preferences', 'calendar'); $strpreferences = get_string('preferences', 'calendar');
$navlinks = array();
if ($course->id != SITEID) { if ($course->id != SITEID) {
$navigation = "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> -> $navlinks[] = array('name' => $course->shortname,
<a href=\"view.php\">$strcalendar</a> -> $strpreferences"; 'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
} else { 'type' => 'misc');
$navigation = "<a href=\"view.php\">$strcalendar</a> -> $strpreferences";
} }
$navlinks[] = array('name' => $strpreferences, 'link' => 'view.php', 'type' => 'misc');
$navigation = build_navigation($navlinks);
print_header("$site->shortname: $strcalendar: $strpreferences", $strcalendar, $navigation, print_header("$site->shortname: $strcalendar: $strpreferences", $strcalendar, $navigation,
'', '', true, '', user_login_string($site)); '', '', true, '', user_login_string($site));

35
course/edit.php
View file

@ -46,11 +46,11 @@
} // it'll be greyed out but we want these by default anyway. } // it'll be greyed out but we want these by default anyway.
} }
$course->allowedmods = $allowedmods; $course->allowedmods = $allowedmods;
if ($course->enrolstartdate){ if ($course->enrolstartdate){
$course->enrolstartdisabled = 0; $course->enrolstartdisabled = 0;
} }
if ($course->enrolenddate) { if ($course->enrolenddate) {
$course->enrolenddisabled = 0; $course->enrolenddisabled = 0;
} }
@ -98,7 +98,7 @@
// assign default role to creator if not already having permission to manage course assignments // assign default role to creator if not already having permission to manage course assignments
if (!has_capability('moodle/course:view', $context) or !has_capability('moodle/role:assign', $context)) { if (!has_capability('moodle/course:view', $context) or !has_capability('moodle/role:assign', $context)) {
role_assign($CFG->creatornewroleid, $USER->id, 0, $context->id); role_assign($CFG->creatornewroleid, $USER->id, 0, $context->id);
} }
if ($data->metacourse and has_capability('moodle/course:managemetacourse', $context)) { if ($data->metacourse and has_capability('moodle/course:managemetacourse', $context)) {
// Redirect users with metacourse capability to student import // Redirect users with metacourse capability to student import
@ -107,8 +107,8 @@
// Redirect to roles assignment // Redirect to roles assignment
redirect($CFG->wwwroot."/$CFG->admin/roles/assign.php?contextid=$context->id"); redirect($CFG->wwwroot."/$CFG->admin/roles/assign.php?contextid=$context->id");
} }
} else { } else {
if (!update_course($data)) { if (!update_course($data)) {
print_error('coursenotupdated'); print_error('coursenotupdated');
} }
@ -127,17 +127,30 @@
$straddnewcourse = get_string("addnewcourse"); $straddnewcourse = get_string("addnewcourse");
$stradministration = get_string("administration"); $stradministration = get_string("administration");
$strcategories = get_string("categories"); $strcategories = get_string("categories");
$navlinks = array();
if (!empty($course)) { if (!empty($course)) {
print_header($streditcoursesettings, $course->fullname, $navlinks[] = array('name' => $streditcoursesettings,
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> 'link' => null,
-> $streditcoursesettings", $editform->focus()); 'type' => 'misc');
$title = $streditcoursesettings;
$fullname = $course->fullname;
} else { } else {
print_header("$site->shortname: $straddnewcourse", $site->fullname, $navlinks[] = array('name' => $stradministration,
"<a href=\"$CFG->wwwroot/$CFG->admin/index.php\">$stradministration</a> -> ". 'link' => "$CFG->wwwroot/$CFG->admin/index.php",
"<a href=\"index.php\">$strcategories</a> -> $straddnewcourse", $editform->focus()); 'type' => 'misc');
$navlinks[] = array('name' => $strcategories,
'link' => 'index.php',
'type' => 'misc');
$navlinks[] = array('name' => $straddnewcourse,
'link' => null,
'type' => 'misc');
$title = "$site->shortname: $straddnewcourse";
$fullname = $site->fullname;
} }
$navigation = build_navigation($navlinks);
print_header($title, $fullname, $navigation, $editform->focus());
print_heading($streditcoursesettings); print_heading($streditcoursesettings);
$editform->display(); $editform->display();

30
files/index.php
View file

@ -49,6 +49,9 @@
function html_header($course, $wdir, $formfield=""){ function html_header($course, $wdir, $formfield=""){
global $CFG, $ME, $choose; global $CFG, $ME, $choose;
$navlinks = array();
// $navlinks[] = array('name' => $course->shortname, 'link' => "../course/view.php?id=$course->id", 'type' => 'misc');
if ($course->id == SITEID) { if ($course->id == SITEID) {
$strfiles = get_string("sitefiles"); $strfiles = get_string("sitefiles");
} else { } else {
@ -56,18 +59,22 @@
} }
if ($wdir == "/") { if ($wdir == "/") {
$fullnav = "$strfiles"; $navlinks[] = array('name' => $strfiles, 'link' => null, 'type' => 'misc');
} else { } else {
$dirs = explode("/", $wdir); $dirs = explode("/", $wdir);
$numdirs = count($dirs); $numdirs = count($dirs);
$link = ""; $link = "";
$navigation = ""; $navlinks[] = array('name' => $strfiles,
'link' => $ME."?id=$course->id&amp;wdir=/&amp;choose=$choose",
'type' => 'misc');
for ($i=1; $i<$numdirs-1; $i++) { for ($i=1; $i<$numdirs-1; $i++) {
$navigation .= " -> "; $link .= "/".urlencode($dirs[$i]);
$link .= "/".urlencode($dirs[$i]); $navlinks[] = array('name' => $dirs[$i],
$navigation .= "<a href=\"".$ME."?id=$course->id&amp;wdir=$link&amp;choose=$choose\">".$dirs[$i]."</a>"; 'link' => $ME."?id=$course->id&amp;wdir=$link&amp;choose=$choose",
'type' => 'misc');
} }
$fullnav = "<a href=\"".$ME."?id=$course->id&amp;wdir=/&amp;choose=$choose\">$strfiles</a> $navigation -> ".$dirs[$numdirs-1]; $navlinks[] = array('name' => $dirs[$numdirs-1], 'link' => null, 'type' => 'misc');
} }
@ -120,13 +127,12 @@
admin_externalpage_print_header(); admin_externalpage_print_header();
print_heading(get_string("publicsitefileswarning"), "center", 2); print_heading(get_string("publicsitefileswarning"), "center", 2);
} }
} else { } else {
print_header("$course->shortname: $strfiles", $course->fullname, $navigation = build_navigation($navlinks);
"<a href=\"../course/view.php?id=$course->id\">$course->shortname". print_header("$course->shortname: $strfiles", $course->fullname, $navigation, $formfield);
"</a> -> $fullnav", $formfield);
} }
} }
@ -192,7 +198,7 @@
echo "<p>$struploadafile ($strmaxsize) --> <b>$wdir</b></p>"; echo "<p>$struploadafile ($strmaxsize) --> <b>$wdir</b></p>";
echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"index.php\">"; echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"index.php\">";
echo "<div>"; echo "<div>";
echo "<table><tr><td colspan=\"2\">"; echo "<table><tr><td colspan=\"2\">";
echo ' <input type="hidden" name="choose" value="'.$choose.'" />'; echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />"; echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
@ -205,7 +211,7 @@
echo "</div>"; echo "</div>";
echo "</form>"; echo "</form>";
echo "<form action=\"index.php\" method=\"get\">"; echo "<form action=\"index.php\" method=\"get\">";
echo "<div>"; echo "<div>";
echo ' <input type="hidden" name="choose" value="'.$choose.'" />'; echo ' <input type="hidden" name="choose" value="'.$choose.'" />';
echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />"; echo " <input type=\"hidden\" name=\"id\" value=\"$id\" />";
echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />"; echo " <input type=\"hidden\" name=\"wdir\" value=\"$wdir\" />";

36
lib/moodlelib.php
View file

@ -7090,14 +7090,18 @@ function build_navigation($extranavlinks) {
//Site name //Site name
if ($site = get_site()) { if ($site = get_site()) {
$navlinks[] = array('name' => format_string($site->shortname), 'link' => "$CFG->wwwroot/", 'type' => 'home'); $navlinks[] = array('name' => format_string($site->shortname),
'link' => "$CFG->wwwroot/",
'type' => 'home');
} }
if ($COURSE) { if ($COURSE) {
if ($COURSE->id != SITEID) { if ($COURSE->id != SITEID) {
//Course //Course
$navlinks[] = array('name' => format_string($COURSE->shortname), 'link' => "$CFG->wwwroot/course/view.php?id=$COURSE->id",'type' => 'course'); $navlinks[] = array('name' => format_string($COURSE->shortname),
'link' => "$CFG->wwwroot/course/view.php?id=$COURSE->id",
'type' => 'course');
} }
} }
@ -7108,26 +7112,35 @@ function build_navigation($extranavlinks) {
//Accessibility: heading hidden from visual browsers by default. //Accessibility: heading hidden from visual browsers by default.
$navigation = '<h2 class="accesshide">'.get_string('youarehere','access')."</h2> <ul>\n"; $navigation = '<h2 class="accesshide">'.get_string('youarehere','access')."</h2> <ul>\n";
$countlinks = count($navlinks); $countlinks = count($navlinks);
$i = 0;
for($i=0;$i<$countlinks;$i++) { foreach ($navlinks as $navlink) {
if ($i >= $countlinks || !is_array($navlink)) {
continue;
}
// Check the link type to see if this link should appear in the trail // Check the link type to see if this link should appear in the trail
if ($navlinks[$i]['type'] == 'activity' && $i+1 < $countlinks && ($CFG->hideactivitytypenavlink == 2 || ($CFG->hideactivitytypenavlink == 1 && !has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $course->id))))) { $cap = has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $COURSE->id));
$hidetype_is2 = $CFG->hideactivitytypenavlink == 2;
$hidetype_is1 = $CFG->hideactivitytypenavlink == 1;
if ($navlink['type'] == 'activity' &&
$i+1 < $countlinks &&
($hidetype_is2 || ($hidetype_is1 && !$cap))) {
continue; continue;
} }
$navigation .= '<li class="first">'; $navigation .= '<li class="first">';
if ($i > 0) { if ($i > 0) {
$navigation .= get_separator(); $navigation .= get_separator();
} }
if ($navlinks[$i]['link'] && $i+1 < $countlinks) { if ($navlink['link'] && $i+1 < $countlinks) {
$navigation .= "<a onclick=\"this.target='$CFG->framename'\" href=\"{$navlinks[$i]['link']}\">"; $navigation .= "<a onclick=\"this.target='$CFG->framename'\" href=\"{$navlink['link']}\">";
} }
$navigation .= "{$navlinks[$i]['name']}"; $navigation .= "{$navlink['name']}";
if ($navlinks[$i]['link'] && $i+1 < $countlinks) { if ($navlink['link'] && $i+1 < $countlinks) {
$navigation .= "</a>"; $navigation .= "</a>";
} }
$navigation .= "</li>"; $navigation .= "</li>";
$i++;
} }
$navigation .= "</ul>"; $navigation .= "</ul>";
@ -7150,8 +7163,7 @@ function is_newnav($navigation) {
* @param object $object The object to check * @param object $object The object to check
* @return boolean * @return boolean
*/ */
function in_object_vars($var, $object) function in_object_vars($var, $object) {
{
$class_vars = get_class_vars(get_class($object)); $class_vars = get_class_vars(get_class($object));
$class_vars = array_keys($class_vars); $class_vars = array_keys($class_vars);
return in_array($var, $class_vars); return in_array($var, $class_vars);

9
mod/data/edit.php
View file

@ -64,16 +64,15 @@
$context = get_context_instance(CONTEXT_MODULE, $cm->id); $context = get_context_instance(CONTEXT_MODULE, $cm->id);
/// If it's hidden then it's don't show anything. :) /// If it's hidden then it doesn't show anything. :)
if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities', $context)) { if (empty($cm->visible) and !has_capability('moodle/course:viewhiddenactivities', $context)) {
$strdatabases = get_string("modulenameplural", "data"); $strdatabases = get_string("modulenameplural", "data");
$navigation = "<a href=\"index.php?id=$course->id\">$strdatabases</a> ->";
$navlinks = array(); $navlinks = array();
$navlinks[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity'); $navlinks[] = array('name' => $strdatabases, 'link' => "index.php?id=$course->id", 'type' => 'activity');
$navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance'); $navlinks[] = array('name' => format_string($data->name), 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($navlinks); $navigation = build_navigation($navlinks);
print_header_simple(format_string($data->name), "", $navigation, "", "", true, '', navmenu($course, $cm)); print_header_simple(format_string($data->name), "", $navigation, "", "", true, '', navmenu($course, $cm));
notice(get_string("activityiscurrentlyhidden")); notice(get_string("activityiscurrentlyhidden"));
} }
@ -161,7 +160,7 @@
if (!has_capability('mod/data:approve', $context)) { if (!has_capability('mod/data:approve', $context)) {
$record->approved = 0; $record->approved = 0;
} }
$record->groupid = $currentgroup; $record->groupid = $currentgroup;
$record->timemodified = time(); $record->timemodified = time();
update_record('data_records',$record); update_record('data_records',$record);

13
mod/lams/mod.html
View file

@ -37,8 +37,8 @@ if (!isset($form->create_sequence_url)) {
<center> <center>
<span id="message"><p>Please wait .......</p></span> <span id="message"><p>Please wait .......</p></span>
<table cellpadding="5"> <table cellpadding="5">
<tr valign=top> <tr valign="top">
<td align=right><b><?php print_string("workspace", "lams") ?>:</b></td> <td align="right"><b><?php print_string("workspace", "lams") ?>:</b></td>
<td> <td>
<select id="workspace" name="workspace"></select> <select id="workspace" name="workspace"></select>
</td> </td>
@ -55,7 +55,8 @@ if (!isset($form->create_sequence_url)) {
<input type="text" id="name" name="name" size="30" /> <input type="text" id="name" name="name" size="30" />
</td> </td>
</tr> </tr>
<td align=right><p><b><?php print_string("introduction", "lams") ?>:</b></p> <tr>
<td align="right"><p><b><?php print_string("introduction", "lams") ?>:</b></p>
<br /> <br />
<font size="1"> <font size="1">
<?php <?php
@ -87,8 +88,10 @@ print_textarea($usehtmleditor, 20, 50, 680, 400, "introduction", $form->introduc
<input type="hidden" name="learning_session_id"/> <input type="hidden" name="learning_session_id"/>
<input type="hidden" name="create_sequence_url" id="create_sequence_url"/> <input type="hidden" name="create_sequence_url" id="create_sequence_url"/>
<input type="submit" id="save" name="save" value="<?php print_string("useSequence","lams") ?>" onClick="return validate();"> <input type="submit" id="save" name="save" value="<?php print_string("useSequence","lams") ?>" onClick="return validate();">
<input type="button" id="edit" name"edit" value="<?php print_string("editSequence","lams") ?>" onClick="openAuthor(<?php echo "'".$form->create_sequence_url."&".$LAMSCONSTANTS->param_ldid."=".$form->sequence."'";?>);"> <input type="button" id="edit" name="edit" value="<?php print_string("editSequence","lams") ?>" onClick="openAuthor(<?php
<input type="button" id="create" name="create" value="<?php print_string("createSequence","lams") ?>" onClick="openAuthor(<?php echo "'".$form->create_sequence_url."'";?>);"> echo "'".$form->create_sequence_url."&".$LAMSCONSTANTS->param_ldid."=".$form->sequence."'";?>);">
<input type="button" id="create" name="create" value="<?php print_string("createSequence","lams") ?>" onClick="openAuthor(<?php
echo "'".$form->create_sequence_url."'";?>);">
<input type="button" id="refresh" name="refresh" value="<?php print_string("refreshSequenceList","lams")?>" onclick="refreshLists();"> <input type="button" id="refresh" name="refresh" value="<?php print_string("refreshSequenceList","lams")?>" onclick="refreshLists();">
<input type="submit" id="cancel" name=cancel value="<?php print_string("cancel") ?>"> <input type="submit" id="cancel" name=cancel value="<?php print_string("cancel") ?>">

14
mod/resource/index.php
View file

@ -12,11 +12,7 @@
if ($course->id != SITEID) { if ($course->id != SITEID) {
require_login($course->id); require_login($course->id);
$navigation = "<a href=\"../../course/view.php?id=$course->id\">$course->shortname</a> ->";
} else {
$navigation = '';
} }
add_to_log($course->id, "resource", "view all", "index.php?id=$course->id", ""); add_to_log($course->id, "resource", "view all", "index.php?id=$course->id", "");
$strresource = get_string("modulename", "resource"); $strresource = get_string("modulename", "resource");
@ -26,12 +22,12 @@
$strname = get_string("name"); $strname = get_string("name");
$strsummary = get_string("summary"); $strsummary = get_string("summary");
$strlastmodified = get_string("lastmodified"); $strlastmodified = get_string("lastmodified");
$navlinks = array(); $navlinks = array();
$navlinks[] = array('name' => $strresources, 'link' => '', 'type' => 'activityinstance'); $navlinks[] = array('name' => $strresources, 'link' => '', 'type' => 'activityinstance');
$navigation = build_navigation($navlinks); $navigation = build_navigation($navlinks);
print_header("$course->shortname: $strresources", $course->fullname, $navigation, print_header("$course->shortname: $strresources", $course->fullname, $navigation,
"", "", true, "", navmenu($course)); "", "", true, "", navmenu($course));
if (! $resources = get_all_instances_in_course("resource", $course)) { if (! $resources = get_all_instances_in_course("resource", $course)) {
@ -73,12 +69,12 @@
$extra = ""; $extra = "";
} }
if (!$resource->visible) { // Show dimmed if the mod is hidden if (!$resource->visible) { // Show dimmed if the mod is hidden
$table->data[] = array ($printsection, $table->data[] = array ($printsection,
"<a class=\"dimmed\" $extra href=\"view.php?id=$resource->coursemodule\">".format_string($resource->name,true)."</a>", "<a class=\"dimmed\" $extra href=\"view.php?id=$resource->coursemodule\">".format_string($resource->name,true)."</a>",
format_text($resource->summary, FORMAT_MOODLE, $options) ); format_text($resource->summary, FORMAT_MOODLE, $options) );
} else { //Show normal if the mod is visible } else { //Show normal if the mod is visible
$table->data[] = array ($printsection, $table->data[] = array ($printsection,
"<a $extra href=\"view.php?id=$resource->coursemodule\">".format_string($resource->name,true)."</a>", "<a $extra href=\"view.php?id=$resource->coursemodule\">".format_string($resource->name,true)."</a>",
format_text($resource->summary, FORMAT_MOODLE, $options) ); format_text($resource->summary, FORMAT_MOODLE, $options) );
} }
@ -89,6 +85,6 @@
print_table($table); print_table($table);
print_footer($course); print_footer($course);
?> ?>