MDL-20219 Deleted external blog block, and preferences link from blog…

…_menu block. Placed these as links in settings block instead
roddle · Sep 15, 2009 · 2367726 · 2367726
1 parent ca497f4
commit 2367726
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 106 deletions.
diff --git a/blocks/blog_externals/block_blog_externals.php b/blocks/blog_externals/block_blog_externals.php
diff --git a/blocks/blog_menu/block_blog_menu.php b/blocks/blog_menu/block_blog_menu.php
@@ -120,11 +120,6 @@ function get_content() {
             $menulist->add_item($OUTPUT->link($myentrieslink));
         }
 
-        // show link to manage blog prefs
-        $blogpreflink = html_link::make(new moodle_url($CFG->wwwroot .'/blog/preferences.php', array('userid' => $USER->id)), get_string('blogpreferences', 'blog'));
-        $blogpreflink->disableifcurrent = true;
-        $menulist->add_item($OUTPUT->link($blogpreflink));
-
         // show Add entry link
         $sitecontext = get_context_instance(CONTEXT_SYSTEM);
         if (has_capability('moodle/blog:create', $sitecontext)) {

diff --git a/blog/index.php b/blog/index.php
@@ -208,6 +208,7 @@
     $filters['entry'] = $entryid;
 }
 $blogheaders = blog_get_headers();
+blog_extend_settings_navigation($PAGE->settingsnav);
 
 // prints the tabs
 $showroles = !empty($userid);

diff --git a/blog/lib.php b/blog/lib.php
@@ -597,3 +597,17 @@ function blog_get_headers() {
 
     return $headers;
 }
+
+function blog_extend_settings_navigation($settingsnav) {
+    global $USER, $PAGE, $FULLME, $CFG, $DB, $OUTPUT;
+    $blogkey = $settingsnav->add(get_string('blogadministration', 'blog'));
+    $blog = $settingsnav->get($blogkey);
+    $blog->forceopen = true;
+
+    $blog->add(get_string('preferences', 'blog'), new moodle_url('preferences.php'), navigation_node::TYPE_SETTING);
+    if ($CFG->useexternalblogs && $CFG->maxexternalblogsperuser > 0) {
+        $blog->add(get_string('externalblogs', 'blog'), new moodle_url('external.php'), navigation_node::TYPE_SETTING);
+    }
+
+    return $blogkey;
+}
diff --git a/lang/en_utf8/blog.php b/lang/en_utf8/blog.php
@@ -13,6 +13,7 @@
 $string['blocktagstitle'] = 'Blog Tags';
 $string['blocktitle'] = 'Blog tags block title';
 $string['blog'] = 'Blog';
+$string['blogadministration'] = 'Blog administration';
 $string['blogdeleteconfirm'] = 'Delete this blog?';
 $string['blogdisable'] = 'Blogging is disabled!';
 $string['blogentries'] = 'Blog entries';
@@ -73,6 +74,7 @@
 $string['pagesize'] = 'Number of blog entries per Page';
 $string['permalink'] = 'Permalink';
 $string['personalblogs'] = 'Users can only see their own blog';
+$string['preferences'] = 'Preferences';
 $string['publishto'] = 'Publish to';
 $string['publishtocourse'] = 'Users sharing a course with you';
 $string['publishtocourseassoc'] = 'Members of the associated course';

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
@@ -1993,15 +1993,6 @@ body.has_navigation_bar {
   width: auto;
 }
 
-.block_blog_externals a.delete {
-  margin-left: 6px;
-}
-
-.block_blog_externals div.newlink {
-  margin-top: 10px;
-  text-align: center;
-  width: 100%;
-}
 /***
  *** Calendar
  ***/