Skip to content

Commit

Permalink
Consistent whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
parndt committed Feb 6, 2012
1 parent 290a28f commit 5e637b2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion core/app/views/refinery/admin/_form_actions.html.erb
Expand Up @@ -68,4 +68,4 @@
:class => "button confirm-delete") unless hide_delete %>
<%= local_assigns[:after_delete_button] -%>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions pages/app/controllers/refinery/admin/pages_controller.rb
Expand Up @@ -9,7 +9,7 @@ class PagesController < Refinery::AdminController
:paging => false

after_filter lambda{::Refinery::Page.expire_page_caching}, :only => [:update_positions]

before_filter :load_valid_templates, :only => [:edit, :new]

before_filter :restrict_access, :only => [:create, :update, :update_positions, :destroy],
Expand All @@ -26,11 +26,11 @@ def children
@page = find_page
render :layout => false
end

def preview
@menu_pages = ::Refinery::Menu.new(::Refinery::Page.fast_menu)
@page = find_page

if @page
# Preview existing pages
@page.attributes = params[:page]
Expand Down
2 changes: 1 addition & 1 deletion pages/app/models/refinery/page_part.rb
Expand Up @@ -16,7 +16,7 @@ def to_param

def body=(value)
super

normalise_text_fields
end

Expand Down
4 changes: 2 additions & 2 deletions pages/app/views/refinery/admin/pages/_page.html.erb
Expand Up @@ -29,11 +29,11 @@
<%= link_to refinery_icon_tag('page_add.png'),
refinery.new_admin_page_path(:parent_id => page.id),
:title => t('new', :scope => 'refinery.admin.pages') %>
<%= link_to refinery_icon_tag('application_edit.png'),
refinery.edit_admin_page_path(page.uncached_nested_url),
:title => t('edit', :scope => 'refinery.admin.pages') %>
<%= link_to refinery_icon_tag('delete.png'),
refinery.admin_page_path(page.uncached_nested_url),
:class => "cancel confirm-delete",
Expand Down
8 changes: 4 additions & 4 deletions pages/config/routes.rb
@@ -1,27 +1,27 @@
Refinery::Core::Engine.routes.draw do
root :to => 'pages#home'
get '/pages/:id', :to => 'pages#show', :as => :page

namespace :admin, :path => 'refinery' do
post 'pages/preview' => 'pages#preview', :as => :preview_pages
match 'pages/*path/preview' => 'pages#preview', :as => :preview_page, :via => [:get, :put]

get 'pages/*path/edit', :to => 'pages#edit'
get 'pages/*path/children', :to => 'pages#children', :as => 'children_pages'
put 'pages/*path', :to => 'pages#update'
delete 'pages/*path', :to => 'pages#destroy'
resources :pages, :except => :show do
post :update_positions, :on => :collection
end

resources :pages_dialogs, :only => [] do
collection do
get :link_to
get :test_url
get :test_email
end
end

resources :page_parts, :only => [:new, :create, :destroy]
end
end
Expand Up @@ -29,7 +29,7 @@ Refinery::Pages.configure do |config|
# Set this to true to activate full-page-cache
# config.cache_pages_full = <%= Refinery::Pages.cache_pages_full.inspect %>

# Set this to true to fully expand the page hierarchy in the admin
# Set this to true to fully expand the page hierarchy in the admin
# config.auto_expand_admin_tree = <%= Refinery::Pages.auto_expand_admin_tree.inspect %>

# config.layout_template_whitelist = <%= Refinery::Pages.layout_template_whitelist.inspect %>
Expand Down

0 comments on commit 5e637b2

Please sign in to comment.