refinerycms 0.9.6.28 → 0.9.6.29

data/VERSION

@@ -1 +1 @@
-0.9.6.28
+0.9.6.29

data/config/application.rb

@@ -2,7 +2,7 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Specified gem version of Refinery to use when vendor/plugins/refinery/lib/refinery.rb is not present.
-REFINERY_GEM_VERSION = '0.9.6.28' unless defined? REFINERY_GEM_VERSION
+REFINERY_GEM_VERSION = '0.9.6.29' unless defined? REFINERY_GEM_VERSION
 
 # Boot Rails
 require File.join(File.dirname(__FILE__), 'boot')

data/db/seeds.rb

@@ -19,87 +19,100 @@ end
 InquirySetting.create(:name => "Confirmation Body", :value => "Thank you for your inquiry %name%,\n\nThis email is a receipt to confirm we have received your inquiry and we'll be in touch shortly.\n\nThanks.", :destroyable => false)
 InquirySetting.create(:name => "Notification Recipients", :value => "", :destroyable => false)
 
-Page.create(:title => "Home",
+page_position = -1
+
+home_page = Page.create(:title => "Home",
             :deletable => false,
             :link_url => "/",
             :menu_match => "^/$",
-            :position => 0).parts.create(
-            {
+            :position => (page_position += 1))
+home_page.parts.create({
               :title => "Body",
-              :body => "<p>Welcome to our site. This is just a place holder page while we gather our content.</p>"
-            }).page.parts.create(
-            {
+              :body => "<p>Welcome to our site. This is just a place holder page while we gather our content.</p>",
+              :position => 0
+            })
+home_page.parts.create({
               :title => "Side Body",
-              :body => "<p>This is another block of content over here.</p>"
+              :body => "<p>This is another block of content over here.</p>",
+              :position => 1
             })
 
-Page.create(:title => "About Us",
+about_us_page = Page.create(:title => "About Us",
             :deletable => true,
-            :position => 1).parts.create(
-            {
+            :position => (page_position += 1))
+about_us_page.parts.create({
               :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(
-            {
+              :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>",
+              :position => 0
+            })
+about_us_page.parts.create({
               :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>"
+              :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>",
+              :position => 1
             })
 
-Page.create(:title => "Contact Us",
+contact_us_page = Page.create(:title => "Contact Us",
             :link_url => "/inquiries/new",
             :menu_match => "^/inquiries.*$",
             :deletable => false,
-            :position => 2).parts.create(
-            {
+            :position => (page_position += 1))
+contact_us_page.parts.create({
               :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(
-            {
+              :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>",
+              :position => 0
+            })
+contact_us_page.parts.create({
               :title => "Side Body",
-              :body => "<p>163 Evergreen Terrace<br/>Happyville<br/>USA.<br/>Phone: 1-800 CALLUSNOW</p>"
+              :body => "<p>163 Evergreen Terrace<br/>Happyville<br/>USA.<br/>Phone: 1-800 CALLUSNOW</p>",
+              :position => 1
             })
 
-Page.create(:title => "Thank You",
+thank_you_page = Page.create(:title => "Thank You",
             :menu_match => "^/inquiries/thank_you$",
             :show_in_menu => false,
             :deletable => false,
-            :position => 3,
-            :parent_id => 4).parts.create(
-            {
+            :position => 0,
+            :parent_id => contact_us_page.id)
+thank_you_page.parts.create({
               :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>"
+              :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>",
+              :position => 0
             })
 
-Page.create(:title => "Page not found",
+page_not_found_page = Page.create(:title => "Page not found",
             :menu_match => "^/404$",
             :show_in_menu => false,
             :deletable => false,
-            :position => 4).parts.create(
-            {
+            :position => (page_position += 1))
+page_not_found_page.parts.create({
               :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>"
+              :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>",
+              :position => 0
             })
 
-Page.create(:title => "Privacy Policy",
+privacy_policy_page = Page.create(:title => "Privacy Policy",
             :deletable => true,
             :show_in_menu => false,
-            :position => 5).parts.create(
-            {
+            :position =>  (page_position += 1))
+privacy_policy_page.parts.create({
               :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(
-            {
+              :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>",
+              :position => 0
+            })
+privacy_policy_page.parts.create({
               :title => "Side Body",
-              :body => ""
+              :body => "",
+              :position => 1
             })
 
-Page.create(:title => "Down for maintenance",
+down_for_maintenance_page = Page.create(:title => "Down for maintenance",
             :menu_match => "^/maintenance$",
             :show_in_menu => false,
-            :position => 6).parts.create(
-            {
+            :position =>  (page_position += 1))
+down_for_maintenance_page.parts.create({
               :title => "Body",
-              :body => "<p>Our site is currently down for maintenance. Please try back later.</p>"
+              :body => "<p>Our site is currently down for maintenance. Please try back later.</p>",
+              :position => 0
             })
 
 # Create a default themes directory.

data/vendor/plugins/authentication/app/controllers/users_controller.rb

@@ -34,7 +34,19 @@ class UsersController < ApplicationController
           @user.plugins = @selected_plugin_titles
           @user.save
           UserSession.create!(@user)
-          current_user.update_attribute(:superuser, true) if User.count == 1 # this is the superuser if this user is the only user.
+          if User.count == 1
+            # this is the superuser if this user is the only user.
+            current_user.update_attribute(:superuser, true)
+
+            # set this user as the recipient of inquiry notifications
+            if (notification_recipients = InquirySetting.find_or_create_by_name("Notification Recipients")).present?
+              notification_recipients.update_attributes({
+                :value => current_user.email,
+                :destroyable => false
+              })
+            end
+          end
+
           redirect_back_or_default(admin_root_url)
           flash[:notice] = "Welcome to Refinery, #{current_user.login}."
 

data/vendor/plugins/authentication/app/models/user.rb

@@ -55,17 +55,4 @@ class User < ActiveRecord::Base
     !other_user.superuser and User.count > 1 and (other_user.nil? or self.id != other_user.id)
   end
 
-protected
-
-  # before filter
-  def encrypt_password
-    return if password.blank?
-    self.password_salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
-    self.crypted_password = encrypt(password)
-  end
-
-  def password_required?
-    crypted_password.blank? || !password.blank?
-  end
-
 end

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

@@ -0,0 +1,16 @@
+<li id="sortable_<%= user.id %>" class='clearfix record <%= cycle("on", "on-hover") %>'>
+  <span class='title'>
+    <strong><%= user.login %></strong>
+    <span class="preview">(<%= user.email %>) created <%= user.created_at.strftime("%b %d, %Y") %></span>
+
+    <span class='actions'>
+      <%= link_to refinery_icon_tag('delete.png'), admin_user_path(user),
+                  :class => "cancel confirm-delete",
+                  :title => "Remove this user forever" if current_user.can_delete?(user) %>
+      <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_user_path(user),
+                  :title => 'Edit this user' %>
+      <%= mail_to user.email, refinery_icon_tag('email_go.png'),
+                  :title => 'Email this user' %>
+    </span>
+  </span>
+</li>

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

@@ -9,24 +9,7 @@
   <% if @users.any? %>
     <%= will_paginate @users, :previous_label => '&laquo;', :next_label => '&raquo;' %>
     <ul>
-      <% @users.each do |user| -%>
-        <li id="sortable_<%= user.id %>" class='clearfix record <%= cycle("on", "on-hover") %>'>
-          <span class='title'>
-            <span class='actions'>
-              <%= link_to refinery_icon_tag('delete.png'), admin_user_path(user),
-                                :class => "cancel confirm-delete",
-                :title => "Remove this user forever" if current_user.can_delete?(user) %>
-              <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_user_path(user),
-                :title => 'Edit this user' %>
-              <%= mail_to user.email, refinery_icon_tag('email_go.png'), :title => 'Email this user' %>
-            </span>
-            <strong><%= user.login %></strong>
-            <span class="preview">
-              (<%= user.email %>) created <%= user.created_at.strftime("%b %d, %Y") %>
-            </span>
-          </span>
-        </li>
-      <% end -%>
+      <%= render :partial => "user", :collection => @users %>
     </ul>
     <%= will_paginate @users, :previous_label => '&laquo;', :next_label => '&raquo;' %>
   <% else %>
@@ -37,4 +20,4 @@
       </strong>
     </p>
   <% end %>
-</div>
+</div>

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

@@ -1,16 +1,17 @@
 <ul id="image_grid" class="clearfix">
   <% @images.each do |image| -%>
-     <li id="image_<%= image.id %>" <%= "class='row-end'" if (@images.index(image)+1) % 4 == 0 %>>
-       <%= image_fu image, :grid, :title => image.title %>
-       <span class='actions'>
-         <%= link_to refinery_icon_tag('eye.png'), image.public_filename,
-                               :target => "_blank", :title => "Click to view '#{image.title}'<br/><em>Opens in a new window</em>" %>
-         <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(image),
-                                 :title => 'Edit this image' %>
-         <%= link_to refinery_icon_tag('delete.png'), admin_image_path(image),
-                                                                    :class => "cancel confirm-delete",
-                                  :title => "Remove this image forever" %>
-       </span>
-     </li>
+    <li id="image_<%= image.id %>" <%= "class='row-end'" if (@images.index(image)+1) % 4 == 0 %>>
+      <%= image_fu image, :grid, :title => image.title %>
+      <span class='actions'>
+        <%= link_to refinery_icon_tag('eye.png'), image.public_filename,
+                    :target => "_blank",
+                    :title => "Click to view '#{image.title}'<br/><em>Opens in a new window</em>" %>
+        <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(image),
+                    :title => 'Edit this image' %>
+        <%= link_to refinery_icon_tag('delete.png'), admin_image_path(image),
+                    :class => "cancel confirm-delete",
+                    :title => "Remove this image forever" %>
+      </span>
+    </li>
   <% end -%>
-</ul>
+</ul>

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

@@ -1,16 +1,17 @@
 <% if list_view_image.parent_id.nil? %>
   <li id="sortable_<%= list_view_image.id %>" class='clearfix record <%= cycle("on", "on-hover") %>'>
     <span class='title'>
+      <%= list_view_image.title %> <span class="preview">&nbsp;</span>
       <span class='actions'>
         <%= link_to refinery_icon_tag('eye.png'), list_view_image.public_filename,
-                              :target => "_blank", :title => "#{image_fu list_view_image, :preview}" %>
+                    :target => "_blank",
+                    :title => "#{image_fu list_view_image, :preview}" %>
         <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(list_view_image),
-                              :title => 'Edit this image' %>
+                    :title => 'Edit this image' %>
         <%= link_to refinery_icon_tag('delete.png'), admin_image_path(list_view_image),
-                               :class => "cancel confirm-delete",
-                               :title => "Remove this image forever" %>
+                    :class => "cancel confirm-delete",
+                    :title => "Remove this image forever" %>
       </span>
-      <%= list_view_image.title %> <span class="preview">&nbsp;</span>
     </span>
   </li>
-<% end %>
+<% end %>

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

@@ -1,24 +1,16 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
+    <%=h inquiry.name %>
+    <span class="preview">- <%= truncate(strip_tags(inquiry.message), :length => 50) -%></span>
+
     <span class='actions'>
-      <%= link_to refinery_icon_tag("#{inquiry.open? ? 'accept' : 'arrow_up'}.png"),
-                  toggle_status_admin_inquiry_url(inquiry),
+      <%= link_to refinery_icon_tag("#{inquiry.open? ? 'accept' : 'arrow_up'}.png"), toggle_status_admin_inquiry_url(inquiry),
                   :title => "Move this inquiry to #{inquiry.open? ? 'closed' : 'open'}" %>
-      <%= link_to refinery_icon_tag('email_open.png'),
-                  admin_inquiry_url(inquiry),
+      <%= link_to refinery_icon_tag('email_open.png'), admin_inquiry_url(inquiry),
                   :title => "Read this inquiry" -%>
-      <%= link_to refinery_icon_tag('delete.png'),
-                  admin_inquiry_url(inquiry),
+      <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry),
                   :class => "cancel confirm-delete",
                   :title => "Remove this inquiry forever" -%>
     </span>
-    <%=h inquiry.name %>
-    <span class="preview">
-      - <%= truncate(strip_tags(inquiry.message), :length => 50) -%>
-    </span>
   </span>
-</li>
-
-
-
-
+</li>

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

@@ -16,16 +16,16 @@
       <% @inquiry_settings.each do |setting| -%>
         <li class='clearfix record <%= cycle("on", "on-hover") %>'>
           <span class='title'>
+            <span><%=h setting.name %></span>
             <span class='actions'>
               <%= link_to refinery_icon_tag("application_edit.png", :alt => "Edit"), edit_admin_inquiry_setting_path(setting) %>
               <%= link_to refinery_icon_tag("delete.png", :alt => "Delete"), admin_inquiry_setting_path(setting),
-                                                                :class => "cancel confirm-delete" ,
-                                :title => "Remove this inquiry setting forever"  if setting.destroyable? %>
+                          :class => "cancel confirm-delete" ,
+                          :title => "Remove this inquiry setting forever" if setting.destroyable? %>
             </span>
-            <span><%=h setting.name %></span>
           </span>
         </li>
       <% end -%>
     </ul>
   <% end -%>
-</div>
+</div>

data/vendor/plugins/inquiries/config/routes.rb

@@ -1,4 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
+  map.new_inquiry '/contact', :controller => "inquiries", :action => "new"
   map.resources :inquiries, :collection => {:thank_you => :get}
 
   map.namespace(:admin) do |admin|

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

@@ -0,0 +1,32 @@
+<%
+  branch = if (!page.parent_id.nil? and page === page.self_and_siblings.last) or (page != @pages.first and page === @pages.last)
+    "branch_end"
+  elsif page === @pages.first
+    "branch_start"
+  end
+-%>
+<li class='record<%= " #{branch}" %>' id="<%= dom_id(page) -%>">
+  <div class='clearfix'>
+    <span class='title'>
+      <%= h page.title %>
+      <%= "<em>(hidden)</em>" unless page.show_in_menu? %>
+      <%= "<em>(draft)</em>" if page.draft? %>
+    </span>
+
+    <span class='actions'>
+      <%= link_to refinery_icon_tag('application_go.png'), page.url,
+                  :target => "_blank",
+                  :title => "View this page live <br/><em>(opens in a new window)</em>" %>
+      <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_page_path(page),
+                  :title => "Edit this page" %>
+      <%= link_to refinery_icon_tag('delete.png'), admin_page_path(page),
+                  :class => "cancel confirm-delete",
+                  :title => "Remove this page forever" if page.deletable? %>
+    </span>
+  </div>
+  <% if (children = page.children).any? -%>
+    <ul class='nested'>
+      <%= render :partial => 'page', :collection => children %>
+    </ul>
+  <% end -%>
+</li>

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

@@ -1,4 +1,2 @@
-<% @pages.each do |page| %>
-   <%= render :partial => 'list', :locals => {:page => page} %>
-<% end %>
+<%= render :partial => "page", :collection => @pages %>
 <%= render :partial => "/shared/admin/sortable_list", :locals => {:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)} %>

data/vendor/plugins/refinery/app/views/admin/_head.html.erb

@@ -1,7 +1,7 @@
 <% use_caching = RefinerySetting.find_or_set(:use_resource_caching, false) -%>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery</title>
+  <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name') %> - Refinery</title>
   <%= stylesheet_link_tag 'refinery/refinery', 'refinery/tooltips', "wymeditor/skins/refinery/skin", :cache => (use_caching ? "cache/refinery" : false) %>
   <%= render :partial => "/shared/admin/head_before_javascript_libraries" -%>
   <%= jquery_include_tags(use_caching) %>

data/vendor/plugins/refinery/app/views/layouts/admin.html.erb

@@ -25,7 +25,7 @@
           <%= link_to image_tag("#{"http://www.resolvedigital.com/images/" unless local_request?}refinery/resolve_digital_footer_logo.png", :alt => "Resolve Digital"), "http://www.resolvedigital.com", :target => "_blank", :id => "footer_logo" %>
           <p>
             Refinery built by <%= link_to "Resolve Digital", "http://www.resolvedigital.com", :target => "_blank" %>.
-            Copyright 2009 Resolve Digital.
+            Copyright &copy; 2005-<%= Time.now.year %> Resolve Digital
           </p>
         </div>
       <% end %>

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

@@ -1,5 +1,8 @@
 <li class='clearfix record <%%= cycle("on", "on-hover") %>' id="<%%= dom_id(<%= singular_name %>) -%>">
   <span class='title'>
+    <%%=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>',
@@ -10,6 +13,5 @@
           :class => "cancel confirm-delete",
           :title => 'Remove this <%= $title_name.downcase %> forever' %>
     </span>
-    <%%=h <%= singular_name %>.<%= attributes.first.name %> %> <span class="preview">&nbsp;</span>
   </span>
-</li>
+</li>

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

@@ -1,24 +1,8 @@
 class RefinerySetting < ActiveRecord::Base
 
   validates_presence_of :name
-  #validates_uniqueness_of :name
 
   serialize :value # stores into YAML format
-  after_save do |object|
-    cache_write(object.name, object.value)
-  end
-
-  def self.cache_key(name)
-    "refinery_setting_#{name}"
-  end
-
-  def self.cache_write(name, value)
-    Rails.cache.write(cache_key(name), value)
-  end
-
-  def self.cache_read(name)
-    Rails.cache.read(cache_key(name))
-  end
 
   # Number of settings to show per page when using will_paginate
   def self.per_page
@@ -47,33 +31,12 @@ class RefinerySetting < ActiveRecord::Base
   end
 
   def self.find_or_set(name, the_value)
-    # Try to get the value from cache first.
-    unless (value = cache_read(name)).present?
-      # Either find the record or create one with the defined value
-      value = find_or_create_by_name(:name => name.to_s, :value => the_value).value
-      # Cache it
-      cache_write(name, value)
-    end
-
-    # Return what we found.
-    value
+    find_or_create_by_name(:name => name.to_s, :value => the_value).value
   end
 
   def self.[](name)
-    # Try to get the value from cache first.
-    unless (value = cache_read(name)).present?
-      # Not found in cache, try to find the record
-      value = if (setting = self.find_by_name(name.to_s)).present?
-        # Cache it
-        cache_write(name, setting.value)
-      else
-        # Still cache the nil to prevent more lookups to find nothing.
-        cache_write(name, nil)
-      end
-    end
-
-    # Return what we found.
-    value
+    setting = self.find_by_name(name.to_s)
+    setting.value unless setting.nil?
   end
 
   def self.[]=(name, value)
@@ -90,9 +53,7 @@ class RefinerySetting < ActiveRecord::Base
   REPLACEMENTS = {"true" => true, "false" => false}
 
   def value
-    current_value = self[:value]
-
-    if current_value.present?
+    if (current_value = self[:value]).present?
       # This bit handles true and false so that true and false are actually returned
       # not "0" and "1"
       REPLACEMENTS.each do |current, new_value|
@@ -119,4 +80,4 @@ class RefinerySetting < ActiveRecord::Base
     self[:value] = new_value
   end
 
-end
+end

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

@@ -1,12 +1,16 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
+    <%=h refinery_setting.name.titleize %>
+    <span class="preview">- <%=h truncate(refinery_setting.value.to_s, :length => 40) %></span>
+
     <span class='actions'>
-      <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_refinery_setting_path(refinery_setting),
-           :title => 'Edit this setting' %>
-      <%= link_to refinery_icon_tag("delete.png"), admin_refinery_setting_path(refinery_setting),
-          :class => "cancel confirm-delete",
-          :title => 'Remove this setting forever' if refinery_setting.destroyable %>
+      <%= link_to refinery_icon_tag("application_edit.png"),
+                  edit_admin_refinery_setting_path(refinery_setting),
+                  :title => 'Edit this setting' %>
+      <%= link_to refinery_icon_tag("delete.png"),
+                  admin_refinery_setting_path(refinery_setting),
+                  :class => "cancel confirm-delete",
+                  :title => 'Remove this setting forever' if refinery_setting.destroyable %>
     </span>
-    <%=h refinery_setting.name.titleize %> <span class="preview">- <%=h truncate(refinery_setting.value.to_s, :length => 40) %></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/_resource.html.erb

@@ -1,5 +1,8 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
+    <%=h resource.title %>
+    <span class="preview">- <%= number_to_human_size(resource.size) %> - <%= resource.public_filename -%></span>
+
     <span class='actions'>
       <%= link_to refinery_icon_tag('page_white_put.png'),  resource.public_filename,
                           :title => "Download this file (#{number_to_human_size(resource.size)})" %>
@@ -8,7 +11,5 @@
       <%= link_to refinery_icon_tag('delete.png'), admin_resource_path(resource), :class => "cancel confirm-delete",
                           :title => "Remove this file forever" %>
     </span>
-    <%=h resource.title %>
-    <span class="preview">- <%= number_to_human_size(resource.size) %> - <%= resource.public_filename -%></span>
   </span>
-</li>
+</li>

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 28
-  version: 0.9.6.28
+  - 29
+  version: 0.9.6.29
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +12:00
+date: 2010-04-15 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -357,6 +357,7 @@ files:
 - vendor/plugins/authentication/app/models/user_plugin.rb
 - vendor/plugins/authentication/app/models/user_session.rb
 - vendor/plugins/authentication/app/views/admin/users/_form.html.erb
+- vendor/plugins/authentication/app/views/admin/users/_user.html.erb
 - vendor/plugins/authentication/app/views/admin/users/edit.html.erb
 - vendor/plugins/authentication/app/views/admin/users/index.html.erb
 - vendor/plugins/authentication/app/views/admin/users/new.html.erb
@@ -659,7 +660,7 @@ files:
 - vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb
 - vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb
 - vendor/plugins/pages/app/views/admin/pages/_form.html.erb
-- vendor/plugins/pages/app/views/admin/pages/_list.html.erb
+- vendor/plugins/pages/app/views/admin/pages/_page.html.erb
 - vendor/plugins/pages/app/views/admin/pages/_page_part_field.html.erb
 - vendor/plugins/pages/app/views/admin/pages/_sortable_list.html.erb
 - vendor/plugins/pages/app/views/admin/pages/edit.html.erb

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

@@ -1,29 +0,0 @@
-<%
-  branch = if (!page.parent_id.nil? and page === page.self_and_siblings.last) or (page != @pages.first and page === @pages.last)
-    "branch_end"
-  elsif page === @pages.first
-    "branch_start"
-  end
--%>
-<li class='record<%= " #{branch}" %>' id="<%= dom_id(page) -%>">
-  <div class='clearfix'>
-    <span class='actions'>
-    <%= link_to refinery_icon_tag('application_go.png'), page.url, :target => "_blank",
-                 :title => "View this page live <br/><em>(opens in a new window)</em>" %>
-    <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_page_path(page),
-                 :title => "Edit this page" %>
-    <%= link_to refinery_icon_tag('delete.png'), admin_page_path(page),
-                  :class => "cancel confirm-delete",
-                  :title => "Remove this page forever" if page.deletable? %>
-    </span>
-    <%= h page.title %> <%= "<em>(hidden)</em>" unless page.show_in_menu? %>
-    <%= "<em>(draft)</em>" if page.draft? %>
-  </div>
-  <% if (children = page.children).any? %>
-    <ul<%= " class='nested'" %>>
-      <% children.each do |child| %>
-        <%= render :partial => 'list', :locals => {:page => child} %>
-      <% end %>
-    </ul>
-  <% end %>
-</li>