Rails 3.1 compatibility changes

app/controllers/refinery/admin/sites_controller.rb

@@ -0,0 +1,13 @@
+class ::Refinery::Admin::SitesController < Admin::BaseController
+  skip_filter :load_site
+
+  #Not namespacing the site model because the purpose is to enable an app-specific site model that 
+  #might not be exclusive to refinery.
+  crudify :site,
+    :title_attribute => :name,
+    :order => "name ASC",
+    #:redirect_to_url => :redirect_to_where?,
+    :xhr_paging => true
+
+end
+

app/helpers/admin/sites_helper.rb → app/helpers/refinery/admin/sites_helper.rb

@@ -1,4 +1,4 @@
-module Admin::SitesHelper
+module Refinery::Admin::SitesHelper
   def link_to_add_fields(name, f, association)
     new_object = f.object.class.reflect_on_association(association).klass.new
     fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|

app/views/layouts/application.html.haml

@@ -2,19 +2,19 @@
 - if @site.try(:stylesheet)
   - content_for :stylesheets do
     = stylesheet_link_tag @site.stylesheet
-= render :partial => "/shared/html_tag"
-- site_bar = render(:partial => "/shared/site_bar", :locals => {:head => true})
-= render :partial => "/shared/head"
+= render :partial => "/refinery/html_tag"
+- site_bar = render(:partial => "/refinery/site_bar", :locals => {:head => true})
+= render :partial => "/refinery/head"
 %body
   /
     = request.host
   -#= site_bar
-  = render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/
+  = render :partial => "/refinery/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/
   #container
     %header
-    = render :partial => "/shared/header"
+    = render :partial => "/refinery/header"
     %section#page
     = yield
     %footer
-    = render :partial => "/shared/footer"
-  = render :partial => "/shared/javascripts"
+    = render :partial => "/refinery/footer"
+  = render :partial => "/refinery/javascripts"

app/views/admin/sites/_actions.html.erb → app/views/refinery/admin/sites/_actions.html.erb

@@ -1,12 +1,12 @@
 <ul>
   <li>
-    <%= render :partial => "/shared/admin/search",
+    <%= render :partial => "/refinery/admin/search",
                :locals => {
-                 :url => admin_sites_url
+                 :url => main_app.refinery_admin_sites_url
                } %>
   </li>
   <li>
-    <%= link_to t('.new'), new_admin_site_url({
+    <%= link_to t('.new'), main_app.new_refinery_admin_site_url({
                              :dialog => true,
                              :width => 725,
                              :height => 475

app/views/admin/sites/_form.html.erb → app/views/refinery/admin/sites/_form.html.erb

@@ -1,6 +1,6 @@
-<%= form_for [:admin, @site] do |f| %>
+<%= form_for [:admin, @site], :url => @site.persisted? ? main_app.refinery_admin_site_path(@site) : main_app.refinery_admin_sites_path  do |f| %>
 
-  <%= render :partial => "/shared/admin/error_messages",
+  <%= render :partial => "/refinery/admin/error_messages",
              :locals => {
                      :object => @site,
                      :include_object_name => true
@@ -12,26 +12,26 @@
   </div>
   <div class='field'>
     <%= f.label :page_id %>
-    <%= f.select :page_id, nested_set_options(Page, @page) {|i| "#{'-' * i.level} #{i.title}" },
+    <%= f.select :page_id, nested_set_options(::Refinery::Page, @page) {|i| "#{'-' * i.level} #{i.title}" },
                :include_blank => true %>
   </div>
   <div class='field'>
     <%= f.label :stylesheet %>
-    <%= f.text_field :stylesheet%>
+!    <%= f.text_field :stylesheet%>
   </div>
   <%= f.label :hostnames %>
   <%= f.fields_for :hostnames do |hf| %>
     <%= render 'hostname_fields', :f=>hf %>
   <% end %>
   <p><%= link_to_add_fields refinery_icon_tag('add.png'), f,
                             :hostnames %></p>
-  <%= render :partial => "/shared/admin/form_actions",
+  <%= render :partial => "/refinery/admin/form_actions",
              :locals => {
                      :f => f,
                      :continue_editing => false,
                      :submit_button_title => t('.restart_may_be_in_order_html'),
                      :delete_title => t('delete', :scope => 'admin.sites'),
-                     :delete_confirmation => t('message', :scope => 'shared.admin.delete',
+                     :delete_confirmation => t('message', :scope => 'refinery.admin.delete',
                                                :title => @site.name.to_s.titleize),
                      :hide_delete => (!@site.persisted? or from_dialog?)
              } %>

app/views/admin/sites/_records.html.erb → app/views/refinery/admin/sites/_records.html.erb

@@ -1,6 +1,6 @@
 <% if searching? %>
   <h2>
-    <%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %>
+    <%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %>
   </h2>
 <% end %>
 <% if @sites.any? %>
@@ -10,7 +10,7 @@
 <% else %>
   <p>
     <% if searching? %>
-      <%= t('no_results', :scope => 'shared.admin.search') %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% else %>
       <strong>
         <%= t('.empty_set') %>

app/views/admin/sites/_site.html.erb → app/views/refinery/admin/sites/_site.html.erb

@@ -6,14 +6,14 @@
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag('application_edit.png'),
-                edit_admin_site_path(site, :dialog => true,
+                main_app.edit_refinery_admin_site_path(site, :dialog => true,
                                   :width => 725, :height => 525),
-                :title => t('edit', :scope => 'admin.sites') %>
+                :title => t('edit', :scope => 'refinery.admin.sites') %>
     <%= link_to refinery_icon_tag('delete.png'),
-                admin_site_path(site),
+                main_app.refinery_admin_site_path(site),
                 :class => 'cancel confirm-delete',
-                :title => t('delete', :scope => 'admin.sites'),
-                :confirm => t('message', :scope => 'shared.admin.delete',
+                :title => t('delete', :scope => 'refinery.admin.sites'),
+                :confirm => t('message', :scope => 'refinery.admin.delete',
                               :title => site.name),
                 :method => :delete %>
   </span>

app/views/admin/sites/_sites.html.erb → app/views/refinery/admin/sites/_sites.html.erb

@@ -1,4 +1,4 @@
-<%= will_paginate @refinery_settings %>
+<%= paginate @sites %>
 <ul class="<%= ['pagination_frame', pagination_css_class].compact.join(' ') %>">
   <%= render :partial => 'site',
              :collection => @sites %>

config/locales/de.yml

@@ -1,11 +1,14 @@
 de:
-  plugins:
-    sites:
-      title: Sites
-  admin:
-    sites:
-      actions:
-        new: 'Site hinzufügen'
-      edit: 'Site anpassen'
-      delete: 'Site entfernen'
+  refinery:
+    plugins:
+      refinery_sites:
+        title: Sites
+    admin:
+      sites:
+        delete: Diese Site für immer löschen
+        edit: Diese Site bearbeiten
+        actions:
+          new: 'Site hinzufügen'
+          edit: 'Site anpassen'
+          delete: 'Site entfernen'
 

config/locales/en.yml

@@ -2,12 +2,16 @@
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  plugins:
-    sites:
-      title: Sites
-  admin:
-    sites:
-      actions:
-        new: 'new site'
-      edit: 'edit site'
-      delete: 'remove site'
+  refinery:
+    plugins:
+      refinery_sites:
+        title: Sites
+    admin:
+      sites:
+        delete: Remove this site forever
+        edit: Edit this site
+        actions:
+          new: 'New site'
+          edit: 'Edit site'
+          delete: 'Remove site'
+

config/routes.rb

@@ -1,9 +1,7 @@
-Refinery::Application.routes.draw do
-
-  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
+::Refinery::Application.routes.draw do
+  scope(:path => 'refinery', :as => 'refinery_admin', :module => 'refinery/admin') do
     resources :sites do
       resources :hostnames
     end
   end
-
 end

lib/refinerycms-multisite.rb

@@ -1,20 +1,27 @@
-
 require 'refinerycms-base'
 
 module Refinery
   module Sites
     class Engine < Rails::Engine
-      initializer "static assets" do |app|
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
+
+      class << self
+        attr_accessor :root
+        def root
+          @root ||= Pathname.new(File.expand_path('../../', __FILE__))
+        end
       end
 
-      config.after_initialize do
-        Refinery::Plugin.register do |plugin|
-          plugin.name = "sites"
-          plugin.activity = {
-            :class => Site,
-            :title => 'name'
-          }
+      class Engine < ::Rails::Engine
+        isolate_namespace ::Refinery
+
+        initializer "init plugin", :after => :set_routes_reloader do |app|
+          ::Refinery::Plugin.register do |plugin|
+            plugin.pathname = root
+            plugin.name = 'refinery_sites'
+            plugin.url = app.routes.url_helpers.refinery_admin_sites_path
+            plugin.version = Refinerycms::Multisite::VERSION
+            plugin.menu_match = /refinery\/sites$/
+          end
         end
       end
     end