From fd2339cfd6e6a28aab1f690c1bbeea3af9e64173 Mon Sep 17 00:00:00 2001 From: nfreear Date: Fri, 22 Sep 2006 15:15:48 +0000 Subject: [PATCH] Fixes bug MDL-6548 "blog_menu block should use lists" - also blocks: rss_client, admin_bookmark. - also fixed &/& validation error in rss_client footer. --- .../admin_bookmarks/block_admin_bookmarks.php | 9 ++++-- blocks/blog_menu/block_blog_menu.php | 29 ++++++++++--------- blocks/rss_client/block_rss_client.php | 13 +++++++-- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/blocks/admin_bookmarks/block_admin_bookmarks.php b/blocks/admin_bookmarks/block_admin_bookmarks.php index 872e69349b..cbf524fd9c 100644 --- a/blocks/admin_bookmarks/block_admin_bookmarks.php +++ b/blocks/admin_bookmarks/block_admin_bookmarks.php @@ -40,14 +40,19 @@ class block_admin_bookmarks extends block_base { $bookmarks = explode(',',$USER->preference['admin_bookmarks']); // hmm... just a liiitle (potentially) processor-intensive // (recall that $adminroot->locate is a huge recursive call... and we're calling it repeatedly here + + /// Accessibility: markup as a list. + $this->content->text .= '
    '."\n"; + foreach($bookmarks as $bookmark) { $temp = $adminroot->locate($bookmark); if (is_a($temp, 'admin_settingpage')) { - $this->content->text .= '' . $temp->visiblename . '' . '
    '; + $this->content->text .= '
  1. ' . $temp->visiblename . "
    2. \n"; } elseif (is_a($temp, 'admin_externalpage')) { - $this->content->text .= '' . $temp->visiblename . '' . '
    '; + $this->content->text .= '
  2. ' . $temp->visiblename . "
    3. \n"; } } + $this->content->text .= "
\n"; } else { $bookmarks = array(); } diff --git a/blocks/blog_menu/block_blog_menu.php b/blocks/blog_menu/block_blog_menu.php index 10fe299b1e..6520d06b67 100755 --- a/blocks/blog_menu/block_blog_menu.php +++ b/blocks/blog_menu/block_blog_menu.php @@ -70,6 +70,7 @@ class block_blog_menu extends block_base { $canviewblogs = has_capability('moodle/blog:view', $curcontext); + /// Accessibility: markup as a list. if ( (isloggedin() && !isguest()) && $incoursecontext && $CFG->bloglevel >= BLOG_COURSE_LEVEL && $canviewblogs) { @@ -77,8 +78,8 @@ class block_blog_menu extends block_base { $coursearg = '&courseid='.$course->id; // a course is specified - $courseviewlink = ''; - $courseviewlink .= get_string('viewcourseentries', 'blog') .'
'; + $courseviewlink = '
  • '; + $courseviewlink .= get_string('viewcourseentries', 'blog') ."
    • \n"; } $blogmodon = false; @@ -89,19 +90,19 @@ class block_blog_menu extends block_base { // show Add entry link - moderation is off, or moderation is on and the user is viewing the block within the context of a course if (has_capability('moodle/blog:create', $curcontext)) { - $addentrylink = 'wwwroot. '/blog/edit.php?userid='. $userBlog->userid . $coursearg .'">'. - get_string('addnewentry', 'blog') .'
    '; + get_string('addnewentry', 'blog') ."\n"; } // show View my entries link - $addentrylink .= 'wwwroot .'/blog/index.php?userid='. $userBlog->userid.'">'.get_string('viewmyentries', 'blog'). - '
    '; + "\n"; // show link to manage blog prefs - $addentrylink .= 'wwwroot. '/blog/preferences.php?userid='. $userBlog->userid . $coursearg .'">'. - get_string('blogpreferences', 'blog').'
    '; + get_string('blogpreferences', 'blog')."\n"; $output = $addentrylink; $output .= $courseviewlink; @@ -109,25 +110,25 @@ class block_blog_menu extends block_base { // show View site entries link if ($CFG->bloglevel >= BLOG_SITE_LEVEL && $canviewblogs) { - $output .= ''; - $output .= get_string('viewsiteentries', 'blog').'
    '; + $output .= '
  • '; + $output .= get_string('viewsiteentries', 'blog')."
    • \n"; } if (isloggedin() && !isguest() && (has_capability('moodle/blog:manageofficialtags', $sitecontext) || has_capability('moodle/blog:managepersonaltags', $curcontext))) { - $output .= link_to_popup_window("/blog/tags.php",'popup',get_string('tagmanagement'), 400, 500, 'Popup window', 'none', true); + $output .= '
  • '. link_to_popup_window("/blog/tags.php",'popup',get_string('tagmanagement'), 400, 500, 'Popup window', 'none', true) ."
    • \n"; } // show Help with blogging link - //$output .= ''; - //$output .= get_string('helpblogging', 'blog') .''; + //$output .= '
  • '; + //$output .= get_string('helpblogging', 'blog') ."
    • \n"; //} else { // $output = ''; //guest users and users who are not logged in do not get menus //} - $this->content->text = $output; + $this->content->text = '\n"; return $this->content; } } diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php index 96bfb035f2..8f78f10bc3 100644 --- a/blocks/rss_client/block_rss_client.php +++ b/blocks/rss_client/block_rss_client.php @@ -200,7 +200,7 @@ isset($this->config->block_rss_client_show_channel_image) && $this->config->block_rss_client_show_channel_image && isset($rss->image) && isset($rss->image['link']) && isset($rss->image['title']) && isset($rss->image['url']) ) { - $returnstring .= '
    '. $rss->image['title'] .'
    '; + $returnstring .= '
    '. $rss->image['title'] .'
    '; } if ($showtitle) { @@ -215,6 +215,9 @@ return ''; } + /// Accessibility: markup as a list. + $returnstring .= '\n"; if (!empty($rss->channel['link'])) { + $rss->channel['link'] = str_replace('&', '&', $rss->channel['link']); + if (!empty($this->config) && isset($this->config->block_rss_client_show_channel_link) && $this->config->block_rss_client_show_channel_link) { $this->content->footer = ''. get_string('clientchannellink', 'block_rss_client') .''; } -- 2.39.5