gridion 0.0.19 → 0.0.20

data/lib/gridion/grid_helper.rb

@@ -53,6 +53,8 @@ module Gridion
       
       options[:table_tag]||="table"
       options[:table_header_tag]||="th"
+      options[:table_header_wrapper_tag]="thead"
+      options[:table_body_wrapper_tag]="tbody"
       options[:table_row_tag]||="tr"
       options[:table_cell_tag]||="td"
       
@@ -86,20 +88,25 @@ module Gridion
           table_tag = options[:table_tag]||"table"
           table_row_tag=options[:table_row_tag]||"tr"
           table_header_tag=options[:table_header_tag]||"th"
+          table_header_wrapper_tag=options[:table_header_wrapper_tag]||"thead"
+          table_body_wrapper_tag=options[:table_body_wrapper_tag]||"tbody"
           table_classes=[options[:class]].flatten.compact
           safe_concat("<#{table_tag} class=\"#{klass.name.downcase} #{table_classes.join(' ')}\">")
-
+          
           columns=options[:columns]||klass.column_names
-
+          safe_concat("<#{table_header_wrapper_tag}>")  if table_header_wrapper_tag.present?
           safe_concat("<#{table_row_tag} class=\"header\">")
+          
           (columns).each do |col|
             col_label=klass.human_attribute_name(col)
             col_label = sort_link(options[:q], col, col_label) if defined?(:sort_link) && options.has_key?(:q)
             safe_concat("<#{table_header_tag} class=\"header_cell #{col.to_s.parameterize.underscore}\">#{col_label}</#{table_header_tag}>")
           end
-          safe_concat("<#{table_header_tag} class=\"actions\">Actions</#{table_header_tag}>")
+          safe_concat("<#{table_header_tag} class=\"actions\">Actions</#{table_header_tag}>") unless options[:actions].blank?
           safe_concat("<#{table_header_tag} class=\"children\"></#{table_header_tag}>") if options.has_key?(:children)
           safe_concat("</#{table_row_tag}>")
+          safe_concat("</#{table_header_wrapper_tag}>")  if table_header_wrapper_tag.present?
+          safe_concat("<#{table_body_wrapper_tag}>")  if table_body_wrapper_tag.present?
         end
 
         grid_binding.row do  |klass, object, options={}|
@@ -200,7 +207,7 @@ module Gridion
           table_row_tag=options[:table_row_tag]
           table_cell_tag=options[:table_cell_tag]
           
-          colspans=(options[:columns]||klass.column_names).count + 2 #TODO: change this to number of action columns
+          colspans=(options[:columns]||klass.column_names).count + 1 + (options[:actions].blank? ? 0 : 1) #TODO: change this to number of action columns
           result = ""
           result << "<#{table_row_tag} class=\"paginator\">"
           result << "<#{table_cell_tag} colspan=\"#{colspans}\">"
@@ -214,7 +221,8 @@ module Gridion
           table_tag = options[:table_tag]
           table_row_tag=options[:table_row_tag]
           table_cell_tag=options[:table_cell_tag]
-          
+          table_body_wrapper_tag=options[:table_body_wrapper_tag]
+          safe_concat("</#{table_body_wrapper_tag}>")  if table_body_wrapper_tag.present?
           safe_concat("</#{table_tag}>")
         end
         

data/lib/gridion/version.rb

@@ -1,3 +1,3 @@
 module Gridion
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gridion
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000Z
+date: 2012-01-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70134955554200 !ruby/object:Gem::Requirement
+  requirement: &70112276837960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134955554200
+  version_requirements: *70112276837960
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70134955553780 !ruby/object:Gem::Requirement
+  requirement: &70112276837220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134955553780
+  version_requirements: *70112276837220
 description: Simple grid helper for rails
 email:
 - william@tofugear.com
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3102073071306199411
+      hash: 387820204184933051
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3102073071306199411
+      hash: 387820204184933051
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10