refinerycms 0.9.5.16 → 0.9.5.17

data/vendor/plugins/inquiries/app/views/inquiries/new.html.erb

@@ -1,6 +1,5 @@
-<div id="body_content" class='clearfix'>
-  <h1 id='body_content_page_title'><%= page_title %></h1>
-  <div id="body_content_left" class='inquiries'>
+<% content_for :body_content_left do %>
+  <div class='inquiries'>
     <%= @page[:body] %>
 
     <%= error_messages_for :inquiry, :header_message => "Whoops there was a small problem",
@@ -28,7 +27,5 @@
       </div>
     <% end %>
   </div>
-  <div id='body_content_right' class='clearfix'>
-    <%= @page[:side_body] %>
-  </div>
-</div>
+<% end %>
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/inquiries/app/views/inquiries/thank_you.html.erb

@@ -1,9 +1 @@
-<div id="body_content" class='clearfix'>
-  <h1 id='body_content_page_title'><%= page_title %></h1>
-  <div id="body_content_left">
-    <%= @page[:body] %>
-  </div>
-  <div id='body_content_right' class='clearfix'>
-    <%= @page[:side_body] %>
-  </div>
-</div>
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/news/app/views/news_items/index.html.erb

@@ -1,21 +1,17 @@
-<div id='body_content' class='clearfix'>
-  <h1 id='body_content_page_title'><%= page_title %></h1>
-  <div id='body_content_left' class='clearfix'>
-    <%= @page[:body] %>
+<% content_for :body_content_left do %>
+  <%= @page[:body] %>
 
-    <% if @news_items.size > 0 %>
-      <% @news_items.each do |item| %>
-        <h3><%= link_to item.title, news_item_url(item) %></h3>
-        <p>
-          <small>Published <%= item.publish_date.strftime("%A %d of %B, %Y") %></small>
-        </p>
-        <%= truncate(item.body, :length => 200, :omission => " ... #{link_to "Read more", news_item_url(item)}", :preserve_html_tags => true) %>
-      <% end %>
-    <% else %>
-      <p><em>Sorry we haven't posted up any news yet.</em></p>
+  <% if @news_items.size > 0 %>
+    <% @news_items.each do |item| %>
+      <h3><%= link_to item.title, news_item_url(item) %></h3>
+      <p>
+        <small>Published <%= item.publish_date.strftime("%A %d of %B, %Y") %></small>
+      </p>
+      <%= truncate(item.body, :length => 200, :omission => " ... #{link_to "Read more", news_item_url(item)}", :preserve_html_tags => true) %>
     <% end %>
-  </div>
-  <div id='body_content_right' class='clearfix'>
-    <%= @page[:side_body] %>
-  </div>
-</div>
+  <% else %>
+    <p><em>Sorry we haven't posted up any news yet.</em></p>
+  <% end %>
+<% end %>
+
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/pages/app/views/pages/home.html.erb

@@ -1,9 +1 @@
-<div id='body_content' class='clearfix'>
-  <h1 id='body_content_page_title'><%= page_title %></h1>
-  <div id='body_content_left' class='clearfix'>
-    <%= @page[:body] %>
-  </div>
-  <div id='body_content_right' class='clearfix'>
-    <%= @page[:side_body] %>
-  </div>
-</div>
+<%= render :partial => "/shared/content_page", :locals => {:show_submenu => false} %>

data/vendor/plugins/pages/app/views/pages/show.html.erb

@@ -1,15 +1 @@
-<%= render :partial => "/shared/submenu" if RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
-<div id='body_content' class='clearfix'>
-  <h1 id='body_content_page_title'><%= page_title %></h1>
-  <div id='body_content_left' class='clearfix'>
-    <%= @page[:body] %>
-  </div>
-  <div id='body_content_right' class='clearfix'>
-    <%= @page[:side_body] %>
-  </div>
-</div>
-<% unless @page.live? %>
-  <div style='border: 1px solid #A00027;color: #A00027;background: #FFB1B1;padding:3px 9px;font-weight:bold;width:auto'>
-    This page is NOT live for public viewing.
-  </div>
-<% end %>
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb

@@ -0,0 +1,15 @@
+<%= render :partial => "/shared/submenu" if (show_submenu ||= true) and RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
+<div id='body_content' class='clearfix'>
+  <h1 id='body_content_page_title'><%= page_title %></h1>
+  <div id='body_content_left' class='clearfix'>
+    <%= (body_content_left = yield :body_content_left).blank? ? @page[:body] : body_content_left %>
+  </div>
+  <div id='body_content_right' class='clearfix'>
+    <%= (body_content_right = yield :body_content_right).blank? ? @page[:side_body] : body_content_right %>
+  </div>
+</div>
+<% unless @page.live? %>
+  <div style='border: 1px solid #A00027;color: #A00027;background: #FFB1B1;padding:3px 9px;font-weight:bold;width:auto'>
+    This page is NOT live for public viewing.
+  </div>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.16
+  version: 0.9.5.17
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +13:00
+date: 2009-11-27 00:00:00 +13:00
 default_executable: refinery
 dependencies: []
 
@@ -426,6 +426,7 @@ files:
 - vendor/plugins/refinery/app/views/admin/_menu.html.erb
 - vendor/plugins/refinery/app/views/layouts/admin.html.erb
 - vendor/plugins/refinery/app/views/layouts/application.html.erb
+- vendor/plugins/refinery/app/views/shared/_content_page.html.erb
 - vendor/plugins/refinery/app/views/shared/_footer.html.erb
 - vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb
 - vendor/plugins/refinery/app/views/shared/_header.html.erb