From b76510037d7664b667de630ad05aa6f97a8fdf6f Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Fri, 20 Aug 2010 14:12:12 +1200 Subject: [PATCH 1/2] make like before --- themes/demolicious/stylesheets/application.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/demolicious/stylesheets/application.css b/themes/demolicious/stylesheets/application.css index ef11589e45..fff8c33a0b 100644 --- a/themes/demolicious/stylesheets/application.css +++ b/themes/demolicious/stylesheets/application.css @@ -28,7 +28,7 @@ body { width: 990px; margin: 0px auto; } -header { +#header { background: url('/theme/images/header_background.png') repeat-x; } header { @@ -86,7 +86,7 @@ header #menu { #menu li:hover ul, #menu div:hover nav { left: auto; } -footer { +#footer { margin-top: 120px; background: url('/theme/images/footer_background.png') repeat-x; } From 55b2d60c8be9cdce0128a58257276d07d4f3e9f6 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Fri, 20 Aug 2010 14:15:01 +1200 Subject: [PATCH 2/2] Seems to be loading the page_parts sanely now (i.e. SELECT * FROM page_parts WHERE page_parts.page_id IN (1,2,3,4,5) instead of one per query. (ht: Radar) --- vendor/plugins/pages/app/models/page.rb | 8 +++++--- .../refinery/app/views/shared/_menu_branch.html.erb | 2 +- .../plugins/refinery/lib/refinery/application_helper.rb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/vendor/plugins/pages/app/models/page.rb b/vendor/plugins/pages/app/models/page.rb index 1358527747..844e66ee49 100644 --- a/vendor/plugins/pages/app/models/page.rb +++ b/vendor/plugins/pages/app/models/page.rb @@ -15,7 +15,6 @@ class Page < ActiveRecord::Base before_destroy :deletable? after_save :reposition_parts! - after_save :invalidate_child_cached_url # when a dialog pops up to link to a page, how many pages per page should there be @@ -183,7 +182,7 @@ def top_level(include_children = false) find_all_by_parent_id(nil, :conditions => {:show_in_menu => true, :draft => false}, :order => "position ASC", - :include => include_associations) + :include => include_associations.presence) end end @@ -198,7 +197,10 @@ def [](part_title) # the way that we call page parts seems flawed, will probably revert to page.parts[:title] in a future release. if (super_value = super).blank? # self.parts is already eager loaded so we can now just grab the first element matching the title we specified. - part = self.parts.detect {|part| (part.title == part_title.to_s) || (part.title.downcase.gsub(" ", "_") == part_title.to_s.downcase.gsub(" ", "_")) } + part = self.parts.detect do |part| + part.title == part_title.to_s or + part.title.downcase.gsub(" ", "_") == part_title.to_s.downcase.gsub(" ", "_") + end return part.body unless part.nil? end diff --git a/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb b/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb index d859cb184a..5a9f310227 100644 --- a/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb +++ b/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb @@ -1,5 +1,5 @@ <% - css = (css = css_for_menu_branch(menu_branch, menu_branch_counter)).any? ? " class='#{css.join(' ')}'" : nil + css = (css = css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count||=nil)).any? ? " class='#{css.join(' ')}'" : nil dom_id = (menu_branch.parent_id.nil? and menu_branch.title.present?) ? " id='item_#{menu_branch_counter}'" : nil -%> <%= dom_id -%>> diff --git a/vendor/plugins/refinery/lib/refinery/application_helper.rb b/vendor/plugins/refinery/lib/refinery/application_helper.rb index f382d11698..52be70c9e1 100644 --- a/vendor/plugins/refinery/lib/refinery/application_helper.rb +++ b/vendor/plugins/refinery/lib/refinery/application_helper.rb @@ -27,7 +27,7 @@ def content_fu(content, thumbnail) # This was extracted from REFINERY_ROOT/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb # to remove the complexity of that template by reducing logic in the view. - def css_for_menu_branch(menu_branch, menu_branch_counter) + def css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count = nil) css = [] css << "selected" if selected_page?(menu_branch) or descendant_page_selected?(menu_branch) css << "first" if menu_branch_counter == 0