Merge branch 'master' of git@github.com:resolve/refinerycms into them…

…e_support

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

@@ -1,6 +1,7 @@
 class Admin::PagesController < Admin::BaseController
 
   crudify :page, :conditions => "parent_id IS NULL", :order => "position ASC", :include => [:parts, :slugs, :children], :paging => false
+  after_filter :expire_menu_fragment_caching, :only => [:create, :update, :destroy]
 
   def new
     @page = Page.new
@@ -9,4 +10,9 @@ def new
     end
   end
 
+protected
+  def expire_menu_fragment_caching
+    expire_fragment(%r{site_menu})
+  end
+
 end

vendor/plugins/refinery/app/views/shared/_menu.html.erb

@@ -1,16 +1,18 @@
 <%
-  # cache important lookups
-  hide_children = RefinerySetting.find_or_set(:menu_hide_children, false)
-  siblings = nil # all pages in the top level menu have the same siblings, basically.
+  cache(:action_suffix => "site_menu") do
+    # cache important lookups
+    hide_children = RefinerySetting.find_or_set(:menu_hide_children, false)
+    siblings = nil # all pages in the top level menu have the same siblings, basically.
 %>
-<ul id='<%= dom_id ||= "menu" %>' class='menu clearfix'>
-  <% @menu_pages.each do |page| -%>
-    <%= render :partial => '/shared/menu_branch', :locals => {
-        :page => page,
-        :position => @menu_pages.index(page),
-        :root => true,
-        :siblings => ((siblings ||= page.shown_siblings) - [self]),
-        :hide_children => hide_children
-    } -%>
-  <% end -%>
-</ul>
+  <ul id='<%= dom_id ||= "menu" %>' class='menu clearfix'>
+    <% @menu_pages.each do |page| -%>
+      <%= render :partial => '/shared/menu_branch', :locals => {
+          :page => page,
+          :position => @menu_pages.index(page),
+          :root => true,
+          :siblings => ((siblings ||= page.shown_siblings) - [self]),
+          :hide_children => hide_children
+      } -%>
+    <% end -%>
+  </ul>
+<% end %>