From 0617dfa18e3d27e855b84ecd55f0dea0a09dc7f7 Mon Sep 17 00:00:00 2001
From: Jason Truesdell <jason@yuzuten.com>
Date: Wed, 29 Jun 2011 15:02:21 -0700
Subject: [PATCH 1/2] Relocate Sites controller based on namespace, adjust
 routing, cleanup bug introduced relating to i18n name for refinery dashboard
 tabs"

---
 app/controllers/refinery/admin/sites_controller.rb | 12 ++++++++++++
 config/routes.rb                                   | 12 ++++++------
 lib/refinerycms-multisite.rb                       |  6 +++---
 tmp/rickrockstar                                   |  1 +
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 app/controllers/refinery/admin/sites_controller.rb
 create mode 160000 tmp/rickrockstar

diff --git a/app/controllers/refinery/admin/sites_controller.rb b/app/controllers/refinery/admin/sites_controller.rb
new file mode 100644
index 0000000..b513c19
--- /dev/null
+++ b/app/controllers/refinery/admin/sites_controller.rb
@@ -0,0 +1,12 @@
+class ::Refinery::Admin::SitesController < ::Refinery::Admin::BaseController
+  helper :refinery_settings
+
+  skip_filter :load_site
+
+  crudify :site,
+          :title_attribute => :name,
+          :order => "name ASC",
+          #:redirect_to_url => :redirect_to_where?,
+          :xhr_paging => true
+
+end
diff --git a/config/routes.rb b/config/routes.rb
index 6284c45..6155fcc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,9 +1,9 @@
-Refinery::Application.routes.draw do
-
-  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
-    resources :sites do
-      resources :hostnames
+::Refinery::Application.routes.draw do
+  scope(:module=> 'refinery') do
+    scope(:module => 'admin', :path => 'refinery', :as => 'refinery_admin') do
+      resources :sites do
+        resources :hostnames
+      end
     end
   end
-
 end
diff --git a/lib/refinerycms-multisite.rb b/lib/refinerycms-multisite.rb
index 1a89f0d..1cc3d56 100644
--- a/lib/refinerycms-multisite.rb
+++ b/lib/refinerycms-multisite.rb
@@ -9,10 +9,10 @@ class Engine < Rails::Engine
       end
 
       config.after_initialize do
-        Refinery::Plugin.register do |plugin|
-          plugin.name = "sites"
+        ::Refinery::Plugin.register do |plugin|
+          plugin.name = "refinery_sites"
           plugin.activity = {
-            :class => Site,
+            :class => ::Site,
             :title => 'name'
           }
         end
diff --git a/tmp/rickrockstar b/tmp/rickrockstar
new file mode 160000
index 0000000..a5db4bd
--- /dev/null
+++ b/tmp/rickrockstar
@@ -0,0 +1 @@
+Subproject commit a5db4bd9215c1baaab0cca4386cf5bc6d2d8327d

From ec38fa1890c7a4edd34a9af612b5c61a870441c6 Mon Sep 17 00:00:00 2001
From: Jason Truesdell <jason@yuzuten.com>
Date: Fri, 8 Jul 2011 14:13:21 -0700
Subject: [PATCH 2/2] Rails 3.1 compatibility fixes, resources/localizations
 updated

---
 app/controllers/admin/sites_controller.rb     | 12 ---------
 .../refinery/admin/sites_controller.rb        | 17 ++++++------
 .../{ => refinery}/admin/sites_helper.rb      |  2 +-
 app/views/layouts/application.html.haml       | 14 +++++-----
 .../admin/sites/_actions.html.erb             |  6 ++---
 .../{ => refinery}/admin/sites/_form.html.erb | 12 ++++-----
 .../admin/sites/_hostname_fields.html.erb     |  0
 .../admin/sites/_records.html.erb             |  4 +--
 .../{ => refinery}/admin/sites/_site.html.erb | 10 +++----
 .../admin/sites/_sites.html.erb               |  2 +-
 .../{ => refinery}/admin/sites/edit.html.erb  |  0
 .../{ => refinery}/admin/sites/index.html.erb |  0
 .../{ => refinery}/admin/sites/new.html.erb   |  0
 .../{ => refinery}/shared/_footer.html.erb    |  0
 .../{ => refinery}/shared/_header.html.erb    |  0
 config/locales/de.yml                         | 21 ++++++++-------
 config/locales/en.yml                         | 22 ++++++++-------
 config/routes.rb                              |  8 +++---
 lib/refinerycms-multisite.rb                  | 27 ++++++++++++-------
 19 files changed, 79 insertions(+), 78 deletions(-)
 delete mode 100644 app/controllers/admin/sites_controller.rb
 rename app/helpers/{ => refinery}/admin/sites_helper.rb (92%)
 rename app/views/{ => refinery}/admin/sites/_actions.html.erb (60%)
 rename app/views/{ => refinery}/admin/sites/_form.html.erb (78%)
 rename app/views/{ => refinery}/admin/sites/_hostname_fields.html.erb (100%)
 rename app/views/{ => refinery}/admin/sites/_records.html.erb (72%)
 rename app/views/{ => refinery}/admin/sites/_site.html.erb (61%)
 rename app/views/{ => refinery}/admin/sites/_sites.html.erb (79%)
 rename app/views/{ => refinery}/admin/sites/edit.html.erb (100%)
 rename app/views/{ => refinery}/admin/sites/index.html.erb (100%)
 rename app/views/{ => refinery}/admin/sites/new.html.erb (100%)
 rename app/views/{ => refinery}/shared/_footer.html.erb (100%)
 rename app/views/{ => refinery}/shared/_header.html.erb (100%)

diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb
deleted file mode 100644
index 2cb70d7..0000000
--- a/app/controllers/admin/sites_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class Admin::SitesController < Admin::BaseController
-  helper :refinery_settings
-
-  skip_filter :load_site
-
-  crudify :site,
-          :title_attribute => :name,
-          :order => "name ASC",
-          #:redirect_to_url => :redirect_to_where?,
-          :xhr_paging => true
-
-end
diff --git a/app/controllers/refinery/admin/sites_controller.rb b/app/controllers/refinery/admin/sites_controller.rb
index b513c19..2e3b772 100644
--- a/app/controllers/refinery/admin/sites_controller.rb
+++ b/app/controllers/refinery/admin/sites_controller.rb
@@ -1,12 +1,13 @@
-class ::Refinery::Admin::SitesController < ::Refinery::Admin::BaseController
-  helper :refinery_settings
-
+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
-
+    :title_attribute => :name,
+    :order => "name ASC",
+    #:redirect_to_url => :redirect_to_where?,
+    :xhr_paging => true
+      
 end
+
diff --git a/app/helpers/admin/sites_helper.rb b/app/helpers/refinery/admin/sites_helper.rb
similarity index 92%
rename from app/helpers/admin/sites_helper.rb
rename to app/helpers/refinery/admin/sites_helper.rb
index 2ae9a1d..cdd9fba 100644
--- a/app/helpers/admin/sites_helper.rb
+++ b/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|
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0d8b5b1..ea796ba 100644
--- a/app/views/layouts/application.html.haml
+++ b/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"
diff --git a/app/views/admin/sites/_actions.html.erb b/app/views/refinery/admin/sites/_actions.html.erb
similarity index 60%
rename from app/views/admin/sites/_actions.html.erb
rename to app/views/refinery/admin/sites/_actions.html.erb
index d8ad4b7..8fa4a86 100644
--- a/app/views/admin/sites/_actions.html.erb
+++ b/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
diff --git a/app/views/admin/sites/_form.html.erb b/app/views/refinery/admin/sites/_form.html.erb
similarity index 78%
rename from app/views/admin/sites/_form.html.erb
rename to app/views/refinery/admin/sites/_form.html.erb
index db1616b..0b3012d 100644
--- a/app/views/admin/sites/_form.html.erb
+++ b/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,12 +12,12 @@
   </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| %>
@@ -25,13 +25,13 @@
   <% 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?)
              } %>
diff --git a/app/views/admin/sites/_hostname_fields.html.erb b/app/views/refinery/admin/sites/_hostname_fields.html.erb
similarity index 100%
rename from app/views/admin/sites/_hostname_fields.html.erb
rename to app/views/refinery/admin/sites/_hostname_fields.html.erb
diff --git a/app/views/admin/sites/_records.html.erb b/app/views/refinery/admin/sites/_records.html.erb
similarity index 72%
rename from app/views/admin/sites/_records.html.erb
rename to app/views/refinery/admin/sites/_records.html.erb
index 4df6729..673a48f 100644
--- a/app/views/admin/sites/_records.html.erb
+++ b/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') %>
diff --git a/app/views/admin/sites/_site.html.erb b/app/views/refinery/admin/sites/_site.html.erb
similarity index 61%
rename from app/views/admin/sites/_site.html.erb
rename to app/views/refinery/admin/sites/_site.html.erb
index b420749..9a0e3d9 100644
--- a/app/views/admin/sites/_site.html.erb
+++ b/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>
diff --git a/app/views/admin/sites/_sites.html.erb b/app/views/refinery/admin/sites/_sites.html.erb
similarity index 79%
rename from app/views/admin/sites/_sites.html.erb
rename to app/views/refinery/admin/sites/_sites.html.erb
index 667aea5..e5e9c11 100644
--- a/app/views/admin/sites/_sites.html.erb
+++ b/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 %>
diff --git a/app/views/admin/sites/edit.html.erb b/app/views/refinery/admin/sites/edit.html.erb
similarity index 100%
rename from app/views/admin/sites/edit.html.erb
rename to app/views/refinery/admin/sites/edit.html.erb
diff --git a/app/views/admin/sites/index.html.erb b/app/views/refinery/admin/sites/index.html.erb
similarity index 100%
rename from app/views/admin/sites/index.html.erb
rename to app/views/refinery/admin/sites/index.html.erb
diff --git a/app/views/admin/sites/new.html.erb b/app/views/refinery/admin/sites/new.html.erb
similarity index 100%
rename from app/views/admin/sites/new.html.erb
rename to app/views/refinery/admin/sites/new.html.erb
diff --git a/app/views/shared/_footer.html.erb b/app/views/refinery/shared/_footer.html.erb
similarity index 100%
rename from app/views/shared/_footer.html.erb
rename to app/views/refinery/shared/_footer.html.erb
diff --git a/app/views/shared/_header.html.erb b/app/views/refinery/shared/_header.html.erb
similarity index 100%
rename from app/views/shared/_header.html.erb
rename to app/views/refinery/shared/_header.html.erb
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 41c8fcd..89f69d4 100644
--- a/config/locales/de.yml
+++ b/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'
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d1d5953..c8862db 100644
--- a/config/locales/en.yml
+++ b/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'
+      
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 6155fcc..a6c90f7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,9 +1,7 @@
 ::Refinery::Application.routes.draw do
-  scope(:module=> 'refinery') do
-    scope(:module => 'admin', :path => 'refinery', :as => 'refinery_admin') do
-      resources :sites do
-        resources :hostnames
-      end
+  scope(:path => 'refinery', :as => 'refinery_admin', :module => 'refinery/admin') do
+    resources :sites do
+      resources :hostnames
     end
   end
 end
diff --git a/lib/refinerycms-multisite.rb b/lib/refinerycms-multisite.rb
index 1cc3d56..f17755c 100644
--- a/lib/refinerycms-multisite.rb
+++ b/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 = "refinery_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