refinerycms 0.9.6.1 → 0.9.6.2

data/VERSION

@@ -1 +1 @@
-0.9.6.1
+0.9.6.2

data/config/environments/development.rb

@@ -16,5 +16,11 @@ config.action_controller.perform_caching             = false
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false
 
-# Uncomment the following line if you're getting "A copy of XX has been removed from the module tree but is still active!" as it may help you:
-# config.after_initialize {  Dependencies.load_once_paths = Dependencies.load_once_paths.select { |path| (path =~ /app/).nil? } }
+# Uncomment the following lines if you're getting
+# "A copy of XX has been removed from the module tree but is still active!"
+# or you want to develop a plugin and don't want to restart every time a change is made:
+#config.after_initialize do
+#  ::ActiveSupport::Dependencies.load_once_paths = ::ActiveSupport::Dependencies.load_once_paths.select do |path|
+#    (path =~ /app/).nil?
+#  end
+#end

data/db/seeds.rb

@@ -26,11 +26,11 @@ Page.create(:title => "Home",
             :menu_match => "^/$",
             :position => 0).parts.create(
             {
-              :title => "body",
+              :title => "Body",
               :body => "<p>Welcome to our site. This is just a place holder page while we gather our content.</p>"
             }).page.parts.create(
             {
-              :title => "side_body",
+              :title => "Side Body",
               :body => "<p>This is another block of content over here.</p>"
             })
 
@@ -38,11 +38,11 @@ Page.create(:title => "About Us",
             :deletable => true,
             :position => 1).parts.create(
             {
-              :title => "body",
+              :title => "Body",
               :body => "<p>This is just a standard text page example. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin metus dolor, hendrerit sit amet, aliquet nec, posuere sed, purus. Nullam et velit iaculis odio sagittis placerat. Duis metus tellus, pellentesque ut, luctus id, egestas a, lorem. Praesent vitae mauris. Aliquam sed nulla. Sed id nunc vitae leo suscipit viverra. Proin at leo ut lacus consequat rhoncus. In hac habitasse platea dictumst. Nunc quis tortor sed libero hendrerit dapibus.\n\nInteger interdum purus id erat. Duis nec velit vitae dolor mattis euismod. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse pellentesque dignissim lacus. Nulla semper euismod arcu. Suspendisse egestas, erat a consectetur dapibus, felis orci cursus eros, et sollicitudin purus urna et metus. Integer eget est sed nunc euismod vestibulum. Integer nulla dui, tristique in, euismod et, interdum imperdiet, enim. Mauris at lectus. Sed egestas tortor nec mi.</p>"
             }).page.parts.create(
             {
-              :title => "side_body",
+              :title => "Side Body",
               :body => "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus fringilla nisi a elit. Duis ultricies orci ut arcu. Ut ac nibh. Duis blandit rhoncus magna. Pellentesque semper risus ut magna. Etiam pulvinar tellus eget diam. Morbi blandit. Donec pulvinar mauris at ligula. Sed pellentesque, ipsum id congue molestie, lectus risus egestas pede, ac viverra diam lacus ac urna. Aenean elit.</p>"
             })
 
@@ -56,7 +56,7 @@ Page.create(:title => "News",
               :body => "<p>Want to know the latest? Here's what has been happening.</p>"
             }).page.parts.create(
             {
-              :title => "side_body",
+              :title => "Side Body",
               :body => "<p>Here we post up the latest about us, along with events and updates you don't want to miss!</p>"
             })
 
@@ -66,11 +66,11 @@ Page.create(:title => "Contact Us",
             :deletable => false,
             :position => 4).parts.create(
             {
-              :title => "body",
+              :title => "Body",
               :body => "<p>Get in touch with us. Just use the form below and we'll get back to you as soon as we can.</p>"
             }).page.parts.create(
             {
-              :title => "side_body",
+              :title => "Side Body",
               :body => "<p>163 Evergreen Terrace<br/>Happyville<br/>USA.<br/>Phone: 1-800 CALLUSNOW</p>"
             })
 
@@ -81,7 +81,7 @@ Page.create(:title => "Thank You",
             :position => 0,
             :parent_id => 4).parts.create(
             {
-              :title => "body",
+              :title => "Body",
               :body => "<p>We've received your inquiry and will get back to you with a response shortly.</p><p><a href='/'>Return to the home page</a></p>"
             })
 
@@ -91,7 +91,7 @@ Page.create(:title => "Page not found",
             :deletable => false,
             :position => 5).parts.create(
             {
-              :title => "body",
+              :title => "Body",
               :body => "<h2>Sorry, there was a problem...</h2><p>The page you requested was not found.</p><p><a href='/'>Return to the home page</a></p>"
             })
 
@@ -100,11 +100,11 @@ Page.create(:title => "Privacy Policy",
             :show_in_menu => false,
             :position => 6).parts.create(
             {
-              :title => "body",
+              :title => "Body",
               :body => "<p><strong>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>"
             }).page.parts.create(
             {
-              :title => "side_body",
+              :title => "Side Body",
               :body => ""
             })
 
@@ -113,11 +113,12 @@ Page.create(:title => "Down for maintenance",
             :show_in_menu => false,
             :position => 7).parts.create(
             {
-              :title => "body",
+              :title => "Body",
               :body => "<p>Our site is currently down for maintenance. Please try back later.</p>"
             })
 
 # Install default themes.
+FileUtils::mkdir File.join(%W(#{RAILS_ROOT} themes)) unless File.directory? File.join(%W(#{RAILS_ROOT} themes))
 Dir[File.join(%W(#{REFINERY_ROOT} themes *.zip))].each do |theme|
   Theme.create(:uploaded_data => {
     "size" => File.size(theme),

data/public/stylesheets/refinery/refinery.css

@@ -789,13 +789,13 @@ body.dialog form {
 	/*bottom: 0px;*/
 	/*right: 0px;*/
 	text-align: right;
-  float: right;
+    float: right;
 	/*position: absolute;*/
 	margin: 0px;
 	width: 763px;
 }
 
-#upload_image_area {
+#upload_image_area, #upload_resource_area {
 	padding: 12px;
 }
 

data/test/fixtures/page_parts.yml

@@ -1,9 +1,9 @@
 home_page_body:
-  title: body
+  title: Body
   page: home_page
   body: This is the body
 
 home_page_side_body:
-  title: side_body
+  title: Side Body
   page: home_page
   body: This is the side body

data/vendor/plugins/images/images.md

@@ -41,7 +41,9 @@ _Note: you will have to restart your web server after changing this setting for
 
 Take the default thumbnails above to use the ``:side_body`` thumbnail I would collect that image out of the database and apply it like this in my view:
 
-    <%= image_tag(@image.public_filename(:side_body)) %>
+    <%= image_fu @image, :side_body %>
+    
+image_fu is a command we have created that automatically adds width and height attributes to the generated image so that web browsers render your pages more smoothly as they know in advance how big an image is going to be before it is fully downloaded.
 
 ## Related Settings
 

data/vendor/plugins/pages/pages.md

@@ -21,8 +21,8 @@ Think of a page part is a single piece of content on your page. At [Resolve Digi
 You can change what the default page parts are called or add more by editing the "Default Page Parts" setting. This is a serialized array of names. The default looks like this
 
     --- 
-    - body
-    - side_body
+    - Body
+    - Side Body
   
 Edit this setting to suit your taste.
 

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

@@ -24,7 +24,7 @@
 <% content_for :head do %>
   <script type='text/javascript'>
     resource_changed = function() {
-      $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=" + $('#current_resource').attr('href') + "&");
+      $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=" + $('#current_resource').attr('href') + "&"));
       $('#remove_resource').show();
       $('#current_resource_container').show();
       $('#no_resource_selected').hide();
@@ -36,7 +36,7 @@
         $('#current_resource_container').hide();
         $('#current_resource_text').innerHTML = '';
         $('#no_resource_selected').show();
-        $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=&");
+        $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=&"));
         $(this).hide();
         e.preventDefault();
       });

data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb

@@ -23,7 +23,7 @@ class <%= migration_name %> < ActiveRecord::Migration
       :position => ((Page.maximum(:position, :conditions => "parent_id IS NULL") || -1)+1),
       :menu_match => "^/<%= plural_name %>(\/|\/.+?|)$"
     )
-    RefinerySetting.find_or_set(:default_page_parts, ["body", "side_body"]).each do |default_page_part|
+    RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each do |default_page_part|
       page.parts.create(:title => default_page_part, :body => nil)
     end
   end

data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb

@@ -1,9 +1,9 @@
 class <%= class_name %> < ActiveRecord::Base
 
   acts_as_indexed :fields => [:<%= attributes.collect{ |attribute| attribute.name if attribute.type.to_s =~ /string|text/ }.compact.uniq.join(", :") %>],
-          :index_file => [RAILS_ROOT,"tmp","index"]
+                  :index_file => %W(#{RAILS_ROOT} tmp index)
 
   validates_presence_of :<%= attributes.first.name %>
   validates_uniqueness_of :<%= attributes.first.name %>
 
-end
+end

data/vendor/plugins/refinery/lib/generators/refinery/templates/public_controller.rb

@@ -1,14 +1,15 @@
 class <%= class_name.pluralize %>Controller < ApplicationController
 
+  before_filter :find_all_<%= plural_name %>
   before_filter :find_page
 
   def index
-    @<%= plural_name %> = <%= class_name %>.find(:all, :order => "position ASC")
+    # you can use meta fields from your model instead (e.g. browser_title)
+    # by swapping @page for @<%= singular_name %> in the line below:
     present(@page)
   end
 
   def show
-    @<%= plural_name %> = <%= class_name %>.find(:all, :order => "position ASC") # for body_content_right
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
 
     # you can use meta fields from your model instead (e.g. browser_title)
@@ -18,6 +19,10 @@ class <%= class_name.pluralize %>Controller < ApplicationController
 
 protected
 
+  def find_all_<%= plural_name %>
+    @<%= plural_name %> = <%= class_name %>.find(:all, :order => "position ASC")
+  end
+
   def find_page
     @page = Page.find_by_link_url("/<%= plural_name %>")
   end

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

@@ -1,12 +1,12 @@
 <%%= error_messages_for :<%= singular_name %> -%>
 <%% form_for [:admin, @<%= singular_name %>] do |f| -%>
-  <% attributes.each do |attribute| %>
+  <% attributes.each_with_index do |attribute, index| %>
   <div class='field'>
     <%%= f.label :<%= attribute.name %> -%>
 <% if attribute.field_type.to_s == "text_area" -%>
     <%%= f.text_area :<%= attribute.name %>, :rows => 20, :cols => 140, :class => 'wymeditor' -%>
 <% else -%>
-    <%%= f.<%= attribute.field_type -%> :<%= attribute.name -%> -%>
+    <%%= f.<%= attribute.field_type -%> :<%= attribute.name -%><%= ", :class => 'larger'" if (index == 0 && attribute.field_type == :text_field) -%> -%>
 <% end -%>
   </div>
   <% end %>

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

@@ -1,15 +1,11 @@
-<div id='body_content' class='clearfix'>
-  <h1><%%= page_title %></h1>
-  <div id='body_content_left' class='clearfix'>
-    <ul id="<%= plural_name %>">
-      <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
-        <li>
-          <%%= link_to <%= singular_name %>.<%= attributes.first.name %>, <%= singular_name %>_url(<%= singular_name %>) %>
-        </li>
-      <%% end %>
-    </ul>
-  </div>
-  <div id='body_content_right' class='clearfix'>
-    &nbsp;
-  </div>
-</div>
+<%% content_for :body_content_left do %>
+  <ul id="<%= plural_name %>">
+    <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
+      <li>
+        <%%= link_to <%= singular_name %>.<%= attributes.first.name %>, <%= singular_name %>_url(<%= singular_name %>) %>
+      </li>
+    <%% end %>
+  </ul>
+<%% end %>
+
+<%%= render :partial => "/shared/content_page" %>

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

@@ -1,23 +1,25 @@
-<div id='body_content' class='clearfix'>
-  <h1>
-    <%%= @<%= singular_name %>.<%= attributes.first.name %> %>
-  </h1>
-  <div id='body_content_left' class='clearfix'>
-    <% attributes.each do |attribute| %>
-    <div>
-      <h3><%= attribute.name.titleize %></h3>
-      <%%= @<%= singular_name %>.<%= attribute.name %> %>
-    </div>
-    <% end %>
+<%% content_for :body_content_title do %>
+  <%%= @<%= singular_name %>.<%= attributes.first.name %> %>
+<%% end %>
+
+<%% content_for :body_content_left do %>
+  <% attributes.each do |attribute| %>
+  <div>
+    <h3><%= attribute.name.titleize %></h3>
+    <%%= @<%= singular_name %>.<%= attribute.name %> %>
   </div>
-  <div id='body_content_right' class='clearfix'>
-    <h2>Other <%= $title_name.pluralize %></h2>
-    <ul id="<%= plural_name %>">
-      <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
-        <li>
-          <%%= link_to <%= singular_name %>.<%= attributes.first.name %>, <%= singular_name %>_url(<%= singular_name %>) %>
-        </li>
-      <%% end %>
-    </ul>
-  </div>
-</div>
+  <% end %>
+<%% end %>
+
+<%% content_for :body_content_right do %>
+  <h2>Other <%= $title_name.pluralize %></h2>
+  <ul id="<%= plural_name %>">
+    <%% @<%= plural_name %>.each do |<%= singular_name %>| %>
+      <li>
+        <%%= link_to <%= singular_name %>.<%= attributes.first.name %>, <%= singular_name %>_url(<%= singular_name %>) %>
+      </li>
+    <%% end %>
+  </ul>
+<%% end %>
+
+<%%= render :partial => "/shared/content_page" %>

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

@@ -6,7 +6,7 @@
         <label for='resource_type_existing' class='stripped'>Existing File</label>
       </span>
     <% end %>
-    <span id='upload_resource_radio' class='radio<%= " selected_radio" if @resource.errors.size > 0 %>'>
+    <span id='upload_resource_radio' class='radio<%= " selected_radio" if @resource.errors.size > 0 or @resources.empty? %>'>
       <input type='radio' name='resource_type' value='upload_resource' id='resource_type_upload' <%= "checked='true'" if @resources.empty? or !@resource.errors.empty? %> />
       <label for='resource_type_upload' class='stripped'>New File</label>
     </span>
@@ -29,14 +29,14 @@
             </ul>
           </div>
         </div>
-        <%= will_paginate @resources, 
-                          :previous_label => '&laquo; Previous', 
-                          :next_label => 'Next &raquo;', 
-                          :renderer => Refinery::LinkRenderer, 
+        <%= will_paginate @resources,
+                          :previous_label => '&laquo; Previous',
+                          :next_label => 'Next &raquo;',
+                          :renderer => Refinery::LinkRenderer,
                           :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog?} unless @thickbox %>
       </div>
     <% end %>
-    <div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" if @resources.empty? %>>
+    <div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" unless @resources.empty? %>>
       <%= render :partial => "form", :locals => {:insert => true} %>
     </div>
   </div>
@@ -47,10 +47,10 @@
     or
     <%= link_to "Cancel", "", :id => "cancel_button", :class => "close_dialog" %>
 
-    <%= will_paginate @resources, 
-                          :previous_label => '&laquo; Previous', 
-                          :next_label => 'Next &raquo;', 
-                          :renderer => Refinery::LinkRenderer, 
+    <%= will_paginate @resources,
+                          :previous_label => '&laquo; Previous',
+                          :next_label => 'Next &raquo;',
+                          :renderer => Refinery::LinkRenderer,
                           :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog? } %>
   </div>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.1
+  version: 0.9.6.2
 platform: ruby
 authors: 
 - Resolve Digital