refinerycms-core 0.9.9.5 → 0.9.9.7

data/lib/refinery/crud.rb

@@ -18,15 +18,17 @@ module Refinery
       this_class = class_name.constantize.base_class
 
       {
-        :title_attribute => "title",
-        :order => ('position ASC' if this_class.table_exists? and this_class.column_names.include?('position')),
         :conditions => '',
-        :sortable => true,
-        :searchable => true,
         :include => [],
+        :order => ('position ASC' if this_class.table_exists? and this_class.column_names.include?('position')),
         :paging => true,
+        :per_page => false,
+        :redirect_to_url => "admin_#{plural_name}_url",
+        :searchable => true,
         :search_conditions => '',
-        :redirect_to_url => "admin_#{plural_name}_url"
+        :sortable => true,
+        :title_attribute => "title",
+        :xhr_paging => false
       }
     end
 
@@ -161,8 +163,11 @@ module Refinery
 
             paging_options = {:page => params[:page]}
 
+            # Use per_page from crudify options.
+            if #{options[:per_page].present?.inspect}
+              paging_options.update({:per_page => #{options[:per_page].inspect}})
             # Seems will_paginate doesn't always use the implicit method.
-            if #{class_name}.methods.map(&:to_sym).include?(:per_page)
+            elsif #{class_name}.methods.map(&:to_sym).include?(:per_page)
               paging_options.update({:per_page => #{class_name}.per_page})
             end
 
@@ -193,6 +198,8 @@ module Refinery
               def index
                 search_all_#{plural_name} if searching?
                 paginate_all_#{plural_name}
+
+                render :partial => '#{plural_name}' if #{options[:xhr_paging].inspect} && request.xhr?
               end
             )
           else
@@ -212,6 +219,8 @@ module Refinery
             module_eval %(
               def index
                 paginate_all_#{plural_name}
+
+                render :partial => '#{plural_name}' if #{options[:xhr_paging].inspect} && request.xhr?
               end
             )
           else

data/lib/refinery/helpers/tag_helper.rb

@@ -2,17 +2,18 @@ module Refinery
   module Helpers
     module TagHelper
 
-      # Returns <span class='help' title='Your Input'>(help)</span>
+      # Returns <img class='help' tooltip='Your Input' src='refinery/icons/information.png' />
       # Remember to wrap your block with <span class='label_with_help'></span> if you're using a label next to the help tag.
       def refinery_help_tag(title='')
         title = h(title) unless title.html_safe?
 
-        "<span class=\"help\" title=\"#{title}\">(#{t('help', :scope => 'shared.admin')})</span>".html_safe
+        refinery_icon_tag('information', :class => 'help', :tooltip => title)
       end
 
       # This is just a quick wrapper to render an image tag that lives inside refinery/icons.
       # They are all 16x16 so this is the default but is able to be overriden with supplied options.
       def refinery_icon_tag(filename, options = {})
+        filename = "#{filename}.png" unless filename.split('.').many?
         image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge(options)
       end
 

data/lib/tasks/refinery.rake

@@ -162,50 +162,10 @@ namespace :refinery do
 
   desc "Update the core files with the gem"
   task :update => :environment do
-    verbose = ENV["verbose"] || false
-    require 'fileutils'
-
-    # Clean up mistakes
-    if (bad_migration = Rails.root.join('db', 'migrate', '20100913234704_add_cached_slug_to_pages.rb')).file?
-      FileUtils::rm bad_migration
-    end
-
-    unless (devise_config = Rails.root.join('config', 'initializers', 'devise.rb')).file?
-      devise_config.parent.mkpath
-      FileUtils::cp Refinery.roots('core').join(*%w(lib generators templates config initializers devise.rb)),
-                    devise_config,
-                    :verbose => verbose
-    end
-
-    (contents = Rails.root.join('Gemfile').read).gsub!("group :test do", "group :development, :test do")
-    Rails.root.join('Gemfile').open("w") do |f|
-      f.puts contents
-    end
-
-    # copy in any new migrations, except for ones that create schemas (this is an update!)
-    # or ones that exist already.
-    Rails.root.join("db", "migrate").mkpath
-    migrations = Pathname.glob(Refinery.roots.map{|r| r.join("db", "migrate", "*.rb")}).reject{|m|
-      m.to_s =~ %r{\d+_create_refinerycms_.+?_schema\.rb} or
-      Dir[Rails.root.join('db', 'migrate', "*#{m.basename.to_s.split(/\d+_/).last}")].any?
-    }
-    FileUtils::cp migrations,
-                  Rails.root.join('db', 'migrate').cleanpath.to_s,
-                  :verbose => verbose
-
-    Rails.root.join("db", "seeds").mkpath
-    Pathname.glob(Refinery.roots.map{|r| r.join('db', 'seeds', '*.rb')}).each do |seed|
-      unless (destination = Rails.root.join('db', 'seeds', seed.basename)).exist?
-        FileUtils::cp seed, destination.to_s, :verbose => verbose
-      end
-    end
-
-    puts "\n" if verbose
-
-    unless (ENV["from_installer"] || 'false').to_s == 'true'
-      puts "\n=== ACTION REQUIRED ==="
-      puts "Please run rake db:migrate to ensure your database is at the correct version.\n"
-    end
+    puts "\nThe rake refinery:update task is DEPRECATED."
+    puts "Please use the generator instead:"
+    puts "rails generate refinerycms --update"
+    puts "\n"
   end
 
   namespace :cache do

data/public/javascripts/refinery/admin.js

@@ -13,14 +13,31 @@ if(typeof(window.onpopstate) == "object"){
   $(window).bind('popstate', function(e) {
     // this fires on initial page load too which we don't need.
     if(!initialLoad) {
-      $.get(location.href, function(data) {
-        $('.pagination_container').slideTo(data);
-      });
+      $(document).paginateTo((location.pathname + location.href.split(location.pathname)[1]));
     }
     initialLoad = false;
   });
 }
 
+$.fn.paginateTo = function(stateUrl) {
+  // Grab the url, ensuring not to cache.
+  $.ajax({
+    url: stateUrl,
+    cache: false,
+    success: function(data) {
+      $('.pagination_container').slideTo(data);
+
+      // remove caching _ argument.
+      $('.pagination_container .pagination a').each(function(i, a){
+        $(this).attr('href', $(this).attr('href').replace(/\?\_\=[^&]+&/, '?'));
+      })
+    },
+    failure: function(data) {
+      window.location = popstate_location;
+    }
+  });
+}
+
 $.fn.slideTo = function(response) {
   $(this).html(response);
   $(this).applyMinimumHeightFromChildren();
@@ -46,12 +63,17 @@ init_ajaxy_pagination = function(){
   if(typeof(window.history.pushState) == 'function' && $('.pagination_container').length > 0){
     var pagination_pages = $('.pagination_container .pagination a');
     pagination_pages.live('click',function(e) {
-      this.href = (this.href.replace(/(\&(amp\;)?)?from_page\=\d+/, '')
-                   + '&from_page=' + $(this).parent().find('em').text()).replace('?&', '?');
-      history.pushState({ path: this.path }, '', this.href);
-      $.get(this.href, function(data) {
-        $('.pagination_container').slideTo(data)
-      })
+      navigate_to = this.href.replace(/(\&(amp\;)?)?from_page\=\d+/, '');
+      navigate_to += '&from_page=' + $(this).parent().find('em').text();
+      navigate_to = navigate_to.replace('?&', '?');
+
+      var current_state_location = (location.pathname + location.href.split(location.pathname)[1]);
+      window.history.pushState({
+        path: current_state_location
+      }, '', navigate_to);
+
+      $(document).paginateTo(navigate_to);
+
       e.preventDefault();
     });
   }

data/public/stylesheets/refinery/refinery.css

@@ -1369,9 +1369,15 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
 .hemisquare small {
   font-size: 0.9em;
 }
-.label_with_help label, .label_with_help span.help {
+.label_with_help {
+  vertical-align: middle;
+}
+.label_with_help label, .label_with_help span.help, .label_with_help img.help {
   display: inline;
 }
+.label_with_help img.help {
+  vertical-align: middle;
+}
 .label_with_help span.help {
   font-weight: normal;
   margin-left: 3px;

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.5}
+  s.version           = %q{0.9.9.7}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-03-08}
+  s.date              = %q{2011-03-10}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '~> 0.9.9.5'
-  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.5'
+  s.add_dependency 'refinerycms-base',            '~> 0.9.9.7'
+  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.7'
   s.add_dependency 'refinerycms-generators',      '~> 0.9.9.3'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.5
+  version: 0.9.9.7
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +13:00
+date: 2011-03-10 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -473,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.6.0
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Core engine for Refinery CMS