Fixed panes to support fields with multiple values

tripal_panes/theme/css/tripal_panes.css

@@ -16,7 +16,7 @@
 }
 
 .tripal_pane-configure_pane_table td {
-  width:50%;
+  width:25%;
 }
 
 /**

tripal_panes/theme/templates/tripal_panes_generic.tpl.php

@@ -13,7 +13,9 @@ drupal_add_js(drupal_get_path('module','tripal_panes') . '/theme/js/tripal_panes
 // Get the variables passed into this template.
 $panes = $variables['element']['#panes'];
 $fields = $variables['element']['#fields'];
+$bundle = $variables['element']['#bundle'];
 
+$bundle_type = $bundle->name . '-' . $bundle->label;
 
 // Process fields in panes
 $content = '';
@@ -43,6 +45,11 @@ foreach ($panes AS $pane_id => $pane) {
   $current_layout = '';
   $counter = 0;
   foreach ($weighed_fields AS $field) {
+    //Add CSS Class
+    $css_class = $field['#css_class'] ? ' ' . $field['#css_class'] : '';
+    $field['#prefix'] = '<div class="tripal_panes-field-wrapper' . $css_class . '">';
+    $field['#suffix'] = '</div>';
+    
     // The field is in a table
     if (in_array($field['#field_name'], $table_layout_group)) {
 
@@ -56,7 +63,7 @@ foreach ($panes AS $pane_id => $pane) {
     // The field is not in a table
     else {
       if ($counter != 0 && $current_layout != 'Default') {
-        $output .= tripal_panes_generic_render_table($table_layout);
+        $output .= tripal_panes_generic_render_table($table_layout, $bundle_type);
         $table_layout = array();
       }
       $no_group [$field['#weight'] . $field['#field_name']] = $field;
@@ -65,7 +72,7 @@ foreach ($panes AS $pane_id => $pane) {
     $counter ++;
   }
   if ($current_layout == 'Table') {
-    $output .= tripal_panes_generic_render_table($table_layout);
+    $output .= tripal_panes_generic_render_table($table_layout, $bundle_type);
   }
   else if ($current_layout == 'Default') {
     $output .= tripal_panes_generic_render_fields($no_group);
@@ -90,9 +97,6 @@ foreach ($panes AS $pane_id => $pane) {
   }
 }
 
-// TODO: need to add the bundle type
-$bundle_type = '';
-
 if ($has_base_pane_only) { ?>
   <div id ="tripal-<?php print $bundle_type?>-contents-box"> <?php
     // print the rendered content
@@ -122,7 +126,7 @@ else { ?>
  * @return
  *   A string containing the HTMLified table.
  */
-function tripal_panes_generic_render_table($fields) {
+function tripal_panes_generic_render_table($fields, $bundle_type) {
   // If we have no fields in table layout
   if (count($fields) == 0) {
     return '';
@@ -132,6 +136,7 @@ function tripal_panes_generic_render_table($fields) {
   $header = array();
   $rows = array();
   foreach ($fields as $field) {
+<<<<<<< HEAD
     // We may have multiple values for the field, so we need to iterate
     // through those values first and add each one.
     $value = '';
@@ -152,6 +157,25 @@ function tripal_panes_generic_render_table($fields) {
         'nowrap' => 'nowrap'
       ),
       $value,
+=======
+    $fname =  preg_replace('/_/', '-', $field['#field_name']);
+    $rows[] = array(
+      'data' => array(
+        array(
+          'data' => $field['#title'],
+          'header' => TRUE,
+          'width' => '20%',
+          'nowrap' => 'nowrap',
+          'class' => array('table-field-label', 'table-field-label-' . $fname)
+        ),
+        array(
+         'data' => $field[0]['#markup'],
+          'nowrap' => 'nowrap',
+          'class' => array('table-field-items', 'table-field-items-' . $fname)
+        )
+      ),
+      'class' => array('table-field-row', $field['#css_class'])
+>>>>>>> 4bdfb94fb7965dcce6b05c34bc253b6e49f20c22
     );
   }
 
@@ -160,7 +184,7 @@ function tripal_panes_generic_render_table($fields) {
     'header' => $header,
     'rows' => $rows,
     'attributes' => array(
-      'id' => '',  // TODO: need to add an ID
+      'id' => 'tripal_panes-' . $bundle_type . '-table',  // TODO: need to add an ID
       'class' => 'tripal-data-horz-table'
     ),
     'sticky' => FALSE,

tripal_panes/tripal_panes.install

@@ -80,6 +80,10 @@ function tripal_panes_schema() {
         'type' => 'int',
         'not null' => TRUE,
       ),
+      'css_class' => array(
+        'description' => 'CSS classes assigned to this field. Class names are separated by a semi-colon',
+        'type' => 'text'
+      )
     ),
     'indexes' => array(
       'pane_id' => array('pane_id'),

tripal_panes/tripal_panes.module

@@ -329,6 +329,22 @@ function tripal_panes_form_field_ui_display_overview_form_pane_configure (&$form
         ),
         '#default_value' => $default_value,
       );
+      $form['te_configure_panes']['pane_items'][$pane->pane_id][$fname]['field_id'] = array(
+        '#type' => 'hidden',
+        '#value' => $field->field_id,
+      );
+      $default_classes = 
+        db_select('tripal_pane_fields', 'tpf')
+          ->fields('tpf', array('css_class'))
+          ->condition('pane_id', $pane->pane_id)
+          ->condition('field_id', $field->field_id)
+          ->execute()
+          ->fetchField();
+      $form['te_configure_panes']['pane_items'][$pane->pane_id][$fname]['css_class'] = array(
+        '#type' => 'textfield',
+        '#default_value' => $default_classes,
+        '#size' => 40
+      );
       $has_field = TRUE;
     }
 
@@ -341,9 +357,9 @@ function tripal_panes_form_field_ui_display_overview_form_pane_configure (&$form
     }
 
     if ($pane->pane_id != $selected_pane) {
+      // Display only the selected pane setting. Hide the others
       $form['te_configure_panes']['pane_items'][$pane->pane_id]['#prefix'] = "<div style=\"display:none;\">";
       $form['te_configure_panes']['pane_items'][$pane->pane_id]['#suffix'] = "</div>";
-      //continue; // Display only the selected pane setting
     }
 
   }
@@ -718,10 +734,21 @@ function tripal_panes_action_configure_panes (&$form, &$form_state) {
   foreach ($panes AS $id => $pane) {
     $table_layout = array();
     foreach($pane AS $key => $value) {
+      // Save layout information
       if (is_array($value) && key_exists('table_group', $value)) {
         if ($value['table_group'] == 1) {
           $table_layout[] = $key;
         }
+      } 
+      // Save CSS class for each field if provided
+      if (is_array($value) && key_exists('css_class', $value) && $value['css_class']) {
+        db_update('tripal_pane_fields')
+          ->fields(array(
+            'css_class' => $value['css_class']
+          ))
+          ->condition('pane_id',$id)
+          ->condition('field_id', $value['field_id'])
+          ->execute();
       }
     }
     $pane_settings = db_select('tripal_panes', 'tp')
@@ -754,16 +781,18 @@ function theme_tripal_panes_form_configure_panes ($variables) {
   foreach (element_children($element) as $id) {
 
     $element[$id]['table_group']['#printed'] = FALSE;
+    $element[$id]['css_class']['#printed'] = FALSE;
     $rows[] = array(
       'data' => array(
         $element[$id]['#title'],
         drupal_render($element[$id]['table_group']),
+        drupal_render($element[$id]['css_class']),
       ),
     );
   }
 
   // Create table header
-  $header = array(t('Field'), t('Layout'));
+  $header = array(t('Field'), t('Layout'), t('CSS Classes'));
 
   // Create a unique id for drupal_add_tabledrag() to find the table object
   $table_id = 'tripal_pane-configure_pane_table-' . strtolower(preg_replace('/\s+/', '_', $element['#title']));
@@ -783,7 +812,7 @@ function theme_tripal_panes_form_configure_panes ($variables) {
   $collapsible_item['element']['#children'] = '';
   $collapsible_item['element']['#description'] =
     '<div id="tripal_panes-pane_configure-fieldset-instruction">
-        Select a group to organize fields into table(s) in this pane.
+        Select a layout to organize fields into table(s) in this pane. Optionally, You can assign CSS classes to each field which allows styling multiple fields at a time. Please separate classes with a space.
      <div>'
     . $table;
   $collapsible_item['element']['#title'] = $element['#title'];
@@ -867,7 +896,17 @@ function tripal_panes_entity_view($entity, $type, $view_mode, $langcode) {
           $pane_id = $pane_id ? $pane_id : $default_pane_id;
           // Do not show disabled fields
           if ($pane_id != $disabled_pane_id) {
+            // Construct field elements
             $fields[$pane_id][$field_name] = $entity->content[$field_name];
+            
+            // Add extra css classes
+            $css_class = db_select('tripal_pane_fields', 'tpf')
+              ->fields('tpf', array('css_class'))
+              ->condition('pane_id', $pane_id)
+              ->condition('field_id', $field_instance['id'])
+              ->execute()
+              ->fetchField();
+              $fields[$pane_id][$field_name]['#css_class'] = $css_class;
           }
           // Unset the field
           unset ($entity->content[$field_name]);
@@ -875,6 +914,7 @@ function tripal_panes_entity_view($entity, $type, $view_mode, $langcode) {
         drupal_add_css(drupal_get_path('module','tripal_panes') . '/theme/css/tripal_panes.css');
         $entity->content['tripal_panes_generic'] = array(
           '#theme' => 'tripal_panes_generic',
+          '#bundle' => $bundle,
           '#panes' => $panes,
           '#fields' => $fields,
         );