MDL-38309 Substitute usage of print_tabs() with renderable tabtree

diff --git a/admin/roles/managetabs.php b/admin/roles/managetabs.php
index 4a7dd95..05e28a4 100644 (file)
--- a/admin/roles/managetabs.php
+++ b/admin/roles/managetabs.php
@@ -33,7 +33,6 @@ $toprow[] = new tabobject('manage', new moodle_url('/admin/roles/manage.php'), g
 $toprow[] = new tabobject('assign', new moodle_url('/admin/roles/allow.php', array('mode'=>'assign')), get_string('allowassign', 'role'));
 $toprow[] = new tabobject('override', new moodle_url('/admin/roles/allow.php', array('mode'=>'override')), get_string('allowoverride', 'role'));
 $toprow[] = new tabobject('switch', new moodle_url('/admin/roles/allow.php', array('mode'=>'switch')), get_string('allowswitch', 'role'));
-$tabs = array($toprow);
 
-print_tabs($tabs, $currenttab);
+echo $OUTPUT->tabtree($toprow, $currenttab);
 

diff --git a/badges/renderer.php b/badges/renderer.php
index 6c7dc92..6cb8b32 100644 (file)
--- a/badges/renderer.php
+++ b/badges/renderer.php
@@ -601,7 +601,7 @@ class core_badges_renderer extends plugin_renderer_base {
     public function print_badge_tabs($badgeid, $context, $current = 'overview') {
         global $DB;
 
-        $tabs = $row = array();
+        $row = array();
 
         $row[] = new tabobject('overview',
                     new moodle_url('/badges/overview.php', array('id' => $badgeid)),
@@ -637,9 +637,7 @@ class core_badges_renderer extends plugin_renderer_base {
                     );
         }
 
-        $tabs[] = $row;
-
-        print_tabs($tabs, $current);
+        echo $this->tabtree($row, $current);
     }
 
     // Prints badge status box.

diff --git a/group/tabs.php b/group/tabs.php
index 322d05d..f1c3b18 100644 (file)
--- a/group/tabs.php
+++ b/group/tabs.php
@@ -21,19 +21,18 @@
  * @copyright  2010 Petr Skoda (http://moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-    $row = $tabs = array();
+    $row = array();
     $row[] = new tabobject('groups',
-                           $CFG->wwwroot.'/group/index.php?id='.$courseid,
+                           new moodle_url('/group/index.php', array('id' => $courseid)),
                            get_string('groups'));
 
     $row[] = new tabobject('groupings',
-                           $CFG->wwwroot.'/group/groupings.php?id='.$courseid,
+                           new moodle_url('/group/groupings.php', array('id' => $courseid)),
                            get_string('groupings', 'group'));
 
     $row[] = new tabobject('overview',
-                           $CFG->wwwroot.'/group/overview.php?id='.$courseid,
+                           new moodle_url('/group/overview.php', array('id' => $courseid)),
                            get_string('overview', 'group'));
-    $tabs[] = $row;
     echo '<div class="groupdisplay">';
-    print_tabs($tabs, $currenttab);
+    echo $OUTPUT->tabtree($row, $currenttab);
     echo '</div>';

diff --git a/mod/data/tabs.php b/mod/data/tabs.php
index 4ff8288..62b2b88 100644 (file)
--- a/mod/data/tabs.php
+++ b/mod/data/tabs.php
@@ -32,31 +32,28 @@
 
     $context = context_module::instance($cm->id);
 
-    $inactive = NULL;
-    $activetwo = NULL;
-    $tabs = array();
     $row = array();
 
-    $row[] = new tabobject('list', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id, get_string('list','data'));
+    $row[] = new tabobject('list', new moodle_url('/mod/data/view.php', array('d' => $data->id)), get_string('list','data'));
 
     if (isset($record)) {
-        $row[] = new tabobject('single', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&rid='.$record->id, get_string('single','data'));
+        $row[] = new tabobject('single', new moodle_url('/mod/data/view.php', array('d' => $data->id, 'rid' => $record->id)), get_string('single','data'));
     } else {
-        $row[] = new tabobject('single', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&mode=single', get_string('single','data'));
+        $row[] = new tabobject('single', new moodle_url('/mod/data/view.php', array('d' => $data->id, 'mode' => 'single')), get_string('single','data'));
     }
 
     // Add an advanced search tab.
-    $row[] = new tabobject('asearch', $CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&mode=asearch', get_string('search', 'data'));
+    $row[] = new tabobject('asearch', new moodle_url('/mod/data/view.php', array('d' => $data->id, 'mode' => 'asearch')), get_string('search', 'data'));
 
     if (isloggedin()) { // just a perf shortcut
         if (data_user_can_add_entry($data, $currentgroup, $groupmode, $context)) { // took out participation list here!
             $addstring = empty($editentry) ? get_string('add', 'data') : get_string('editentry', 'data');
-            $row[] = new tabobject('add', $CFG->wwwroot.'/mod/data/edit.php?d='.$data->id, $addstring);
+            $row[] = new tabobject('add', new moodle_url('/mod/data/edit.php', array('d' => $data->id)), $addstring);
         }
         if (has_capability(DATA_CAP_EXPORT, $context)) {
             // The capability required to Export database records is centrally defined in 'lib.php'
             // and should be weaker than those required to edit Templates, Fields and Presets.
-            $row[] = new tabobject('export', $CFG->wwwroot.'/mod/data/export.php?d='.$data->id,
+            $row[] = new tabobject('export', new moodle_url('/mod/data/export.php', array('d' => $data->id)),
                          get_string('export', 'data'));
         }
         if (has_capability('mod/data:managetemplates', $context)) {
@@ -70,27 +67,23 @@
                 $defaultemplate = 'singletemplate';
             }
 
-            $row[] = new tabobject('templates', $CFG->wwwroot.'/mod/data/templates.php?d='.$data->id.'&mode='.$defaultemplate,
+            $templatestab = new tabobject('templates', new moodle_url('/mod/data/templates.php', array('d' => $data->id, 'mode' => $defaultemplate)),
                          get_string('templates','data'));
-            $row[] = new tabobject('fields', $CFG->wwwroot.'/mod/data/field.php?d='.$data->id,
+            $row[] = $templatestab;
+            $row[] = new tabobject('fields', new moodle_url('/mod/data/field.php', array('d' => $data->id)),
                          get_string('fields','data'));
-            $row[] = new tabobject('presets', $CFG->wwwroot.'/mod/data/preset.php?d='.$data->id,
+            $row[] = new tabobject('presets', new moodle_url('/mod/data/preset.php', array('d' => $data->id)),
                          get_string('presets', 'data'));
         }
     }
 
-    $tabs[] = $row;
-
-    if ($currenttab == 'templates' and isset($mode)) {
-
-        $inactive = array();
-        $inactive[] = 'templates';
+    if ($currenttab == 'templates' and isset($mode) && isset($templatestab)) {
+        $templatestab->inactive = true;
         $templatelist = array ('listtemplate', 'singletemplate', 'asearchtemplate', 'addtemplate', 'rsstemplate', 'csstemplate', 'jstemplate');
 
-        $row  = array();
         $currenttab ='';
         foreach ($templatelist as $template) {
-            $row[] = new tabobject($template, "templates.php?d=$data->id&mode=$template", get_string($template, 'data'));
+            $templatestab->subtree[] = new tabobject($template, new moodle_url('/mod/data/templates.php', array('d' => $data->id, 'mode' => $template)), get_string($template, 'data'));
             if ($template == $mode) {
                 $currenttab = $template;
             }
@@ -98,11 +91,9 @@
         if ($currenttab == '') {
             $currenttab = $mode = 'singletemplate';
         }
-        $tabs[] = $row;
-        $activetwo = array('templates');
     }
 
 // Print out the tabs and continue!
-    print_tabs($tabs, $currenttab, $inactive, $activetwo);
+    echo $OUTPUT->tabtree($row, $currenttab);
 
 

diff --git a/mod/wiki/files.php b/mod/wiki/files.php
index 239e2e0..4ee6bc1 100644 (file)
--- a/mod/wiki/files.php
+++ b/mod/wiki/files.php
@@ -86,7 +86,7 @@ echo $OUTPUT->header();
 
 $renderer = $PAGE->get_renderer('mod_wiki');
 
-$tabitems = array('view' => 'view', 'edit' => 'edit', 'comments' => 'comments', 'history' => 'history', 'map' => 'map', 'files' => 'files');
+$tabitems = array('view' => 'view', 'edit' => 'edit', 'comments' => 'comments', 'history' => 'history', 'map' => 'map', 'files' => 'files', 'admin' => 'admin');
 
 $options = array('activetab'=>'files');
 echo $renderer->tabs($page, $tabitems, $options);

diff --git a/mod/wiki/renderer.php b/mod/wiki/renderer.php
index 365d5bc..48f72ef 100644 (file)
--- a/mod/wiki/renderer.php
+++ b/mod/wiki/renderer.php
@@ -240,9 +240,7 @@ class mod_wiki_renderer extends plugin_renderer_base {
     }
 
     public function tabs($page, $tabitems, $options) {
-        global $CFG;
         $tabs = array();
-        $baseurl = $CFG->wwwroot . '/mod/wiki/';
         $context = context_module::instance($this->page->cm->id);
 
         $pageid = null;
@@ -281,7 +279,7 @@ class mod_wiki_renderer extends plugin_renderer_base {
             if ($tab == 'admin' && !has_capability('mod/wiki:managewiki', $context)) {
                 continue;
             }
-            $link = $baseurl . $tab . '.php?pageid=' . $pageid;
+            $link = new moodle_url('/mod/wiki/'. $tab. '.php', array('pageid' => $pageid));
             if ($linked == $tab) {
                 $tabs[] = new tabobject($tab, $link, get_string($tab, 'wiki'), '', true);
             } else {
@@ -289,7 +287,7 @@ class mod_wiki_renderer extends plugin_renderer_base {
             }
         }
 
-        return print_tabs(array($tabs), $selected, $inactive, null, true);
+        return $this->tabtree($tabs, $selected, $inactive);
     }
 
     public function prettyview_link($page) {