From 3f873af7bf2674f114c47bcd9a65bb4c968fa7e1 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Tue, 17 Aug 2010 13:05:33 +0000
Subject: [PATCH] MDL-23842 cohort UI now linked from course category settings
 block too

---
 cohort/index.php      | 3 ++-
 lib/navigationlib.php | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cohort/index.php b/cohort/index.php
index e08985b2cd6..0f7d2fa0fbd 100644
--- a/cohort/index.php
+++ b/cohort/index.php
@@ -53,7 +53,8 @@ if (!$manager) {
 
 $strcohorts = get_string('cohorts', 'cohort');
 
-if ($category) { 
+if ($category) {
+    $PAGE->set_pagelayout('admin');
     $PAGE->set_context($context);
     $PAGE->set_url('/cohort/index.php', array('contextid'=>$context->id));
     $PAGE->set_title($strcohorts);
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 9fbdf695b51..64329965706 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -3439,6 +3439,12 @@ class settings_navigation extends navigation_node {
             $url = new moodle_url('/'.$CFG->admin.'/roles/check.php', array('contextid'=>$this->context->id));
             $categorynode->add(get_string('checkpermissions', 'role'), $url, self::TYPE_SETTING);
         }
+
+        // Cohorts
+        if (has_capability('moodle/cohort:manage', $this->context) or has_capability('moodle/cohort:view', $this->context)) {
+            $categorynode->add(get_string('cohorts', 'cohort'), new moodle_url('/cohort/index.php', array('contextid' => $this->context->id)));
+        }
+
         // Manage filters
         if (has_capability('moodle/filter:manage', $this->context) && count(filter_get_available_in_context($this->context))>0) {
             $url = new moodle_url('/filter/manage.php', array('contextid'=>$this->context->id));