From cf6ea2455fbec1e5e2b613d1e89fbc433bbae418 Mon Sep 17 00:00:00 2001
From: Alexander O'Neill <al.oneill@unb.ca>
Date: Thu, 10 Feb 2011 11:43:09 -0400
Subject: [PATCH] ISLANDORA-171 Pop out tabs in Collection Class

---
 CollectionClass.inc      | 18 ++++++++----------
 fedora_repository.module |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/CollectionClass.inc b/CollectionClass.inc
index ad736e65..7eab22d5 100644
--- a/CollectionClass.inc
+++ b/CollectionClass.inc
@@ -417,9 +417,7 @@ class CollectionClass {
 
     $tabset = array();
 
-    $tabset['my_tabset'] = array(
-      '#type' => 'tabset',
-    );
+    
     
     global $user;
     $objectHelper = new ObjectHelper();
@@ -431,13 +429,13 @@ class CollectionClass {
     $show_ingest_tab = (!empty($_POST['form_id']) && $_POST['form_id'] == 'fedora_repository_ingest_form');
     $add_to_collection = $this->getIngestInterface();
     
-    $tabset['my_tabset']['view_tab'] = array(
+    $tabset['view_tab'] = array(
 //     $collection_fieldset = array (
       '#type' => 'tabpage',
       '#title' => t('Members'),
       '#content' => $collection_items
     );
-    $tabset['my_tabset']['add_tab'] = array(
+    $tabset['add_tab'] = array(
       // #type and #title are the minimum requirements.
       '#type' => 'tabpage',
       '#title' => t('Add / Edit'),
@@ -445,18 +443,18 @@ class CollectionClass {
       // This will be the content of the tab.
       '#content' => $add_to_collection,
     );
-    $tabset['my_tabset']['third_tab'] = array(
+    $tabset['third_tab'] = array(
       '#type' => 'tabpage',
       '#title' => t('Description'),
     );
-    $tabset['my_tabset']['third_tab']['tabset'] = array(
+    $tabset['third_tab']['tabset'] = array(
       '#type' => 'tabset',
     );
     $dc_html = $objectHelper->getFormattedDC($collection_item);
     
     $ds_list = $objectHelper->getFormattedDatastreamList($this->pid, NULL, $collection_item);
     
-    $tabset['my_tabset']['third_tab']['tabset']['view'] = array(
+    $tabset['third_tab']['tabset']['view'] = array(
       '#type' => 'tabpage',
       '#title' => t('View'),
       '#content' => $dc_html . $ds_list,
@@ -464,14 +462,14 @@ class CollectionClass {
     
     if (fedora_repository_access(OBJECTHELPER :: $EDIT_FEDORA_METADATA, $this->pid, $user)) {
       $editform = drupal_get_form('fedora_repository_edit_qdc_form', $this->pid, 'DC');
-      $tabset['my_tabset']['third_tab']['tabset']['edit'] = array(
+      $tabset['third_tab']['tabset']['edit'] = array(
         '#type' => 'tabpage',
         '#title' => t('Edit'),
         '#content' => $editform,
       );
       
     }
-    return tabs_render($tabset);
+    return $tabset;
   }
 
   function getIngestInterface() {
diff --git a/fedora_repository.module b/fedora_repository.module
index 6ded3f2f..d1bc54eb 100644
--- a/fedora_repository.module
+++ b/fedora_repository.module
@@ -822,9 +822,9 @@ function fedora_repository_get_items($pid = NULL, $dsId = NULL, $collection = NU
       $cmodels_tabs = array_merge($cmodels_tabs, $content_model_fieldset);
     }
     else {
-      $cmodels_tabs['tabset'][$content_model->pid] = array(
+      $cmodels_tabs[$content_model->pid] = array(
         '#type' => 'tabpage',
-        '#title' => $cmodel->name,
+        '#title' => $content_model->name,
         '#content' => $content_model_fieldset,
       );
     }