submit functionality to save the input data and new handler fields

base/tripal_views_integration/README.patches.txt

@@ -6,7 +6,7 @@ Submit issue reported and solved here:
 http://drupal.org/node/1231140
 The original patch location:
 http://drupal.org/files/issues/1231140.ahah_helper.form-submit-handler.patch
-The patch file alexg used:
+The patch file alexgl used:
 patches/1231140.ahah_helper.form-submit-handler.patch
 Usage:
 1. Find the global or local path to this module and substitue in the command below for*path_to_tripal_views_integration*

base/tripal_views_integration/includes/tripal_views_integration.admin.inc

@@ -2,7 +2,7 @@
 /**
  * Purpose: Provide Guidance to new Tripal Admin
  *
- * @return 
+ * @return
  *   HTML Formatted text
  *
  * @ingroup tripal_views_integration
@@ -14,7 +14,7 @@ function tripal_views_integration_module_description_page() {
              <li><a href=\"".url("admin/tripal/tripal_views_integration/list") . "\">List of integrated views</a></li>
              <li><a href=\"".url("admin/tripal/tripal_views_integration/new"). "\">Setup integration of a materialized view</a></li>
            </ul>";
-#             <li><a href=\"".url("admin/tripal/tripal_feature/aggregate"). "\">Feature Relationship Aggegators</a></li> 
+  #             <li><a href=\"".url("admin/tripal/tripal_feature/aggregate"). "\">Feature Relationship Aggegators</a></li>
 
   $text .= '<h3>Module Description:</h3>';
   $text .= '<p>This module provides an interface for integrating <a href="http://drupal.org/project/views">Drupal Views</a>
@@ -43,23 +43,23 @@ function tripal_views_integration_module_description_page() {
                <li><b>Setup the Views Integration</b>: Navigate to the <a href=\"".url("admin/tripal/tripal_views_integration/new") . "\">
                  Tripal views integration setup page</a> to integrate the selected materialized view.  Provide a  user friendly name
                  and description to help you remember the purpose for integrating the view.  Next, select the view you want to integrate
-                 from the provided select box.  If your materialized view has fields that can join with other Chado tables, you may 
+                 from the provided select box.  If your materialized view has fields that can join with other Chado tables, you may
                  provide those relationships in the provided form.  Finally, if your fields require a special handler for display, you
                  may select it from the drop down provided</li>
                <li><b>Create custom pages/block/search form</b>:  After saving setup information from step 2 above, you will be redirected to the
                  Drupal Views interface</a> where you can create a custom page, block or search form.</li>
-               <li><b>Review your integrated views</b>:  A page providing a  
+               <li><b>Review your integrated views</b>:  A page providing a
                  <a href=\"".url("admin/tripal/tripal_views_integration/list") . "\">list of all integrated views</a> is provided. You may
                  view this page to see all integrated views, but also to remove any unwanted integrations.</li>
             </ol>
          
-            </p>";  
+            </p>";
   $text .= '<h3>Features of this Module:</h3>';
   $text .= '<p>This module provides the following functionality
             <ul>
               <li>A dynamic form for integration of an existing materialized view with Drupal Views.  This form allows the site
                   administrator to select an existing view and indicate Chado tables on which the fields may join.</li>
-            </ul> 
+            </ul>
             
             </p>';
   return $text;
@@ -70,50 +70,50 @@ function tripal_views_integration_module_description_page() {
  */
 function tripal_views_integration_admin_form(){
 
-   $form = array();
+  $form = array();
 
-   $form['#theme'] = 'tripal';
+  $form['#theme'] = 'tripal';
 
-   $query_results = db_query('SELECT * FROM public.tripal_views_integration;');
+  $query_results = db_query('SELECT * FROM public.tripal_views_integration;');
 
-   $header = array('Setup ID', 'Name', 'Materialized View ID', 'Base Table Name', 'Description');
-   $rows = array();
+  $header = array('Setup ID', 'Name', 'Materialized View ID', 'Base Table Name', 'Description');
+  $rows = array();
 
-   $results = array();
-   while($result = db_fetch_object($query_results)){
-      $rows[] = array($result->setup_id, $result->name, $result->mview_id, $result->base_table_name, $result->description,);
-      $results[] = $result;
-   }
+  $results = array();
+  while($result = db_fetch_object($query_results)){
+    $rows[] = array($result->setup_id, $result->name, $result->mview_id, $result->base_table_name, $result->description,);
+    $results[] = $result;
+  }
 
-   $options = array();
-   foreach ($results as $key => $value) {
-      if(!empty($value))
-      $options[] = $value->setup_id;// . ' | ' . $value->name . ' | ' . $value->mview_id . ' | ' . $value->base_table_name;
-   }
+  $options = array();
+  foreach ($results as $key => $value) {
+    if(!empty($value))
+    $options[] = $value->setup_id;// . ' | ' . $value->name . ' | ' . $value->mview_id . ' | ' . $value->base_table_name;
+  }
 
-   $form['existing_rows'] = array(
+  $form['existing_rows'] = array(
     '#type' => 'select',
     '#options' => $options,
     '#description' => '<strong>Select a View Setup to delete from the database.</strong>',
     '#prefix' => theme('table', $header, $rows),
-   );
+  );
 
-   $form['submit'] = array(
+  $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Remove'),
-   );
+  );
 
-   $form['cancel'] = array(
+  $form['cancel'] = array(
     '#type' => 'markup',
     '#value' => l(t('Cancel '), 'admin/tripal/'),
-   );
+  );
 
-   $form['new'] = array(
+  $form['new'] = array(
     '#type' => 'markup',
     '#value' => l(t(' New'), 'admin/tripal/tripal_views_integration/new'),
-   );
+  );
 
-   return $form;
+  return $form;
 }
 
 /**
@@ -121,10 +121,10 @@ function tripal_views_integration_admin_form(){
  * @ingroup tripal_views_integration
  */
 function tripal_views_integration_admin_form_submit($form, &$form_state){
-   $value = $form['existing_rows']['#options'][$form_state['values']['existing_rows']];
-   db_query("DELETE FROM public.tripal_views_integration WHERE setup_id = $value;");
-   db_query("DELETE FROM public.tripal_views_handlers WHERE setup_id = $value;");
-   db_query("DELETE FROM public.tripal_mviews_join WHERE setup_id = $value;");
+  $value = $form['existing_rows']['#options'][$form_state['values']['existing_rows']];
+  db_query("DELETE FROM public.tripal_views_integration WHERE setup_id = $value;");
+  db_query("DELETE FROM public.tripal_views_handlers WHERE setup_id = $value;");
+  db_query("DELETE FROM public.tripal_mviews_join WHERE setup_id = $value;");
 }
 /**
  *
@@ -132,183 +132,258 @@ function tripal_views_integration_admin_form_submit($form, &$form_state){
  */
 
 function tripal_views_integration_new_setup_form(&$form_state){
-   $form = array();
 
-   $form['#cache'] = TRUE;
+  $form = array();
 
-   //ahah_helper requires this to register the form with it's module
-   ahah_helper_register($form, $form_state);
+  $data = array();
 
-   // field for the name of the 
-   $form['row_name'] = array(
+  $form['#cache'] = TRUE;
+
+  //ahah_helper requires this to register the form with it's module
+  ahah_helper_register($form, $form_state);
+
+  // field for the name of the
+  $form['row_name'] = array(
     '#title' => t('Name'),
     '#type' => 'textfield',
     '#size' => 60,
     '#maxlength' => 128,
     '#description' => 'Name of the Views Setup',
     '#required' => TRUE,
-   );
+  );
 
-   $form['row_description'] = array(
+  $form['row_description'] = array(
     '#title' => t('Description'),
     '#type' => 'textfield',
     '#size' => 60,
     '#maxlength' => 255,
     '#description' => 'Briefly describe in which view this will be used',
     '#required' => TRUE,
-   );
-
-   $mview_query = db_query("SELECT mview_id,name FROM {tripal_mviews} ORDER BY name;");
-   $mview_options = array();
-   $mview_options['0'] = 'Select';
-   while ($mview_option = db_fetch_array($mview_query)){
-      $mview_options[$mview_option['mview_id']] = $mview_option['name'];
-   }
-
-   $form['mview_id'] = array(
-      '#title' => t('Materialized View'),
-      '#type' => 'select',
-      '#options' => $mview_options,
-      '#description' => 'Which materialized view to use.',
-      '#required' => TRUE,
-      '#default_value' => $mview_default_value,
-      '#ahah' => array(
-         'path' => ahah_helper_path(array('view_setup_table')),
-         'wrapper' => 'table-rows-div',
-         'effect' => 'fade',
-         'event' => 'change',
-         'method' => 'replace',
-      ),
-   );
-
-   // ignore this for now... we'll come back to it later -- spf
-   //   $form['row_base_table_name'] = array(
-   //      '#title' => t('Base Table Name'),
-   //      '#type' => 'select',
-   //      // '#options' => array('stub'),
-   //      '#options' => tripal_core_get_chado_tables(),
-   //      '#description' => 'Select which chado table to use for this view.',
-   //      '#required' => TRUE,
-   //   );
-
-   $form['view_setup_table'] = array(
+  );
+
+  $mview_query = db_query("SELECT mview_id,name FROM {tripal_mviews} ORDER BY name;");
+  $mview_options = array();
+  $mview_options['0'] = 'Select';
+  while ($mview_option = db_fetch_array($mview_query)){
+    $mview_options[$mview_option['mview_id']] = $mview_option['name'];
+  }
+
+  $form['mview_id'] = array(
+    '#title' => t('Materialized View'),
+    '#type' => 'select',
+    '#options' => $mview_options,
+    '#description' => 'Which materialized view to use.',
+    '#required' => TRUE,
+    '#default_value' => $mview_default_value,
+    '#ahah' => array(
+       'path' => ahah_helper_path(array('view_setup_table')),
+       'wrapper' => 'table-rows-div',
+       'effect' => 'fade',
+       'event' => 'change',
+       'method' => 'replace',
+  ),
+  );
+
+  // ignore this for now... we'll come back to it later -- spf
+  //   $form['row_base_table_name'] = array(
+  //      '#title' => t('Base Table Name'),
+  //      '#type' => 'select',
+  //      // '#options' => array('stub'),
+  //      '#options' => tripal_core_get_chado_tables(),
+  //      '#description' => 'Select which chado table to use for this view.',
+  //      '#required' => TRUE,
+  //   );
+
+  $form['view_setup_table'] = array(
      '#type' => 'item',
        '#prefix' => '<div id="table-rows-div">',
        '#suffix' => '</div>',
-   );
+  );
 
 
-   if ($form_state['storage']['mview_id']){
+  if ($form_state['storage']['mview_id']){
 
-      $mview_id = $form_state['storage']['mview_id'];
+    $mview_id = $form_state['storage']['mview_id'];
 
-      $form['view_setup_table'] = array(
-         '#type' => 'fieldset',
-         '#title' => 'Join Selection',
-         '#prefix' => '<div id="fieldset-table-rows-wrapper">',
-         '#suffix' => '</div>',
-      );
+    $form['view_setup_table'] = array(
+     '#type' => 'fieldset',
+     '#title' => 'Join Selection',
+     '#prefix' => '<div id="fieldset-table-rows-wrapper">',
+     '#suffix' => '</div>',
+    );
 
-      // get the columns in this materialized view.  They are separated by commas
-      // where the first word is the column name and the rest is the type
-      $sql = "SELECT mv_specs FROM {tripal_mviews} WHERE mview_id = $mview_id";
-      $mview = db_fetch_object(db_query($sql));
-      $columns = explode(",",$mview->mv_specs);
+    // get the columns in this materialized view.  They are separated by commas
+    // where the first word is the column name and the rest is the type
+    $sql = "SELECT mv_specs FROM {tripal_mviews} WHERE mview_id = $mview_id";
+    $mview = db_fetch_object(db_query($sql));
+    $columns = explode(",",$mview->mv_specs);
 
-      $i=1;
-      $chado_tables = tripal_core_get_chado_tables();
-      $chado_tables = array_merge(array('',), $chado_tables);
+    $i=1;
+    $chado_tables = tripal_core_get_chado_tables();
+    $chado_tables = array_merge(array('',), $chado_tables);
 
-      $handlers = array();
-      $form['view_setup_table']["instructions"] = array(
+    $handlers_filters = array('', 'hello' , 'world');
+    $handlers_fields = array('', 'foo', 'bar');
+    $form['view_setup_table']["instructions"] = array(
          '#type' => 'markup',
          '#value' => "Select an optional table to which the fields of the materialized view can join.  If a field does not need to join you may leave the selection blank.",
-      );
-      $form['view_setup_table']["fields_headers"] = array(
+    );
+    $form['view_setup_table']["fields_headers"] = array(
          '#type' => 'markup',
          '#value' => "<div class=\"field-headers\">".
               "<div class=\"column-id\">Field Name and Type</div>".
               "<div class=\"fields-column-join\">Join Table</div>".
               "<div class=\"fields-column-join-column\">Join Column</div>".
-              "<div class=\"fields-column-handler\">Handler</div></div>",
-      );
+              "<div class=\"fields-column-handler-filter\">Handler: Filter</div></div>".
+    					"<div class=\"fields-column-handler-field\">Handler: Field</div></div>",
+    );
+
+    $data['field_types'] = array();
 
-      foreach ($columns as $column){
-         $column = trim($column);  // trim trailing and leading spaces
-         preg_match("/^(.*?)\ (.*?)$/",$column,$matches);
-         $column_name = $matches[1];
-         $column_type = $matches[2];
+    foreach ($columns as $column){
+      $column = trim($column);  // trim trailing and leading spaces
+      preg_match("/^(.*?)\ (.*?)$/",$column,$matches);
+      $column_name = $matches[1];
+      $column_type = $matches[2];
 
-         $form['view_setup_table']["fields_start_$mview_id-$i"] = array(
+      $form['view_setup_table']["fields_start_$mview_id-$i"] = array(
            '#type' => 'markup',
            '#value' => "<div class=\"fields-new-row\">",
-         );
+      );
 
-         $form['view_setup_table']["fields_name_$mview_id-$i"] = array(
-           '#type' => 'markup',
-           '#attributes' => array('class' => 'fields-column-name'),
-           '#value' => "<div class=\"column-id\"><span class=\"column-name\">$column_name</span>".
-                       "<br><span class=\"column-type\">$column_type</span></div>",
-         );
-
-         $table = $form_state['storage']["fields_join_$mview_id-$i"];
-         $form['view_setup_table']["fields_join_$mview_id-$i"] = array(
-            '#type' => 'select',
-            '#prefix' => "<div class=\"fields-column-join\">",
-            '#suffix' => "</div>",
-            '#options' => $chado_tables,
-            '#required' => FALSE,
-            '#default_value' => $table,
-            '#ahah' => array(
-               'path' => ahah_helper_path(array('view_setup_table',"fields_join_column_$mview_id-$i")),
-               'wrapper' => "fields-column-join-column-$mview_id-$i",
-               'effect' => 'fade',
-               'event' => 'change',
-               'method' => 'replace',
-            ),
-         );
-         if($table){
-            $table_desc = module_invoke_all('chado_'.$table.'_schema');
-            $columns = array_keys($table_desc['fields']);
-         } else {
-            $columns = array();
-         }
-         $form['view_setup_table']["fields_join_column_$mview_id-$i"] = array(
-            '#type' => 'select',
-            '#prefix' => "<div id=\"fields-column-join-column-$mview_id-$i\" class=\"fields-column-join-column\">",
-            '#suffix' => "</div>",
-            '#options' => $columns,
-            '#required' => FALSE,
-         );
-         $form['view_setup_table']["fields_handler_$mview_id-$i"] = array(
-            '#type' => 'select',
-            '#prefix' => "<div class=\"fields-column-handler\">",
-            '#suffix' => "</div>",
-            '#options' => $handlers,
-            '#required' => FALSE,
-         );
-         $form['view_setup_table']["fields_end_$i"] = array(
-            '#type' => 'markup',
-            '#value' => "</div>",
-         );
-         $i++;
+      $form['view_setup_table']["fields_name_$mview_id-$i"] = array(
+        '#type' => 'markup',
+        '#attributes' => array('class' => 'fields-column-name'),
+        '#value' => "<div class=\"column-id\"><span class=\"column-name\">$column_name</span>".
+                   "<br><span class=\"column-type\">$column_type</span></div>",
+      );
+
+      $data['field_types'][$column_name] = $column_type;
+
+      $table = $form_state['storage']["fields_join_$mview_id-$i"];
+      $form['view_setup_table']["fields_join_$mview_id-$i"] = array(
+        '#type' => 'select',
+        '#prefix' => "<div class=\"fields-column-join\">",
+        '#suffix' => "</div>",
+        '#options' => $chado_tables,
+        '#required' => FALSE,
+        '#default_value' => $table,
+        '#ahah' => array(
+           'path' => ahah_helper_path(array('view_setup_table',"fields_join_column_$mview_id-$i")),
+           'wrapper' => "fields-column-join-column-$mview_id-$i",
+           'effect' => 'fade',
+           'event' => 'change',
+           'method' => 'replace',
+      ),
+      );
+      if($table){
+        $table_desc = module_invoke_all('chado_'.$table.'_schema');
+        $columns = array_keys($table_desc['fields']);
+      } else {
+        $columns = array();
       }
-   }
-   
-   $form['save'] = array(
-           '#type'  => 'submit',
-           '#value' => t('Save'),
-   );
-
-   return $form;
+      $form['view_setup_table']["fields_join_column_$mview_id-$i"] = array(
+        '#type' => 'select',
+        '#prefix' => "<div id=\"fields-column-join-column-$mview_id-$i\" class=\"fields-column-join-column\">",
+        '#suffix' => "</div>",
+        '#options' => $columns,
+        '#required' => FALSE,
+      );
+      
+      $form['view_setup_table']["fields_handler_filter_$mview_id-$i"] = array(
+        '#type' => 'select',
+        '#prefix' => "<div class=\"fields-column-handler-filter\">",
+        '#suffix' => "</div>",
+        '#options' => $handlers_filters,
+        '#required' => FALSE,
+      );
+      
+      $form['view_setup_table']["fields_handler_field_$mview_id-$i"] = array(
+              '#type' => 'select',
+              '#prefix' => "<div class=\"fields-column-handler-field\">",
+              '#suffix' => "</div>",
+              '#options' => $handlers_fields,
+              '#required' => FALSE,
+      );
+      
+      $form['view_setup_table']["fields_end_$i"] = array(
+        '#type' => 'markup',
+        '#value' => "</div>",
+      );
+      $i++;
+    }
+    $data['row_count'] = $i - 1;
+  }
+
+
+
+  //use this to put values into $form_state['values']
+  $form['data'] = array();
+
+  //need to find out if storing $form['data'][$key]['#value'] = $value <- is an issue
+  //since it will give me errors if i try to stare an array instead of $value
+  //and yet $value can be an array ie "field_types"
+  foreach ($data as $key => $value) {
+    $form['data'][$key] = array(
+    	'#type' => 'hidden',
+    	'#value' => $value,
+    );
+  }
+
+
+  $form['save'] = array(
+  	'#type'  => 'submit',
+  	'#value' => t('Save'),
+  );
+
+
+  return $form;
 }
 
 
+/**
+ *
+ * @ingroup tripal_views_integration
+ */
+function tripal_views_integration_new_setup_form_validate($form, &$form_state){
+  //TODO: write validation function for this new form
+}
 /**
  *
  * @ingroup tripal_views_integration
  */
 function tripal_views_integration_new_setup_form_submit($form, &$form_state){
+  $name = $form_state['values']['row_name'];
+  $mview_id = $form_state['values']['mview_id'];
+  $tripal_views_integration_record = array(
+    'mview_id' => $mview_id,
+    'name' => $name,
+  	'description' => $form_state['values']['row_description'],
+  );
+
+  drupal_write_record('tripal_views_integration', $tripal_views_integration_record);
+
+  $i = 1;
+  foreach ($form_state['values']['field_types'] as $key => $value){
+    $mview_join_record = array(
+        'setup_id' => $tripal_views_integration_record['setup_id'],
+        'view_table' => $name,
+        'view_column' => $key,
+        'chado_table_join' => $form_state['values']["fields_join_$mview_id-$i"],
+        'chado_column' => $form['view_setup_table']["fields_join_column_$mview_id-$i"]['#options'][$form_state['values']["fields_join_column_$mview_id-$i"]],
+    );
+    drupal_write_record('tripal_mviews_join', $mview_join_record);
+    
+    $handlers_record = array(
+      'setup_id' => $tripal_views_integration_record['setup_id'],
+      'column_name' => $key,//TODO: should we change this to an mview_join_id from tripal_view_join?
+      'handler_filter' => $form['view_setup_table']["fields_handler_filter_$mview_id-$i"]['#options'][$form_state['values']["fields_handler_filter_$mview_id-$i"]],
+    	'handler_field' => $form['view_setup_table']["fields_handler_field_$mview_id-$i"]['#options'][$form_state['values']["fields_handler_field_$mview_id-$i"]],
+    );
+    drupal_write_record('tripal_views_handlers', $handlers_record);
+    
+    $i++;
+  }
 
 }
 

base/tripal_views_integration/tripal_views_integration.install

@@ -15,7 +15,7 @@ function tripal_views_integration_schema(){
 				'type' => 'int',
 				'unsigned' => TRUE,
 			),
-			'base_table_name' => array(
+			'chado_table_name' => array(
 				'description' => 'the base table name to be used when using this setup',
 				'type' => 'varchar',
 				'length' => 255,
@@ -45,38 +45,64 @@ function tripal_views_integration_schema(){
 	$schema['tripal_mviews_join'] = array(
 		'description' => 'which materialzed views and chado tables to join in a given setup',
 		'fields' => array(
+		  'mview_join_id' => array(
+				'description' => 'the id of the join',
+					'type' => 'serial',
+					'unsigned' => TRUE,
+					'not null' => TRUE,
+		  ),
 			'setup_id' => array(
 				'description' => 'tripal setup id from tripal_views_integration table',
-				'type' => 'serial',
+				'type' => 'int',
 				'unsigned' => TRUE,
 				'not null'=> TRUE,
 			),
+			'view_table' => array(
+					'description' => 'materialized view table name',
+					'type' => 'varchar',
+					'length' => '255',
+					'not null' => TRUE,
+					'default' => '',
+	    ),
 			'view_column' => array(
-				'description' => 'materialized view name and column',
+				'description' => 'column of materialized view table (mview_table)',
 				'type' => 'varchar',
 				'length' => '255',
 				'not null' => TRUE,
 				'default' => '',
 			),
-			'chado_column' => array(
-				'description' => 'which chado table and column is to be linked up to materialized view in this serach',
+			'chado_table_join' => array(
+				'description' => 'on which chado table to join to materialized view in this serach',
 				'type' => 'varchar',
 				'length' => '255',
 				'not null' => TRUE,
 				'default' => '',
 			),
+			'chado_column' => array(
+				'description' => 'chado table (above) column to join on materialized view in this serach',
+				'type' => 'varchar',
+				'length' => '255',
+				'not null' => TRUE,
+				'default' => '',
+	    ),
 		),
 		'unique_keys' => array(
-			'setup_id' => array('setup_id'),
+			'setup_id' => array('mview_join_id'),
 		),
-		'primary key' => array('setup_id'),
+		'primary key' => array('mview_join_id'),
 	);
 	$schema['tripal_views_handlers'] = array(
 		'description' => 'in formation for views: column and views handler name',
 		'fields' => array(
+			'handler_id' => array(
+				'description' => 'the id of the handler',
+					'type' => 'serial',
+					'unsigned' => TRUE,
+					'not null' => TRUE,
+	    ),
 			'setup_id' => array(
 				'description' => 'which setup this is used by from tripal_views_integration table',
-					'type' => 'serial',
+					'type' => 'int',
 					'unsigned' => TRUE,
 					'not null'=> TRUE,
 			),
@@ -87,14 +113,25 @@ function tripal_views_integration_schema(){
 				'not null' => TRUE,
 				'default' => '',
 			),
-			'handler_name' => array(
-				'description' => 'name of the views handler to be used for this particular setup',
+			'handler_filter' => array(
+				'description' => 'identifier of the handler filter to be used for this column',
 				'type' => 'varchar',
 				'length' => '255',
 				'not null' => TRUE,
 				'default' => '',
 			),
-		), 
+			'handler_field' => array(
+				'description' => 'identifier of the handler field to be used for this column',
+				'type' => 'varchar',
+				'length' => '255',
+				'not null' => TRUE,
+				'default' => '',
+	    ),
+		),
+		'unique_keys' => array(
+				'setup_id' => array('handler_id'),
+	  ),
+		'primary key' => array('handler_id'),
 	);
 	return $schema;
 }

base/tripal_views_integration/tripal_views_integration_fields_form.tpl.php

@@ -9,13 +9,13 @@
 #tripal-views-integration-new-setup-form .form-item {
    margin: 0px 0px 5px 0px;
 }
-#tripal-views-integration-new-setup-form .column-id,.fields-column-join,.fields-column-join-column, .fields-column-handler {
+#tripal-views-integration-new-setup-form .column-id,.fields-column-join,.fields-column-join-column, .fields-column-handler-filter, .fields-column-handler-field {
    display: inline-block;
    margin: 0px;
    vertical-align: top;
 }
 #tripal-views-integration-new-setup-form  .field-headers {
-   font-weight: bold;  
+   font-weight: bold;
 }
 #tripal-views-integration-new-setup-form  .field-headers div {
    display: inline-block;
@@ -26,19 +26,22 @@
 
 }
 #tripal-views-integration-new-setup-form .column-type {
-   font-style: italic;  
+   font-style: italic;
 }
 #tripal-views-integration-new-setup-form .column-id {
-   width: 25%;
+   width: 20%;
 }
 #tripal-views-integration-new-setup-form .fields-column-join {
-   width: 25%;
+   width: 20%;
 }
 #tripal-views-integration-new-setup-form .fields-column-join-column {
-   width: 25%;
+   width: 20%;
 }
-#tripal-views-integration-new-setup-form .fields-column-handler {
-   width: 25%;
+#tripal-views-integration-new-setup-form .fields-column-handler-filter {
+   width: 20%;
+}
+#tripal-views-integration-new-setup-form .fields-column-handler-filed {
+   width: 20%;
 }
 
 </style>