Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rails 3 1 - Update routing to match upstream changes. #16

Open
wants to merge 3 commits into
base: rails-3-1
Choose a base branch
from
Open

Rails 3 1 - Update routing to match upstream changes. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71beebc
Update the config/routes.rb to be compatible with the current
jasherai Feb 24, 2012
efc1572
Update the snippet engine's controller/view/engine paths to the new
jasherai Feb 24, 2012
8ea2b66
Update gemspec
jasherai Feb 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/refinery/admin/snippets_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/views/refinery/admin/pages/tabs/_snippets_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ul>
<% @page.parts.each do |part|%>
<li>
<%= link_to(part.title, main_app.url_for(:anchor => "part-#{part.id}")) %> |
<%= link_to(part.title, refinery.url_for(:anchor => "part-#{part.id}")) %> |
</li>
<% end %>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions app/views/refinery/admin/pages/tabs/_snippets_field.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
<span class="title"><%= snippet.title %></span>
<div class="actions">
<% 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 %>
<span class="add-snippet"><%= t('.add_after_body') %></span>
<% 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 %>
<span class=" add-snippet"><%= t('.add_before_body') %></span>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/refinery/admin/pages/tabs/_snippets_list_item.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<% end %>
</span>
<span class='actions'>
<%= 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' %>
</span>
Expand Down
8 changes: 4 additions & 4 deletions app/views/refinery/admin/snippets/_actions.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<li>
<%= render :partial => "/refinery/admin/search",
:locals => {
:url => main_app.refinery_admin_snippets_path
:url => refinery.admin_snippets_path
} %>
</li>
<% end %>
<li>
<%= 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" %>
</li>
<% if !searching? and Refinery::Admin::SnippetsController.sortable? and Refinery::Snippet.count > 1 %>
<li>
<%= 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" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/refinery/admin/snippets/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/views/refinery/admin/snippets/_locale_picker.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<% locales.each do |locale| %>
<li<%= " class='selected'" if locale.to_s == local_assigns[:current_locale].to_s %>>
<%= link_to refinery_icon_tag("flags/#{locale}.png", :size => '48x33'),
main_app.url_for(:switch_locale => locale) %>
refinery.url_for(:switch_locale => locale) %>
</li>
<% end %>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions app/views/refinery/admin/snippets/_snippet.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<% end %>
</span>
<span class='actions'>
<%= 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),
Expand Down
11 changes: 4 additions & 7 deletions config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,6 +10,5 @@
end
end
end

end
end
end
6 changes: 3 additions & 3 deletions lib/refinery/snippets/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
122 changes: 63 additions & 59 deletions refinerycms-snippets.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{[email protected]}
Expand All @@ -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