diff --git a/app/controllers/refinery/admin/snippets_controller.rb b/app/controllers/refinery/admin/snippets_controller.rb index 7a025ae..356520f 100644 --- a/app/controllers/refinery/admin/snippets_controller.rb +++ b/app/controllers/refinery/admin/snippets_controller.rb @@ -12,10 +12,10 @@ def create ) unless request.xhr? - redirect_to (params[:continue_editing] =~ /1/ ? main_app.edit_refinery_admin_snippet_path(@snippet) : main_app.refinery_admin_snippets_url) + redirect_to (params[:continue_editing] =~ /1/ ? refinery.edit_admin_snippet_path(@snippet) : refinery.admin_snippets_url) else response = Hash.new - response['redirect'] = main_app.edit_refinery_admin_snippet_path(@snippet) if params[:continue_editing] + response['redirect'] = refinery.edit_admin_snippet_path(@snippet) if params[:continue_editing] render :json => response end diff --git a/app/views/refinery/admin/pages/tabs/_snippets_content.html.erb b/app/views/refinery/admin/pages/tabs/_snippets_content.html.erb index 717d797..165706d 100644 --- a/app/views/refinery/admin/pages/tabs/_snippets_content.html.erb +++ b/app/views/refinery/admin/pages/tabs/_snippets_content.html.erb @@ -5,7 +5,7 @@ diff --git a/app/views/refinery/admin/pages/tabs/_snippets_field.html.erb b/app/views/refinery/admin/pages/tabs/_snippets_field.html.erb index 3328d75..267afd4 100644 --- a/app/views/refinery/admin/pages/tabs/_snippets_field.html.erb +++ b/app/views/refinery/admin/pages/tabs/_snippets_field.html.erb @@ -32,12 +32,12 @@ <%= snippet.title %>
<% unless snippet.after?(part) %> - <%= link_to t('.add_after_body'), main_app.url_for({:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id}), :class => 'add_icon add-snippet' %> + <%= link_to t('.add_after_body'), refinery.url_for({:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id}), :class => 'add_icon add-snippet' %> <% else %> <%= t('.add_after_body') %> <% end %> <% unless snippet.before?(part) %> - <%= link_to t('.add_before_body'), main_app.url_for({:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => 'true'}), :class => 'add_icon add-snippet' %> + <%= link_to t('.add_before_body'), refinery.url_for({:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => 'true'}), :class => 'add_icon add-snippet' %> <% else %> <%= t('.add_before_body') %> <% end %> diff --git a/app/views/refinery/admin/pages/tabs/_snippets_list_item.html.erb b/app/views/refinery/admin/pages/tabs/_snippets_list_item.html.erb index 3fc8e71..d9aa826 100644 --- a/app/views/refinery/admin/pages/tabs/_snippets_list_item.html.erb +++ b/app/views/refinery/admin/pages/tabs/_snippets_list_item.html.erb @@ -11,9 +11,9 @@ <% end %> - <%= link_to refinery_icon_tag('application_edit.png'), main_app.edit_refinery_admin_snippet_path(snippet), + <%= link_to refinery_icon_tag('application_edit.png'), refinery.edit_admin_snippet_path(snippet), :title => t('.edit') %> - <%= link_to refinery_icon_tag('delete.png'), main_app.url_for({:controller => 'snippets_page_parts', :action => 'remove', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => before_body}), + <%= link_to refinery_icon_tag('delete.png'), refinery.url_for({:controller => 'snippets_page_parts', :action => 'remove', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => before_body}), :title => t('.remove'), :class => 'remove-snippet' %> diff --git a/app/views/refinery/admin/snippets/_actions.html.erb b/app/views/refinery/admin/snippets/_actions.html.erb index 7fcee33..2d0b911 100644 --- a/app/views/refinery/admin/snippets/_actions.html.erb +++ b/app/views/refinery/admin/snippets/_actions.html.erb @@ -3,23 +3,23 @@
  • <%= render :partial => "/refinery/admin/search", :locals => { - :url => main_app.refinery_admin_snippets_path + :url => refinery.admin_snippets_path } %>
    • <% end %>
  • - <%= link_to t('.create_new'), main_app.new_refinery_admin_snippet_path, + <%= link_to t('.create_new'), refinery.new_admin_snippet_path, :class => "add_icon" %>
    • <% if !searching? and Refinery::Admin::SnippetsController.sortable? and Refinery::Snippet.count > 1 %>
  • <%= link_to t('.reorder', :what => "Snippets"), - main_app.refinery_admin_snippets_path, + refinery.update_positions_admin_snippets_path, :id => "reorder_action", :class => "reorder_icon" %> <%= link_to t('.reorder_done', :what => "Snippets"), - main_app.refinery_admin_snippets_path, + refinery.update_positions_admin_snippets_path, :id => "reorder_action_done", :style => "display: none;", :class => "reorder_icon" %> diff --git a/app/views/refinery/admin/snippets/_form.html.erb b/app/views/refinery/admin/snippets/_form.html.erb index bcb19a8..45b9468 100644 --- a/app/views/refinery/admin/snippets/_form.html.erb +++ b/app/views/refinery/admin/snippets/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_for [main_app, :refinery_admin, @snippet] do |f| -%> +<%= form_for [refinery, :admin, @snippet] do |f| -%> <%= render :partial => "/refinery/admin/error_messages", :locals => { :object => @snippet, :include_object_name => true diff --git a/app/views/refinery/admin/snippets/_locale_picker.html.erb b/app/views/refinery/admin/snippets/_locale_picker.html.erb index c67aae5..5db1dbc 100644 --- a/app/views/refinery/admin/snippets/_locale_picker.html.erb +++ b/app/views/refinery/admin/snippets/_locale_picker.html.erb @@ -5,7 +5,7 @@ <% locales.each do |locale| %> > <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => '48x33'), - main_app.url_for(:switch_locale => locale) %> + refinery.url_for(:switch_locale => locale) %>
    • <% end %> diff --git a/app/views/refinery/admin/snippets/_snippet.html.erb b/app/views/refinery/admin/snippets/_snippet.html.erb index a312bc1..ad857f9 100644 --- a/app/views/refinery/admin/snippets/_snippet.html.erb +++ b/app/views/refinery/admin/snippets/_snippet.html.erb @@ -11,9 +11,9 @@ <% end %> - <%= link_to refinery_icon_tag("application_edit.png"), main_app.edit_refinery_admin_snippet_path(snippet), + <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_admin_snippet_path(snippet), :title => t('.edit') %> - <%= link_to refinery_icon_tag("delete.png"), main_app.refinery_admin_snippet_path(snippet), + <%= link_to refinery_icon_tag("delete.png"), refinery.admin_snippet_path(snippet), :class => "cancel confirm-delete", :title => t('.delete'), :confirm => t('message', :scope => 'refinery.admin.delete', :title => snippet.title), diff --git a/config/routes.rb b/config/routes.rb index 8076e8e..bc333d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,7 @@ -Rails.application.routes.draw do - scope(:path => 'refinery', :as => 'refinery_admin', :module => 'refinery/admin') do +Refinery::Core::Engine.routes.draw do + namespace :admin, :path => 'refinery' do resources :snippets do - collection do - post :update_positions - end + post :update_positions, :on => :collection resources :snippets_page_parts do member do @@ -12,6 +10,5 @@ end end end - end -end \ No newline at end of file +end diff --git a/lib/refinery/snippets/engine.rb b/lib/refinery/snippets/engine.rb index 6c46163..0624ff9 100644 --- a/lib/refinery/snippets/engine.rb +++ b/lib/refinery/snippets/engine.rb @@ -18,15 +18,15 @@ class Engine < Rails::Engine Refinery::Plugin.register do |plugin| plugin.pathname = root plugin.name = "refinery_snippets" - plugin.url = app.routes.url_helpers.refinery_admin_snippets_path + plugin.url = {:controller => '/refinery/admin/snippets'} plugin.menu_match = /^\/?(admin|refinery)\/snippets/ plugin.activity = [{ :class_name => :'refinery/snippet', - :url => "refinery_admin_snippet_path" + :url => "refinery.admin_snippet_path" }, { :class_name => :'refinery/snippet_page_part', :nested_with => ['snippet'], - :url => "refinery_admin_snippet_snippets_page_part_path" + :url => "refinery.admin_snippet_snippets_page_part_path" }] end end diff --git a/refinerycms-snippets.gemspec b/refinerycms-snippets.gemspec index 20246b5..f4c2dfb 100644 --- a/refinerycms-snippets.gemspec +++ b/refinerycms-snippets.gemspec @@ -3,7 +3,7 @@ Gem::Specification.new do |s| s.name = %q{refinerycms-snippets} s.version = %q{2.0.0} s.description = %q{Ruby on Rails Snippets engine for Refinery CMS} - s.date = %q{2011-12-14} + s.date = %q{2012-02-25} s.summary = %q{Html snippets for Refinery CMS page} s.authors = ['Marek L.', 'Rodrigo Garcia Suarez'] s.email = %q{nospam.keram@gmail.com} @@ -12,90 +12,94 @@ Gem::Specification.new do |s| s.add_dependency 'refinerycms-pages', '>= 2.0.0' s.files = [ + 'db', + 'db/migrate', + 'db/migrate/2_translate_snippets.rb', + 'db/migrate/3_create_snippets_page_parts.rb', + 'db/migrate/1_create_snippets.rb', + 'db/seeds.rb', 'app', - 'app/assets', - 'app/assets/javascripts', - 'app/assets/javascripts/page-snippet-picker.js', - 'app/assets/javascripts/part-snippets-select.js', - 'app/assets/stylesheets', - 'app/assets/stylesheets/page-snippet-picker.css', - 'app/controllers', - 'app/controllers/refinery', - 'app/controllers/refinery/admin', - 'app/controllers/refinery/admin/snippets_controller.rb', - 'app/controllers/refinery/admin/snippets_page_parts_controller.rb', - 'app/models', - 'app/models/refinery', - 'app/models/refinery/snippet.rb', - 'app/models/refinery/snippet_page.rb', - 'app/models/refinery/snippet_page_part.rb', 'app/views', + 'app/views/admin', + 'app/views/admin/pages', + 'app/views/admin/pages/tabs', + 'app/views/admin/pages/tabs/_snippets_field.html.erb', 'app/views/refinery', 'app/views/refinery/admin', 'app/views/refinery/admin/pages', 'app/views/refinery/admin/pages/tabs', 'app/views/refinery/admin/pages/tabs/_snippets.html.erb', - 'app/views/refinery/admin/pages/tabs/_snippets_content.html.erb', 'app/views/refinery/admin/pages/tabs/_snippets_field.html.erb', + 'app/views/refinery/admin/pages/tabs/_snippets_content.html.erb', 'app/views/refinery/admin/pages/tabs/_snippets_list_item.html.erb', + 'app/views/refinery/admin/snippets_page_parts', + 'app/views/refinery/admin/snippets_page_parts/remove.html.erb', + 'app/views/refinery/admin/snippets_page_parts/add.html.erb', 'app/views/refinery/admin/snippets', - 'app/views/refinery/admin/snippets/_actions.html.erb', - 'app/views/refinery/admin/snippets/_form.html.erb', - 'app/views/refinery/admin/snippets/_form_actions.html.erb', + 'app/views/refinery/admin/snippets/index.html.erb', + 'app/views/refinery/admin/snippets/edit.html.erb', + 'app/views/refinery/admin/snippets/_snippets.html.erb', 'app/views/refinery/admin/snippets/_locale_picker.html.erb', + 'app/views/refinery/admin/snippets/_actions.html.erb', 'app/views/refinery/admin/snippets/_records.html.erb', + 'app/views/refinery/admin/snippets/new.html.erb', + 'app/views/refinery/admin/snippets/_form.html.erb', 'app/views/refinery/admin/snippets/_snippet.html.erb', - 'app/views/refinery/admin/snippets/_snippets.html.erb', 'app/views/refinery/admin/snippets/_sortable_list.html.erb', - 'app/views/refinery/admin/snippets/edit.html.erb', - 'app/views/refinery/admin/snippets/index.html.erb', - 'app/views/refinery/admin/snippets/new.html.erb', - 'app/views/refinery/admin/snippets_page_parts', - 'app/views/refinery/admin/snippets_page_parts/add.html.erb', - 'app/views/refinery/admin/snippets_page_parts/remove.html.erb', - 'config', - 'config/locales', - 'config/locales/en.yml', - 'config/locales/es.yml', - 'config/locales/nl.yml', - 'config/routes.rb', - 'db', - 'db/migrate', - 'db/migrate/1_create_snippets.rb', - 'db/migrate/2_translate_snippets.rb', - 'db/migrate/3_create_snippets_page_parts.rb', - 'db/seeds.rb', - 'features', - 'features/manage_snippets.feature', - 'features/step_definitions', - 'features/step_definitions/snippet_steps.rb', - 'features/support', - 'features/support/paths.rb', + 'app/assets', + 'app/assets/stylesheets', + 'app/assets/stylesheets/page-snippet-picker.css', + 'app/assets/javascripts', + 'app/assets/javascripts/part-snippets-select.js', + 'app/assets/javascripts/page-snippet-picker.js', + 'app/controllers', + 'app/controllers/refinery', + 'app/controllers/refinery/admin', + 'app/controllers/refinery/admin/snippets_controller.rb', + 'app/controllers/refinery/admin/snippets_page_parts_controller.rb', + 'app/models', + 'app/models/refinery', + 'app/models/refinery/snippet_page.rb', + 'app/models/refinery/snippet.rb', + 'app/models/refinery/snippet_page_part.rb', 'lib', - 'lib/extensions', - 'lib/extensions/page_extensions.rb', - 'lib/extensions/pages_helper_extensions.rb', 'lib/gemspec.rb', + 'lib/tasks', + 'lib/tasks/snippets.rake', + 'lib/refinerycms-snippets.rb', 'lib/generators', 'lib/generators/refinery', 'lib/generators/refinery/snippets_generator.rb', + 'lib/extensions', + 'lib/extensions/pages_helper_extensions.rb', + 'lib/extensions/page_extensions.rb', 'lib/refinery', + 'lib/refinery/snippets.rb', 'lib/refinery/snippets', - 'lib/refinery/snippets/engine.rb', 'lib/refinery/snippets/tabs.rb', + 'lib/refinery/snippets/engine.rb', 'lib/refinery/snippets/version.rb', - 'lib/refinery/snippets.rb', - 'lib/refinerycms-snippets.rb', - 'lib/tasks', - 'lib/tasks/snippets.rake', - 'readme.md', - 'refinerycms-snippets.gemspec', 'spec', - 'spec/helpers', - 'spec/helpers/pages_helper_spec.rb', 'spec/models', 'spec/models/page_spec.rb', - 'spec/models/snippet_spec.rb' + 'spec/models/snippet_spec.rb', + 'spec/helpers', + 'spec/helpers/pages_helper_spec.rb', + 'refinerycms-snippets.gemspec', + 'config', + 'config/routes.rb', + 'config/locales', + 'config/locales/cs.yml', + 'config/locales/en.yml', + 'config/locales/es.yml', + 'config/locales/nl.yml', + 'features', + 'features/support', + 'features/support/paths.rb', + 'features/manage_snippets.feature', + 'features/step_definitions', + 'features/step_definitions/snippet_steps.rb', + 'readme.md' ] s.require_path = 'lib' end