refinerycms 0.9.7.10 → 0.9.7.11

data/vendor/plugins/refinery/app/views/shared/_html5_for_ie.js.erb

@@ -0,0 +1,5 @@
+// html5shiv MIT @rem remysharp.com/html5-enabling-script
+// iepp v1.5.1 MIT @jon_neal iecss.com/print-protector
+/*@cc_on(function(p,e){var q=e.createElement("div");q.innerHTML="<z>i</z>";q.childNodes.length!==1&&function(){function r(a,b){if(g[a])g[a].styleSheet.cssText+=b;else{var c=s[l],d=e[j]("style");d.media=a;c.insertBefore(d,c[l]);g[a]=d;r(a,b)}}function t(a,b){for(var c=new RegExp("\\b("+m+")\\b(?!.*[;}])","gi"),d=function(k){return".iepp_"+k},h=-1;++h<a.length;){b=a[h].media||b;t(a[h].imports,b);r(b,a[h].cssText.replace(c,d))}}for(var s=e.documentElement,i=e.createDocumentFragment(),g={},m="abbr article aside audio canvas details figcaption figure footer header hgroup mark meter nav output progress section summary time video".replace(/ /g, '|'),
+n=m.split("|"),f=[],o=-1,l="firstChild",j="createElement";++o<n.length;){e[j](n[o]);i[j](n[o])}i=i.appendChild(e[j]("div"));p.attachEvent("onbeforeprint",function(){for(var a,b=e.getElementsByTagName("*"),c,d,h=new RegExp("^"+m+"$","i"),k=-1;++k<b.length;)if((a=b[k])&&(d=a.nodeName.match(h))){c=new RegExp("^\\s*<"+d+"(.*)\\/"+d+">\\s*$","i");i.innerHTML=a.outerHTML.replace(/\r|\n/g," ").replace(c,a.currentStyle.display=="block"?"<div$1/div>":"<span$1/span>");c=i.childNodes[0];c.className+=" iepp_"+
+d;c=f[f.length]=[a,c];a.parentNode.replaceChild(c[1],c[0])}t(e.styleSheets,"all")});p.attachEvent("onafterprint",function(){for(var a=-1,b;++a<f.length;)f[a][1].parentNode.replaceChild(f[a][0],f[a][1]);for(b in g)s[l].removeChild(g[b]);g={};f=[]})}()})(this,document);@*/

data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb

@@ -11,7 +11,10 @@
 
   unless hide_cancel
     cancel_button_text  ||= t('.cancel')
-    cancel_title        ||= t('.cancel_lose_changes', :object_name => f.object.class.name.underscore.gsub("_", " "))
+    unless defined?(cancel_title)
+      cancel_title = t('.cancel_lose_changes',
+                       :object_name => f.object.class.name.underscore.gsub("_", " "))
+    end
     cancel_button_id    ||= "cancel_button"
 
     cancel_url          ||= (((back = url_for(:back)).include?('javascript') or action_name =~ /^(create|update)$/) ? send("admin_#{f.object.class.name.pluralize.underscore}_url") : back)

data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb

@@ -1,5 +1,5 @@
 <form method="GET" action="<%= url %>" class="search_form">
   <input id="search" name="search" size="22" type="search" value="<%= params[:search] %>" />
   <input id="dialog" name="dialog" type="hidden" value="<%= from_dialog? %>" />
-  <%= submit_tag t('admin.search'), :name => "" %>
+  <%= submit_tag t('admin.search'), :name => nil %>
 </form>

data/vendor/plugins/refinery/app/views/shared/admin/_sortable_list.html.erb

@@ -1,9 +1,9 @@
 <input type='hidden' id='reorder_authenticity_token' name='reorder_authenticity_token' value='<%= form_authenticity_token %>'/>
-<% unless params[(list_id ||= "sortable_list").to_sym].blank? %>
+<% if params[(list_id ||= "sortable_list").to_sym].present? and
+      (defined?(continue_reordering) ? continue_reordering == "true" : true) -%>
   <script type='text/javascript'>
     $(document).ready(function(){
-      <%= "list_reorder.enable_reordering();" if (defined?(continue_reordering) ? continue_reordering == "true" : true) %>
-      init_tooltips();
+      list_reorder.enable_reordering();
     });
   </script>
-<% end %>
+<% end -%>

data/vendor/plugins/refinery/lib/crud.rb

@@ -35,7 +35,8 @@ module Crud
       }.merge!(new_options)
 
       module_eval %(
-        before_filter :find_#{singular_name}, :only => [:update, :destroy, :edit, :show]
+        before_filter :find_#{singular_name},
+                      :only => [:update, :destroy, :edit, :show]
 
         def new
           @#{singular_name} = #{class_name}.new
@@ -44,14 +45,18 @@ module Crud
         def create
           # if the position field exists, set this object as last object, given the conditions of this class.
           if #{class_name}.column_names.include?("position")
-            params[:#{singular_name}].merge!({:position => ((#{class_name}.maximum(:position, :conditions => "#{options[:conditions]}")||-1) + 1)})
+            params[:#{singular_name}].merge!({
+              :position => ((#{class_name}.maximum(:position, :conditions => "#{options[:conditions]}")||-1) + 1)
+            })
           end
 
           if (@#{singular_name} = #{class_name}.create(params[:#{singular_name}])).valid?
             unless request.xhr?
-              flash[:notice] = t('refinery.crudify.created', :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
+              flash[:notice] = t('refinery.crudify.created',
+                                 :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
             else
-              flash.now[:notice] = t('refinery.crudify.created', :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
+              flash.now[:notice] = t('refinery.crudify.created',
+                                     :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
             end
             unless from_dialog?
               unless params[:continue_editing] =~ /true|on|1/
@@ -70,7 +75,11 @@ module Crud
             unless request.xhr?
               render :action => 'new'
             else
-              render :partial => "/shared/admin/error_messages_for", :locals => {:symbol => :#{singular_name}, :object => @#{singular_name}}
+              render :partial => "/shared/admin/error_messages_for",
+                     :locals => {
+                       :symbol => :#{singular_name},
+                       :object => @#{singular_name}
+                     }
             end
           end
         end
@@ -82,9 +91,11 @@ module Crud
         def update
           if @#{singular_name}.update_attributes(params[:#{singular_name}])
             unless request.xhr?
-              flash[:notice] = t('refinery.crudify.updated', :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
+              flash[:notice] = t('refinery.crudify.updated',
+                                 :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
             else
-              flash.now[:notice] = t('refinery.crudify.updated', :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
+              flash.now[:notice] = t('refinery.crudify.updated',
+                                     :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'")
             end
             unless from_dialog?
               unless params[:continue_editing] =~ /true|on|1/
@@ -103,7 +114,11 @@ module Crud
             unless request.xhr?
               render :action => 'edit'
             else
-              render :partial => "/shared/admin/error_messages_for", :locals => {:symbol => :#{singular_name}, :object => @#{singular_name}}
+              render :partial => "/shared/admin/error_messages_for",
+                     :locals => {
+                       :symbol => :#{singular_name},
+                       :object => @#{singular_name}
+                     }
             end
           end
         end
@@ -117,39 +132,51 @@ module Crud
         end
 
         def find_#{singular_name}
-          @#{singular_name} = #{class_name}.find(params[:id], :include => %w(#{options[:include].join(' ')}))
+          @#{singular_name} = #{class_name}.find(params[:id],
+                                                 :include => %w(#{options[:include].join(' ')}))
         end
 
         def find_all_#{plural_name}
-          @#{plural_name} = #{class_name}.find  :all,
-                                                :order => "#{options[:order]}",
-                                                :conditions => "#{options[:conditions]}",
-                                                :include => %w(#{options[:include].join(' ')})
+          @#{plural_name} = #{class_name}.find(
+            :all,
+            :order => "#{options[:order]}",
+            :conditions => "#{options[:conditions]}",
+            :include => %w(#{options[:include].join(' ')})
+          )
         end
 
         def paginate_all_#{plural_name}
-          @#{plural_name} = #{class_name}.paginate :page => params[:page],
-                                                   :order => "#{options[:order]}",
-                                                   :conditions => "#{options[:conditions]}",
-                                                   :include => %w(#{options[:include].join(' ')})
+          @#{plural_name} = #{class_name}.paginate(
+            :page => params[:page],
+            :order => "#{options[:order]}",
+            :conditions => "#{options[:conditions]}",
+            :include => %w(#{options[:include].join(' ')})
+          )
         end
 
         def search_all_#{plural_name}
-          @#{plural_name} = #{class_name}.find_with_index params[:search],
-                                                   :order => "#{options[:order]}",
-                                                   :conditions => "#{options[:search_conditions]}",
-                                                   :include => %w(#{options[:include].join(' ')})
+          @#{plural_name} = #{class_name}.with_query(params[:search]).find(
+            :all,
+            :order => "#{options[:order]}",
+            :conditions => "#{options[:search_conditions]}",
+            :include => %w(#{options[:include].join(' ')})
+          )
         end
 
         def search_and_paginate_all_#{plural_name}
-          @#{plural_name} = #{class_name}.paginate_search params[:search],
-                                                   :page => params[:page],
-                                                   :order => "#{options[:order]}",
-                                                   :conditions => "#{options[:search_conditions]}",
-                                                   :include => %w(#{options[:include].join(' ')})
+          @#{plural_name} = #{class_name}.with_query(params[:search]).paginate(
+            :page => params[:page],
+            :order => "#{options[:order]}",
+            :conditions => "#{options[:search_conditions]}",
+            :include => %w(#{options[:include].join(' ')})
+          )
         end
 
-        protected :find_#{singular_name}, :find_all_#{plural_name}, :paginate_all_#{plural_name}, :search_all_#{plural_name}, :search_and_paginate_all_#{plural_name}
+        protected :find_#{singular_name},
+                  :find_all_#{plural_name},
+                  :paginate_all_#{plural_name},
+                  :search_all_#{plural_name},
+                  :search_and_paginate_all_#{plural_name}
 
       )
 
@@ -211,7 +238,11 @@ module Crud
             end
 
             find_all_#{plural_name}
-            render :partial => 'sortable_list', :layout => false, :locals => {:continue_reordering => params[:continue_reordering]}
+            render :partial => 'sortable_list',
+                   :layout => false,
+                   :locals => {
+                     :continue_reordering => params[:continue_reordering]
+                   }
           end
 
           # takes in a single branch and saves the nodes inside it
@@ -220,7 +251,9 @@ module Crud
               parse_branch(pos, id, id_hash["id"]) unless pos == "id"
             end if id_hash.include?('0')
 
-            #{class_name}.update(id_hash["id"], :parent_id => parent_id, :position => position)
+            #{class_name}.update(id_hash["id"],
+                                 :parent_id => parent_id,
+                                 :position => position)
           end
 
           protected :parse_branch

data/vendor/plugins/refinery/lib/generators/refinery_plugin/templates/rails/init.rb

@@ -2,7 +2,7 @@ Refinery::Plugin.register do |plugin|
   plugin.name = "<%= class_name.pluralize.underscore.downcase %>"
   plugin.activity = {
     :class => <%= class_name %><% if attributes.first.name != "title" %>,
-    :title => '<%= attributes.first.name %>'
+    :title => '<%= attributes.select { |a| a.type.to_s == "string" }.first.name %>'
   <% end %>}
 
   plugin.directory = directory # tell refinery where this plugin is located

data/vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/admin/_sortable_list.html.erb

@@ -1,2 +1,4 @@
-<%%= render :partial => '<%= singular_name %>', :collection => @<%= plural_name %> %>
+<ul id='sortable_list'>
+  <%%= render :partial => '<%= singular_name %>', :collection => @<%= plural_name %> %>
+</ul>
 <%%= render :partial => "/shared/admin/sortable_list", :locals => {:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)} %>

data/vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/admin/index.html.erb

@@ -25,9 +25,7 @@
   <%% else %>
     <%% if @<%= plural_name %>.any? %>
       <%%= will_paginate @<%= plural_name %>, :previous_label => '&laquo;', :next_label => '&raquo;' %>
-       <ul id='sortable_list'>
-        <%%= render :partial => "sortable_list" %>
-       </ul>
+      <%%= render :partial => "sortable_list" %>
       <%%= will_paginate @<%= plural_name %>, :previous_label => '&laquo;', :next_label => '&raquo;' %>
     <%% else %>
       <p>

data/vendor/plugins/refinery/lib/refinery.rb

@@ -31,7 +31,7 @@ module Refinery
     @major = 0
     @minor = 9
     @tiny  = 7
-    @build = 10
+    @build = 11
 
     def self.to_s
       [@major, @minor, @tiny, @build].compact.join('.')

data/vendor/plugins/refinery/lib/tasks/refinery.rake

@@ -162,6 +162,7 @@ namespace :refinery do
     Rails.root.join('features', 'refinery').mkpath
     Rails.root.join('features', 'step_definitions', 'refinery').mkpath
     Rails.root.join('features', 'support').mkpath
+    Rails.root.join('features', 'uploads').mkpath
 
     # copy in cucumber features
     FileUtils::cp Dir[Refinery.root.join('features', 'refinery', '*.feature').to_s],
@@ -176,6 +177,10 @@ namespace :refinery do
                   Rails.root.join('features', 'step_definitions').to_s,
                   :verbose => verbose
 
+    FileUtils::cp Dir[Refinery.root.join('features', 'uploads', '*').to_s],
+                  Rails.root.join('features', 'uploads').to_s,
+                  :verbose => verbose
+
     FileUtils::cp Dir[Refinery.root.join('features', 'support', '*.rb').to_s],
                   Rails.root.join('features', 'support').to_s,
                   :verbose => verbose

data/vendor/plugins/refinery/plugins.md

@@ -149,7 +149,7 @@ Here's what the different activity options mean:
     # the name of the class we're watching.
 
     :url_prefix
-    # Just use "_edit" if you're not sure how this works.
+    # Just use "edit_" if you're not sure how this works.
     #
     # When it says "'About' page was updated about 4 hours ago", the page title "About"
     # is linked to that page in a way we specify.  So by setting "_edit" as a :url_prefix what

data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb

@@ -2,6 +2,7 @@
 <html>
   <%= render :partial => "/admin/head" %>
   <body id='dialog_container' class='dialog'>
+    <div id='tooltip_container'></div>
     <div id="flash_container">
       <%= render :partial => '/shared/message' %>
     </div>

data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb

@@ -35,12 +35,9 @@ class Admin::ResourcesController < Admin::BaseController
 
   def index
     if searching?
-      @resources = Resource.paginate_search params[:search],
-                                            :page => params[:page],
-                                            :order => "created_at DESC"
+      search_and_paginate_all_resources
     else
-      @resources = Resource.paginate  :page => params[:page],
-                                      :order => "created_at DESC"
+      paginate_all_resources
     end
 
     if RefinerySetting.find_or_set(:group_resources_by_date_uploaded, true)

data/vendor/plugins/resources/app/views/admin/resources/_resource.html.erb

@@ -11,6 +11,7 @@
     <%= link_to refinery_icon_tag('delete.png'), admin_resource_path(resource),
                 :class => "cancel confirm-delete",
                 :title => t('.delete.title'),
-                :'data-confirm' => t('.delete.message', :title => resource.filename) %>
+                :'data-confirm' => t('.delete.message', :title => resource.filename),
+                :'data-method' => "delete" %>
   </span>
 </li>

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 9
   - 7
-  - 10
-  version: 0.9.7.10
+  - 11
+  version: 0.9.7.11
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +12:00
+date: 2010-08-07 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -43,7 +44,6 @@ files:
 - public/.htaccess
 - config.ru
 - app/controllers/admin/base_controller.rb
-- app/controllers/application.rb
 - app/controllers/application_controller.rb
 - app/helpers/application_helper.rb
 - bin/refinery
@@ -112,6 +112,7 @@ files:
 - features/refinery/manage_refinery_settings.feature
 - features/refinery/manage_users.feature
 - features/refinery/plugin_generator.feature
+- features/refinery/search.feature
 - features/refinery/site_bar.feature
 - features/refinery/theme_generator.feature
 - features/step_definitions/refinery/core_steps.rb
@@ -146,6 +147,8 @@ files:
 - public/images/refinery/branch-end.gif
 - public/images/refinery/branch-start.gif
 - public/images/refinery/branch.gif
+- public/images/refinery/carousel-left.png
+- public/images/refinery/carousel-right.png
 - public/images/refinery/cross.png
 - public/images/refinery/dialogLoadingAnimation.gif
 - public/images/refinery/header_background.png
@@ -504,6 +507,7 @@ files:
 - public/javascripts/jquery/GPL-LICENSE.txt
 - public/javascripts/jquery/jquery.corner.js
 - public/javascripts/jquery/jquery.html5-placeholder-shim.js
+- public/javascripts/jquery/jquery.jcarousel.js
 - public/javascripts/jquery/jquery.nestedsortables.js
 - public/javascripts/jquery/jquery.textTruncate.js
 - public/javascripts/jquery/jquery.timers.js
@@ -517,6 +521,7 @@ files:
 - public/javascripts/wymeditor/jquery.refinery.wymeditor.js
 - public/javascripts/wymeditor/lang/ca.js
 - public/javascripts/wymeditor/lang/cs.js
+- public/javascripts/wymeditor/lang/da.js
 - public/javascripts/wymeditor/lang/de.js
 - public/javascripts/wymeditor/lang/en.js
 - public/javascripts/wymeditor/lang/es.js
@@ -940,6 +945,7 @@ files:
 - vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb
 - vendor/plugins/refinery/app/views/shared/_head.html.erb
 - vendor/plugins/refinery/app/views/shared/_header.html.erb
+- vendor/plugins/refinery/app/views/shared/_html5_for_ie.js.erb
 - vendor/plugins/refinery/app/views/shared/_ie6check.html.erb
 - vendor/plugins/refinery/app/views/shared/_language_switcher.html.erb
 - vendor/plugins/refinery/app/views/shared/_menu.html.erb
@@ -1099,23 +1105,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A beautiful open source Ruby on Rails content manager for small business.

data/app/controllers/application.rb

@@ -1,3 +0,0 @@
-# This file is here to support web servers who load Rails in the old fashion e.g. some builds of Phusion Passenger.
-# This will simply load the application controller using the new style if this file is ever loaded.
-require_dependency 'application_controller'