compass-jquery-plugin 0.3.0.beta.10 → 0.3.0.beta.13

data/.loadpath

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<loadpath>
-	<pathentry path="" type="src"/>
-	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
-</loadpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<loadpath>
+	<pathentry path="" type="src"/>
+	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
+</loadpath>

data/.project

@@ -1,17 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>compass-jquery-plugin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.rubypeople.rdt.core.rubybuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.rubypeople.rdt.core.rubynature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>compass-jquery-plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.rubypeople.rdt.core.rubybuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.rubypeople.rdt.core.rubynature</nature>
+		<nature>org.radrails.rails.core.railsnature</nature>
+	</natures>
+</projectDescription>

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
-:commit: beta.10
+:commit: beta.13
 :patch:  0
 :minor:  3
 :major:  0

data/compass-jquery-plugin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{compass-jquery-plugin}
-  s.version = "0.3.0.beta.10"
+  s.version = "0.3.0.beta.13"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kosmas Schuetz"]
-  s.date = %q{2010-06-19}
+  s.date = %q{2010-08-14}
   s.description = %q{A compass plugin that integrates jRails, jQuery, jQuery UI and Themes, jqGrid and more into the Compass Sass framework.}
   s.email = %q{kosmas.schuetz@gmx.com}
   s.extra_rdoc_files = [
@@ -83,10 +83,14 @@ Gem::Specification.new do |s|
      "templates/dynatree/jquery.ui/dynatree.aero/cbUnchecked_hover.png",
      "templates/dynatree/jquery.ui/dynatree.aero/collapsed.png",
      "templates/dynatree/jquery.ui/dynatree.aero/collapsed_hover.png",
+     "templates/dynatree/jquery.ui/dynatree.aero/copy_here.png",
      "templates/dynatree/jquery.ui/dynatree.aero/customDoc1.png",
      "templates/dynatree/jquery.ui/dynatree.aero/customFolder1.png",
      "templates/dynatree/jquery.ui/dynatree.aero/doc_with_children.png",
      "templates/dynatree/jquery.ui/dynatree.aero/document.png",
+     "templates/dynatree/jquery.ui/dynatree.aero/drop_accept.png",
+     "templates/dynatree/jquery.ui/dynatree.aero/drop_here.png",
+     "templates/dynatree/jquery.ui/dynatree.aero/drop_reject.png",
      "templates/dynatree/jquery.ui/dynatree.aero/empty.png",
      "templates/dynatree/jquery.ui/dynatree.aero/expanded.png",
      "templates/dynatree/jquery.ui/dynatree.aero/expanded_hover.png",
@@ -98,6 +102,7 @@ Gem::Specification.new do |s|
      "templates/dynatree/jquery.ui/dynatree.aero/ltError.png",
      "templates/dynatree/jquery.ui/dynatree.aero/ltWait.ani",
      "templates/dynatree/jquery.ui/dynatree.aero/ltWait.gif",
+     "templates/dynatree/jquery.ui/dynatree.aero/move_here.png",
      "templates/dynatree/jquery.ui/dynatree.aero/rbChecked.png",
      "templates/dynatree/jquery.ui/dynatree.aero/rbChecked_hover.png",
      "templates/dynatree/jquery.ui/dynatree.aero/rbIntermediate.png",
@@ -113,10 +118,14 @@ Gem::Specification.new do |s|
      "templates/dynatree/jquery.ui/dynatree.aqua/cbUnchecked_hover.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/collapsed.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/collapsed_hover.png",
+     "templates/dynatree/jquery.ui/dynatree.aqua/copy_here.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/customDoc1.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/customFolder1.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/doc_with_children.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/document.png",
+     "templates/dynatree/jquery.ui/dynatree.aqua/drop_accept.png",
+     "templates/dynatree/jquery.ui/dynatree.aqua/drop_here.png",
+     "templates/dynatree/jquery.ui/dynatree.aqua/drop_reject.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/empty.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/expanded.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/expanded_hover.png",
@@ -128,6 +137,7 @@ Gem::Specification.new do |s|
      "templates/dynatree/jquery.ui/dynatree.aqua/ltDoc.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/ltError.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/ltWait.gif",
+     "templates/dynatree/jquery.ui/dynatree.aqua/move_here.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/rbChecked.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/rbChecked_hover.png",
      "templates/dynatree/jquery.ui/dynatree.aqua/rbIntermediate.png",
@@ -143,10 +153,14 @@ Gem::Specification.new do |s|
      "templates/dynatree/jquery.ui/dynatree.crystal/cbUnchecked_hover.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/collapsed.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/collapsed_hover.png",
+     "templates/dynatree/jquery.ui/dynatree.crystal/copy_here.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/customDoc1.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/customFolder1.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/doc_with_children.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/document.png",
+     "templates/dynatree/jquery.ui/dynatree.crystal/drop_accept.png",
+     "templates/dynatree/jquery.ui/dynatree.crystal/drop_here.png",
+     "templates/dynatree/jquery.ui/dynatree.crystal/drop_reject.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/empty.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/expanded.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/expanded_hover.png",
@@ -158,6 +172,7 @@ Gem::Specification.new do |s|
      "templates/dynatree/jquery.ui/dynatree.crystal/ltDoc.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/ltError.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/ltWait.gif",
+     "templates/dynatree/jquery.ui/dynatree.crystal/move_here.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/rbChecked.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/rbChecked_hover.png",
      "templates/dynatree/jquery.ui/dynatree.crystal/rbIntermediate.png",
@@ -171,8 +186,12 @@ Gem::Specification.new do |s|
      "templates/dynatree/jquery.ui/dynatree.xp/cbIntermediate_hover.png",
      "templates/dynatree/jquery.ui/dynatree.xp/cbUnchecked.png",
      "templates/dynatree/jquery.ui/dynatree.xp/cbUnchecked_hover.png",
+     "templates/dynatree/jquery.ui/dynatree.xp/copy_here.png",
      "templates/dynatree/jquery.ui/dynatree.xp/customDoc1.png",
      "templates/dynatree/jquery.ui/dynatree.xp/customFolder1.png",
+     "templates/dynatree/jquery.ui/dynatree.xp/drop_accept.png",
+     "templates/dynatree/jquery.ui/dynatree.xp/drop_here.png",
+     "templates/dynatree/jquery.ui/dynatree.xp/drop_reject.png",
      "templates/dynatree/jquery.ui/dynatree.xp/ltD_ne.png",
      "templates/dynatree/jquery.ui/dynatree.xp/ltD_nes.png",
      "templates/dynatree/jquery.ui/dynatree.xp/ltDoc.png",
@@ -188,6 +207,7 @@ Gem::Specification.new do |s|
      "templates/dynatree/jquery.ui/dynatree.xp/ltP_ne.png",
      "templates/dynatree/jquery.ui/dynatree.xp/ltP_nes.png",
      "templates/dynatree/jquery.ui/dynatree.xp/ltWait.gif",
+     "templates/dynatree/jquery.ui/dynatree.xp/move_here.png",
      "templates/dynatree/jquery.ui/dynatree.xp/rbChecked.png",
      "templates/dynatree/jquery.ui/dynatree.xp/rbChecked_hover.png",
      "templates/dynatree/jquery.ui/dynatree.xp/rbIntermediate.png",
@@ -209,6 +229,8 @@ Gem::Specification.new do |s|
      "templates/jqgrid/i18n/jqgrid/locale-cn.min.js",
      "templates/jqgrid/i18n/jqgrid/locale-cs.js",
      "templates/jqgrid/i18n/jqgrid/locale-cs.min.js",
+     "templates/jqgrid/i18n/jqgrid/locale-da.js",
+     "templates/jqgrid/i18n/jqgrid/locale-da.min.js",
      "templates/jqgrid/i18n/jqgrid/locale-de.js",
      "templates/jqgrid/i18n/jqgrid/locale-de.min.js",
      "templates/jqgrid/i18n/jqgrid/locale-dk.js",
@@ -217,6 +239,8 @@ Gem::Specification.new do |s|
      "templates/jqgrid/i18n/jqgrid/locale-el.min.js",
      "templates/jqgrid/i18n/jqgrid/locale-en.js",
      "templates/jqgrid/i18n/jqgrid/locale-en.min.js",
+     "templates/jqgrid/i18n/jqgrid/locale-es.js",
+     "templates/jqgrid/i18n/jqgrid/locale-es.min.js",
      "templates/jqgrid/i18n/jqgrid/locale-fa.js",
      "templates/jqgrid/i18n/jqgrid/locale-fa.min.js",
      "templates/jqgrid/i18n/jqgrid/locale-fi.js",

data/gem_tasks/dynatree.rake

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'lib/handle_js_files'
 
 # Compass generator for DYNATREE_14
-DYNATREE_SRC = File.join(GEM_ROOT, 'src', 'dynatree.0.5.3')
+DYNATREE_SRC = File.join(GEM_ROOT, 'src', 'dynatree')
 DYNATREE_SRC_SKINS = File.join(DYNATREE_SRC, 'skins')
 
 DYNATREE_DEST_TEMPLATES = File.join(GEM_ROOT, 'templates', 'dynatree')

data/gem_tasks/jqgrid.rake

@@ -2,7 +2,7 @@ require 'fileutils'
 require 'lib/handle_js_files'
 
 # Compass generator for jqGrid 3.5+
-JQGRID_SRC = File.join(GEM_ROOT, 'src', 'jqgrid.3.7.1')
+JQGRID_SRC = File.join(GEM_ROOT, 'src', 'jqgrid')
 JQGRID_SRC_LOCALES = File.join(JQGRID_SRC, 'config', 'locales') 
 JQGRID_SRC_TRANSLATIONS = File.join(JQGRID_SRC, 'js', 'i18n') + "/*.js"
 
@@ -18,25 +18,26 @@ JQGRID_MESSAGE2 = "// Generated by compass-jquery-plugin/gem-tasks/jqgrid.rake\n
 all_scripts = [
   #'plugins/jquery.contextmenu.js',
   'plugins/jquery.tablednd.js',
-  'plugins/ui.multiselect.js',
+  'plugins/ui.multiselect.js',  
   'js/grid.base.js',
-  'js/grid.celledit.js',
   'js/grid.common.js',
-  'js/grid.custom.js',
   'js/grid.formedit.js',
-  'js/grid.import.js',  
-  'js/grid.inlinedit.js',
-  'js/grid.jqueryui.js',
-  'js/grid.postext.js',
-  'js/grid.setcolumns.js',
+  'js/grid.inlinedit.js',  
+  'js/grid.celledit.js',
   'js/grid.subgrid.js',
+  'js/grid.treegrid.js',  
+  'js/grid.custom.js',
+  'js/grid.postext.js',
   'js/grid.tbltogrid.js',
-  'js/grid.treegrid.js',
-  'js/jqDnR.js',
+  'js/grid.setcolumns.js',
+  'js/grid.import.js',  
+  'js/jquery.fmatter.js',  
+  'js/grid.grouping.js',
   'js/jqModal.js',
-  'js/jquery.fmatter.js',
-  'js/jquery.searchFilter.js',
-  'js/JsonXml.js'
+  'js/jqDnR.js',
+  'js/JsonXml.js',  
+  'js/grid.jqueryui.js',
+  'js/jquery.searchFilter.js'
 ].collect {|filename| File.read(File.join(JQGRID_SRC, filename))}.join "\n\n"
 
 all_stylesheets = [

data/gem_tasks/jrails.rake

@@ -186,7 +186,6 @@ namespace :build do
         'jquery.ui.accordion.js',
         'jquery.ui.autocomplete.js',
         'jquery.ui.button.js',
-        #'jquery.ui.checkbox.js',
         'jquery.ui.core.js',
         'jquery.ui.datepicker.js',
         'jquery.ui.dialog.js',
@@ -220,8 +219,6 @@ namespace :build do
         Dir.foreach JQUERY_UI_18_SRC_TRANSLATIONS do |file|
           next unless /^jquery.ui\.datepicker-(.+)\.js$/ =~ file
           lang = file
-          #lang.gsub!(/^ui\.datepicker-(.+)\.js$/, '')
-          #puts lang
           js = File.read File.join(JQUERY_UI_18_SRC_TRANSLATIONS, file)
           file.gsub!(/^jquery.ui\./,'')          
           manifest.print "javascript '#{File.join(path, 'jquery.ui', file)}'\n"
@@ -238,7 +235,7 @@ namespace :build do
 
       # jQuery UI Themes
       
-      ui = JqueryUiTheme.new(14, File.join(JQUERY_UI_18_SRC_THEMES, 'base')) 
+      ui = JqueryUiTheme.new(File.join(JQUERY_UI_18_SRC_THEMES, 'base')) 
       ui.convert_css(File.join(JRAILS_DEST_THEMES, '_partials'))
        
       all_jquery_ui_stylesheets = [
@@ -246,11 +243,11 @@ namespace :build do
         '_accordion.scss',
         '_autocomplete.scss',
         '_button.scss',
-        #'_checkbox.scss',
         '_datepicker.scss',
         '_dialog.scss',
         '_progressbar.scss',
         '_resizable.scss',
+        '_selectable.scss',
         '_slider.scss',
         '_tabs.scss',
         '_theme.scss'
@@ -276,14 +273,7 @@ namespace :build do
         src_dir = File.join(JQUERY_UI_18_SRC_THEMES, theme, 'images')
         dest_dir = File.join(JRAILS_DEST_IMAGES, theme)
         FileUtils.mkdir_p dest_dir
-        
-        # Fix for Autocomplete
-        if theme != :base 
-          image = 'ui-anim_basic_16x16.gif'
-          FileUtils.cp(File.join(JQUERY_UI_18_SRC_THEMES, 'base/images', image), dest_dir) 
-          manifest.print "image 'jquery.ui/#{theme}/#{image}'\n"
-        end
-        
+                
         Dir.foreach(src_dir) do |image|
           next if /^\./ =~ image
           FileUtils.cp(File.join(src_dir, image), dest_dir)    

data/lib/jquery/gridify/grid_column.rb

@@ -31,6 +31,9 @@ module Gridify
                   
                   # visiblity
                   #:always_hidden,          # (false)
+                  :sorttype,
+                  :summary_type,
+                  :summary_tpl,
                   :hidden                   # initial hide state (false)
      
     def initialize(options)
@@ -107,15 +110,19 @@ module Gridify
         vals[:formatter] = 'date'
         vals[:formatoptions] = { :srcformat => 'UniversalSortableDateTime', :newformat => 'FullDateTime' }
       end
-      vals[:hidden]      = true         if hidden
-      vals[:width]       = width        if width
-      vals[:formatter]   = formatter    if formatter
-      vals[:formatoptions] = format_options  if format_options
-      vals[:edittype]    = edit_type    if editable && edit_type
-      vals[:formoptions] = form_options if editable && form_options
-      vals[:editoptions] = edit_options if editable && edit_options
-      vals[:editrules]   = validations  if editable && validations
-        # and more...
+      vals[:hidden]         = true         if hidden
+      vals[:width]          = width        if width
+      vals[:formatter]      = formatter    if formatter
+      vals[:formatoptions]  = format_options  if format_options
+      vals[:edittype]       = edit_type    if editable && edit_type
+      vals[:formoptions]    = form_options if editable && form_options
+      vals[:editoptions]    = edit_options if editable && edit_options
+      vals[:editrules]      = validations  if editable && validations
+      
+      vals[:sorttype]       = sorttype if sorttype
+      vals[:summaryType]    = summary_type if summary_type
+      vals[:summaryTpl]     = summary_tpl if summary_tpl
+      # and more...
         
       vals
     end

data/lib/jquery/gridify/grid_finder.rb

@@ -21,12 +21,14 @@ module Gridify
       self.sort_order    = params[:sord] if params[:sord]
       self.current_page  = params[:page].to_i if params[:page]
       self.rows_per_page = params[:rows].to_i if params[:rows]
+      self.total_rows    = params[:total_rows].to_i if params[:total_rows]
     end
 
     # return find args (scope) for current settings
     def current_scope
       #debugger
       find_args = {}
+      find_args[:include] = colInclude if colInclude
       if sort_by.present? && col = columns_hash[sort_by]
         if case_sensitive || !([:string, :text].include?(col.value_type))
           find_args[:order] = "#{sort_by} #{sort_order}" 
@@ -34,7 +36,11 @@ module Gridify
           find_args[:order] = "upper(#{sort_by}) #{sort_order}" 
         end
       end
-      if rows_per_page.present? && rows_per_page > 0
+      if total_rows.present? && total_rows > 0
+        find_args[:limit] = total_rows
+        offset = (current_page.to_i-1) * rows_per_page if current_page.present?
+        find_args[:offset] = offset if offset && offset > 0      
+      elsif rows_per_page.present? && rows_per_page > 0
         find_args[:limit] = rows_per_page
         offset = (current_page.to_i-1) * rows_per_page if current_page.present?
         find_args[:offset] = offset if offset && offset > 0
@@ -60,28 +66,41 @@ module Gridify
       #TODO: :only => [attributes], :methods => [virtual attributes]
       case data_type
       when :xml
-        xml = records.to_xml( :skip_types => true, :dasherize => false ) do |xml|
-          if rows_per_page > 0
-            xml.page          current_page
-            xml.total_pages   total_pages
-            xml.total_records total_count
+#        if colInclude
+#          xml = records.to_xml( :include => [ colInclude ], :skip_types => true, :dasherize => false ) do |xml|
+#            if rows_per_page > 0
+#              xml.page          current_page
+#              xml.total_pages   total_pages
+#              xml.total_records total_count
+#            end
+#          end
+#        else
+          xml = records.to_xml( :skip_types => true, :dasherize => false ) do |xml|
+            if rows_per_page > 0
+              xml.page    current_page
+              xml.total   total_pages
+              xml.records total_count
+            end
           end
-        end
-        
+#        end    
+      
       when :json
         #debugger
-        data = { resource => records }
+        data = { resource => records }        
         if rows_per_page > 0       
           data.merge!( 
-            :page => current_page, 
-            :total_pages => total_pages, 
-            :total_records => total_count 
+            :page    => current_page, 
+            :total   => total_pages, 
+            :records => total_count 
           )
-        end
-        
+        end        
         save = ActiveRecord::Base.include_root_in_json
-        ActiveRecord::Base.include_root_in_json = false
-        json = data.to_json
+        ActiveRecord::Base.include_root_in_json = false     
+        if colInclude
+          json = data.to_json(:include => colInclude)
+        else
+          json = data.to_json
+        end
         ActiveRecord::Base.include_root_in_json = save
         json
 
@@ -148,7 +167,7 @@ module Gridify
           # toolbar search
           self.search_rules = []
           self.search_rules_op = :and
-          columns.each do |col|  
+          colModel.each do |col|  
             name = col.name
             data = params[name.to_sym]        
             self.search_rules << { "field" => name, "op" => "cn", "data" => data } if data

data/lib/jquery/gridify/grid_options.rb

@@ -12,6 +12,7 @@ module Gridify
                   :colModel,              # incoming: hash of presets (native jqGrid); internally: array of GridColumn objects
                                           # { :body => { "title" => {"width" => 98} }} 
                   :colNames,              # Column names
+                  :colInclude,            # included submodels
                   #:widths,               # hash of column width (key = data type)
                   :searchable,            # default: true (used in generating columns, changing has no effect on existing cols)
                   :sortable,              # default: true (used in generating columns, changing has no effect on existing cols)
@@ -84,6 +85,7 @@ module Gridify
                   :case_sensitive,        # sort and search are case sensitive (false)                  
                   :current_page,          # current page requested
                   :rows_per_page,         # number of items to be requested in the next request (paging_choices.first or -1 if pager false)
+                  :total_rows,            # number of rows to read
                   :table_to_grid,         # when true generates tableToGrid (false) from html table, then use as local data
                                           # note, we assume table rows are not selectable. 
                                           # (tableToGrid sets multiselect when first col has checkboxes or radio buttons, 
@@ -204,15 +206,15 @@ module Gridify
       @paging_choices || [10,25,50,100]
     end
     
+    def restful
+      @restful==false ? false : true
+    end
+    
     # data
     def url
       @url || "/#{resource}"
     end
     
-    def restful
-      @restful==false ? false : true
-    end
-
     def rows_per_page
       #debugger
       # all rows when pager controls or rows per page are off
@@ -236,8 +238,8 @@ module Gridify
         {
           :root        => resource,
           :page        => resource+'>page',
-          :total       => resource+'>total_pages',
-          :records     => resource+'>total_records',
+          :total       => resource+'>total',
+          :records     => resource+'>records',
           :row         => resource.singularize,
           :repeatitems => false,
           :id          => :id
@@ -246,8 +248,8 @@ module Gridify
         {
           :root        => resource,
           :page        => 'page',
-          :total       => 'total_pages',
-          :records     => 'total_records',
+          :total       => 'total',
+          :records     => 'records',
           :row         => resource.singularize,
           :repeatitems => false,
           :id          => :id

data/lib/jquery/gridify/grid_view.rb

@@ -42,7 +42,6 @@ module Gridify
       s     
     end
     
-    
     def to_json
       jqgrid_properties.to_json_with_js
     end
@@ -116,6 +115,7 @@ module Gridify
       vals[:postData]          = { :grid => name, :datatype => data_type } #identify which grid making the request
       vals[:colNames]          = colNames if colNames.present?
       vals[:colModel]          = column_model if colModel.present?
+      #vals[:colModel]          = colModel if colModel.present?
       vals[:datatype]          = data_type if data_type
       if data_format.present?
         case data_type
@@ -131,6 +131,7 @@ module Gridify
       vals[:sortname]          = sort_by if sort_by
       vals[:sortorder]         = sort_order if sort_order && sort_by
       vals[:rowNum]            = rows_per_page if rows_per_page
+      vals[:rowTotal]          = total_rows if total_rows
       vals[:page]              = current_page if current_page
 
       # grid options

data/lib/jquery.ui.rb

@@ -1,5 +1,5 @@
 JRAILS_MESSAGE1 = "# Generated by compass-jquery-plugin/gem-tasks/jrailsxx.rake\n# Install with: compass -f jquery -p jrails\n\n"
-JRAILS_MESSAGE2 = "// Generated by compass-jquery-plugin/gem-tasks/jrailsxx.rake\n\n"
+JRAILS_MESSAGE2 = "// Generated by compass-jquery-plugin/gem-tasks/jrailsxx.rake\n"
 AUTOCOMPLETE_FIX = "\n\n/* Fix Autocomplete */\n\n.ui-autocomplete-loading { background: white/*{bgColorLoading}*/ url(images/ui-anim_basic_16x16.gif)/*{bgImgUrlLoading}*/ right/*{bgLoadingXPos}*/ center/*{bgLoadingYPos}*/ no-repeat/*{bgLoadingRepeat}*/; }"
 
 class JqueryUiTheme
@@ -10,25 +10,11 @@ class JqueryUiTheme
   attr_accessor :base_theme
 
   # Initialize with the base theme
-  def initialize(version, base_theme_directory)
-    if version == 14
-      @prefix = 'jquery.ui'
-      @version = 14
-    else
-      @prefix = 'ui'
-      @version = 13
-    end
+  def initialize(base_theme_directory)
+    @prefix = 'jquery.ui'
     @theme_filename = "#{@prefix}.theme.css"
     @base_theme_directory = base_theme_directory
     @base_theme = File.read(File.join(@base_theme_directory, @theme_filename))
-    if @base_theme[3775..3794] == "#363636/*{fcError}*/"
-      print "Fixing up bug in 1.7.1 template\n"
-      @base_theme[3775..3794] == "#cd0a0a/*{fcError}*/"
-    end
-    if @base_theme[416,16] == ".ui-widget input"
-      print "Fixing up bug in 1.7.3 template\n"
-      @base_theme[416,0] = ".ui-widget .ui-widget { font-size: 1em; }\n"
-    end
     
     # Fix opacity issue
     print "Fixing overlays\n"  
@@ -38,9 +24,7 @@ class JqueryUiTheme
     @base_theme.sub!(/\{opacityShadow\}/, '{bgShadowFilter}')
 
     # Fix AutoComplete
-    if @version == 14
-      @base_theme += AUTOCOMPLETE_FIX
-    end
+    @base_theme += AUTOCOMPLETE_FIX
   end
 
   # This sets up the Regexp that will extract the variables from a theme
@@ -108,10 +92,7 @@ class JqueryUiTheme
       
       # Fix Overlay stuff
       theme.gsub!(/\;filter:Alpha/, "; filter: Alpha")      
-      
-      if @version == 14
-        theme += AUTOCOMPLETE_FIX
-      end
+      theme += AUTOCOMPLETE_FIX
     end
     FileUtils.mkdir_p stylesheets
     # Figure out the variables with the regexp
@@ -128,9 +109,6 @@ class JqueryUiTheme
     # Write out the theme sass
     open File.join(stylesheets, "#{name}.scss"), 'w' do |f|
       f.print JRAILS_MESSAGE2
-      # Preserve header comment (css2sass currently doesn't convert comments)
-      theme =~ /\/\*\s*(.*)^\*\//m
-      $1.each {|line| f.print line.gsub(/^(\s*\*\s*)/,'// ')}
       f.print "\n"
       vars.each do |variable_name, value|
         f.print "$#{variable_name}: #{value} !default;\n"