refinerycms 0.9.6.29 → 0.9.6.30

data/vendor/plugins/authentication/app/views/admin/users/_user.html.erb

@@ -13,4 +13,4 @@
                   :title => 'Email this user' %>
     </span>
   </span>
-</li>
+</li>

data/vendor/plugins/authentication/app/views/admin/users/index.html.erb

@@ -20,4 +20,4 @@
       </strong>
     </p>
   <% end %>
-</div>
+</div>

data/vendor/plugins/images/app/helpers/admin/images_helper.rb

@@ -13,7 +13,7 @@ module Admin::ImagesHelper
   end
 
   def change_list_mode_if_specified
-    unless params[:action] != "index" or params[:view].blank? or !image_views.include? params[:view].to_sym
+    unless action_name != "index" or params[:view].blank? or !image_views.include? params[:view].to_sym
       RefinerySetting[:preferred_image_view] = params[:view]
     end
   end

data/vendor/plugins/images/app/views/admin/images/_form.html.erb

@@ -4,14 +4,14 @@
                               :html => {:multipart => true, :style => 'float: left; width: 70%'} do |f| %>
   <div class='field'>
     <%= f.label :uploaded_data, 'Image' %>
-    <% if params[:action] =~ /(edit)|(update)/ %>
+    <% if action_name =~ /(edit)|(update)/ %>
       Use current image
       <em>or</em>, replace it with this one...
     <% end %>
     <%= f.file_field :uploaded_data %>
   </div>
 
-  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_cancel => (@app_dialog or params[:action] == "insert")} %>
+  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_cancel => (@app_dialog or action_name == "insert")} %>
 
   <% if @app_dialog %>
     <input type='hidden' name='app_dialog' value='<%= @app_dialog %>' />
@@ -23,7 +23,7 @@
   <% end %>
 <% end %>
 
-<% if params[:action] =~ /(edit)|(update)/ %>
+<% if action_name =~ /(edit)|(update)/ %>
   <div style='float: right; width: 25%;'>
     <label>Current Image</label>
     <%= image_fu @image, :medium, { :class => "brown_border" } %>

data/vendor/plugins/images/app/views/admin/images/_grid_view.html.erb

@@ -14,4 +14,4 @@
       </span>
     </li>
   <% end -%>
-</ul>
+</ul>

data/vendor/plugins/images/app/views/admin/images/_list_view_image.html.erb

@@ -14,4 +14,4 @@
       </span>
     </span>
   </li>
-<% end %>
+<% end %>

data/vendor/plugins/inquiries/app/controllers/inquiries_controller.rb

@@ -2,6 +2,10 @@ class InquiriesController < ApplicationController
 
   before_filter :find_page, :only => [:create, :new]
 
+  def index
+    redirect_to :action => "new"
+  end
+
   def thank_you
     @page = Page.find_by_menu_match("^/inquiries/thank_you$", :include => [:parts, :slugs])
   end

data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb

@@ -13,4 +13,4 @@
                   :title => "Remove this inquiry forever" -%>
     </span>
   </span>
-</li>
+</li>

data/vendor/plugins/inquiries/app/views/admin/inquiry_settings/index.html.erb

@@ -28,4 +28,4 @@
       <% end -%>
     </ul>
   <% end -%>
-</div>
+</div>

data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb

@@ -13,7 +13,7 @@ class Admin::PagesController < Admin::BaseController
 
 protected
   def expire_menu_fragment_caching
-    expire_fragment(%r{site_menu})
+    expire_fragment(%r{#{RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")}})
   end
 
   # This finds all of the pages that could possibly be assigned as the current page's parent.

data/vendor/plugins/pages/app/controllers/pages_controller.rb

@@ -1,8 +1,7 @@
 class PagesController < ApplicationController
 
   def home
-    @page = Page.find_by_link_url("/", :include => [:parts, :slugs])
-    error_404 unless @page.present?
+    error_404 unless (@page = Page.find_by_link_url("/", :include => [:parts, :slugs])).present?
   end
 
   def show
@@ -19,4 +18,4 @@ class PagesController < ApplicationController
     end
   end
 
-end
+end

data/vendor/plugins/pages/app/views/admin/pages/_page.html.erb

@@ -29,4 +29,4 @@
       <%= render :partial => 'page', :collection => children %>
     </ul>
   <% end -%>
-</li>
+</li>

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

@@ -1,8 +1,8 @@
 <li class='clearfix record <%%= cycle("on", "on-hover") %>' id="<%%= dom_id(<%= singular_name %>) -%>">
   <span class='title'>
-    <%%=h <%= singular_name %>.<%= attributes.first.name %> %> 
+    <%%=h <%= singular_name %>.<%= attributes.first.name %> %>
     <span class="preview">&nbsp;</span>
-    
+
     <span class='actions'>
       <%%= link_to refinery_icon_tag("application_go.png"), <%= singular_name %>_url(<%= singular_name %>),
           :title => 'View this <%= $title_name.downcase %><br/><em>Opens in a new window</em>',
@@ -14,4 +14,4 @@
           :title => 'Remove this <%= $title_name.downcase %> forever' %>
     </span>
   </span>
-</li>
+</li>

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

@@ -6,38 +6,49 @@ class Refinery::ApplicationController < ActionController::Base
   include Crud # basic create, read, update and delete methods
   include AuthenticatedSystem
 
-  before_filter :take_down_for_maintenance?, :find_pages_for_menu, :show_welcome_page
+  before_filter :take_down_for_maintenance?, :find_pages_for_menu, :show_welcome_page?
 
-  rescue_from ActiveRecord::RecordNotFound, ActionController::UnknownAction, :with => :error_404
+  rescue_from ActiveRecord::RecordNotFound, ActionController::UnknownAction, ActionView::MissingTemplate, :with => :error_404
 
-  def error_404
+  def admin?
+    controller_name =~ %r{^admin/}
+  end
+
+  def error_404(exception=nil)
     if (@page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])).present?
-      # render the application's custom 404 page with layout.
-      render :template => "/pages/show", :status => 404
+      if exception.present? and exception.is_a?(ActionView::MissingTemplate) and params[:format] != "html"
+        # Attempt to respond to all requests with the default format's 404 page
+        # unless a format wasn't specified. This requires finding menu pages and re-attaching any themes
+        # which for some unknown reason don't happen, most likely due to the format being passed in.
+        response.template.template_format = :html
+        response.headers["Content-Type"] = Mime::Type.lookup_by_extension('html').to_s
+        find_pages_for_menu if @menu_pages.nil? or @menu_pages.empty?
+        attach_theme_to_refinery if self.respond_to?(:attach_theme_to_refinery) # may not be using theme support
+        present(@page)
+      end
+
+      # render the application's custom 404 page with layout and meta.
+      render :template => "/pages/show", :status => 404, :format => 'html'
     else
       # fallback to the default 404.html page.
-      render :file => Rails.root.join("public", "404.html"), :layout => false, :status => 404
+      render :file => Rails.root.join("public", "404.html").cleanpath.to_s, :layout => false, :status => 404
     end
   end
 
-  def home_page?
-    action_name == "home" and controller_name == "pages"
+  def from_dialog?
+    params[:dialog] == "true" or params[:modal] == "true"
   end
 
-  def local_request?
-    ENV["RAILS_ENV"] == "development" or request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/
+  def home_page?
+    action_name == "home" and controller_name == "pages"
   end
 
   def just_installed?
     !User.exists?
   end
 
-  def from_dialog?
-    params[:dialog] == "true" or params[:modal] == "true"
-  end
-
-  def admin?
-    controller_name =~ /^admin\//
+  def local_request?
+    ENV["RAILS_ENV"] == "development" or request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/
   end
 
   def wymiframe
@@ -46,20 +57,6 @@ class Refinery::ApplicationController < ActionController::Base
 
 protected
 
-  def take_down_for_maintenance?
-    if RefinerySetting.find_or_set(:down_for_maintenance, false)
-      if (@page = Page.find_by_menu_match("^/maintenance$", :include => [:parts, :slugs])).present?
-        render :template => "/pages/show", :status => 503
-      else
-        render :text => "Our website is currently down for maintenance. Please try back soon."
-      end
-    end
-  end
-
-  def show_welcome_page
-    render :template => "/welcome", :layout => "admin" if just_installed? and controller_name != "users"
-  end
-
   # get all the pages to be displayed in the site menu.
   def find_pages_for_menu
     @menu_pages = Page.top_level(include_children=true)
@@ -77,4 +74,20 @@ protected
     super
   end
 
+  def show_welcome_page?
+    render :template => "/welcome", :layout => "admin" if just_installed? and controller_name != "users"
+  end
+  # todo: make this break in the next major version rather than aliasing.
+  alias_method :show_welcome_page, :show_welcome_page?
+
+  def take_down_for_maintenance?
+    if RefinerySetting.find_or_set(:down_for_maintenance, false)
+      if (@page = Page.find_by_menu_match("^/maintenance$", :include => [:parts, :slugs])).present?
+        render :template => "/pages/show", :status => 503
+      else
+        render :text => "Our website is currently down for maintenance. Please try back soon."
+      end
+    end
+  end
+
 end

data/vendor/plugins/refinery/rails/init.rb

@@ -11,7 +11,7 @@ require_dependency 'refinery/base_presenter'
 
 [ Refinery.root.join("vendor", "plugins", "*", "app", "presenters").to_s,
   Rails.root.join("vendor", "plugins", "*", "app", "presenters").to_s,
-  Rails.root.join("app", "presenters").to_s 
+  Rails.root.join("app", "presenters").to_s
 ].uniq.each do |path|
   Dir[path].each do |presenters_path|
     $LOAD_PATH << presenters_path

data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb

@@ -80,4 +80,4 @@ class RefinerySetting < ActiveRecord::Base
     self[:value] = new_value
   end
 
-end
+end

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb

@@ -1,7 +1,7 @@
 <%= error_messages_for :refinery_setting %>
 <% form_for [:admin, @refinery_setting] do |f| %>
   <div class='field'>
-  <% if params[:action] =~ /(new)|(create)/ %>
+  <% if action_name =~ /(new)|(create)/ %>
     <%= f.label :name %>
     <%= f.text_field :name, :class => "larger", :size => 67 %>
   <% else %>

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_refinery_setting.html.erb

@@ -13,4 +13,4 @@
                   :title => 'Remove this setting forever' if refinery_setting.destroyable %>
     </span>
   </span>
-</li>
+</li>

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb

@@ -24,4 +24,4 @@
       <% end %>
     </p>
   <% end %>
-</div>
+</div>

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

@@ -4,7 +4,7 @@
                                   :html => {:multipart => true} do |f| -%>
   <div class='field'>
     <%= f.label :uploaded_data, 'File to upload' -%>
-    <% if params[:action] =~ /(edit)|(update)/ -%>
+    <% if action_name =~ /(edit)|(update)/ -%>
       <%= link_to "Download current file", @resource.public_filename, {:title => @resource.title} -%>
       <em>or</em>, replace it with this one...
     <% end -%>

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

@@ -12,4 +12,4 @@
                           :title => "Remove this file forever" %>
     </span>
   </span>
-</li>
+</li>

data/vendor/plugins/themes/rails/init.rb

@@ -4,26 +4,29 @@ config.middleware.use "ThemeServer"
 ::Refinery::ApplicationController.module_eval do
 
   # Add or remove theme paths to/from Refinery application
-  before_filter do |controller|
+  prepend_before_filter :attach_theme_to_refinery
+
+  def attach_theme_to_refinery
     # remove any paths relating to any theme.
-    controller.view_paths.reject! { |v| v.to_s =~ %r{^themes/} }
+    view_paths.reject! { |v| v.to_s =~ %r{^themes/} }
 
     # add back theme paths if there is a theme present.
-    if (theme = Theme.current_theme(controller.request.env)).present?
+    if (theme = Theme.current_theme(request.env)).present?
       # Set up view path again for the current theme.
-      controller.view_paths.unshift Rails.root.join("themes", theme, "views").to_s
+      view_paths.unshift Rails.root.join("themes", theme, "views").to_s
 
       # Ensure that routes within the application are top priority.
       # Here we grab all the routes that are under the application's view folder
       # and promote them ahead of any other path.
-      controller.view_paths.select{|p| p.to_s =~ /^app\/views/}.each do |app_path|
-        controller.view_paths.unshift app_path
+      view_paths.select{|p| p.to_s =~ /^app\/views/}.each do |app_path|
+        view_paths.unshift app_path
       end
     end
 
     # Set up menu caching for this theme or lack thereof
     RefinerySetting[:refinery_menu_cache_action_suffix] = "#{"#{theme}_" if theme.present?}site_menu" if RefinerySetting.table_exists?
   end
+  protected :attach_theme_to_refinery
 
 end
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 29
-  version: 0.9.6.29
+  - 30
+  version: 0.9.6.30
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-15 00:00:00 +12:00
+date: 2010-04-16 00:00:00 +12:00
 default_executable: 
 dependencies: []