refinerycms 0.9.7.5 → 0.9.7.6

data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb

@@ -79,6 +79,10 @@ protected
     @current_link = params[:current_link]
   end
 
+  def restrict_controller
+    super unless action_name == 'insert'
+  end
+
   def paginate_resources(conditions={})
     @resources = Resource.paginate   :page => (@paginate_page_number ||= params[:page]),
                                      :conditions => conditions,

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

@@ -8,9 +8,8 @@ class Resource < ActiveRecord::Base
                  :max_size => MAX_SIZE_IN_MB.megabytes,
                  :path_prefix => (Refinery.s3_backend ? nil : 'public/system/resources')
 
-  # TODO acts_as_indexed for resources?
-  #acts_as_indexed :fields => [:title, :type_of_content],
-  #          :index_file => [RAILS_ROOT,"tmp","index"]
+   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
+   acts_as_indexed :fields => [:filename, :title, :type_of_content]
 
   # we could use validates_as_attachment but it produces 4 odd errors like
   # "size is not in list". So we basically here enforce the same validation
@@ -32,9 +31,6 @@ class Resource < ActiveRecord::Base
     end
   end
 
-  # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
-  acts_as_indexed :fields => [:title, :type_of_content]
-
   # when a dialog pops up with images, how many images per page should there be
   PAGES_PER_DIALOG = 12
 

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

@@ -6,8 +6,7 @@
         <% @resources.each do |resource| -%>
           <% resource_linked = (resource.public_filename == params[:current_link]) if params[:current_link].present? %>
           <li<%= " class='linked'" if resource_linked %>>
-            <%= link_to "#{resource.title} (#{resource.public_filename})",
-                        resource.public_filename,
+            <%= link_to "#{resource.title} (#{resource.public_filename})", resource.public_filename,
                         :title => t('.link_to_resource'),
                         :rel => resource.title,
                         :class => 'page_link',
@@ -21,7 +20,8 @@
   <%= render :partial => "/shared/admin/form_actions",
              :locals => {
                :f => nil,
-               :cancel_url => '',
+               :cancel_text => ,
+               :cancel_url => admin_resources_url,
                :submit_button_text => t('.submit_insert'),
                :hide_cancel => false,
                :hide_delete => true,

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

@@ -3,15 +3,18 @@
   <%= f.error_messages %>
 
   <div class='field'>
-    <% if action_name =~ /(edit)|(update)/ -%>
-      <%= link_to t('.download_current'), @resource.public_filename, {:title => @resource.title} -%>
+    <% if action_name =~ /(edit)|(update)/ %>
+      <%= link_to t('.download_current'), @resource.public_filename,
+                  :title => @resource.title %>
       <em><%= t('.or')%></em><%=t('.replace') %>
-    <% end -%>
-    <%= f.file_field :uploaded_data -%>
+    <% end %>
+    <%= f.file_field :uploaded_data %>
   </div>
 
   <div class='field'>
-    <label><%= t('.maximum_file_size', :megabytes => (Resource.attachment_options[:max_size] / 1024 / 1024)) %></label>
+    <label>
+      <%= t('.maximum_file_size', :megabytes => (Resource.attachment_options[:max_size] / 1024 / 1024)) %>
+    </label>
   </div>
 
   <%= render :partial => "/shared/admin/form_actions",

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

@@ -1,23 +1,46 @@
+<% user_can_modify_resources = Refinery::Plugins.active.names.include?("refinery_files") %>
 <div class='clearfix'>
   <div id='dialog_menu_left'>
-    <% if @resources.any? %>
+    <% if (any_resources = @resources.any?) %>
       <span id='existing_resource_radio' class='radio<%= " selected_radio" if @resource.errors.empty? %>'>
         <input type='radio' name='resource_type' value='existing_resource' id='resource_type_existing' <%= "checked='true'" if @resource.errors.empty? %> />
-        <label for='resource_type_existing' class='stripped'><%=t('.existing')%></label>
+        <label for='resource_type_existing' class='stripped'>
+          <%=t('.existing')%>
+        </label>
+      </span>
+    <% end %>
+    <% if user_can_modify_resources %>
+      <span id='upload_resource_radio' class='radio<%= " selected_radio" if @resource.errors.any? or @resources.empty? %>'>
+        <input type='radio' name='resource_type' value='upload_resource' id='resource_type_upload' <%= "checked='true'" if @resources.empty? or @resource.errors.any? %> />
+        <label for='resource_type_upload' class='stripped'>
+          <%= t('.new') %>
+        </label>
       </span>
     <% end %>
-    <span id='upload_resource_radio' class='radio<%= " selected_radio" if @resource.errors.any? or @resources.empty? %>'>
-      <input type='radio' name='resource_type' value='upload_resource' id='resource_type_upload' <%= "checked='true'" if @resources.empty? or @resource.errors.any? %> />
-      <label for='resource_type_upload' class='stripped'><%= t('.new') %></label>
-    </span>
   </div>
 
   <div id='dialog_main'>
-    <%= render :partial => 'existing_resource' if @resources.any? %>
+    <% if any_resources or user_can_modify_images %>
+      <%= render :partial => 'existing_resource' if any_resources %>
 
-    <div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" if @resources.any? and @resource.errors.empty? %>>
-      <%= render :partial => "form", :locals => {:insert => true} %>
-    </div>
+      <% if user_can_modify_resources %>
+        <div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" if any_resources and @resource.errors.empty? %>>
+          <%= render :partial => "form", :locals => {:insert => true} %>
+        </div>
+      <% end %>
+    <% else %>
+      <% flash.now[:error] = t('admin.resources.index.no_files_yet').split('.').first.html_safe + "." %>
+      <%= render :partial => "/shared/admin/form_actions",
+                 :locals => {
+                   :f => nil,
+                   :cancel_url => '',
+                   :hide_cancel => false,
+                   :hide_delete => true,
+                   :hide_submit => true,
+                   :cancel_button_text => t('shared.admin.message.close'),
+                   :cancel_title => ''
+                 } %>
+    <% end %>
   </div>
 </div>
 

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

@@ -16,7 +16,7 @@ da:
         download: Download fil ({{size}})
         edit: Redigér fil
         delete:
-          message: Er du sikker på du vil slette filen '{{title}}'?
+          message: "Er du sikker på du vil slette filen '{{title}}'?"
           title: Slet fil
       index:
         upload_new: Upload en fil

data/vendor/plugins/resources/config/locales/pt-BR.yml

@@ -22,11 +22,12 @@ pt-BR:
         upload_new: Enviar Novo Arquivo
         no_files_yet: Ainda não existem arquivos. Clique em "Enviar Novo Arquivo" para adicionar seu primeiro arquivo.
       insert:
-        existing_file: Arquivo Existente
+        existing: Arquivo Existente
         new: Novo Arquivo
-        link_to_resource: 'Link para este Recurso'
         previous: Anterior
         next: Próximo
-        submit_insert: Inserir
         or: ou
         cancel: Cancelar
+      existing_resource:
+        link_to_resource: Link para este Recurso
+        submit_insert: Inserir

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 9
   - 7
-  - 5
-  version: 0.9.7.5
+  - 6
+  version: 0.9.7.6
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +12:00
+date: 2010-07-15 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +27,7 @@ email: info@refinerycms.com
 executables: 
 - refinery
 - refinery-upgrade-096-to-097
+- refinerycms
 extensions: []
 
 extra_rdoc_files: []
@@ -47,6 +49,7 @@ files:
 - app/helpers/application_helper.rb
 - bin/refinery
 - bin/refinery-upgrade-096-to-097
+- bin/refinerycms
 - config/acts_as_indexed_config.rb
 - config/amazon_s3.yml.example
 - config/application.rb
@@ -701,10 +704,6 @@ files:
 - vendor/plugins/authentication/Rakefile
 - vendor/plugins/authentication/README
 - vendor/plugins/authentication/readme.md
-- vendor/plugins/authentication/test/functional/admin/base_controller_test.rb
-- vendor/plugins/authentication/test/functional/admin/dashboard_controller_test.rb
-- vendor/plugins/authentication/test/functional/admin/pages_controller_test.rb
-- vendor/plugins/authentication/test/test_helper.rb
 - vendor/plugins/authentication/test/unit/user_mailer_test.rb
 - vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb
 - vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb
@@ -816,7 +815,7 @@ files:
 - vendor/plugins/images/app/controllers/admin/images_controller.rb
 - vendor/plugins/images/app/helpers/admin/images_helper.rb
 - vendor/plugins/images/app/models/image.rb
-- vendor/plugins/images/app/views/admin/images/_existing_image.erb
+- vendor/plugins/images/app/views/admin/images/_existing_image.html.erb
 - vendor/plugins/images/app/views/admin/images/_form.html.erb
 - vendor/plugins/images/app/views/admin/images/_grid_view.html.erb
 - vendor/plugins/images/app/views/admin/images/_list_view.html.erb
@@ -879,16 +878,14 @@ files:
 - vendor/plugins/model_translations/README.rdoc
 - vendor/plugins/model_translations/test/model_translations_test.rb
 - vendor/plugins/model_translations/test/test_helper.rb
-- vendor/plugins/pages/app/controllers/admin/page_dialogs_controller.rb
 - vendor/plugins/pages/app/controllers/admin/page_parts_controller.rb
 - vendor/plugins/pages/app/controllers/admin/pages_controller.rb
+- vendor/plugins/pages/app/controllers/admin/pages_dialogs_controller.rb
 - vendor/plugins/pages/app/controllers/pages_controller.rb
 - vendor/plugins/pages/app/helpers/pages_helper.rb
 - vendor/plugins/pages/app/models/page.rb
 - vendor/plugins/pages/app/models/page_part.rb
 - vendor/plugins/pages/app/presenters/page_presenter.rb
-- 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/_form_advanced_options.html.erb
 - vendor/plugins/pages/app/views/admin/pages/_form_advanced_options_seo.html.erb
@@ -900,6 +897,8 @@ files:
 - vendor/plugins/pages/app/views/admin/pages/edit.html.erb
 - vendor/plugins/pages/app/views/admin/pages/index.html.erb
 - vendor/plugins/pages/app/views/admin/pages/new.html.erb
+- vendor/plugins/pages/app/views/admin/pages_dialogs/_page_link.html.erb
+- vendor/plugins/pages/app/views/admin/pages_dialogs/link_to.html.erb
 - vendor/plugins/pages/app/views/pages/home.html.erb
 - vendor/plugins/pages/app/views/pages/show.html.erb
 - vendor/plugins/pages/config/locales/da.yml
@@ -1073,23 +1072,27 @@ 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.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A beautiful open source Ruby on Rails content manager for small business.

data/vendor/plugins/authentication/test/functional/admin/base_controller_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class Admin::BaseControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end

data/vendor/plugins/authentication/test/functional/admin/dashboard_controller_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class Admin::DashboardControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end

data/vendor/plugins/authentication/test/functional/admin/pages_controller_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class Admin::PagesControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end

data/vendor/plugins/authentication/test/test_helper.rb

@@ -1,38 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-
-class Test::Unit::TestCase
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
-  #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  #
-  # The only drawback to using transactional fixtures is when you actually
-  # need to test transactions.  Since your test is bracketed by a transaction,
-  # any transactions started in your code will be automatically rolled back.
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
-
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end