wice_grid 3.4.0 → 3.4.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+4.0.1
+
+Support for Bootstrap 3
+
+4.0.0
+
+Support for Rails 4
+
 3.2.2
 
 improvement of the javascript calendar control: if the FROM field is set to a value after TO, TO is set to the value of FROM.

data/app/views/kaminari/wice_grid/_paginator.html.erb

@@ -1,6 +1,6 @@
 <%= paginator.render do %>
   <div class="pagination">
-    <ul>
+    <ul class="pagination">
       <% unless current_page.first? %>
         <%= prev_page_tag %>
       <% end %>

data/lib/generators/wice_grid/templates/wice_grid.css.scss

@@ -5,6 +5,14 @@
 
 .wg-detached-filter, .wice-grid{
 
+  .text-filter-container {
+    input{
+      width:auto;
+      margin-right: 10px;
+      display: inline;
+    }
+  }
+
   a.date-label {text-decoration: none;}
   a.date-label:hover {text-decoration: line-through;}
 
@@ -19,16 +27,13 @@
   }
 
   .custom-dropdown-container {
-    position: relative;
-    padding-right: 18px;
-
 
-    .collapse-multi-select-icon, .expand-multi-select-icon{
-      width: 12px;
-      height: 12px;
-      position:absolute;
-      top:0;
-      right:0;
+    .expand-multi-select-icon, .collapse-multi-select-icon{
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-left: 5px;
+      vertical-align: top;
     }
 
     .collapse-multi-select-icon{
@@ -40,20 +45,8 @@
     }
 
   }
-
-  .text-filter-container {
-    position: relative; padding-right: 13px;
-    .negation-checkbox {
-      position:absolute;
-      top:0;
-      right:0;
-    }
-  }
-
-
 }
 
-
 .wice-grid{
 
 
@@ -138,3 +131,10 @@
     @include icon-dimensions;
   }
 }
+
+input.wice-grid-save-query-field{
+  width: auto;
+  display: inline-block;
+  margin-right: 10px;
+}
+

data/lib/wice/columns/column_integer.rb

@@ -12,6 +12,8 @@ module Wice
 
         opts = {:size => 3, :id => @dom_id,  :class => 'range-start'}
 
+        opts[:class] += ' form-control input-sm'
+
         if auto_reload
           opts[:class] += ' auto-reload'
         end

data/lib/wice/columns/column_range.rb

@@ -8,18 +8,21 @@ module Wice
       def render_filter_internal(params) #:nodoc:
         @contains_a_text_input = true
 
-        @query, _, parameter_name, @dom_id = form_parameter_name_id_and_query(:fr => '')
+        @query,  _, parameter_name,  @dom_id  = form_parameter_name_id_and_query(:fr => '')
         @query2, _, parameter_name2, @dom_id2 = form_parameter_name_id_and_query(:to => '')
 
-        opts1 = {:size => 3, :id => @dom_id,  :class => 'range-start'}
-        opts2 = {:size => 3, :id => @dom_id2, :class => 'range-end'}
+        opts1 = {:size => 2, :id => @dom_id,  :class => 'form-control input-sm range-start'}
+        opts2 = {:size => 2, :id => @dom_id2, :class => 'form-control input-sm range-end'}
 
         if auto_reload
           opts1[:class] += ' auto-reload'
           opts2[:class] += ' auto-reload'
         end
 
-        text_field_tag(parameter_name,  params[:fr], opts1) + text_field_tag(parameter_name2, params[:to], opts2)
+        content_tag(
+          :div,
+          text_field_tag(parameter_name,  params[:fr], opts1) + text_field_tag(parameter_name2, params[:to], opts2),
+          :class => 'form-inline')
       end
 
       def yield_declaration_of_column_filter #:nodoc:

data/lib/wice/columns/column_string.rb

@@ -9,7 +9,7 @@ module Wice
 
       def render_filter_internal(params) #:nodoc:
         @contains_a_text_input = true
-        css_class = auto_reload ? 'auto-reload' : nil
+        css_class = 'form-control input-sm ' + (auto_reload ? 'auto-reload' : '')
 
         if negation
           self.auto_reloading_input_with_negation_checkbox = true if auto_reload

data/lib/wice/helpers/wice_grid_serialized_queries_view_helpers.rb

@@ -39,10 +39,10 @@ module Wice
 
         '<div class="form-horizontal"><div class="wg-saved-query-input-controls input-append">'+
 
-        text_field_tag(input_field_name,  '',  :onkeydown=>'', :class => 'wice-grid-save-query-field span4') +
+        text_field_tag(input_field_name,  '',  :onkeydown=>'', :class => 'wice-grid-save-query-field form-control ') +
         button_tag(
           NlMessage['save_query_button_label'],
-          :class => 'wice-grid-save-query-button btn',
+          :class => 'wice-grid-save-query-button btn btn-primary',
           'data-grid-name'   => grid_name,
           'data-base-path-to-query-controller' => base_path_to_query_controller,
           'data-parameters'  => parameters.to_json,

data/lib/wice/wice_grid_serialized_query.rb

@@ -9,7 +9,7 @@ class WiceGridSerializedQuery < ActiveRecord::Base  #:nodoc:
 
   def self.list(name, controller)
     conditions = {:grid_name => name}
-    self.where(conditions).load
+    self.where(conditions).all
   end
 
 end

data/lib/wice_grid.rb

@@ -549,7 +549,7 @@ module Wice
 
     def resultset_without_paging_with_user_filters  #:nodoc:
       @klass.unscoped do
-        active_relation_for_resultset_without_paging_with_user_filters.load
+        active_relation_for_resultset_without_paging_with_user_filters.all
       end
     end
 

data/wice_grid.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name          = 'wice_grid'
-  s.version       = '3.4.0'
+  s.version       = '3.4.1'
   s.homepage      = 'https://github.com/leikind/wice_grid'
-  s.date          = '2013-10-11'
+  s.date          = '2013-10-17'
   s.summary       = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
   s.description   = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.' +
                     'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, '  +

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
+  prerelease: 
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
 description: A Rails grid plugin to create grids with sorting, pagination, and (automatically
@@ -104,24 +107,25 @@ files:
 homepage: https://github.com/leikind/wice_grid
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Rails grid plugin to create grids with sorting, pagination, and (automatically

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 092a576a254b1d6d2e661f6f5b87f708c858f640
-  data.tar.gz: b742d69270656e4f21e56c0b30b79504da23b015
-SHA512:
-  metadata.gz: 4e65ab3eecc3cbeb363fc3d2cbaf7a36638ef84ed305fb1f4e489f4094613ad5c100dff281a73216392269327f4da7e921daa7bc385381e2fb295fad9b99c923
-  data.tar.gz: e1be30d9b58d59bd9f4c03a000276921c1f56cacf85d1ed9a595533dbbf6516c516943aa29458e57d708ed5f40eae3e0e6e9d192dd6e37ed15ced71579f978c9