Merge branch '7.x-3.x' into 7.x-3.x-core3

tripal_fields_layout/theme/js/tripal_fields_layout.js

@@ -30,7 +30,12 @@
     		  var prevObj = $(id).prev().attr('class');
     		  // Highlight the panel if it's already at the top
     		  if (prevObj.indexOf('tripal_panel-base_panel') == 0 && $(id).css('display') == 'block') {
-    			$(id).effect('highlight', {color: '#DDDEEE'});
+    		    var color = $(id).css('background-color') ? $(id).css('background-color') : '#FFFFFF';
+                    if (jQuery.ui) {
+                      $(id).fadeTo(10, 0.5, function() {});
+                      $(id).fadeTo(100, 1, function() {});
+                      //$(id).effect('highlight', {color: '#DDDEEE'});
+                    }
     		  }
     		  // Move the panel
     		  else {
@@ -45,4 +50,4 @@
     },
   };
   
-})(jQuery);
+})(jQuery);

tripal_fields_layout/tripal_fields_layout.module

@@ -289,9 +289,6 @@ function tripal_fields_layout_form_field_ui_display_overview_form_panel_configur
   foreach ($panels as $panel) {
     $options[$panel->panel_id] = $panel->label;
     $has_panel = TRUE;
-    if ($panel->panel_id != $selected_panel) {
-      continue; // Display only the selected panel setting
-    }
     $panel_settings = unserialize($panel->settings);
     $table_layout = key_exists('table_layout', $panel_settings) ? $panel_settings['table_layout'] : array();
     $form['te_configure_panels']['panel_items'][$panel->panel_id] = array(
@@ -347,6 +344,12 @@ function tripal_fields_layout_form_field_ui_display_overview_form_panel_configur
       $form['te_configure_panels']['panel_items'][$panel->panel_id]['#theme_wrappers'] = array('tripal_fields_layout_form_configure_panels');
     }
 
+    if ($panel->panel_id != $selected_panel) {
+      $form['te_configure_panels']['panel_items'][$panel->panel_id]['#prefix'] = "<div style=\"display:none;\">";
+      $form['te_configure_panels']['panel_items'][$panel->panel_id]['#suffix'] = "</div>";
+      //continue; // Display only the selected panel setting
+    }
+    
   }
   $form['te_configure_panels']['panel_select']['#options'] = $options;
   if ($has_panel) {