refinerycms 0.9.7.9 → 0.9.7.10

data/Gemfile

@@ -45,7 +45,7 @@ end
 
 #===REQUIRED FOR REFINERY GEM INSTALL===
 # Leave the gem below disabled (commented out) if you're not using the gem install method.
-# gem 'refinerycms',    '= 0.9.7.9'
+# gem 'refinerycms',    '= 0.9.7.10'
 #===END OF REFINERY GEM INSTALL REQUIREMENTS===
 
 # Bundle gems for certain environments:

data/changelog.md

@@ -1,3 +1,10 @@
+## 0.9.7.10 [02 August 2010]
+- Added options to site_bar partial to allow particular components to be disabled (CSS, JS, jQuery or cornering script) so that they don't interfere with these already being included in the theme. [Philip Arndt](http://github.com/parndt)
+- Fixed the schema file as it was invalid somehow. [Steven Heidel](http://github.com/stevenheidel)
+- Made search more consistent and added it to Spam/Ham. [Uģis Ozols](http://github.com/ugisozols)
+- Fixed a bug with adding new resources. [Steven Heidel](http://github.com/stevenheidel)
+- Fixed a range of issues with translation keys and grammar between different languages. [Uģis Ozols](http://github.com/ugisozols)
+
 ## 0.9.7.9 [30 July 2010]
 
 - Added a theme generator to create the basic file structure of a new theme. [David Jones](http://github.com/djones) and [Levi Cole](http://github.com/levicole)

data/db/schema.rb

@@ -9,20 +9,23 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100708014636) do
+ActiveRecord::Schema.define(:version => 20100729221735) do
 
   create_table "images", :force => true do |t|
-    t.string   "image_mime_type"
-    t.string   "image_name"
-    t.integer  "image_size"
-    t.integer  "image_width"
-    t.integer  "image_height"
+    t.integer  "parent_id"
+    t.string   "content_type"
+    t.string   "filename"
+    t.string   "thumbnail"
+    t.integer  "size"
+    t.integer  "width"
+    t.integer  "height"
+    t.string   "image_type"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "image_uid",       :null => false
-    t.string   "image_ext"
   end
 
+  add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
+
   create_table "inquiries", :force => true do |t|
     t.string   "name"
     t.string   "email"
@@ -55,12 +58,6 @@ ActiveRecord::Schema.define(:version => 20100708014636) do
   add_index "page_parts", ["id"], :name => "index_page_parts_on_id"
   add_index "page_parts", ["page_id"], :name => "index_page_parts_on_page_id"
 
-  create_table "page_translations", :force => true do |t|
-    t.integer "page_id"
-    t.string  "custom_title"
-    t.string  "meta_keywords"
-  end
-
   create_table "pages", :force => true do |t|
     t.string   "title"
     t.integer  "parent_id"
@@ -98,13 +95,12 @@ ActiveRecord::Schema.define(:version => 20100708014636) do
   add_index "refinery_settings", ["name"], :name => "index_refinery_settings_on_name"
 
   create_table "resources", :force => true do |t|
-    t.string   "file_mime_type"
-    t.string   "file_name"
-    t.integer  "file_size"
+    t.string   "content_type"
+    t.string   "filename"
+    t.integer  "size"
+    t.integer  "parent_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "file_uid",       :null => false
-    t.string   "file_ext"
   end
 
   create_table "roles", :force => true do |t|
@@ -134,7 +130,7 @@ ActiveRecord::Schema.define(:version => 20100708014636) do
     t.integer "position"
   end
 
-  add_index "user_plugins", ["name"], :name => "index_user_plugins_on_title"
+  add_index "user_plugins", ["name"], :name => "index_user_plugins_on_name"
   add_index "user_plugins", ["user_id", "name"], :name => "index_unique_user_plugins", :unique => true
 
   create_table "users", :force => true do |t|

data/features/step_definitions/refinery/core_steps.rb

@@ -52,4 +52,4 @@ end
 
 Then /^I should be redirected back to "([^"]*)"$/ do |page_name|
   visit path_to(page_name)
-end
+end

data/test/fixtures/user_plugins.yml

@@ -21,7 +21,7 @@ quentin_pages:
 
 quentin_resources:
   user: quentin
-  name: refinery_resources
+  name: refinery_files
 
 quentin_settings:
   user: quentin

data/themes/demolicious/views/layouts/application.html.erb

@@ -2,7 +2,13 @@
 <html>
   <%= render :partial => "/shared/head", :locals => {:theme => true} %>
   <body>
-    <%= render :partial => "/shared/site_bar" %>
+    <%= render :partial => "/shared/site_bar",
+               :locals => {
+                 :exclude_css => false,
+                 :exclude_cornering_library => false,
+                 :exclude_site_bar_javascript => false,
+                 :exclude_jquery => false
+               } %>
     <div id='page_container'>
       <div id='page'>
         <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>

data/todo.md

@@ -3,10 +3,9 @@
 ## Solid Test Coverage
 
 * Add Cucumber for the whole of Refinery. (top priority)
-* Add unit test coverage for user, user plugin and user mailer
-* Add unit test coverage for inquiry mailer and inquiry setting
-* Add functional tests for the whole of Refinery.
-* Add RSpec for the whole of Refinery.
+* Add RSpec for the whole of Refinery, particularly:
+  - User, User plugin and User mailer
+  - Inquiry mailer and Inquiry setting
 
 ## Rails 3.0 Support
 
@@ -17,6 +16,9 @@ Join the IRC channel on freenode.net #refinerycms on August 7th to contribute!
 ## I18n support
 
 * Check all the views for missing translations
+  - You can run a rake task with your locale e.g for Slovenian:
+  ``rake translate:lost_in_translation LOCALE=sl``
+    
 * Translate models and model attributes used in forms (Rails 2.3.8 supports translation form labels!)
 * Javascript messages etc:
   - http://github.com/fnando/i18n-js

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

@@ -18,7 +18,7 @@
                       :class => "edit_icon" %>
         </li>
       <% end %>
-      <% if Refinery::Plugins.active.names.include?("refinery_resources") %>
+      <% if Refinery::Plugins.active.names.include?("refinery_files") %>
         <li>
           <%= link_to t('.upload_a_file'),
                       new_admin_resource_url(:dialog => true,

data/vendor/plugins/images/app/models/image.rb

@@ -24,7 +24,7 @@ class Image < ActiveRecord::Base
 
         unless enum.nil? || enum.include?(send(attr_name))
           errors.add_to_base(I18n.translate('file_should_be_smaller_than_max_image_size',
-                              :max_image_size => ActionController::Base.helpers.number_to_human_size(MAX_SIZE_IN_MB) ))
+                              :max_image_size => ActionController::Base.helpers.number_to_human_size(MAX_SIZE_IN_MB.megabytes) ))
           errors.add_to_base(I18n.translate('file_must_be_these_formats')) if attr_name == :content_type
         end
       end

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

@@ -8,7 +8,7 @@
   <div class='field'>
     <% if action_name =~ /(edit)|(update)/ %>
       <%= t('.use_current_image') %>
-      <em><%= t('.or') %></em>, <%= t('.replace_image') %>
+      <em><%= t('.or') %></em><%= t('.replace_image') %>
     <% end %>
     <%= f.file_field :uploaded_data %>
   </div>

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

@@ -21,7 +21,7 @@
 </div>
 <div id='records'>
   <% if searching? %>
-    <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
+    <h2><%= t('admin.search_results_for', :query => h(params[:search])) %></h2>
     <% if @images.any? %>
       <%= render :partial => "#{current_image_view}_view" %>
     <% else %>

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

@@ -5,10 +5,18 @@ class Admin::InquiriesController < Admin::BaseController
   before_filter :get_spam_count, :only => [:index, :spam]
 
   def index
+    if searching?
+      @inquiries = Inquiry.ham.find_with_index params[:search]
+    end
+
     @grouped_inquiries = group_by_date(Inquiry.ham)
   end
 
   def spam
+    if searching?
+      @inquiries = Inquiry.spam.find_with_index params[:search]
+    end
+
     @grouped_inquiries = group_by_date(Inquiry.spam)
   end
 

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

@@ -1,16 +1,16 @@
 <div id='actions'>
   <ul>
     <li>
-      <%= render :partial => "/shared/admin/search", :locals => {:url => admin_inquiries_url} %>
+      <%= render :partial => "/shared/admin/search", :locals => {:url => request.path} %>
     </li>
     <li <%= "class='selected'" if params[:action] == "index" %>>
-      <%= link_to "Inbox", admin_inquiries_url, :class => "email_icon" %>
+      <%= link_to t('.inbox'), admin_inquiries_url, :class => "email_icon" %>
     </li>
     <li <%= "class='selected'" if params[:action] == "spam" %>>
       <% if @spam_count > 0  %>
-        <%= link_to "Spam (#{@spam_count})", spam_admin_inquiries_url, :class => "spam_icon" %>
+        <%= link_to "#{t('.spam')} (#{@spam_count})", spam_admin_inquiries_url, :class => "spam_icon" %>
       <% else %>
-        <%= link_to "Spam", spam_admin_inquiries_url, :class => "spam_empty_icon" %>
+        <%= link_to t('.spam'), spam_admin_inquiries_url, :class => "spam_empty_icon" %>
       <% end %>
     </li>
     <li>

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

@@ -1,8 +1,12 @@
 <%= render :partial => "submenu" %>
 <div id='records'>
   <% if searching? %>
-    <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
-    <%= render :partial => "inquiry", :collection => @inquiries %>
+    <h2><%= t('admin.search_results_for', :query => h(params[:search])) %></h2>
+    <% if @inquiries.any? %>
+      <%= render :partial => "inquiry", :collection => @inquiries %>
+    <% else %>
+      <p><%= t('admin.search_no_results') %></p>
+    <% end %>
   <% else %>
     <% if @grouped_inquiries.any? -%>
       <% @grouped_inquiries.each do |container| %>

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

@@ -15,7 +15,8 @@
     </li>
     <li>
       <%= link_to t('.title'), admin_inquiry_url(@inquiry), :class => 'delete_icon no-tooltip confirm-delete',
-                                                                              :title => t('.title') %>
+                                                            :title => t('.title'),
+                                                            :'data-confirm' => t('admin.inquiries.inquiry.remove_inquiry', :name => @inquiry.name) %>
     </li>
   </ul>
 </div>

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

@@ -1,8 +1,12 @@
 <%= render :partial => "submenu" %>
 <div id='records'>
   <% if searching? %>
-    <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
-    <%= render :partial => "inquiry", :collection => @inquiries %>
+    <h2><%= t('admin.search_results_for', :query => h(params[:search])) %></h2>
+    <% if @inquiries.any? %>
+      <%= render :partial => "inquiry", :collection => @inquiries %>
+    <% else %>
+      <p><%= t('admin.search_no_results') %></p>
+    <% end %>
   <% else %>
     <% if @grouped_inquiries.any? -%>
       <% @grouped_inquiries.each do |container| %>

data/vendor/plugins/inquiries/config/locales/da.yml

@@ -43,7 +43,7 @@ da:
         actions: Handlinger
         back_to_all_inquiries: Tilbage til alle henvendelser
         inquiry: Henvendelse
-      submenu: 
+      submenu:
         update_notified: Opdatér, hvem der får besked
         edit_confirmation_email: Redigér e-mailbekræftelse
     inquiry_settings:

data/vendor/plugins/inquiries/config/locales/de.yml

@@ -46,7 +46,7 @@ de:
         actions: Aktionen
         back_to_all_inquiries: Zurück zu allen Kontaktanfragen
         inquiry: Kontaktanfrage
-      submenu:        
+      submenu:
         update_notified: Wer wird benachrichtigt aktualisieren
         edit_confirmation_email: Bestätigungsmail bearbeiten
     inquiry_settings:

data/vendor/plugins/inquiries/config/locales/en.yml

@@ -35,6 +35,8 @@ en:
         closed: "Inquiry '{{inquiry}}' is closed"
         reopened: "Inquiry '{{inquiry}}' is reopened"
       submenu:
+        inbox: Inbox
+        spam: Spam
         update_notified: Update who gets notified
         edit_confirmation_email: Edit confirmation email
       index:

data/vendor/plugins/inquiries/config/locales/fr.yml

@@ -46,7 +46,7 @@ fr:
         actions: Actions
         back_to_all_inquiries: Retourné à la liste de requêtes
         inquiry: Requête
-      submenu:    
+      submenu:
         update_notified: "Mettre à jour qui est notifié"
         edit_confirmation_email: Modifier le couriel de confirmation
     inquiry_settings:

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

@@ -16,15 +16,13 @@
 </div>
 <div id='records' class='tree'>
   <% if searching? %>
+    <h2><%= t('admin.search_results_for', :query => h(params[:search])) %></h2>
     <% if @pages.any? %>
-      <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
       <ul id='sortable_list'>
         <%= render :partial => "sortable_list" %>
       </ul>
     <% else %>
-      <p>
-        <strong><%=t('.sorry_no_results')%></strong>
-      </p>
+      <p><%= t('admin.search_no_results') %></p>
     <% end %>
   <% else %>
     <% if @pages.any? %>

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

@@ -1,17 +1,27 @@
 <% if refinery_user? %>
   <% unless admin? or login? # jquery scripts should already be cached when using the site bar as login has happened. %>
-    <%= stylesheet_link_tag('refinery/site_bar') %>
-    <%= jquery_include_tags %>
-    <%= javascript_include_tag 'jquery/jquery.corner.js' %>
-    <script type='text/javascript'>
-      $(document).ready(function() {
-        logo = $('#site_bar_content #site_bar_refinery_cms_logo');
-        $(logo).css('left', ($('#site_bar_content').width() / 2) - ($(logo).width() / 2));
-        $('#editor_switch a').corner('6px').appendTo(
-          $('<span></span>').prependTo('#editor_switch').corner('6px')
-        );
-      });
-    </script>
+    <%= stylesheet_link_tag('refinery/site_bar') unless exclude_css ||= false %>
+    <%= jquery_include_tags(:jquery_ui => false) unless exclude_jquery ||= false %>
+    <%= javascript_include_tag 'jquery/jquery.corner.js' unless exclude_cornering_library ||= false %>
+    <% unless exclude_site_bar_javascript ||= false %>
+      <script type='text/javascript'>
+        if (typeof($) == 'function') {
+          $(document).ready(function() {
+            logo = $('#site_bar_content #site_bar_refinery_cms_logo');
+            $(logo).css('left', ($('#site_bar_content').width() / 2) - ($(logo).width() / 2));
+
+            if ($.isFunction($('#editor_switch a').corner)) {
+              $('#editor_switch a').corner('6px');
+            }
+
+            $('#editor_switch a').appendTo((span = $('<span></span>').prependTo('#editor_switch')));
+            if ($.isFunction(span.corner)) {
+              span.corner('6px');
+            }
+          });
+        }
+      </script>
+    <% end %>
   <% end -%>
 
   <div id='site_bar'>

data/vendor/plugins/refinery/config/locales/de.yml

@@ -39,6 +39,7 @@ de:
         cancel: Abbrechen
         or_continue: oder
         cancel_lose_changes: "Abbrechen verlieren alle Änderungen, die Sie auf diese {{object_name}} gemacht haben"
+        delete: 'Löschen'
       image_picker:
         none_selected: "Es ist derzeit kein {{what}} ausgewählt ist, klicken Sie bitte hier eine Annonce aufgeben"
         remove_current: "Entfernen aktuel {{what}}"

data/vendor/plugins/refinery/lib/refinery.rb

@@ -31,7 +31,7 @@ module Refinery
     @major = 0
     @minor = 9
     @tiny  = 7
-    @build = 9
+    @build = 10
 
     def self.to_s
       [@major, @minor, @tiny, @build].compact.join('.')

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

@@ -29,7 +29,7 @@
     <%= f.label :value %>
     <%= f.text_area :value, :rows => 5, :class => 'widest' %>
   </div>
-  
+
   <%= render :partial => "/shared/admin/form_actions",
              :locals => {
                :f => f,

data/vendor/plugins/resources/app/models/resource.rb

@@ -18,14 +18,13 @@ class Resource < ActiveRecord::Base
   def validate
     if self.filename.nil?
       errors.add_to_base(I18n.translate('must_choose_file'))
-      errors.add_to_base("You must choose a file to upload")
     else
       [:size].each do |attr_name|
         enum = attachment_options[attr_name]
 
         unless enum.nil? || enum.include?(send(attr_name))
           errors.add_to_base(I18n.translate('file_should_be_smaller_than_max_file_size',
-                              :max_file_size => ActionController::Base.helpers.number_to_human_size(MAX_SIZE_IN_MB) ))
+                              :max_file_size => ActionController::Base.helpers.number_to_human_size(MAX_SIZE_IN_MB.megabytes) ))
         end
       end
     end

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

@@ -13,7 +13,8 @@
 
   <div class='field'>
     <label>
-      <%= t('.maximum_file_size', :megabytes => (Resource.attachment_options[:max_size] / 1024 / 1024)) %>
+      <%= t('.maximum_file_size',
+            :megabytes => (Resource.attachment_options[:max_size] / 1024 / 1024)) %>
     </label>
   </div>
 
@@ -22,8 +23,9 @@
                :f => f,
                :continue_editing => false,
                :hide_cancel => (@app_dialog or action_name == "insert" or from_dialog?),
-                :delete_title => t('admin.resources.resource.delete.title'),
-                :delete_confirmation => t('admin.resources.resource.delete.message', :title => @resource.filename)
+               :delete_title => t('admin.resources.resource.delete.title'),
+               :delete_confirmation => (t('admin.resources.resource.delete.message',
+                                         :title => @resource.title) unless @resource.new_record?)
              } %>
 
   <% if @app_dialog -%>

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

@@ -10,6 +10,7 @@
                 :title => t('.edit') %>
     <%= link_to refinery_icon_tag('delete.png'), admin_resource_path(resource),
                 :class => "cancel confirm-delete",
-                :title => t('.delete.title') %>
+                :title => t('.delete.title'),
+                :'data-confirm' => t('.delete.message', :title => resource.filename) %>
   </span>
 </li>

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

@@ -10,7 +10,7 @@
 </div>
 <div id='records' class='files'>
   <% if searching? %>
-    <h2><%= t('admin.search_results_for', :query => params[:search]) %></h2>
+    <h2><%= t('admin.search_results_for', :query => h(params[:search])) %></h2>
     <% if @resources.any? %>
         <%= render :partial => "resource", :collection => @resources %>
     <% else %>

data/vendor/plugins/themes/readme.md

@@ -69,7 +69,7 @@ Simply use the Theme generator to make the basic structure of a new theme.
 
     ruby script/generate refinery_theme name_of_theme
 
-Don't forgot to "activate" this new theme by setting the theme setting to the name of this new theme.
+Don't forget to "activate" this new theme by setting the theme setting to the name of this new theme.
 
 ## How do I select which Theme Refinery should use?
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: false
   segments: 
   - 0
   - 9
   - 7
-  - 9
-  version: 0.9.7.9
+  - 10
+  version: 0.9.7.10
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +12:00
+date: 2010-08-02 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -1100,27 +1099,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A beautiful open source Ruby on Rails content manager for small business.