spud_cms 0.8.0 → 0.8.1

data/app/assets/javascripts/spud/admin/cms.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/spud/admin/cms.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/pages_controller.rb

@@ -1,5 +1,6 @@
 class PagesController < ApplicationController
 	caches_action :show, :if => Proc.new { |c| Spud::Cms.enable_action_caching }
+
 	# caches_page :show, :if => Proc.new { |c| Spud::Cms.enable_full_page_caching }
 	after_filter({:only => [:show]}) do |c|
 		return if !Spud::Cms.enable_full_page_caching
@@ -9,9 +10,24 @@ class PagesController < ApplicationController
   	end
 	def show
 		url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
-		@page = SpudPage.published_pages.where(:url_name => url_name).includes([:spud_template,:spud_page_partials]).first
+		@page = SpudPage.published_pages.where(:url_name => url_name).includes([:spud_template,:spud_page_partials])
+
+		# MultiSite Code Block
+		if Spud::Core.multisite_mode_enabled
+			site_config = Spud::Core.site_config_for_host(request.host_with_port)
+			@page = @page.site(site_config[:site_id]) if !site_config.blank?
+		end
+
+		@page = @page.first
 		if @page.blank?
-			@permalink = SpudPermalink.includes(:attachment).where(:url_name => url_name).first
+			@permalink = SpudPermalink.includes(:attachment).where(:url_name => url_name)
+
+			# MultiSite Code Block
+			if Spud::Core.multisite_mode_enabled && !site_config.blank?
+				@permalink = @permalink.site(site_config[:site_id])
+			end
+			@permalink = @permalink.first
+
 			if !@permalink.blank? && @permalink.attachment_type == 'SpudPage'
 				redirect_to @permalink.attachment.url_name == Spud::Cms.root_page_name ? root_url() : page_url(:id => @permalink.attachment.url_name) , :status => :moved_permanently and return
 			end
@@ -28,8 +44,15 @@ class PagesController < ApplicationController
 				return
 			end
 		end
+
 		layout = Spud::Cms.default_page_layout
 
+		# MultiSite Code Block
+		if Spud::Core.multisite_mode_enabled && !site_config.blank?
+			cms_config = Spud::Cms.site_config_for_short_name(site_config[:short_name])
+			layout = cms_config[:default_page_layout] if !cms_config.blank? && !cms_config[:default_page_layout].blank?
+		end		 
+
 
 		if !@page.spud_template.blank?
 			if !@page.spud_template.base_layout.blank?
@@ -41,4 +64,7 @@ class PagesController < ApplicationController
 		render :layout => layout
 		
 	end
+
+private
+
 end

data/app/controllers/spud/admin/cms_controller.rb

@@ -0,0 +1,3 @@
+class Spud::Admin::CmsController < Spud::Admin::ApplicationController
+
+end

data/app/controllers/spud/admin/menu_items_controller.rb

@@ -1,4 +1,4 @@
-class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
+class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	add_breadcrumb "Menus", :spud_admin_menus_path
 	belongs_to_spud_app :menus
 	layout 'spud/admin/cms/detail'

data/app/controllers/spud/admin/menus_controller.rb

@@ -1,11 +1,11 @@
-class Spud::Admin::MenusController < Spud::Admin::ApplicationController
+class Spud::Admin::MenusController < Spud::Admin::CmsController
 	layout 'spud/admin/detail'
 	belongs_to_spud_app :menus
 	add_breadcrumb "Menus", :spud_admin_menus_path
 	before_filter :load_menu,:only => [:edit,:update,:show,:destroy]
 	
 	def index
-		@menus = SpudMenu.order(:name).paginate :page => params[:page]
+		@menus = SpudMenu.site(session[:admin_site]).order(:name).paginate :page => params[:page]
 		respond_with @menus
 	end
 	
@@ -19,8 +19,9 @@ class Spud::Admin::MenusController < Spud::Admin::ApplicationController
 	def create
 		add_breadcrumb "New", :new_spud_admin_menu_path
 		@menu = SpudMenu.new(params[:spud_menu])
+		@menu.site_id = session[:admin_site]
 		flash[:notice] = "New menu created" if @menu.save
-		respond_with @menu,:location => spud_admin_menu_menu_items_url(:menu_id => @menu.id)
+		respond_with @menu,:location => @menu.id != nil ? spud_admin_menu_menu_items_url(:menu_id => @menu.id) : spud_admin_menus_url
 	end
 
 	def edit
@@ -42,7 +43,7 @@ class Spud::Admin::MenusController < Spud::Admin::ApplicationController
 
 private
 	def load_menu
-		@menu = SpudMenu.find(params[:id])
+		@menu = SpudMenu.site(session[:admin_site]).where(:id => params[:id]).first
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
 			redirect_to spud_admin_menus_url() and return false

data/app/controllers/spud/admin/pages_controller.rb

@@ -1,4 +1,4 @@
-class Spud::Admin::PagesController < Spud::Admin::ApplicationController
+class Spud::Admin::PagesController < Spud::Admin::CmsController
 	layout 'spud/admin/cms/detail'
 	add_breadcrumb "Pages", :spud_admin_pages_path
 	belongs_to_spud_app :pages
@@ -6,7 +6,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 	cache_sweeper :page_sweeper,:only => [:update,:destroy]
 	def index
 		
-		@pages = SpudPage.where(:spud_page_id => nil).order(:page_order).includes(:spud_pages).paginate :page => params[:page]
+		@pages = SpudPage.site(session[:admin_site]).where(:spud_page_id => nil).order(:page_order).includes(:spud_pages).paginate :page => params[:page]
 		respond_with @pages
 	end
 
@@ -39,7 +39,15 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 		
 		@templates = SpudTemplate.all
 		@page = SpudPage.new
-		Spud::Cms.default_page_parts.each do |part|
+		parts = Spud::Cms.default_page_parts
+		if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
+			site_config = Spud::Core.multisite_config.select{|c| c[:site_id] == session[:admin_site]}
+			if !site_config.blank?
+				cms_config = Spud::Cms.site_config_for_short_name(site_config[0][:short_name])
+				parts = cms_config[:default_page_parts] if !cms_config.blank? && !cms_config[:default_page_parts].blank?
+			end
+		end
+		parts.each do |part|
 			@page.spud_page_partials.new(:name => part.strip)
 		end
 		respond_with @page		
@@ -47,6 +55,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 
 	def create
 		@page = SpudPage.new(params[:spud_page])
+		@page.site_id = session[:admin_site]
 		flash[:notice] = "Page Saved successfully" if @page.save
 		respond_with @page,:location => spud_admin_pages_url
 	end
@@ -57,7 +66,15 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 		
 		@templates = SpudTemplate.all
 		if @page.spud_page_partials.blank?
-			Spud::Cms.default_page_parts.each do |part|
+			parts = Spud::Cms.default_page_parts
+			if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
+				site_config = Spud::Core.multisite_config.select{|c| c[:site_id] == session[:admin_site]}
+				if !site_config.blank?
+					cms_config = Spud::Cms.site_config_for_short_name(site_config[0][:short_name])
+					parts = cms_config[:default_page_parts] if !cms_config.blank? && !cms_config[:default_page_parts].blank?
+				end
+			end
+			parts.each do |part|
 				@page.spud_page_partials.new(:name => part.strip)
 			end
 		end
@@ -109,7 +126,15 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
         new_page_partials << page.spud_page_partials.build(:name => page_part.strip)
       end
     else
-    	Spud::Cms.default_page_parts.each do |part|
+    	parts = Spud::Cms.default_page_parts
+			if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
+				site_config = Spud::Core.multisite_config.select{|c| c[:site_id] == session[:admin_site]}
+				if !site_config.blank?
+					cms_config = Spud::Cms.site_config_for_short_name(site_config[0][:short_name])
+					parts = cms_config[:default_page_parts] if !cms_config.blank? && !cms_config[:default_page_parts].blank?
+				end
+			end
+    	parts.each do |part|
 			new_page_partials << page.spud_page_partials.build(:name => part)
 		end
       
@@ -132,7 +157,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 
   def clear
   	Rails.cache.clear
-	SpudPage.published_pages.all.each do |record|
+	SpudPage.site(session[:admin_site]).published_pages.all.each do |record|
 		if Spud::Cms.enable_full_page_caching
     		if record.url_name == Spud::Cms.root_page_name
 	        	expire_page root_path
@@ -151,7 +176,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 
 private
 	def load_page
-		@page = SpudPage.where(:id => params[:id]).includes(:spud_page_partials).first
+		@page = SpudPage.site(session[:admin_site]).where(:id => params[:id]).includes(:spud_page_partials).first
 		if @page.blank?
 			flash[:error] = "Page not found!"
 			redirect_to spud_admin_pages_url() and return false

data/app/controllers/spud/admin/templates_controller.rb

@@ -1,4 +1,4 @@
-class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
+class Spud::Admin::TemplatesController < Spud::Admin::CmsController
 	layout 'spud/admin/cms/detail'
 	add_breadcrumb "Templates", :spud_admin_templates_path
 	belongs_to_spud_app :templates
@@ -7,13 +7,21 @@ class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
 
 	def index
 		flash.now[:warning] = "Templates are an advanced way to create modified pages and require some experience in HTML and Ruby."
-		@templates = SpudTemplate.order(:name).paginate :page => params[:page]
+		@templates = SpudTemplate.site(session[:admin_site]).order(:name).paginate :page => params[:page]
 		respond_with @templates
 	end
 
 	def new
 		add_breadcrumb "New", :new_spud_admin_template_path
-		@template = SpudTemplate.new(:base_layout => Spud::Cms.default_page_layout,:page_parts => Spud::Cms.default_page_parts.join(","))
+		parts = Spud::Cms.default_page_parts
+		if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
+			site_config = Spud::Core.multisite_config.select{|c| c[:site_id] == session[:admin_site]}
+			if !site_config.blank?
+				cms_config = Spud::Cms.site_config_for_short_name(site_config[0][:short_name])
+				parts = cms_config[:default_page_parts] if !cms_config.blank? && !cms_config[:default_page_parts].blank?
+			end
+		end
+		@template = SpudTemplate.new(:base_layout => Spud::Cms.default_page_layout,:page_parts => parts.join(","))
 		respond_with @template
 	end
 
@@ -21,7 +29,7 @@ class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
 		add_breadcrumb "New", :new_spud_admin_template_path
 
 		@template = SpudTemplate.new(params[:spud_template])
-		
+		@template.site_id = session[:admin_site]
 		flash[:notice] = "Template created successfully!" if @template.save
 		
 		respond_with @template, :location => spud_admin_templates_url
@@ -50,7 +58,7 @@ class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
 
 private
 	def load_template
-		@template = SpudTemplate.where(:id => params[:id]).first
+		@template = SpudTemplate.site(session[:admin_site]).where(:id => params[:id]).first
 		if @template.blank?
 			flash[:error] = "Template not found!"
 			redirect_to spud_admin_templates_url and return false

data/app/helpers/spud/admin/cms_helper.rb

@@ -0,0 +1,2 @@
+module Spud::Admin::CmsHelper
+end

data/app/helpers/spud/cms/application_helper.rb

@@ -1,6 +1,12 @@
 module Spud::Cms::ApplicationHelper
 	def sp_list_pages(options = {})
+		
 		pages = SpudPage.public.published_pages
+		
+		if Spud::Core.multisite_mode_enabled
+			site_config = Spud::Core.site_config_for_host(request.host_with_port)
+			pages = pages.site(site_config[:site_id]) if !site_config.blank?
+		end
 		start_page = nil
 		max_depth = 0
 		active_class = "menu-active"
@@ -30,6 +36,7 @@ module Spud::Cms::ApplicationHelper
 
 		pages = pages.all.group_by(&:spud_page_id)
 		if pages[start_page].blank?
+			
 			return ""
 		end
 		pages[start_page].sort_by{|p| p.page_order}.each do |page|
@@ -48,13 +55,19 @@ module Spud::Cms::ApplicationHelper
 			content += "</li>"
 		end
 		content += "</ul>"
+		
 		return content.html_safe
 	end
 
 
 	def sp_list_menu(options = {})
+
 		max_depth = 0
 		menu = SpudMenu
+		if Spud::Core.multisite_mode_enabled
+			site_config = Spud::Core.site_config_for_host(request.host_with_port)
+			menu = menu.site(site_config[:site_id]) if !site_config.blank?
+		end
 		if !options.blank?
 
 			if options.has_key?(:menu_id)
@@ -78,12 +91,22 @@ module Spud::Cms::ApplicationHelper
 		end
 		menu = menu.first
 		if menu.blank?
+			
 			return ""
 		end
-		menu_items = menu.spud_menu_items_combined.select("spud_menu_items.id as id,spud_menu_items.url as url,spud_menu_items.classes as classes,spud_menu_items.parent_type as parent_type,spud_menu_items.menu_order as menu_order,spud_menu_items.parent_id as parent_id,spud_menu_items.name as name,spud_pages.url_name as url_name").order(:parent_type,:parent_id).joins("LEFT JOIN spud_pages ON (spud_pages.id = spud_menu_items.spud_page_id)").all
+		menu_items = menu.spud_menu_items_combined.select("
+			#{SpudMenuItem.table_name}.id as id,
+			#{SpudMenuItem.table_name}.url as url,
+			#{SpudMenuItem.table_name}.classes as classes,
+			#{SpudMenuItem.table_name}.parent_type as parent_type,
+			#{SpudMenuItem.table_name}.menu_order as menu_order,
+			#{SpudMenuItem.table_name}.parent_id as parent_id,
+			#{SpudMenuItem.table_name}.name as name,
+			#{SpudPage.table_name}.url_name as url_name").order(:parent_type,:parent_id).joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)").all
 
 		grouped_items = menu_items.group_by(&:parent_type)
 		if grouped_items["SpudMenu"].blank?
+			
 			return ""
 		end
 		child_items = grouped_items["SpudMenuItem"].blank? ? [] : grouped_items["SpudMenuItem"].group_by(&:parent_id)
@@ -108,23 +131,38 @@ module Spud::Cms::ApplicationHelper
 		end
 		
 		content += "</ul>"
+		
 		return content.html_safe
 	end
 
 	def sp_menu_with_seperator(options={})
+		
 		seperator = "&nbsp;|&nbsp;".html_safe
 		if(options.has_key?(:seperator))
 			seperator = options[:seperator]
 		end
 
-		menu = SpudMenu.where(:name => options[:name]).first
-		menu_items = menu.spud_menu_items_combined.select("spud_menu_items.id as id,spud_menu_items.url as url,spud_menu_items.classes as classes,spud_menu_items.parent_type as parent_type,spud_menu_items.menu_order as menu_order,spud_menu_items.parent_id as parent_id,spud_menu_items.name as name,spud_pages.url_name as url_name").order(:parent_type,:parent_id).joins("LEFT JOIN spud_pages ON (spud_pages.id = spud_menu_items.spud_page_id)").all
+		menu = SpudMenu.where(:name => options[:name])
+		if Spud::Core.multisite_mode_enabled
+			site_config = Spud::Core.site_config_for_host(request.host_with_port)
+			menu = menu.site(site_config[:site_id]) if !site_config.blank?
+		end
+		menu = menu.first
+		menu_items = menu.spud_menu_items_combined.select("
+			#{SpudMenuItem.table_name}.id as id,
+			#{SpudMenuItem.table_name}.url as url,
+			#{SpudMenuItem.table_name}.classes as classes,
+			#{SpudMenuItem.table_name}.parent_type as parent_type,
+			#{SpudMenuItem.table_name}.menu_order as menu_order,
+			#{SpudMenuItem.table_name}.parent_id as parent_id,
+			#{SpudMenuItem.table_name}.name as name,
+			#{SpudPage.table_name}.url_name as url_name").order(:parent_type,:parent_id).joins("LEFT JOIN #{SpudPage.table_name} ON (#{SpudPage.table_name}.id = #{SpudMenuItem.table_name}.spud_page_id)").all
 		
 		menu_tags = []		
 		menu_items.sort_by{|p| p.menu_order}.each do |item|
 			menu_tags += ["<a #{"class='#{item.classes}' " if !item.classes.blank?}href='#{!item.url_name.blank? ? (item.url_name == Spud::Cms.root_page_name ? root_path() : page_path(:id => item.url_name)) : item.url}'>#{item.name}</a>"]
 		end
-
+		
 		return menu_tags.join(seperator).html_safe
 	end
 private
@@ -185,5 +223,7 @@ private
 		return content.html_safe
 	end
 	
+
+	
 	
 end

data/app/models/page_sweeper.rb

@@ -50,7 +50,7 @@ private
     	end
     else
     	Rails.cache.clear
-    	SpudPage.published_pages.all.each {|page| expire_cache_for(page)}
+    	SpudPage.site(session[:admin_site]).published_pages.all.each {|page| expire_cache_for(page)}
     end
   end
 end

data/app/models/spud_menu.rb

@@ -1,6 +1,9 @@
 class SpudMenu < ActiveRecord::Base
 	validates :name,:presence => true
+	validates_uniqueness_of :name, :scope => [:site_id]
 	has_many :spud_menu_items,:as => :parent,:dependent => :destroy
 	has_many :spud_menu_items_combined,:class_name => "SpudMenuItem",:foreign_key => :spud_menu_id,:dependent => :destroy
 	
+	attr_protected :site_id
+	scope :site, lambda {|sid| where(:site_id => sid)}
 end

data/app/models/spud_menu_item.rb

@@ -9,6 +9,9 @@ class SpudMenuItem < ActiveRecord::Base
 	validates :parent_id,:presence => true
 
 
+	attr_accessible :name,:parent_type,:parent_id,:item_type,:spud_page_id,:menu_order,:url,:classes 
+
+
 	def options_tree(options,depth,current = nil)
 		sub_items = self.spud_menu_items
 		sub_items = sub_items.where(["id != ?",current.id]) if !current.blank? && !current.id.blank?

data/app/models/spud_page.rb

@@ -8,25 +8,31 @@ class SpudPage < ActiveRecord::Base
 	belongs_to :created_by_user,:class_name => "SpudUser",:foreign_key => :created_by
 	belongs_to :updated_by_user,:class_name => "SpudUser",:foreign_key => :updated_by
 
+
+	
+	
 	before_validation :generate_url_name
 	validates :name,:presence => true
-	validates :url_name,:presence => true, :uniqueness => true
-
+	validates_uniqueness_of :name, :scope => [:site_id,:spud_page_id]
+	validates :url_name,:presence => true
+	validates_uniqueness_of :url_name, :scope => :site_id
+	attr_protected :site_id
 	accepts_nested_attributes_for :spud_page_partials, :allow_destroy => true
 	scope :parent_pages,  where(:spud_page_id => nil)
+	scope :site, lambda {|sid| where(:site_id => sid)}
 	scope :published_pages, where(:published => true)
 	scope :public, where(:visibility => 0)
 
 
-	def self.grouped
-		return all.group_by(&:spud_page_id)
+	def self.grouped(site_id=nil)
+		return site(site_id).all.group_by(&:spud_page_id)
 	end
 
 	# Returns an array of pages in order of heirarchy
 	# 	:fitler Filters out a page by ID, and all of its children
 	#   :value Pick an attribute to be used in the value field, defaults to ID
 	def self.options_tree_for_page(config={})
-		collection = config[:collection] || self.grouped
+		collection = config[:collection] || self.grouped(config[:site_id])
 		level 		 = config[:level] 		 || 0
 		parent_id  = config[:parent_id]  || nil
 		filter 		 = config[:filter] 		 || nil
@@ -58,7 +64,7 @@ class SpudPage < ActiveRecord::Base
 				if !self.id.blank?
 					pages = pages.where("id != #{self.id}")
 				end
-				url_names = pages.all.collect{|p| p.url_name}
+				url_names = pages.site(self.site_id).all.collect{|p| p.url_name}
 
 				counter = 1
 				url_name_new = url_name
@@ -69,7 +75,7 @@ class SpudPage < ActiveRecord::Base
 				# url_name = url_name_new
 				# Check Permalinks List
 
-				permalink = SpudPermalink.where(:url_name => url_name_new).first
+				permalink = SpudPermalink.site(self.site_id).where(:url_name => url_name_new).first
 				counter = 1
 				while permalink.blank? == false
 				
@@ -79,20 +85,20 @@ class SpudPage < ActiveRecord::Base
 					else
 						url_name_new = url_name + "-#{counter}"
 			     	  	counter += 1
- 	  					permalink = SpudPermalink.where(:url_name => url_name_new).first
+ 	  					permalink = SpudPermalink.site(self.site_id).where(:url_name => url_name_new).first
 					end
 				end
 				url_name = url_name_new
 	     	end
 	      if self.url_name.blank? == false && url_name != self.url_name
-	      	self.spud_permalinks.create(:url_name => self.url_name)
+	      	self.spud_permalinks.create(:url_name => self.url_name,:site_id => self.site_id)
 	      end
           self.url_name = url_name
           self.use_custom_url_name = false
     	elsif self.id.to_i > 0
 			page = SpudPage.where(:id => self.id).first
 			if page.url_name.blank? == false && page.url_name != self.url_name
-				permalink = SpudPermalink.where(:url_name => self.url_name).first
+				permalink = SpudPermalink.site(self.site_id).where(:url_name => self.url_name).first
 				if permalink.blank? == false
 					if permalink.attachment == self
 						permalink.destroy
@@ -101,7 +107,7 @@ class SpudPage < ActiveRecord::Base
 						return false
 					end
 				end
-				self.spud_permalinks.create(:url_name => page.url_name)
+				self.spud_permalinks.create(:url_name => page.url_name,:site_id => self.site_id)
 			end
       	end
       	return true

data/app/models/spud_page_partial.rb

@@ -1,3 +1,4 @@
 class SpudPagePartial < ActiveRecord::Base
 	belongs_to :spud_page
+	attr_accessible :name,:spud_page_id,:content,:format
 end

data/app/models/spud_template.rb

@@ -4,4 +4,7 @@ class SpudTemplate < ActiveRecord::Base
 	validates :base_layout, :presence => true
 	validates :page_parts, :presence => true
 	validates :name, :presence => true,:uniqueness => true
+
+	attr_protected :site_id
+	scope :site, lambda {|sid| where(:site_id => sid)}
 end

data/app/views/spud/admin/menu_items/_form.html.erb

@@ -18,7 +18,7 @@
 <div class="control-group">
 	<%=f.label :spud_page_id, "Page",:class => "control-label"%>
 	<div class="controls">
-	    <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(),@menu_item.spud_page_id),{:include_blank => 'Use URL instead'},{:title => "",:onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
+	    <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:site_id => session[:admin_site]),@menu_item.spud_page_id),{:include_blank => 'Use URL instead'},{:title => "",:onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
 	</div>
   
 </div>

data/app/views/spud/admin/pages/_form.html.erb

@@ -27,7 +27,7 @@
       	
       	<%=f.label :template_id, "Template", :class=>"control-label"%>
         <div class="controls">
-        	<%=f.select :template_id, options_for_select(SpudTemplate.all.collect{|tp| [tp.name,tp.id]},@page.template_id), {:include_blank => 'Default'},{:title => "", 'data-source' => page_parts_spud_admin_pages_path(:page => @page.id) }%>
+        	<%=f.select :template_id, options_for_select(SpudTemplate.site(session[:admin_site]).all.collect{|tp| [tp.name,tp.id]},@page.template_id), {:include_blank => 'Default'},{:title => "", 'data-source' => page_parts_spud_admin_pages_path(:page => @page.id) }%>
           <span class="help-inline">Use this to control the layout template to be used for this page if they are available.</span>
         </div>
   	  </div>
@@ -36,7 +36,7 @@
       
       <%=f.label :spud_page_id, "Parent Page", :class=>"control-label"%>
       <div class="controls">
-        <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page),@page.spud_page_id),{:include_blank => 'None'},{:title => ""}%>
+        <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page,:site_id => session[:admin_site]),@page.spud_page_id),{:include_blank => 'None'},{:title => ""}%>
 
       </div>
     </div>

data/db/migrate/20120329132314_add_site_id_to_spud_pages.rb

@@ -0,0 +1,6 @@
+class AddSiteIdToSpudPages < ActiveRecord::Migration
+  def change
+  	add_column :spud_pages, :site_id, :integer
+    add_index :spud_pages,:site_id
+  end
+end

data/db/migrate/20120329132322_add_site_id_to_spud_templates.rb

@@ -0,0 +1,6 @@
+class AddSiteIdToSpudTemplates < ActiveRecord::Migration
+  def change
+  	add_column :spud_templates, :site_id, :integer
+    add_index :spud_templates,:site_id
+  end
+end

data/db/migrate/20120329132330_add_site_id_to_spud_menus.rb

@@ -0,0 +1,6 @@
+class AddSiteIdToSpudMenus < ActiveRecord::Migration
+  def change
+  	add_column :spud_menus, :site_id, :integer
+    add_index :spud_menus,:site_id
+  end
+end

data/lib/spud_cms/configuration.rb

@@ -2,7 +2,7 @@ module Spud
   module Cms
     include ActiveSupport::Configurable
 
-    config_accessor :menus_enabled,:templates_enabled,:root_page_name,:default_page_parts,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:enable_full_page_caching,:enable_action_caching
+    config_accessor :menus_enabled,:templates_enabled,:root_page_name,:default_page_parts,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:enable_full_page_caching,:enable_action_caching,:multisite_config
 
     self.root_page_name = "home"
     self.menus_enabled = true
@@ -13,5 +13,15 @@ module Spud
     self.enable_full_page_caching = false
     self.enable_action_caching = false
     self.enable_sitemap = true
+    self.multisite_config = []
+    def self.site_config_for_short_name(short_name)
+        configs = Spud::Cms.multisite_config.select{|p| p[:short_name].to_s == short_name.to_s}
+        if configs.blank?
+          return nil
+        else
+          return configs[0]
+        end
+    end
+
   end
 end

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "0.8.0"
+		VERSION = "0.8.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70107591862880 !ruby/object:Gem::Requirement
+  requirement: &70155890998780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70107591862880
+  version_requirements: *70155890998780
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70107591862360 !ruby/object:Gem::Requirement
+  requirement: &70155890997960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,21 +35,21 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70107591862360
+  version_requirements: *70155890997960
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
-  requirement: &70107591861480 !ruby/object:Gem::Requirement
+  requirement: &70155890997240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70107591861480
+  version_requirements: *70155890997240
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &70107591861080 !ruby/object:Gem::Requirement
+  requirement: &70155890996860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70107591861080
+  version_requirements: *70155890996860
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70107591860480 !ruby/object:Gem::Requirement
+  requirement: &70155890996360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107591860480
+  version_requirements: *70155890996360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70107591860060 !ruby/object:Gem::Requirement
+  requirement: &70155890995940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107591860060
+  version_requirements: *70155890995940
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70107591859520 !ruby/object:Gem::Requirement
+  requirement: &70155890995520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70107591859520
+  version_requirements: *70155890995520
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70107591858980 !ruby/object:Gem::Requirement
+  requirement: &70155890995020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70107591858980
+  version_requirements: *70155890995020
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70107591858300 !ruby/object:Gem::Requirement
+  requirement: &70155890994480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,10 +112,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70107591858300
+  version_requirements: *70155890994480
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70107591857680 !ruby/object:Gem::Requirement
+  requirement: &70155890994000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -123,7 +123,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70107591857680
+  version_requirements: *70155890994000
 description: Spud CMS is a full-featured light weight modular cms engine as a part
   of the spud suite of rails gems. This particular gem comes with page management,
   administrative dashboard, template management, menu management and more. It is also
@@ -140,13 +140,17 @@ files:
 - app/assets/images/spud/admin/pages_thumb.png
 - app/assets/images/spud/admin/templates_thumb.png
 - app/assets/javascripts/spud/admin/cms/application.js
+- app/assets/javascripts/spud/admin/cms.js
 - app/assets/stylesheets/spud/admin/cms/application.css
+- app/assets/stylesheets/spud/admin/cms.css
 - app/controllers/pages_controller.rb
+- app/controllers/spud/admin/cms_controller.rb
 - app/controllers/spud/admin/menu_items_controller.rb
 - app/controllers/spud/admin/menus_controller.rb
 - app/controllers/spud/admin/pages_controller.rb
 - app/controllers/spud/admin/templates_controller.rb
 - app/controllers/spud/cms/sitemaps_controller.rb
+- app/helpers/spud/admin/cms_helper.rb
 - app/helpers/spud/cms/application_helper.rb
 - app/models/page_sweeper.rb
 - app/models/spud_menu.rb
@@ -190,6 +194,9 @@ files:
 - db/migrate/20120118141852_add_notes_to_spud_pages.rb
 - db/migrate/20120126232428_add_menu_id_to_spud_menu_items.rb
 - db/migrate/20120128163601_add_classes_to_spud_menu_items.rb
+- db/migrate/20120329132314_add_site_id_to_spud_pages.rb
+- db/migrate/20120329132322_add_site_id_to_spud_templates.rb
+- db/migrate/20120329132330_add_site_id_to_spud_menus.rb
 - lib/spud_cms/configuration.rb
 - lib/spud_cms/engine.rb
 - lib/spud_cms/page_route.rb
@@ -251,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1833908218773550740
+      hash: -403661204937112407
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -260,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1833908218773550740
+      hash: -403661204937112407
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15