typus 1.0.0.pre10 → 1.0.0.pre11

data/app/helpers/admin/relationships_helper.rb

@@ -21,7 +21,6 @@ module Admin
         form = build_relate_form
       end
 
-      build_pagination
       options = { foreign_key => @item.id }
 
       render "admin/templates/has_n",
@@ -43,8 +42,6 @@ module Admin
         form = build_relate_form
       end
 
-      build_pagination
-
       render "admin/templates/has_n",
              :model_to_relate => @model_to_relate,
              :model_to_relate_as_resource => @model_to_relate_as_resource,
@@ -54,19 +51,6 @@ module Admin
 
     end
 
-    def build_pagination
-      options = { :order => @model_to_relate.typus_order_by, :conditions => set_conditions }
-      items_count = @resource.find(params[:id]).send(@field).count(:conditions => set_conditions)
-      items_per_page = @model_to_relate.typus_options_for(:per_page)
-
-      @pager = ::Paginator.new(items_count, items_per_page) do |offset, per_page|
-        options.merge!({:limit => per_page, :offset => offset})
-        items = @resource.find(params[:id]).send(@field).all(options)
-      end
-
-      @items = @pager.page(params[:page])
-    end
-
     def build_relate_form
       render "admin/templates/relate_form",
              :model_to_relate => @model_to_relate,

data/app/helpers/admin/resources_helper.rb

@@ -46,11 +46,6 @@ module Admin
       render File.join(path, "display_link_to_previous"), :message => message
     end
 
-    def pagination(*args)
-      @options = args.extract_options!
-      render File.join(path, "pagination") if @items.prev || @items.next
-    end
-
     private
 
     def path

data/app/views/admin/resources/index.html.erb

@@ -29,7 +29,7 @@
 
 <% if @items.any? -%>
   <%= raw build_list(@resource, @fields, @items) %>
-  <%= pagination %>
+  <%= will_paginate(@items, :renderer => Typus::Pagination) %>
 <% end %>
 
 <% if @items.empty? && !@resource.count.zero? %>

data/app/views/admin/templates/_has_many.html.erb

@@ -14,7 +14,7 @@
 
   <% if @items.any? -%>
     <%= table %>
-    <%= pagination(:anchor => model_to_relate.to_resource) %>
+    <%= will_paginate(@items, :renderer => Typus::Pagination, :anchor => model_to_relate.to_resource) %>
   <% else %>
     <p><%= _t("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
   <% end %>

data/app/views/admin/templates/_has_n.html.erb

@@ -9,7 +9,7 @@
 
   <% if @items.any? -%>
     <%= table %>
-    <%= pagination(:anchor => model_to_relate.to_resource) %>
+    <%= will_paginate(@items, :renderer => Typus::Pagination, :anchor => model_to_relate.to_resource) %>
   <% else %>
     <p><%= _t("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
   <% end %>

data/lib/generators/templates/public/admin/stylesheets/screen.css

@@ -258,15 +258,15 @@ fieldset.buttons { }
 
 /* @group Pagination */
 
-#pagination { margin: 1.5em auto; text-align: center; }
+.pagination { margin: 1.5em auto; text-align: center; }
 
-#pagination a { padding: 3px 5px; text-decoration: none; }
-#pagination a:hover { background: #000; color: #FFF; }
+.pagination a { padding: 3px 5px; text-decoration: none; }
+.pagination a:hover { background: #000; color: #FFF; }
 
-#pagination span.disabled { color: #D3D3D3; margin: 2px; padding: 2px 3px; }
+.pagination span.disabled { color: #D3D3D3; margin: 2px; padding: 2px 3px; }
 
-#pagination .left { float: left; }
-#pagination .right { float: right; }
+.pagination .left { float: left; }
+.pagination .right { float: right; }
 
 /* @end */
 

data/lib/typus/format.rb

@@ -12,12 +12,7 @@ module Typus
     def generate_html
       items_count = @resource.count(:joins => @joins, :conditions => @conditions)
       items_per_page = @resource.typus_options_for(:per_page)
-
-      @pager = ::Paginator.new(items_count, items_per_page) do |offset, per_page|
-        data(:limit => per_page, :offset => offset)
-      end
-
-      @items = @pager.page(params[:page])
+      @items = data.paginate(:per_page => items_per_page, :page => params[:page])
     end
 
     #--

data/lib/typus/pagination.rb

@@ -0,0 +1,18 @@
+module Typus
+
+  class Pagination < WillPaginate::ViewHelpers::LinkRenderer
+
+    def to_html
+      previous_label = "&larr; " + _t("Previous")
+      next_label = _t("Next") + " &rarr;"
+
+      html = []
+      html << previous_or_next_page(@collection.previous_page, previous_label, 'left')
+      html << previous_or_next_page(@collection.next_page, next_label, 'right')
+
+      html_container(html)
+    end
+
+  end
+
+end

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "1.0.0.pre10"
+  VERSION = "1.0.0.pre11"
 end

data/lib/typus.rb

@@ -15,6 +15,7 @@ autoload :FakeUser, "support/fake_user"
 module Typus
 
   autoload :Configuration, "typus/configuration"
+  autoload :Pagination, "typus/pagination"
   autoload :Resources, "typus/resources"
 
   module Authentication

data/typus.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.files = Dir.glob("**/*")
   s.require_path = "lib"
 
-  s.add_dependency 'paginator'
+  s.add_dependency 'will_paginate', '~> 3.0.beta'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  hash: -1637175999
+  hash: -1637175938
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - pre10
-  version: 1.0.0.pre10
+  - pre11
+  version: 1.0.0.pre11
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -20,17 +20,19 @@ date: 2010-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: paginator
+  name: will_paginate
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31098121
         segments: 
+        - 3
         - 0
-        version: "0"
+        - beta
+        version: 3.0.beta
   type: :runtime
   version_requirements: *id001
 description: Awesone admin scaffold generator for Ruby on Rails applications.
@@ -74,7 +76,6 @@ files:
 - app/views/admin/helpers/dashboard/_resources.html.erb
 - app/views/admin/helpers/filters/_filters.html.erb
 - app/views/admin/helpers/resources/_display_link_to_previous.html.erb
-- app/views/admin/helpers/resources/_pagination.html.erb
 - app/views/admin/helpers/search/_search.html.erb
 - app/views/admin/helpers/sidebar/_sidebar.html.erb
 - app/views/admin/helpers/table/_table.html.erb
@@ -191,6 +192,7 @@ files:
 - lib/typus/engine.rb
 - lib/typus/format.rb
 - lib/typus/orm/active_record.rb
+- lib/typus/pagination.rb
 - lib/typus/resources.rb
 - lib/typus/user.rb
 - lib/typus/version.rb

data/app/views/admin/helpers/resources/_pagination.html.erb

@@ -1,27 +0,0 @@
-<div id="pagination">
-
-  <div class="left">
-
-    <% previous_text = ("&larr; " + _t("Previous")).html_safe %>
-
-    <% if @items.prev? %>
-      <%= link_to previous_text, params.merge(:page => @items.prev.number, :anchor => @options[:anchor]) %>
-    <% else %>
-      <span class="disabled"><%= previous_text %></span>
-    <% end %>
-
-  </div>
-
-  <div class="right">
-
-    <% next_text = (_t("Next") + " &rarr;").html_safe %>
-
-    <% if @items.next? %>
-      <%= link_to next_text, params.merge(:page => @items.next.number, :anchor => @options[:anchor]) %>
-    <% else %>
-      <span class="disabled"><%= next_text %></span>
-    <% end %>
-
-  </div>
-
-</div>