Merge show/new page of DataProvider

BrainPortal/app/assets/stylesheets/cbrain.css.erb

@@ -2586,11 +2586,13 @@ img {
 
 #data_provider_classes {
   z-index: 1111;
-  max-width: 60em;
+  width: 60%;
   position: absolute;
   background-color: white;
   border: 0.2em solid #0471B4;
   padding: 1em;
+  word-wrap: break-word;
+  white-space: normal;
 }
 
 

BrainPortal/app/controllers/data_providers_controller.rb

@@ -830,7 +830,7 @@ def get_type_list #:nodoc:
     grouped_options.delete(nil) # data providers that can not be on this list return a category name of nil, so we remove them
     grouped_options.keys.sort.map { |type| [ type, grouped_options[type].sort ] }
 
-    return grouped_options || []
+    return grouped_options
   end
 
   def get_personal_type_list #:nodoc:
@@ -849,7 +849,7 @@ def get_personal_type_list #:nodoc:
     userkey_group          << UserkeyFlatDirSshDataProvider.name
     grouped_options[category_of_userkey_dp] = userkey_group
 
-    return grouped_options || []
+    return grouped_options
   end
 
 

BrainPortal/app/views/data_providers/show.html.erb

@@ -89,7 +89,12 @@
         <% t.edit_cell(:type, :content => @provider.type) do |f| %>
           <%= f.select :type, grouped_options_for_select(@typelist, @provider.type) %>
           <% if !is_normal_user %>
-            <%= overlay_ajax_link "(Data Provider Type Information)", "/doc/data_providers/data_provider_info.html", :class  => "help_link" %>
+            <div class="field_explanation"><%= show_hide_toggle "(Data Provider Type Information)", "#data_provider_classes", :class  => 'action_link' %></div>
+            </p>
+
+            <div id="data_provider_classes" style="display:none">
+              <%= render :partial => 'dp_types_explained' %>
+            </div>
           <% end %>
         <% end %>
       <% else %>