Merge branch '7.x-2.x' of git.drupal.org:sandbox/spficklin/1337878 into 7.x-2.x

tripal_bulk_loader/includes/tripal_bulk_loader.admin.inc

@@ -41,20 +41,6 @@ function tripal_bulk_loader_admin_jobs_listing() {
   return $output;
 }
 
-function tripal_bulk_loader_admin_enable_view($view_name) {
-
-  $status = variable_get('views_defaults', array());
-  if (isset($status[$view_name])) {
-    $status[$view_name] = FALSE;
-    variable_set('views_defaults', $status);
-    drupal_set_message("Successfully Enabled $view_name");
-  }
-  else {
-    drupal_set_message("Unable to find a view by the name of '$view_name'",'error');
-  }
-  drupal_goto('admin/tripal/loaders/bulk');
-}
-
 /**
  * @section
  * Configuration Form

tripal_bulk_loader/tripal_bulk_loader.module

@@ -84,16 +84,16 @@ function tripal_bulk_loader_menu() {
   $items['admin/tripal/loaders/bulk/views/jobs/enable'] = array(
     'title' => 'Enable Jobs Administrative View',
     'description' => 'Enable Jobs Administrative View',
-    'page callback' => 'tripal_bulk_loader_admin_enable_view',
-    'page arguments' => array('tripal_bulk_loading_jobs'),
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_bulk_loading_jobs','admin/tripal/loaders/bulk'),
     'access arguments' => array('administer tripal_bulk_loader'),
     'type' => MENU_CALLBACK,
   );
   $items['admin/tripal/loaders/bulk/views/templates/enable'] = array(
     'title' => 'Enable Templates Administrative View',
     'description' => 'Enable Templates Administrative View',
-    'page callback' => 'tripal_bulk_loader_admin_enable_view',
-    'page arguments' => array('tripal_bulk_loader_templates'),
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_bulk_loader_templates', 'admin/tripal/loaders/bulk'),
     'access arguments' => array('administer tripal_bulk_loader'),
     'type' => MENU_CALLBACK,
   );

tripal_bulk_loader/tripal_bulk_loader.views_default.inc

@@ -287,6 +287,7 @@ function tripal_bulk_loader_defaultview_admin_template_listing() {
   $handler->display->display_options['header']['area']['table'] = 'views';
   $handler->display->display_options['header']['area']['field'] = 'area';
   $handler->display->display_options['header']['area']['label'] = 'Add Template';
+  $handler->display->display_options['header']['area']['empty'] = TRUE;
   $handler->display->display_options['header']['area']['content'] = '<ul class="action-links">
       <li><a href="template/create">Add Template</a></li>
       <li><a href="templates/import">Import Template</a></li>

tripal_cv/includes/tripal_cv_admin.inc

@@ -1,16 +1,57 @@
 <?php
+
+/**
+ * Provide landing page to the new admin pages
+ */
+function tripal_cv_admin_cv_listing() {
+  $output = '';
+
+  // set the breadcrumb
+  $breadcrumb = array();
+  $breadcrumb[] = l('Home', '<front>');
+  $breadcrumb[] = l('Administration', 'admin');
+  $breadcrumb[] = l('Tripal', 'admin/tripal');
+  $breadcrumb[] = l('Chado Modules', 'admin/tripal/chado');
+  $breadcrumb[] = l('Vocabularies', 'admin/tripal/chado/tripal_cv');
+  drupal_set_breadcrumb($breadcrumb);
+
+  // Add the view
+  $cvs_view = views_embed_view('tripal_cv_admin_cvs','default');
+  $cvterms_view = views_embed_view('tripal_cv_admin_cvterms','default');
+  if (isset($cvs_view) && isset($cvterms_view)) {
+    $output .= $cvs_view;
+  }
+  else {
+    $output .= '<p>The Tripal Controlled Vocabulary module uses primarily views to provide an '
+      . 'administrative interface. Currently one or more views needed for this '
+      . 'administrative interface are disabled. <strong>Click each of the following links to '
+      . 'enable the pertinent views</strong>:</p>';
+    $output .= '<ul>';
+    if (!isset($cvs_view)) {
+      $output .= '<li>'.l('Tripal Vocabularies', 'admin/tripal/chado/tripal_cv/views/cvs/enable').'</li>';
+    }
+    if (!isset($cvterm_view)) {
+      $output .= '<li>'.l('Tripal Vocabulary Terms', 'admin/tripal/chado/tripal_cv/views/cvterms/enable').'</li>';
+    }
+    $output .= '</ul>';
+  }
+
+  return $output;
+}
+
 /**
  * Purpose: Provides the form for Updating and Deleteing existing
  *   chado controlled vocabularies (See chado cv table)
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_cv_edit_page() {
   $output .= drupal_get_form('tripal_cv_select_form');
   $output .= '<div id="cv-edit-div">Please select a vocabulary above to view or edit</div>';
 
   return $output;
 }
+*/
 
 /**
  * Purpose: Provides the actual "Select CV" form on the Update/Delete Controlled
@@ -18,7 +59,7 @@ function tripal_cv_edit_page() {
  * @todo Modify this form to use Drupal AJAX
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_cv_select_form() {
 
   // get a list of db from chado for user to choose
@@ -46,12 +87,13 @@ function tripal_cv_select_form() {
 
   return $form;
 }
+*/
 
 /**
  * Purpose: The edit controlled vocabulary javascript
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_ajax_cv_edit() {
 
   // get the database id, build the form and then return the JSON object
@@ -60,12 +102,13 @@ function tripal_ajax_cv_edit() {
   drupal_json(array('status' => TRUE, 'data' => $form));
 
 }
+*/
 
 /**
  * Purpose: Provides a form to allow updating/deleteing of controlled vocabularies
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_cv_edit_form(&$form_state = NULL, $cvid = NULL) {
 
   $sql = "SELECT * FROM {cv} WHERE cv_id = :cv_id ";
@@ -126,12 +169,13 @@ function tripal_cv_edit_form(&$form_state = NULL, $cvid = NULL) {
 
   return $form;
 }
+*/
 
 /**
  * Purpose: The submit function of the update/delete controlled vocabulary form
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_cv_edit_form_submit($form, &$form_state) {
 
   $name =  $form_state['values']['name'];
@@ -169,13 +213,13 @@ function tripal_cv_edit_form_submit($form, &$form_state) {
   }
 
 }
-
+*/
 
 /**
  * Purpose: Provides the Add controlled vocabulary form
  *
   * @ingroup tripal_cv
- */
+ *
 function tripal_cv_add_form(&$form_state = NULL) {
 
   $form['cvid'] = array(
@@ -211,12 +255,12 @@ function tripal_cv_add_form(&$form_state = NULL) {
 
   return $form;
 }
-
+*/
 /**
  * Purpose: The submit function for the add controlled vocabulary form
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_cv_add_form_submit($form, &$form_state) {
 
   $name =  $form_state['values']['name'];
@@ -237,13 +281,13 @@ function tripal_cv_add_form_submit($form, &$form_state) {
   }
 
 }
-
+*/
 /**
  * Purpose: Provides the form that allows adding of terms to an existing
  *   controlled vocabulary
  *
   * @ingroup tripal_cv
- */
+ *
 function tripal_cv_cvterm_form(&$form_state, $action = 'add') {
   tripal_core_ahah_init_form();
 
@@ -427,13 +471,13 @@ function tripal_cv_cvterm_form(&$form_state, $action = 'add') {
 
   return $form;
 }
-
+*/
 
 /**
  * Purpose: Validates the input for adding a cvterm
  *
   * @ingroup tripal_cv
- */
+ *
 function tripal_cv_cvterm_form_validate($form, &$form_state) {
 
   // Ensure that submit does not get called unless the AHAH in the form was called
@@ -442,12 +486,12 @@ function tripal_cv_cvterm_form_validate($form, &$form_state) {
   }
 
 }
-
+*/
 /**
  * Purpose: Adds terms to an existing controlled vocabulary
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_cv_cvterm_form_submit($form, &$form_state) {
 
   // Ensure the AHAH in the form was called
@@ -512,14 +556,14 @@ function tripal_cv_cvterm_form_submit($form, &$form_state) {
   }
 
 }
-
+*/
 /**
  * Purpose: This function gets called when the selecting of a cv from
  *   the select list triggers it. This function simply rebuilds the form
  *   with new information. No elements are created here
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_cv_cvterm_callback() {
   $status = TRUE;
 
@@ -540,12 +584,12 @@ function tripal_cv_cvterm_callback() {
     )
   );
 }
-
+*/
 /**
  * Cvterm path form submit
  *
  * @ingroup tripal_cv
- */
+ *
 function tripal_cv_cvtermpath_form_submit($form, &$form_state) {
   global $user;
 
@@ -561,4 +605,5 @@ function tripal_cv_cvtermpath_form_submit($form, &$form_state) {
     tripal_add_job("Update cvtermpath: $cv->name", 'tripal_cv',
        'tripal_cv_update_cvtermpath', $job_args, $user->uid);
   }
-}
+}
+*/

tripal_cv/tripal_cv.module

@@ -9,6 +9,7 @@ require_once "includes/cv_form.inc";
 require_once "includes/cvterm_form.inc";
 require_once "includes/cvtermpath_form.inc";
 
+require_once "includes/tripal_cv_admin.inc";
 
 /**
  * @defgroup tripal_cv CV Module
@@ -48,6 +49,7 @@ function tripal_cv_menu() {
   $items['admin/tripal/chado/tripal_cv'] = array(
     'title' => 'Controlled Vocabularies',
     'description' => 'Controlled Vocabularies control the terms available for various chado fields.',
+    'page callback' => 'tripal_cv_admin_cv_listing',
     'access arguments' => array('administer controlled vocabularies'),
     'type' => MENU_NORMAL_ITEM,
   );
@@ -58,7 +60,7 @@ function tripal_cv_menu() {
     'page callback' => 'theme',
     'page arguments' => array('tripal_cv_help'),
     'access arguments' => array('administer controlled vocabularies'),
-    'type' => MENU_NORMAL_ITEM,
+    'type' => MENU_LOCAL_TASK,
     'weight' => 10
   );
 
@@ -68,7 +70,7 @@ function tripal_cv_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('tripal_cv_obo_form'),
     'access arguments' => array('administer controlled vocabularies'),
-    'type' => MENU_NORMAL_ITEM,
+    'type' => MENU_CALLBACK,
   );
 
   /*
@@ -81,7 +83,7 @@ function tripal_cv_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('tripal_cv_cvtermpath_form'),
     'access arguments' => array('administer controlled vocabularies'),
-    'type' => MENU_NORMAL_ITEM,
+    'type' => MENU_CALLBACK,
   );
 
   /*
@@ -94,7 +96,7 @@ function tripal_cv_menu() {
     'page arguments' => array('tripal_cv_cv_edit_form'),
     'access callback' => 'user_access',
     'access arguments' => array('administer controlled vocabularies'),
-    'type' => MENU_NORMAL_ITEM,
+    'type' => MENU_CALLBACK,
   );
 
   $items['admin/tripal/chado/tripal_cv/add_cv'] = array(
@@ -104,7 +106,7 @@ function tripal_cv_menu() {
     'page arguments' => array('tripal_cv_cv_add_form'),
     'access callback' => 'user_access',
     'access arguments' => array('administer controlled vocabularies'),
-    'type' => MENU_NORMAL_ITEM,
+    'type' => MENU_CALLBACK,
   );
 
   /*
@@ -116,15 +118,15 @@ function tripal_cv_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('tripal_cv_cvterm_add_form'),
     'access arguments' => array('administer controlled vocabularies'),
-    'type' => MENU_NORMAL_ITEM,
+    'type' => MENU_CALLBACK,
   );
-  $items['admin/tripal/chado/tripal_cv/cvterm/edit'] = array(
+  $items['admin/tripal/chado/tripal_cv/cvterm/edit/%'] = array(
     'title' => 'Edit a Controlled Vocabulary Term',
     'description' => 'Edit an existing controlled vocabulary term.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('tripal_cv_cvterm_edit_form'),
     'access arguments' => array('administer controlled vocabularies'),
-    'type' => MENU_NORMAL_ITEM,
+    'type' => MENU_CALLBACK,
   );
   $items['admin/tripal/chado/tripal_cv/cvterm/auto_name/%/%'] = array(
     'page callback' => 'tripal_cv_cvterm_name_autocomplete',
@@ -144,6 +146,23 @@ function tripal_cv_menu() {
     'type' => MENU_CALLBACK
   );
 
+  /*
+   * Menu items for enabling views
+   */
+  $items['admin/tripal/chado/tripal_cv/views/cvs/enable'] = array(
+    'title' => 'Enable Vocabulary Administrative View',
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_cv_admin_cvs', 'admin/tripal/chado/tripal_cv'),
+    'access arguments' => array('administer controlled vocabularies'),
+    'type' => MENU_CALLBACK,
+  );
+  $items['admin/tripal/chado/tripal_cv/views/cvterms/enable'] = array(
+    'title' => 'Enable Vocabulary Terms Administrative View',
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_cv_admin_cvterms', 'admin/tripal/chado/tripal_cv'),
+    'access arguments' => array('administer controlled vocabularies'),
+    'type' => MENU_CALLBACK,
+  );
 
   /*
    * Menu items for working with CV Trees
@@ -274,6 +293,6 @@ function tripal_cv_theme() {
       'path' => $theme_path,
     ),
   );
-  
+
   return $items;
 }

tripal_cv/tripal_cv.views.inc

@@ -3,7 +3,7 @@
 /**
  *  @file
  *  This file contains the basic functions for views integration of
- *  chado/tripal db tables. Supplementary functions can be found in
+ *  chado/tripal cv tables. Supplementary functions can be found in
  *  ./views/
  *
  *  Documentation on views integration can be found at
@@ -14,597 +14,3 @@
  * @defgroup tripal_cv_views Controlled Vocabulary Views Integration
  * @ingroup views
  */
-
-/**
- *
- * @ingroup tripal_cv_views
- */
-function tripal_cv_views_default_views() {
-  $views = array();
-
-  if (!module_exists('tripal_views')) {
-    return $views;
-  }
-
-  // Main default view
-  // List all cvterms based on cv
-  $view = new view;
-  $view->name = 'cvterm_listing';
-  $view->description = 'A listing of all controlled vocabulary terms filtered by controlled vocabulary';
-  $view->tag = 'chado default';
-  $view->base_table = 'cvterm';
-  $view->core = 0;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
-    'name_1' => array(
-      'label' => 'Vocabulary',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'absolute' => 0,
-        'link_class' => '',
-        'alt' => '',
-        'rel' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'type' => 'separator',
-      'separator' => ', ',
-      'exclude' => 0,
-      'id' => 'name_1',
-      'table' => 'cv',
-      'field' => 'name',
-      'relationship' => 'none',
-    ),
-    'name' => array(
-      'label' => 'Name',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'link_class' => '',
-        'alt' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'cvterm',
-      'field' => 'name',
-      'relationship' => 'none',
-    ),
-    'definition' => array(
-      'label' => 'Definition',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'link_class' => '',
-        'alt' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'exclude' => 0,
-      'id' => 'definition',
-      'table' => 'cvterm',
-      'field' => 'definition',
-      'relationship' => 'none',
-    ),
-    'is_obsolete' => array(
-      'label' => 'Is Obsolete',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'link_class' => '',
-        'alt' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'type' => 'yes-no',
-      'not' => 0,
-      'exclude' => 0,
-      'id' => 'is_obsolete',
-      'table' => 'cvterm',
-      'field' => 'is_obsolete',
-      'relationship' => 'none',
-    ),
-    'is_relationshiptype' => array(
-      'label' => 'Is Relationship',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'link_class' => '',
-        'alt' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'type' => 'yes-no',
-      'not' => 0,
-      'exclude' => 0,
-      'id' => 'is_relationshiptype',
-      'table' => 'cvterm',
-      'field' => 'is_relationshiptype',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('sorts', array(
-    'name' => array(
-      'order' => 'ASC',
-      'id' => 'name',
-      'table' => 'cv',
-      'field' => 'name',
-      'relationship' => 'none',
-    ),
-    'name_1' => array(
-      'order' => 'ASC',
-      'id' => 'name_1',
-      'table' => 'cvterm',
-      'field' => 'name',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('filters', array(
-    'name' => array(
-      'operator' => '=',
-      'value' => array(),
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'name_op',
-        'identifier' => 'cv',
-        'label' => 'Vocabulary',
-        'remember' => 0,
-      ),
-      'case' => 1,
-      'id' => 'name',
-      'table' => 'cv',
-      'field' => 'name',
-      'relationship' => 'none',
-      'values_form_type' => 'select',
-      'multiple' => 1,
-      'optional' => 0,
-      'agg' => array(
-        'records_with' => 1,
-        'aggregates_with' => 1,
-      ),
-    ),
-    'name_1' => array(
-      'operator' => '~',
-      'value' => '',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => '',
-        'identifier' => 'name',
-        'label' => 'Name Contains',
-        'remember' => 0,
-      ),
-      'case' => 0,
-      'id' => 'name_1',
-      'table' => 'cvterm',
-      'field' => 'name',
-      'relationship' => 'none',
-      'values_form_type' => 'textfield',
-      'multiple' => 0,
-      'optional' => 0,
-      'show_all' => 0,
-      'agg' => array(
-        'records_with' => 1,
-        'aggregates_with' => 1,
-      ),
-    ),
-    'definition' => array(
-      'operator' => '~',
-      'value' => '',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'definition_op',
-        'identifier' => 'definition',
-        'label' => 'Definition Contains',
-        'remember' => 0,
-      ),
-      'case' => 0,
-      'id' => 'definition',
-      'table' => 'cvterm',
-      'field' => 'definition',
-      'relationship' => 'none',
-      'agg' => array(
-        'records_with' => 1,
-        'aggregates_with' => 0,
-      ),
-    ),
-    'search_results' => array(
-      'operator' => '=',
-      'value' => '',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
-        'operator' => FALSE,
-        'label' => '',
-      ),
-      'id' => 'search_results',
-      'table' => 'views',
-      'field' => 'search_results',
-      'relationship' => 'none',
-      'apply_button' => 'Show',
-      'no_results_text' => 'Click "Show" to see a list of all controlled vocabulary terms matching the entered criteria. If you leave a any of the criteria blank then the controlled vocabulary terms will be not be filtered based on that field. Furthermore, if you leave all criteria blank then all controlled vocabulary terms will be listed.',
-    ),
-  ));
-  $handler->override_option('access', array(
-    'type' => 'perm',
-    'perm' => 'access chado_cv content',
-  ));
-  $handler->override_option('cache', array(
-    'type' => 'none',
-  ));
-  $handler->override_option('title', 'Controlled Vocabulary Terms');
-  $handler->override_option('header', 'Click "Show" to see a list of all controlled vocabulary terms matching the entered criteria. If you leave a any of the criteria blank then the controlled vocabulary terms will be not be filtered based on that field. Furthermore, if you leave all criteria blank then all controlled vocabulary terms will be listed.');
-  $handler->override_option('header_format', '2');
-  $handler->override_option('header_empty', 0);
-  $handler->override_option('empty', 'There are no terms associated with the selected controlled vocabulary. Please select a different vocabulary from the list above.');
-  $handler->override_option('empty_format', '1');
-  $handler->override_option('items_per_page', 50);
-  $handler->override_option('use_pager', '1');
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
-    'grouping' => '',
-    'override' => 1,
-    'sticky' => 0,
-    'order' => 'asc',
-    'summary' => '',
-    'columns' => array(
-      'name_1' => 'name_1',
-      'name' => 'name',
-      'definition' => 'definition',
-      'is_obsolete' => 'is_obsolete',
-      'is_relationshiptype' => 'is_relationshiptype',
-    ),
-    'info' => array(
-      'name_1' => array(
-        'sortable' => 1,
-        'separator' => '',
-      ),
-      'name' => array(
-        'sortable' => 1,
-        'separator' => '',
-      ),
-      'definition' => array(
-        'sortable' => 0,
-        'separator' => '',
-      ),
-      'is_obsolete' => array(
-        'sortable' => 1,
-        'separator' => '',
-      ),
-      'is_relationshiptype' => array(
-        'sortable' => 1,
-        'separator' => '',
-      ),
-    ),
-    'default' => '-1',
-  ));
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('path', 'admin/tripal/tripal_cv/list_cvterms');
-  $handler->override_option('menu', array(
-    'type' => 'normal',
-    'title' => 'Term Listing',
-    'description' => 'A listing of a controlled vocabulary terms for a given vocabulary',
-    'weight' => '10',
-    'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
-    'type' => 'none',
-    'title' => '',
-    'description' => '',
-    'weight' => 0,
-    'name' => 'navigation',
-  ));
-  $views[$view->name] = $view;
-
-  // Main cv default listing
-  $view = new view;
-  $view->name = 'cv_listing';
-  $view->description = 'A listing of all controlled vocabularies';
-  $view->tag = 'chado default';
-  $view->base_table = 'cv';
-  $view->core = 6;
-  $view->api_version = '2';
-  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
-    'name' => array(
-      'label' => 'Name',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'absolute' => 0,
-        'link_class' => '',
-        'alt' => '',
-        'rel' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'type' => 'separator',
-      'separator' => ', ',
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'cv',
-      'field' => 'name',
-      'relationship' => 'none',
-    ),
-    'definition' => array(
-      'label' => 'Definition',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'absolute' => 0,
-        'link_class' => '',
-        'alt' => '',
-        'rel' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'type' => 'separator',
-      'separator' => ', ',
-      'exclude' => 0,
-      'id' => 'definition',
-      'table' => 'cv',
-      'field' => 'definition',
-      'relationship' => 'none',
-    ),
-    'nothing' => array(
-      'label' => 'Terms',
-      'alter' => array(
-        'text' => 'view',
-        'make_link' => 1,
-        'path' => 'admin/tripal/tripal_cv/list_cvterms?cv%5B%5D=[name]',
-        'absolute' => 0,
-        'link_class' => '',
-        'alt' => '',
-        'rel' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'target' => '',
-        'help' => '',
-        'trim' => 0,
-        'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
-      ),
-      'empty' => '',
-      'hide_empty' => 0,
-      'empty_zero' => 0,
-      'hide_alter_empty' => 1,
-      'exclude' => 0,
-      'id' => 'nothing',
-      'table' => 'views',
-      'field' => 'nothing',
-      'relationship' => 'none',
-    ),
-  ));
-  $handler->override_option('filters', array(
-    'name' => array(
-      'operator' => '~',
-      'value' => '',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'name_op',
-        'identifier' => 'name',
-        'label' => 'Name Contains',
-        'remember' => 0,
-      ),
-      'case' => 0,
-      'id' => 'name',
-      'table' => 'cv',
-      'field' => 'name',
-      'relationship' => 'none',
-      'values_form_type' => 'textfield',
-      'multiple' => 0,
-      'optional' => 0,
-      'agg' => array(
-        'records_with' => 1,
-        'aggregates_with' => 0,
-      ),
-    ),
-    'definition' => array(
-      'operator' => '~',
-      'value' => '',
-      'group' => '0',
-      'exposed' => TRUE,
-      'expose' => array(
-        'use_operator' => 0,
-        'operator' => 'definition_op',
-        'identifier' => 'definition',
-        'label' => 'Definition Contains',
-        'remember' => 0,
-      ),
-      'case' => 0,
-      'id' => 'definition',
-      'table' => 'cv',
-      'field' => 'definition',
-      'relationship' => 'none',
-      'agg' => array(
-        'records_with' => 1,
-        'aggregates_with' => 0,
-      ),
-    ),
-    'search_results' => array(
-      'operator' => '=',
-      'value' => '',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
-        'operator' => FALSE,
-        'label' => '',
-      ),
-      'id' => 'search_results',
-      'table' => 'views',
-      'field' => 'search_results',
-      'relationship' => 'none',
-      'apply_button' => 'Show',
-      'no_results_text' => 'Click "Show" to see a list of all controlled vocabularies matching the entered criteria. If you leave a any of the criteria blank then the controlled vocabularies will be not be filtered based on that field. Furthermore, if you leave all criteria blank then all controlled vocabularies will be listed.',
-    ),
-  ));
-  $handler->override_option('access', array(
-    'type' => 'perm',
-    'perm' => 'access chado_cv content',
-  ));
-  $handler->override_option('cache', array(
-    'type' => 'none',
-  ));
-  $handler->override_option('title', 'Controlled Vocabularies');
-  $handler->override_option('header', 'Click "Show" to see a list of all controlled vocabularies matching the entered criteria. If you leave a any of the criteria blank then the controlled vocabularies will be not be filtered based on that field. Furthermore, if you leave all criteria blank then all controlled vocabularies will be listed.');
-  $handler->override_option('header_format', '2');
-  $handler->override_option('header_empty', 0);
-  $handler->override_option('empty', 'No controlled vocabularies match the supplied criteria.');
-  $handler->override_option('empty_format', '2');
-  $handler->override_option('items_per_page', 50);
-  $handler->override_option('style_plugin', 'table');
-  $handler->override_option('style_options', array(
-    'grouping' => '',
-    'override' => 1,
-    'sticky' => 0,
-    'order' => 'asc',
-    'summary' => '',
-    'columns' => array(
-      'name' => 'name',
-      'definition' => 'definition',
-      'nothing' => 'nothing',
-    ),
-    'info' => array(
-      'name' => array(
-        'sortable' => 1,
-        'separator' => '',
-      ),
-      'definition' => array(
-        'sortable' => 0,
-        'separator' => '',
-      ),
-      'nothing' => array(
-        'separator' => '',
-      ),
-    ),
-    'default' => 'name',
-  ));
-  $handler = $view->new_display('page', 'Page', 'page_1');
-  $handler->override_option('path', 'admin/tripal/tripal_cv/list_cvs');
-  $handler->override_option('menu', array(
-    'type' => 'normal',
-    'title' => 'CV Listing',
-    'description' => 'A listing of all controlled vocabularies',
-    'weight' => '10',
-    'name' => 'navigation',
-  ));
-  $handler->override_option('tab_options', array(
-    'type' => 'none',
-    'title' => '',
-    'description' => '',
-    'weight' => 0,
-    'name' => 'navigation',
-  ));
-  $views[$view->name] = $view;
-
-  return $views;
-}

tripal_cv/tripal_cv.views_default.inc

@@ -0,0 +1,399 @@
+<?php
+/**
+ * Implements hook_views_default_views().
+ */
+function tripal_cv_views_default_views() {
+  $views = array();
+
+  // Default Tripal Admin View: Jobs
+  $view = tripal_cv_defaultview_admin_cvs_listing();
+  $views[$view->name] = $view;
+
+  // Default Tripal Admin View: Templates
+  $view = tripal_cv_defaultview_admin_cvterms_listing();
+  $views[$view->name] = $view;
+
+  return $views;
+}
+
+/**
+ * Default Admin View for cv management
+ */
+function tripal_cv_defaultview_admin_cvs_listing() {
+
+  $view = new view();
+  $view->name = 'tripal_cv_admin_cvs';
+  $view->description = 'A listing of all controlled vocabularies';
+  $view->tag = 'tripal admin';
+  $view->base_table = 'cv';
+  $view->human_name = 'CVs Admin';
+  $view->core = 6;
+  $view->api_version = '3.0';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+  /* Display: Defaults */
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->display->display_options['title'] = 'Controlled Vocabularies';
+  $handler->display->display_options['use_more_always'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'perm';
+  $handler->display->display_options['access']['perm'] = 'administer controlled vocabularies';
+  $handler->display->display_options['cache']['type'] = 'none';
+  $handler->display->display_options['query']['type'] = 'views_query';
+  $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '25';
+  $handler->display->display_options['pager']['options']['offset'] = '0';
+  $handler->display->display_options['pager']['options']['id'] = '0';
+  $handler->display->display_options['pager']['options']['quantity'] = '9';
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['grouping'] = '';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'name' => 'name',
+    'definition' => 'definition',
+    'nothing' => 'nothing',
+  );
+  $handler->display->display_options['style_options']['default'] = 'name';
+  $handler->display->display_options['style_options']['info'] = array(
+    'name' => array(
+      'sortable' => 1,
+      'separator' => '',
+    ),
+    'definition' => array(
+      'sortable' => 0,
+      'separator' => '',
+    ),
+    'nothing' => array(
+      'separator' => '',
+    ),
+  );
+  /* Header: Global: Text area */
+  $handler->display->display_options['header']['text']['id'] = 'text';
+  $handler->display->display_options['header']['text']['table'] = 'views';
+  $handler->display->display_options['header']['text']['field'] = 'area';
+  $handler->display->display_options['header']['text']['label'] = 'Add Cv';
+  $handler->display->display_options['header']['text']['empty'] = TRUE;
+  $handler->display->display_options['header']['text']['content'] = '<ul class="action-links">
+          <li><a href="tripal_cv/add_cv">Add Vocabulary</a></li>
+          <li><a href="tripal_cv/obo_loader">Load Ontology</a></li>
+     </ul>';
+  $handler->display->display_options['header']['text']['format'] = 'full_html';
+  /* No results behavior: Global: Text area */
+  $handler->display->display_options['empty']['text']['id'] = 'area';
+  $handler->display->display_options['empty']['text']['table'] = 'views';
+  $handler->display->display_options['empty']['text']['field'] = 'area';
+  $handler->display->display_options['empty']['text']['content'] = 'No controlled vocabularies match the supplied criteria.';
+  $handler->display->display_options['empty']['text']['format'] = '2';
+  /* Field: Chado Cv: Cv Id */
+  $handler->display->display_options['fields']['cv_id']['id'] = 'cv_id';
+  $handler->display->display_options['fields']['cv_id']['table'] = 'cv';
+  $handler->display->display_options['fields']['cv_id']['field'] = 'cv_id';
+  $handler->display->display_options['fields']['cv_id']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['cv_id']['separator'] = '';
+  /* Field: Chado Cv: Name */
+  $handler->display->display_options['fields']['name']['id'] = 'name';
+  $handler->display->display_options['fields']['name']['table'] = 'cv';
+  $handler->display->display_options['fields']['name']['field'] = 'name';
+  /* Field: Chado Cv: Definition */
+  $handler->display->display_options['fields']['definition']['id'] = 'definition';
+  $handler->display->display_options['fields']['definition']['table'] = 'cv';
+  $handler->display->display_options['fields']['definition']['field'] = 'definition';
+  /* Field: Global: Custom text */
+  $handler->display->display_options['fields']['nothing_1']['id'] = 'nothing_1';
+  $handler->display->display_options['fields']['nothing_1']['table'] = 'views';
+  $handler->display->display_options['fields']['nothing_1']['field'] = 'nothing';
+  $handler->display->display_options['fields']['nothing_1']['label'] = 'Edit Link';
+  $handler->display->display_options['fields']['nothing_1']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['nothing_1']['alter']['text'] = 'edit';
+  $handler->display->display_options['fields']['nothing_1']['alter']['make_link'] = TRUE;
+  $handler->display->display_options['fields']['nothing_1']['alter']['path'] = 'tripal_cv/edit_cv/[cv_id]';
+  /* Field: Global: Custom text */
+  $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['table'] = 'views';
+  $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['label'] = 'View Terms link';
+  $handler->display->display_options['fields']['nothing']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['nothing']['alter']['text'] = 'View Terms';
+  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = TRUE;
+  $handler->display->display_options['fields']['nothing']['alter']['path'] = 'admin/tripal/tripal_cv/list_cvterms?cv%5B%5D=[name]';
+  $handler->display->display_options['fields']['nothing']['hide_alter_empty'] = TRUE;
+  /* Field: Global: Custom text */
+  $handler->display->display_options['fields']['nothing_2']['id'] = 'nothing_2';
+  $handler->display->display_options['fields']['nothing_2']['table'] = 'views';
+  $handler->display->display_options['fields']['nothing_2']['field'] = 'nothing';
+  $handler->display->display_options['fields']['nothing_2']['label'] = '';
+  $handler->display->display_options['fields']['nothing_2']['alter']['text'] = '[nothing_1]<br />
+  [nothing]';
+  $handler->display->display_options['fields']['nothing_2']['element_class'] = 'short-column';
+  $handler->display->display_options['fields']['nothing_2']['element_label_class'] = 'short-column';
+  $handler->display->display_options['fields']['nothing_2']['element_label_colon'] = FALSE;
+  /* Sort criterion: Chado Cv: Name */
+  $handler->display->display_options['sorts']['name']['id'] = 'name';
+  $handler->display->display_options['sorts']['name']['table'] = 'cv';
+  $handler->display->display_options['sorts']['name']['field'] = 'name';
+  /* Filter criterion: Chado Cv: Name */
+  $handler->display->display_options['filters']['name']['id'] = 'name';
+  $handler->display->display_options['filters']['name']['table'] = 'cv';
+  $handler->display->display_options['filters']['name']['field'] = 'name';
+  $handler->display->display_options['filters']['name']['operator'] = 'contains';
+  $handler->display->display_options['filters']['name']['group'] = '0';
+  $handler->display->display_options['filters']['name']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op';
+  $handler->display->display_options['filters']['name']['expose']['label'] = 'Name Contains';
+  $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op';
+  $handler->display->display_options['filters']['name']['expose']['identifier'] = 'name';
+  $handler->display->display_options['filters']['name']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+  );
+  /* Filter criterion: Chado Cv: Definition */
+  $handler->display->display_options['filters']['definition']['id'] = 'definition';
+  $handler->display->display_options['filters']['definition']['table'] = 'cv';
+  $handler->display->display_options['filters']['definition']['field'] = 'definition';
+  $handler->display->display_options['filters']['definition']['operator'] = 'contains';
+  $handler->display->display_options['filters']['definition']['group'] = '0';
+  $handler->display->display_options['filters']['definition']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['definition']['expose']['operator_id'] = 'definition_op';
+  $handler->display->display_options['filters']['definition']['expose']['label'] = 'Definition Contains';
+  $handler->display->display_options['filters']['definition']['expose']['operator'] = 'definition_op';
+  $handler->display->display_options['filters']['definition']['expose']['identifier'] = 'definition';
+  $handler->display->display_options['filters']['definition']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+  );
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->display->display_options['path'] = 'admin/tripal/chado/tripal_cv/cvs';
+  $handler->display->display_options['menu']['type'] = 'default tab';
+  $handler->display->display_options['menu']['title'] = 'Vocabularies';
+  $handler->display->display_options['menu']['description'] = 'A listing of all controlled vocabularies';
+  $handler->display->display_options['menu']['weight'] = '-10';
+  $handler->display->display_options['menu']['name'] = 'management';
+  $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['menu']['context_only_inline'] = 0;
+  $handler->display->display_options['tab_options']['weight'] = '0';
+
+  return $view;
+}
+
+/**
+ * Default Admin View for cvterm management
+ */
+function tripal_cv_defaultview_admin_cvterms_listing() {
+
+  $view = new view();
+  $view->name = 'tripal_cv_admin_cvterms';
+  $view->description = 'A listing of all controlled vocabulary terms filtered by controlled vocabulary';
+  $view->tag = 'tripal admin';
+  $view->base_table = 'cvterm';
+  $view->human_name = 'CV Terms Admin';
+  $view->core = 0;
+  $view->api_version = '3.0';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+  /* Display: Defaults */
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->display->display_options['title'] = 'Controlled Vocabulary Terms';
+  $handler->display->display_options['use_more_always'] = FALSE;
+  $handler->display->display_options['access']['type'] = 'perm';
+  $handler->display->display_options['access']['perm'] = 'administer controlled vocabularies';
+  $handler->display->display_options['cache']['type'] = 'none';
+  $handler->display->display_options['query']['type'] = 'views_query';
+  $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '25';
+  $handler->display->display_options['pager']['options']['offset'] = '0';
+  $handler->display->display_options['pager']['options']['id'] = '0';
+  $handler->display->display_options['pager']['options']['quantity'] = '9';
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['grouping'] = '';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'name_1' => 'name_1',
+    'name' => 'name',
+    'definition' => 'definition',
+    'is_obsolete' => 'is_obsolete',
+    'is_relationshiptype' => 'is_relationshiptype',
+  );
+  $handler->display->display_options['style_options']['default'] = '-1';
+  $handler->display->display_options['style_options']['info'] = array(
+    'name_1' => array(
+      'sortable' => 1,
+      'separator' => '',
+    ),
+    'name' => array(
+      'sortable' => 1,
+      'separator' => '',
+    ),
+    'definition' => array(
+      'sortable' => 0,
+      'separator' => '',
+    ),
+    'is_obsolete' => array(
+      'sortable' => 1,
+      'separator' => '',
+    ),
+    'is_relationshiptype' => array(
+      'sortable' => 1,
+      'separator' => '',
+    ),
+  );
+  /* Header: Global: Text area */
+  $handler->display->display_options['header']['text']['id'] = 'text';
+  $handler->display->display_options['header']['text']['table'] = 'views';
+  $handler->display->display_options['header']['text']['field'] = 'area';
+  $handler->display->display_options['header']['text']['label'] = 'Add cvterm';
+  $handler->display->display_options['header']['text']['empty'] = TRUE;
+  $handler->display->display_options['header']['text']['content'] = '<ul class="action-links">
+        <li><a href="cvterm/add">Add Term</a></li>
+   </ul>';
+  $handler->display->display_options['header']['text']['format'] = 'full_html';
+  /* No results behavior: Global: Text area */
+  $handler->display->display_options['empty']['text']['id'] = 'area';
+  $handler->display->display_options['empty']['text']['table'] = 'views';
+  $handler->display->display_options['empty']['text']['field'] = 'area';
+  $handler->display->display_options['empty']['text']['content'] = 'There are no terms associated with the selected controlled vocabulary. Please select a different vocabulary from the list above.';
+  $handler->display->display_options['empty']['text']['format'] = '1';
+  /* Field: Chado Cv: Name */
+  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
+  $handler->display->display_options['fields']['name_1']['table'] = 'cv';
+  $handler->display->display_options['fields']['name_1']['field'] = 'name';
+  $handler->display->display_options['fields']['name_1']['label'] = 'Vocabulary';
+  $handler->display->display_options['fields']['name_1']['alter']['make_link'] = TRUE;
+  $handler->display->display_options['fields']['name_1']['alter']['path'] = 'cvs?name=[name_1]';
+  /* Field: Chado Cvterm: Cvterm Id */
+  $handler->display->display_options['fields']['cvterm_id']['id'] = 'cvterm_id';
+  $handler->display->display_options['fields']['cvterm_id']['table'] = 'cvterm';
+  $handler->display->display_options['fields']['cvterm_id']['field'] = 'cvterm_id';
+  $handler->display->display_options['fields']['cvterm_id']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['cvterm_id']['separator'] = '';
+  /* Field: Chado Cvterm: Name */
+  $handler->display->display_options['fields']['name']['id'] = 'name';
+  $handler->display->display_options['fields']['name']['table'] = 'cvterm';
+  $handler->display->display_options['fields']['name']['field'] = 'name';
+  /* Field: Chado Cvterm: Definition */
+  $handler->display->display_options['fields']['definition']['id'] = 'definition';
+  $handler->display->display_options['fields']['definition']['table'] = 'cvterm';
+  $handler->display->display_options['fields']['definition']['field'] = 'definition';
+  $handler->display->display_options['fields']['definition']['element_class'] = 'wide-column';
+  $handler->display->display_options['fields']['definition']['element_label_class'] = 'wide-column';
+  /* Field: Chado Cvterm: Is Obsolete */
+  $handler->display->display_options['fields']['is_obsolete']['id'] = 'is_obsolete';
+  $handler->display->display_options['fields']['is_obsolete']['table'] = 'cvterm';
+  $handler->display->display_options['fields']['is_obsolete']['field'] = 'is_obsolete';
+  $handler->display->display_options['fields']['is_obsolete']['label'] = 'Obsolete?';
+  $handler->display->display_options['fields']['is_obsolete']['alter']['alter_text'] = TRUE;
+  $handler->display->display_options['fields']['is_obsolete']['alter']['text'] = 'Yes';
+  $handler->display->display_options['fields']['is_obsolete']['element_class'] = 'short-column';
+  $handler->display->display_options['fields']['is_obsolete']['element_label_class'] = 'short-column';
+  $handler->display->display_options['fields']['is_obsolete']['empty'] = 'No';
+  $handler->display->display_options['fields']['is_obsolete']['empty_zero'] = TRUE;
+  $handler->display->display_options['fields']['is_obsolete']['separator'] = '';
+  /* Field: Chado Cvterm: Is Relationshiptype */
+  $handler->display->display_options['fields']['is_relationshiptype']['id'] = 'is_relationshiptype';
+  $handler->display->display_options['fields']['is_relationshiptype']['table'] = 'cvterm';
+  $handler->display->display_options['fields']['is_relationshiptype']['field'] = 'is_relationshiptype';
+  $handler->display->display_options['fields']['is_relationshiptype']['label'] = 'Relation-ship?';
+  $handler->display->display_options['fields']['is_relationshiptype']['alter']['alter_text'] = TRUE;
+  $handler->display->display_options['fields']['is_relationshiptype']['alter']['text'] = 'Yes';
+  $handler->display->display_options['fields']['is_relationshiptype']['element_class'] = 'short-column';
+  $handler->display->display_options['fields']['is_relationshiptype']['element_label_class'] = 'short-column';
+  $handler->display->display_options['fields']['is_relationshiptype']['empty'] = 'No';
+  $handler->display->display_options['fields']['is_relationshiptype']['empty_zero'] = TRUE;
+  $handler->display->display_options['fields']['is_relationshiptype']['separator'] = '';
+  /* Field: Global: Custom text */
+  $handler->display->display_options['fields']['nothing']['id'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['table'] = 'views';
+  $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
+  $handler->display->display_options['fields']['nothing']['label'] = 'Edit Link';
+  $handler->display->display_options['fields']['nothing']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['nothing']['alter']['text'] = 'edit';
+  $handler->display->display_options['fields']['nothing']['alter']['make_link'] = TRUE;
+  $handler->display->display_options['fields']['nothing']['alter']['path'] = 'admin/tripal/chado/tripal_cv/cvterm/edit/[cvterm_id]';
+  /* Field: Global: Custom text */
+  $handler->display->display_options['fields']['nothing_1']['id'] = 'nothing_1';
+  $handler->display->display_options['fields']['nothing_1']['table'] = 'views';
+  $handler->display->display_options['fields']['nothing_1']['field'] = 'nothing';
+  $handler->display->display_options['fields']['nothing_1']['label'] = '';
+  $handler->display->display_options['fields']['nothing_1']['alter']['text'] = '[nothing]';
+  $handler->display->display_options['fields']['nothing_1']['element_class'] = 'short-column';
+  $handler->display->display_options['fields']['nothing_1']['element_label_class'] = 'short-column';
+  $handler->display->display_options['fields']['nothing_1']['element_label_colon'] = FALSE;
+  /* Sort criterion: Chado Cv: Name */
+  $handler->display->display_options['sorts']['name']['id'] = 'name';
+  $handler->display->display_options['sorts']['name']['table'] = 'cv';
+  $handler->display->display_options['sorts']['name']['field'] = 'name';
+  /* Sort criterion: Chado Cvterm: Name */
+  $handler->display->display_options['sorts']['name_1']['id'] = 'name_1';
+  $handler->display->display_options['sorts']['name_1']['table'] = 'cvterm';
+  $handler->display->display_options['sorts']['name_1']['field'] = 'name';
+  /* Filter criterion: Chado Cv: Name */
+  $handler->display->display_options['filters']['name']['id'] = 'name';
+  $handler->display->display_options['filters']['name']['table'] = 'cv';
+  $handler->display->display_options['filters']['name']['field'] = 'name';
+  $handler->display->display_options['filters']['name']['value'] = 'All';
+  $handler->display->display_options['filters']['name']['group'] = '0';
+  $handler->display->display_options['filters']['name']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op';
+  $handler->display->display_options['filters']['name']['expose']['label'] = 'Vocabulary';
+  $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op';
+  $handler->display->display_options['filters']['name']['expose']['identifier'] = 'cv';
+  $handler->display->display_options['filters']['name']['expose']['values_form_type'] = 'select';
+  $handler->display->display_options['filters']['name']['expose']['select_multiple'] = FALSE;
+  $handler->display->display_options['filters']['name']['expose']['select_optional'] = TRUE;
+  $handler->display->display_options['filters']['name']['expose']['max_length'] = 40;
+  $handler->display->display_options['filters']['name']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+  );
+  /* Filter criterion: Chado Cvterm: Name */
+  $handler->display->display_options['filters']['name_1']['id'] = 'name_1';
+  $handler->display->display_options['filters']['name_1']['table'] = 'cvterm';
+  $handler->display->display_options['filters']['name_1']['field'] = 'name';
+  $handler->display->display_options['filters']['name_1']['operator'] = 'contains';
+  $handler->display->display_options['filters']['name_1']['group'] = '0';
+  $handler->display->display_options['filters']['name_1']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['name_1']['expose']['operator_id'] = '';
+  $handler->display->display_options['filters']['name_1']['expose']['label'] = 'Name Contains';
+  $handler->display->display_options['filters']['name_1']['expose']['identifier'] = 'name';
+  $handler->display->display_options['filters']['name']['expose']['values_form_type'] = 'textfield';
+  $handler->display->display_options['filters']['name']['expose']['select_multiple'] = FALSE;
+  $handler->display->display_options['filters']['name']['expose']['select_optional'] = FALSE;
+  $handler->display->display_options['filters']['name']['expose']['max_length'] = 40;
+  $handler->display->display_options['filters']['name_1']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+  );
+  /* Filter criterion: Chado Cvterm: Definition */
+  $handler->display->display_options['filters']['definition']['id'] = 'definition';
+  $handler->display->display_options['filters']['definition']['table'] = 'cvterm';
+  $handler->display->display_options['filters']['definition']['field'] = 'definition';
+  $handler->display->display_options['filters']['definition']['operator'] = 'contains';
+  $handler->display->display_options['filters']['definition']['group'] = '0';
+  $handler->display->display_options['filters']['definition']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['definition']['expose']['operator_id'] = 'definition_op';
+  $handler->display->display_options['filters']['definition']['expose']['label'] = 'Definition Contains';
+  $handler->display->display_options['filters']['definition']['expose']['operator'] = 'definition_op';
+  $handler->display->display_options['filters']['definition']['expose']['identifier'] = 'definition';
+  $handler->display->display_options['filters']['definition']['expose']['remember_roles'] = array(
+    2 => '2',
+    1 => 0,
+    3 => 0,
+  );
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->display->display_options['path'] = 'admin/tripal/chado/tripal_cv/cvterms';
+  $handler->display->display_options['menu']['type'] = 'tab';
+  $handler->display->display_options['menu']['title'] = 'Terms';
+  $handler->display->display_options['menu']['description'] = 'A listing of a controlled vocabulary terms for a given vocabulary';
+  $handler->display->display_options['menu']['weight'] = '-8';
+  $handler->display->display_options['menu']['name'] = 'management';
+  $handler->display->display_options['menu']['context'] = 0;
+  $handler->display->display_options['menu']['context_only_inline'] = 0;
+
+  return $view;
+}

tripal_db/includes/tripal_db.admin.inc

@@ -16,8 +16,8 @@ function tripal_db_admin_db_listing() {
   drupal_set_breadcrumb($breadcrumb);
 
   // Add the view
-  $dbs_view = views_embed_view('db_admin','default');
-  $dbxrefs_view = views_embed_view('db_reference_admin','default');
+  $dbs_view = views_embed_view('tripal_db_admin_dbs','default');
+  $dbxrefs_view = views_embed_view('tripal_db_admin_dbxrefs','default');
   if (isset($dbs_view) && isset($dbxrefs_view)) {
     $output .= $dbs_view;
   }

tripal_db/tripal_db.module

@@ -63,6 +63,20 @@ function tripal_db_menu() {
     'type' => MENU_CALLBACK,
   );
 
+  $items['admin/tripal/chado/tripal_db/views/dbs/enable'] = array(
+    'title' => 'Enable Database Administrative View',
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_db_admin_dbs', 'admin/tripal/chado/tripal_db'),
+    'access arguments' => array('administer controlled vocabularies'),
+    'type' => MENU_CALLBACK,
+  );
+  $items['admin/tripal/chado/tripal_db/views/dbxrefs/enable'] = array(
+    'title' => 'Enable Reference Administrative View',
+    'page callback' => 'tripal_views_admin_enable_view',
+    'page arguments' => array('tripal_db_admin_dbxrefs', 'admin/tripal/chado/tripal_db'),
+    'access arguments' => array('administer controlled vocabularies'),
+    'type' => MENU_CALLBACK,
+  );
 
   return $items;
 }

tripal_db/tripal_db.views_default.inc

@@ -22,7 +22,7 @@ function tripal_db_views_default_views() {
 function tripal_db_defaultview_admin_db_listing() {
 
   $view = new view();
-  $view->name = 'db_admin';
+  $view->name = 'tripal_db_admin_dbs';
   $view->description = 'A listing of all databases.';
   $view->tag = 'tripal admin';
   $view->base_table = 'db';
@@ -200,7 +200,7 @@ function tripal_db_defaultview_admin_db_listing() {
 function tripal_db_defaultview_admin_dbxref_listing() {
 
   $view = new view();
-  $view->name = 'db_reference_admin';
+  $view->name = 'tripal_db_admin_dbxrefs';
   $view->description = '';
   $view->tag = 'tripal admin';
   $view->base_table = 'dbxref';

tripal_views/api/tripal_views.api.inc

@@ -157,6 +157,54 @@ function tripal_views_is_lightest_priority_setup($setup_id, $table_name) {
 
 }
 
+/**
+ * Programatically enable view
+ *
+ * @param $view_name
+ *   The machine-name of the view to be enabled
+ * @param $redirect_link
+ *   The path to redirect to. FALSE if no redirect needed
+ */
+function tripal_views_admin_enable_view($view_name, $redirect_link = FALSE) {
+
+  $status = variable_get('views_defaults', array());
+  if (isset($status[$view_name])) {
+    $status[$view_name] = FALSE;
+    variable_set('views_defaults', $status);
+    drupal_set_message("Successfully Enabled $view_name");
+  }
+  else {
+    drupal_set_message("Unable to find a view by the name of '$view_name'. Unable to enable this view.",'error');
+  }
+  if ($redirect_link) {
+    drupal_goto($redirect_link);
+  }
+}
+
+/**
+ * Programatically disable view
+ *
+ * @param $view_name
+ *   The machine-name of the view to be enabled
+ * @param $redirect_link
+ *   The path to redirect to. FALSE if no redirect needed
+ */
+function tripal_views_admin_disable_view($view_name, $redirect_link = FALSE) {
+
+  $status = variable_get('views_defaults', array());
+  if (isset($status[$view_name])) {
+    $status[$view_name] = TRUE;
+    variable_set('views_defaults', $status);
+    drupal_set_message("Disabled $view_name");
+  }
+  else {
+    drupal_set_message("Unable to find a view by the name of '$view_name'. Unable to disable this view.",'error');
+  }
+  if ($redirect_link) {
+    drupal_goto($redirect_link);
+  }
+}
+
 /**
  * Purpose: Deletes ALL Tripal Views Integrations.
  */

tripal_views/theme/tripal_views_admin_views.css

@@ -3,6 +3,9 @@
  * CSS rules to theme tripal admin listings
  */
 
+/**
+ * Exposed Form Theme-ing
+ */
 .views-exposed-form {
   border: 1px solid #ccc;
   padding: 15px;
@@ -13,7 +16,7 @@
 .views-exposed-form .views-exposed-widget {
   float: none;
   display: block;
-  width: 450px;
+  width: 540px;
 }
 
 .views-exposed-widget .views-widget {
@@ -28,11 +31,11 @@
 }
 
 .views-exposed-widget .views-widget input[type="text"] {
-  width: 200px;
+  width: 250px;
 }
 
-.views-exposed-widget .views-widget input[type="select"] {
-  width: 200px;
+.views-exposed-widget .views-widget select {
+  width: 255px;
 }
 
 .views-exposed-widget label {
@@ -47,6 +50,29 @@
 
 .views-exposed-form .views-submit-button {
   position:absolute;
-  left:475px;
+  left:550px;
   top: 0px;
 }
+
+/**
+ * Table Theme-ing
+ */
+table.views-table {
+  table-layout: fixed;
+  width: 100%
+}
+
+th.views-field {
+  max-width: 33%;
+  word-wrap: break-word;
+}
+
+td.views-field.short-column, th.views-field.short-column {
+  width: 75px;
+  word-wrap: break-word;
+}
+
+td.views-field.wide-column, th.views-field.wide-column {
+  width: 45%;
+  word-wrap: break-word;
+}