refinerycms 0.9.6.31 → 0.9.6.32

data/public/stylesheets/refinery/ui.css

@@ -0,0 +1,86 @@
+.ui-dialog #dialog_loading {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  width: 208px;
+  height: 13px;
+  margin: -6px 0 0 -104px;
+}
+
+.ui-widget-overlay {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  width: auto !important;
+  opacity: .75;
+  filter:Alpha(Opacity=75);
+  background: #000;
+}
+
+.ui-dialog {
+  position: relative;
+  background-color: #fff;
+  color: #000;
+  border: 4px solid #525252;
+  width: auto;
+}
+.ui-dialog .ui-dialog-titlebar {
+  float: left;
+  position: relative;
+  width: 100%;
+  background-color: #e8e8e8;
+}
+.ui-dialog .ui-dialog-title {
+  float: left;
+  height: 33px;
+  line-height: 33px;
+  font-size: 16px;
+  padding-left: 10px;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+  position: absolute;
+  right: 10px;
+  top: 5px;
+  width: 19px;
+  border: none;
+}
+.ui-dialog .ui-dialog-titlebar-close span {
+  display: block;
+  margin: 1px;
+  background: transparent url('/images/thickbox/cross.png') top left no-repeat;
+  text-indent:-10000px;
+}
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus {
+  padding: 0;
+}
+
+.ui-tabs-hide {
+  display:none;
+}
+.ui-tabs li.ui-state-default {
+  float: left;
+  list-style: none;
+  margin-right: 2px;
+}
+.ui-tabs .ui-state-default a {
+  background-color: #c2c3b3;
+  padding: 9px 13px;
+  border-bottom: none;
+  display: block;
+  margin-top: 4px;
+}
+.ui-tabs .ui-state-active a {
+  background-color: #808080;
+  color: #fff;
+  padding: 11px 13px;
+  margin-top: 0px;
+}
+.ui-dialog iframe {
+  clear:both;
+  border: 0px none;
+  margin-bottom:-1px;
+  margin-top:1px;
+  width: 100% !important;
+}

data/public/stylesheets/wymeditor/skins/refinery/skin.css

@@ -74,24 +74,24 @@
 		.wym_skin_refinery .wym_buttons li		 { float:left;}
 		.wym_skin_refinery .wym_buttons a 				 { width: 20px; height: 20px; overflow: hidden; padding: 2px }
 		/*image replacements*/
-		.wym_skin_refinery .wym_buttons li a						 { background: url('/images/wymeditor/skins/refinery/icons.png') no-repeat; text-indent: -9999px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_strong a		{ background-position: 0 -382px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_emphasis a		{ background-position: 0 -22px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_superscript a	 { background-position: 0 -430px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_subscript a	 { background-position: 0 -454px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_ordered_list a	{ background-position: 0 -48px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_unordered_list a{ background-position: 0 -72px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_indent a		{ background-position: 0 -574px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_outdent a		 { background-position: 0 -598px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_undo a			{ background-position: 0 -502px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_redo a			{ background-position: 0 -526px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_link a			{ background-position: 0 -96px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_unlink a		{ background-position: 0 -168px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_image a		 { background-position: 0 -121px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_table a		 { background-position: 0 -144px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_paste a		 { background-position: 0 -552px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_html a			{ background-position: 0 -193px;}
-		.wym_skin_refinery .wym_buttons li.wym_tools_preview a		 { background-position: 0 -408px;}
+		.wym_skin_refinery .wym_buttons li a						 { text-indent: -9999px;background-repeat: no-repeat;background-position: 4px 4px;}
+		.wym_skin_refinery .wym_buttons li.wym_tools_strong a		{ background-image: url('/images/wymeditor/skins/refinery/text_bold.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_emphasis a		{ background-image: url('/images/wymeditor/skins/refinery/text_italic.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_superscript a	 { background-image: url('/images/wymeditor/skins/refinery/text_superscript.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_subscript a	 { background-image: url('/images/wymeditor/skins/refinery/text_subscript.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_ordered_list a	{ background-image: url('/images/wymeditor/skins/refinery/text_list_numbers.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_unordered_list a{ background-image: url('/images/wymeditor/skins/refinery/text_list_bullets.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_indent a		{ background-image: url('/images/wymeditor/skins/refinery/text_indent.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_outdent a		{ background-image: url('/images/wymeditor/skins/refinery/text_outdent.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_undo a			{ background-image: url('/images/wymeditor/skins/refinery/arrow_undo.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_redo a			{ background-image: url('/images/wymeditor/skins/refinery/arrow_redo.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_link a			{ background-image: url('/images/wymeditor/skins/refinery/link_add.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_unlink a		{ background-image: url('/images/wymeditor/skins/refinery/link_break.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_image a		 { background-image: url('/images/wymeditor/skins/refinery/photo_add.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_table a		 { background-image: url('/images/wymeditor/skins/refinery/table_add.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_paste a		 { background-image: url('/images/wymeditor/skins/refinery/page_paste.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_html a			{ background-image: url('/images/wymeditor/skins/refinery/page_code.png');}
+		.wym_skin_refinery .wym_buttons li.wym_tools_preview a		 { background-image: url('/images/wymeditor/skins/refinery/eye.png');}
 
 		/* make tools and containers play nicely next to eachother */
 
@@ -101,14 +101,14 @@
 				.wym_skin_refinery .wym_containers li { float: left; }
 		.wym_skin_refinery .wym_containers li a, .wym_skin_refinery li.wym_tools_class a {background-repeat: no-repeat; background-position: center center;width: 20px; height: 20px; overflow: hidden; padding: 2px; border: 0px none;}
 
-		.wym_skin_refinery li.wym_containers_h1 a	 { background-image: url('/images/wymeditor/skins/refinery/h1.png'); }
-		.wym_skin_refinery li.wym_containers_h2 a	 { background-image: url('/images/wymeditor/skins/refinery/h2.png');}
-		.wym_skin_refinery li.wym_containers_h3 a	 { background-image: url('/images/wymeditor/skins/refinery/h3.png');}
-		.wym_skin_refinery li.wym_containers_h4 a	 { background-image: url('/images/wymeditor/skins/refinery/h4.png');}
-		.wym_skin_refinery li.wym_containers_h5 a	 { background-image: url('/images/wymeditor/skins/refinery/h5.png');}
-		.wym_skin_refinery li.wym_containers_h6 a	 { background-image: url('/images/wymeditor/skins/refinery/h6.png');}
-		.wym_skin_refinery li.wym_containers_p a	 { background-image: url('/images/wymeditor/skins/refinery/paragraph.png');}
-		.wym_skin_refinery li.wym_tools_class a { background-image: url('/images/wymeditor/skins/refinery/css.png');}
+		.wym_skin_refinery li.wym_containers_h1 a	 { background-image: url('/images/wymeditor/skins/refinery/text_heading_1.png'); }
+		.wym_skin_refinery li.wym_containers_h2 a	 { background-image: url('/images/wymeditor/skins/refinery/text_heading_2.png');}
+		.wym_skin_refinery li.wym_containers_h3 a	 { background-image: url('/images/wymeditor/skins/refinery/text_heading_3.png');}
+		.wym_skin_refinery li.wym_containers_h4 a	 { background-image: url('/images/wymeditor/skins/refinery/text_heading_4.png');}
+		.wym_skin_refinery li.wym_containers_h5 a	 { background-image: url('/images/wymeditor/skins/refinery/text_heading_5.png');}
+		.wym_skin_refinery li.wym_containers_h6 a	 { background-image: url('/images/wymeditor/skins/refinery/text_heading_6.png');}
+		.wym_skin_refinery li.wym_containers_p a	 { background-image: url('/images/wymeditor/skins/refinery/text_paragraph.png');}
+		.wym_skin_refinery li.wym_tools_class a { background-image: url('/images/wymeditor/skins/refinery/style.png');}
 
 /*DECORATION*/
 		.wym_skin_refinery .wym_section h2			 { background: #DDD; border: solid gray; border-width: 0 0 1px;}

data/readme.md

@@ -65,7 +65,7 @@ After your database exists, you'll need to install the gems that Refinery depend
 
     rake gems:install
 
-Note: The news engine that was previously in Refinery's core was extracted into a separate gem / plugin to be found here:p
+Note: The news engine that was previously in Refinery's core was extracted into a separate gem / plugin to be found here:
 
     http://github.com/resolve/refinerycms-news
 
@@ -92,7 +92,7 @@ If you're using [Heroku](http://heroku.com/) you will want to put
 
     Refinery.s3_backend = true
 
-in your ``config/production.rb`` file to make Refinery store files uploaded on Amazon S3.
+in your ``config/environments/production.rb`` file to make Refinery store files uploaded on Amazon S3.
 
 ## Updating to the latest Refinery
 

data/test/unit/inquiry_test.rb

@@ -30,12 +30,4 @@ class InquiryTest < ActiveSupport::TestCase
     assert @full_valid_inquiry.save
   end
 
-  def test_named_scopes
-    assert_equal 2, Inquiry.open.size
-    assert_equal 1, Inquiry.closed.size
-
-    # check the order. Phil is the newest person to inquire
-    assert_equal inquiries(:phil), Inquiry.open.first
-  end
-
 end

data/vendor/plugins/acts_as_indexed/CHANGELOG

@@ -1,3 +1,7 @@
+===0.5.2 [3rd May 2009]
+- Fix for Errno::ERANGE error related to certain Math.log calculations. [parndt]
+- Improved index detection in a shared-directory environment. [bob-p]
+
 ===0.5.1 [11 June 2009]
 - Fixed Ruby 1.8.6 compatibility.
 

data/vendor/plugins/acts_as_indexed/README.rdoc

@@ -95,7 +95,7 @@ Pagination is supported via the +paginate_search+ method whose first argument is
 To generate the RDoc documentation, run the <tt>rake rdoc</tt> task in the acts_as_indexed 
 plugin folder. Then point your browser at <tt>/vendor/plugins/acts_as_indexed/rdoc/index.html</tt>.
 
-Alternatively, you can view the rdoc documentation online[http://douglasfshearer.com/rdoc/acts_as_indexed/].
+Alternatively, you can view the rdoc documentation online[http://rdoc.info/projects/dougal/acts_as_indexed/].
 
 == Problems, Comments, Suggestions?
 

data/vendor/plugins/acts_as_indexed/lib/search_atom.rb

@@ -90,7 +90,9 @@ module Foo #:nodoc:
             end
 
             # weighting = frequency * log (records.size / records_with_atom)
-            out[r_id] = pos.size * Math.log(records_size / @records.size)
+            ## parndt 2010/05/03 changed to records_size.to_f to avoid -Infinity Errno::ERANGE exceptions
+            ## which would happen for example Math.log(1 / 20) == -Infinity but Math.log(1.0 / 20) == -2.99573227355399
+            out[r_id] = pos.size * Math.log(records_size.to_f / @records.size)
           end
           out
         end

data/vendor/plugins/acts_as_indexed/lib/search_index.rb

@@ -125,7 +125,7 @@ module Foo #:nodoc:
         #--
         # TODO: Make a private method called 'root_exists?' which checks for the root directory.
         def exists?
-          File.exists?(File.join(@root))
+          File.exists?(File.join(@root + ['size']))
         end
 
         private

data/vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb

@@ -2,7 +2,7 @@
 <% if @recent_activity.any? %>
   <table id='recent_activity'>
     <% @recent_activity.each do |change| %>
-      <tr class='<%= cycle("on", "") %>'>
+      <tr class='<%= cycle("on", "on-hover") %>'>
         <%= activity_message_for change %>
       </tr>
     <% end %>

data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb

@@ -2,23 +2,18 @@ class Admin::InquiriesController < Admin::BaseController
 
   crudify :inquiry, :title_attribute => "name", :order => "created_at DESC"
 
-  before_filter :find_inquiry, :only => [:show, :toggle_status, :destroy]
-  before_filter :find_all_inquiries, :only => [:index]
-
-  def toggle_status
-    @inquiry.toggle!(:open)
-
-    flash[:notice] = "'#{@inquiry.name}' has been #{@inquiry.open? ? "reopened" : "closed"}"
-
-    redirect_to :action => 'index'
+  def index
+    @grouped_inquiries = []
+
+    Inquiry.all.each do |inquiry|
+      key = inquiry.created_at.strftime("%Y-%m-%d")
+      inquiry_group = @grouped_inquiries.collect{|inquiries| inquiries.last if inquiries.first == key }.flatten.compact << inquiry
+      (@grouped_inquiries.delete_if {|i| i.first == key}) << [key, inquiry_group]
+    end
   end
 
-protected
-
-  def find_all_inquiries
-    @open_inquiries = Inquiry.open
-    @closed_inquiries = Inquiry.closed
-    @inquiries = @open_inquiries
+  def show
+    find_inquiry
   end
 
 end

data/vendor/plugins/inquiries/app/models/inquiry.rb

@@ -10,7 +10,4 @@ class Inquiry < ActiveRecord::Base
 
   default_scope :order => 'created_at DESC'
 
-  named_scope :closed, :conditions => {:open => false}
-  named_scope :open, :conditions => {:open => true}
-
 end

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

@@ -1,16 +1,14 @@
 <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>
+    <%= link_to h(inquiry.name), admin_inquiry_url(inquiry) %> said
+    <span class="preview"><%= truncate(strip_tags(inquiry.message), :length => 60) -%></span>
 
     <span class='actions'>
-      <%= 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),
-                  :title => "Read this inquiry" -%>
       <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry),
                   :class => "cancel confirm-delete",
                   :title => "Remove this inquiry forever" -%>
+      <%= link_to refinery_icon_tag('zoom.png'), admin_inquiry_url(inquiry),
+                  :title => "Read this inquiry" -%>
     </span>
   </span>
 </li>

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

@@ -18,26 +18,18 @@
     <h2>Search Results for "<%= params[:search] %>"</h2>
     <%= render :partial => "inquiry", :collection => @inquiries %>
   <% else %>
-    <h2>Open Inquiries</h2>
-    <% if @open_inquiries.any? -%>
-      <ul>
-        <%= render :partial => "inquiry", :collection => @open_inquiries %>
-      </ul>
+    <% if @grouped_inquiries.any? -%>
+      <% @grouped_inquiries.each do |container| %>
+        <h3><%= (inquiry_group = container.last).first.created_at.strftime("%A, %d %B %Y") %></h3>
+        <ul>
+          <%= render :partial => 'inquiry', :collection => inquiry_group %>
+        </ul>
+      <% end %>
     <% else -%>
       <p>
         <%= refinery_icon_tag('accept.png', :style => 'vertical-align: bottom') %>
         Hooray! There are no open inquiries because you've dealt with them all.
       </p>
     <% end -%>
-    <h2>Closed Inquiries</h2>
-    <% if @closed_inquiries.any? -%>
-      <ul>
-        <%= render :partial => "inquiry", :collection => @closed_inquiries %>
-      </ul>
-    <% else -%>
-      <p>
-        You haven't closed any inquiries yet.
-      </p>
-    <% end -%>
   <% end %>
 </div>

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

@@ -1,7 +1,6 @@
 <div id='actions'>
   <h2>Details</h2>
   <p>
-    <strong>Status:</strong> <%= @inquiry.open? ? "Open" : "Closed" %><br/>
     <strong>Age:</strong> <%= time_ago_in_words(@inquiry.created_at) %>
   </p>
   <h2>Actions</h2>

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

@@ -18,4 +18,4 @@ class PagesController < ApplicationController
     end
   end
 
-end
+end

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

@@ -1,6 +1,5 @@
-<%= error_messages_for :page %>
-
 <% form_for [:admin, @page] do |f| %>
+  <%= f.error_messages  %>
   <div class="field">
     <%= f.label :title %>
     <%= f.text_field :title, :class => "larger", :style => 'width: 954px' %>
@@ -35,97 +34,12 @@
       <% end %>
     </div>
   </div>
-  <p>
-    <a href="#" id="toggle_advanced_options" rel="Click to access meta tag settings and menu options">&raquo; Hide/Show Advanced Options</a>
-  </p>
-  <div id='more_options' style="display:none;">
-    <div class='field'>
-      <%= f.label :parent_id %>
-      <%= f.collection_select :parent_id, @pages_for_parents_list, :id, :indented_title, :include_blank => true %>
-    </div>
-    <div class='field'>
-      <%= label_tag :custom_title %>
-      <%= label_tag "", 'Type:', :class => "stripped" %>
-      <% ["none", "text"].each do |type| %>
-        <%= f.radio_button :custom_title_type, "#{type}" %>
-        <%= label_tag "page_custom_title_type_#{type}", "#{type.titleize}", :class => "stripped" %>
-      <% end %>
-      <br/>
-      <div id='custom_title_none'></div>
-      <div id='custom_title_text' style='display: <%= @page.custom_title_type == 'text' ? 'block' : 'none' %>'>
-        <p>
-          <%= f.text_field :custom_title, {:size => 103} %><br/>
-          <small>
-            If you want the page to have a different title than the one that shows in the menu and browser title then enter it here.<br/>
-          </small>
-        </p>
-      </div>
-    </div>
-    <div class='field'>
-      <%= label_tag :skip_to_first_child? %>
-      <%= f.check_box :skip_to_first_child %>
-      <%= f.label :skip_to_first_child, "Check this box if you want the visitor to be redirected to this page's first child page if this page is selected.", :class => "stripped" %>
-    </div>
-    <div class='field'>
-      <%= f.label :link_url, "Custom URL" %>
-      <%= f.text_field :link_url, {:size => 103} %><br/>
-      <small>
-        Enter a URL if this page links to an external site or to a pre-existing resource e.g. a contact page.
-        <br/>
-        Note: This URL must point to a location that exists; a new one will not be created.
-      </small>
-    </div>
-    <h2>Search Engine Optimization</h2>
-    <div class='field'>
-      <%= f.label :browser_title %>
-      <%= f.text_field :browser_title, :size => 63 %><br/>
-      <small>
-        If you want to override the default browser title, do it here.
-      </small>
-    </div>
-    <div class='field'>
-      <%= f.label :meta_keywords %>
-      <%= f.text_field :meta_keywords, :size => 63 %><br/>
-      <small>
-        Enter 5-10 keywords that relate to this page. Separate keywords by a comma.
-      </small>
-    </div>
-    <div class='field'>
-      <%= f.label :meta_description %>
-      <%= f.text_area :meta_description, :cols => 95, :rows => 3 %><br/>
-      <small>
-        Enter a concise two or three sentences describing what this page is about.
-      </small>
-    </div>
-    <div class='field'>
-      <%= f.label :show_in_menu %>
-      <%= f.check_box :show_in_menu %>
-      <small>
-        <%= f.label :show_in_menu, "Check this box if this page should appear in the site menu" %>
-      </small>
-    </div>
-  </div>
-  <div class='field'>
-    <label>Draft</label>
-    <%= f.check_box :draft %>
-    <%= f.label :draft, "Save as Draft", :class => "stripped" %>
-  </div>
+
+  <%= render :partial => "form_advanced_options", :locals => {:f => f} %>
+
   <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => true} %>
-  <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
-    <div id='new_page_part_dialog' style='display: none'>
-      <div class='field'>
-        <label for='new_page_part_title'>Title</label>
-        <input id='new_page_part_title' value='' class='larger' size='40' />
-        <input id='new_page_part_index' type='hidden' value='<%= @page.parts.size %>' />
-      </div>
-      <%= render :partial => "/shared/admin/form_actions", :locals => {
-        :f => f,
-        :continue_editing => false,
-        :submit_button_id => "new_page_part_save",
-        :cancel_button_id => "new_page_part_cancel"
-      } %>
-    </div>
-  <% end %>
+
+  <%= render :partial => "form_new_page_parts", :locals => {:f => f} if RefinerySetting.find_or_set(:new_page_parts, false) %>
 <% end %>
 
 <% content_for :head do %>