spud_cms 0.8.15 → 0.8.17

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

@@ -4,6 +4,7 @@
 //= require codemirror/modes/css
 //= require codemirror/modes/htmlmixed
 //= require codemirror/modes/htmlembedded
+//= require spud/admin/cms/menu_items
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
 
@@ -14,8 +15,8 @@ $(document).ready(function() {
 		var $this = $(this);
 		$.get($this.attr("data-source"), { template: $this.val() }, function(data) {
 			$('.formtabs').tabs('destroy');
-			console.log($("#page_partials_form"))
-			
+
+
 			$('textarea.tinymce').each(function() {$(this).tinymce().execCommand('mceRemoveControl',false,this.id)});
 			$("#page_partials_form").replaceWith(data)
 			initFormTabs();
@@ -25,4 +26,4 @@ $(document).ready(function() {
 			$('<p> Error: ' + jqXHR.responseText + '</p>').dialog();
 		});
 	});
-});
+});

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

@@ -0,0 +1,44 @@
+Spud = (typeof(Spud) == 'undefined') ? {} : Spud;
+Spud.Admin = (typeof(Spud.Admin) == 'undefined') ? {} : Spud.Admin;
+Spud.Admin.Cms = (typeof(Spud.Admin.Cms) == 'undefined') ? {} : Spud.Admin.Cms;
+
+Spud.Admin.Cms.MenuItems = new function() {
+  var self=this;
+
+  self.editMode = false;
+  self.mouseIsDown = false;
+  self.init = function() {
+    // $('.admin_application').effect('shake',{},100,self.shakeLoop)
+
+    $('.sortable').sortable({
+      connectWith:".connectedSortable",
+      start: function(event,ui) {
+        $('#root_menu_list').addClass('menu_edit');
+      },
+      axis:"y",
+      tolerance:'pointer',
+      cursor: "move",
+      items:'li',
+      stop: function(event,ui) {
+        $('#root_menu_list').removeClass('menu_edit');
+      },
+      over: function(event,ui) {
+        // console.log(event);
+        var source = ui.item[0];
+        // ui.placeholder.style.backgroundColor('#FAE7D9');
+        var destination = $(event.target);
+        // console.log(destination);
+                  $('ul.left_guide').removeClass('left_guide');
+
+        if(destination.hasClass('subitem'))
+        {
+          destination.addClass('left_guide');
+        }
+        // console.log(ui.item[0].innerHTML)
+      }
+    }).disableSelection();
+    // $('.admin_application').addClass('jiggly')
+    // $('.admin_application').draggable();
+  };
+
+}();

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

@@ -1,4 +1,28 @@
 /*
 //= require codemirror
 //= require codemirror/themes/night
-*/
+*/
+.menu_list {
+  list-style-type:none;
+}
+.page_row {
+  background:white;
+}
+.menu_edit .subitem {
+
+  min-height:10px;
+  /*padding-bottom:12px;*/
+}
+
+.subitem .page_row {
+
+  border-left:2px solid #999;
+}
+.left_guide.subitem .page_row {
+  border:none;
+}
+
+.ui-sortable-placeholder {
+  background:#FAE7D9 !important;
+  visibility:visible !important;
+}

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

@@ -3,24 +3,24 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	belongs_to_spud_app :menus
 	layout 'spud/admin/cms/detail'
 	before_filter :load_menu
-	before_filter :load_menu_item, :only => [:edit,:update,:show,:destroy]
+	before_filter :load_menu_item, :only => [:edit,:update,:show,:destroy,:reorder]
 	cache_sweeper :page_sweeper,:only => [:create,:update,:destroy]
 	def index
 		@page_name = "Menu Items"
-		@menu_items = @menu.spud_menu_items.order(:menu_order).includes(:spud_menu_items).paginate :page => params[:page]
+		@menu_items = @menu.spud_menu_items.order(:menu_order).includes(:spud_menu_items)
 		respond_with @menu_items
 	end
 
 	def new
 		add_breadcrumb "New", :new_spud_admin_page_path
 		@page_name = "New Menu Item"
-		
+
 		@menu_item = @menu.spud_menu_items.new
 		respond_with @menu_item
 	end
 
 	def create
-		
+
 		add_breadcrumb "New", :new_spud_admin_page_path
 		@page_name = "New Menu Item"
 		@menu_item = SpudMenuItem.new(params[:spud_menu_item])
@@ -57,7 +57,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	end
 
 	def update
-		
+
 		add_breadcrumb "Edit #{@menu_item.name}", :edit_spud_admin_menu_menu_item_path
 		@page_name = "Edit #{@menu_item.name}"
 		if params[:spud_menu_item][:parent_id].blank?
@@ -74,18 +74,32 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	end
 
 	def destroy
-		
+
 		flash[:notice] = "Menu Item removed!" if @menu_item.destroy
 
 		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
 	end
+
+	def reorder
+		#id param
+		#source position
+		#destination position
+		#parent
+				# @menu_items = @menu.spud_menu_items.order(:menu_order).includes(:spud_menu_items).paginate :page => params[:page]
+
+
+	end
 private
 	def load_menu
 
 		@menu = SpudMenu.find(params[:menu_id])
+
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
 			redirect_to spud_admin_menus_url() and return false
+		elsif Spud::Core.multisite_mode_enabled && @menu.site_id != session[:admin_site]
+			flash[:warning] = "Site Context Changed. The menu you were viewing is not associated with the current site. Redirected back to menu selections."
+			redirect_to spud_admin_menus_url() and return false
 		end
 		add_breadcrumb "#{@menu.name}", :spud_admin_menu_menu_items_path
 	end
@@ -99,7 +113,7 @@ private
 	end
 
 
-	
+
 
 
 end

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

@@ -3,12 +3,12 @@ class Spud::Admin::MenusController < Spud::Admin::CmsController
 	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.site(session[:admin_site]).order(:name).paginate :page => params[:page]
 		respond_with @menus
 	end
-	
+
 
 	def new
 		add_breadcrumb "New", :new_spud_admin_menu_path
@@ -31,7 +31,7 @@ class Spud::Admin::MenusController < Spud::Admin::CmsController
 
 	def update
 		add_breadcrumb "Edit #{@menu.name}", :edit_spud_admin_menu_path
-		
+
 		flash[:notice] = "Menu saved successfully" if @menu.update_attributes(params[:spud_menu])
 		respond_with @menu,:location => spud_admin_menu_menu_items_url(:menu_id => @menu.id)
 	end
@@ -47,6 +47,9 @@ private
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
 			redirect_to spud_admin_menus_url() and return false
+		elsif Spud::Core.multisite_mode_enabled && @menu.site_id != session[:admin_site]
+			flash[:warning] = "Site Context Changed. The menu you were viewing is not associated with the current site. Redirected back to menu selections."
+			redirect_to spud_admin_menus_url() and return false
 		end
 	end
 end

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

@@ -5,24 +5,13 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 	before_filter :load_page,:only => [:edit,:update,:show,:destroy]
 	cache_sweeper :page_sweeper,:only => [:update,:destroy]
 	def index
-		
+
 		@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
 
 	def show
-			
-		
-		if @page.blank?
-			flash[:error] = "Page not found"
-			if !params[:id].blank?
-				redirect_to spud_admin_pages_url() and return
-			else
-				return
-			end
-		end		
-		layout = 'application'
-
+		layout = Spud::Cms.default_page_layout
 
 		if !@page.spud_template.blank?
 			if !@page.spud_template.base_layout.blank?
@@ -36,7 +25,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 	def new
 		add_breadcrumb "New", :new_spud_admin_page_path
 
-		
+
 		@templates = SpudTemplate.all
 		@page = SpudPage.new
 		parts = Spud::Cms.default_page_parts
@@ -50,11 +39,11 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 		parts.each do |part|
 			@page.spud_page_partials.new(:name => part.strip)
 		end
-		respond_with @page		
+		respond_with @page
 	end
 
 	def create
-		
+
 		@page = SpudPage.new(params[:spud_page])
 		@page.site_id = session[:admin_site]
 		if params[:preview] && params[:preview].to_i == 1
@@ -68,7 +57,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 	def edit
 		add_breadcrumb "#{@page.name}", :spud_admin_page_path
 		add_breadcrumb "Edit", :edit_spud_admin_page_path
-		
+
 		@templates = SpudTemplate.all
 		if @page.spud_page_partials.blank?
 			parts = Spud::Cms.default_page_parts
@@ -94,7 +83,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 	end
 
 	def update
-		
+
 		@page.attributes = params[:spud_page]
 		if params[:preview] && params[:preview].to_i == 1
 			preview
@@ -128,7 +117,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 
 	def destroy
 		status = 500
-		
+
 		if @page.destroy
 			flash[:notice] = "Page removed successfully!"
 			status = 200
@@ -140,7 +129,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 			format.html { redirect_to spud_admin_pages_url()}
 		end
 	end
-  
+
   def page_parts
     template =  params[:template] && !params[:template].blank? ? SpudTemplate.where(:id => params[:template]).first : nil
     page = SpudPage.where(:id => params[:page]).includes(:spud_page_partials).first
@@ -163,7 +152,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
     	parts.each do |part|
 			new_page_partials << page.spud_page_partials.build(:name => part)
 		end
-      
+
     end
     new_page_partials.each do |partial|
       old_partial = old_page_partials.select {|pp| partial.name.strip.downcase == pp.name.strip.downcase }
@@ -195,7 +184,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 	        	expire_action root_path
 		    else
 				expire_action page_path(:id => record.url_name)
-			end 
+			end
 		end
 	end
 	redirect_to spud_admin_pages_url
@@ -203,14 +192,17 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 
 private
 	def load_page
-		@page = SpudPage.site(session[:admin_site]).where(:id => params[:id]).includes(:spud_page_partials).first
+		@page = SpudPage.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
+		elsif Spud::Core.multisite_mode_enabled && @page.site_id != session[:admin_site]
+			flash[:warning] = "Site Context Changed. The page you were viewing is not associated with the current site. Redirected back to page selections."
+			redirect_to spud_admin_pages_url() and return false
 		end
 		return true
 	end
 
-	
+
 
 end

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

@@ -31,7 +31,7 @@ class Spud::Admin::TemplatesController < Spud::Admin::CmsController
 		@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
 	end
 
@@ -41,30 +41,33 @@ class Spud::Admin::TemplatesController < Spud::Admin::CmsController
 	end
 
 	def update
-		
+
 		add_breadcrumb "Edit #{@template.name}", :edit_spud_admin_template_path
 		flash[:notice] = "Template updated successfully" if @template.update_attributes(params[:spud_template])
-		
+
 		respond_with @template, :location => spud_admin_templates_url
 	end
 
 
 	def destroy
-		
+
 		flash[:notice] = "Template removed" if @template.destroy
-		
+
 		respond_with @template, :location => spud_admin_templates_url
 	end
 
 private
 	def load_template
-		@template = SpudTemplate.site(session[:admin_site]).where(:id => params[:id]).first
+		@template = SpudTemplate.where(:id => params[:id]).first
 		if @template.blank?
 			flash[:error] = "Template not found!"
 			redirect_to spud_admin_templates_url and return false
+		elsif Spud::Core.multisite_mode_enabled && @template.site_id != session[:admin_site]
+			flash[:warning] = "Site Context Changed. The template you were viewing is not associated with the current site. Redirected back to template selections."
+			redirect_to spud_admin_templates_url() and return false
 		end
 	end
 
-	
+
 
 end

data/app/models/page_sweeper.rb

@@ -20,8 +20,8 @@ class PageSweeper < ActionController::Caching::Sweeper
   end
   def after_save(record)
     expire_cache_for(record)
-    expire_page spud_cms_sitemap_path
-    expire_page spud_sitemap_path
+    expire_page spud_cms_sitemap_path(:format => :xml)
+    expire_page spud_sitemap_path(:format => :xml)
   end
   def after_destroy(record)
   	expire_cache_for(record)
@@ -36,6 +36,13 @@ private
   		end
     elsif record.is_a?(SpudPage)
     	if Spud::Cms.enable_full_page_caching
+        multisite_prefix = ""
+
+        if Spud::Core.multisite_mode_enabled
+            site_config = Spud::Core.site_config_for_id(record.site_id)
+            multisite_prefix = "/" + site_config[:short_name].to_s.downcase
+        end
+
     		if record.url_name == Spud::Cms.root_page_name
 	        	expire_page root_path
 		    else
@@ -50,7 +57,7 @@ private
     	end
     else
     	Rails.cache.clear
-    	SpudPage.site(session[:admin_site]).published_pages.all.each {|page| expire_cache_for(page)}
+    	SpudPage.site(record.spud_menu.site_id).published_pages.all.each {|page| expire_cache_for(page)}
     end
   end
-end
+end

data/app/models/spud_page.rb

@@ -11,13 +11,13 @@ class SpudPage < ActiveRecord::Base
 
 
 	attr_accessible :name,:url_name,:created_by,:updated_by,:template_id,:visibility,:spud_page_id,:publish_at,:format,:meta_description,:meta_keywords,:page_order,:spud_page_partials_attributes,:use_custom_url_name,:published,:notes
-	
+
 	before_validation :generate_url_name
 	validates :name,:presence => true
 	validates_uniqueness_of :name, :scope => [:site_id,:spud_page_id]
 	validates :url_name,:presence => true
 	validates_uniqueness_of :url_name, :scope => :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)}
@@ -61,7 +61,7 @@ class SpudPage < ActiveRecord::Base
      	  url_name += self.name.parameterize.downcase
 			if !self.use_custom_url_name
 				pages = SpudPage
-				
+
 				if !self.id.blank?
 					pages = pages.where("id != #{self.id}")
 				end
@@ -79,7 +79,7 @@ class SpudPage < ActiveRecord::Base
 				permalink = SpudPermalink.site(self.site_id).where(:url_name => url_name_new).first
 				counter = 1
 				while permalink.blank? == false
-				
+
 					if permalink.attachment == self
 						permalink.destroy
 						permalink = nil
@@ -97,21 +97,21 @@ class SpudPage < ActiveRecord::Base
           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.site(self.site_id).where(:url_name => self.url_name).first
-				if permalink.blank? == false
-					if permalink.attachment == self
-						permalink.destroy
-					else
-						self.errors.add :url_name, "This permalink has already been used by another page."
-						return false
+				page = SpudPage.where(:id => self.id).first
+				if page.url_name.blank? == false && page.url_name != self.url_name
+					permalink = SpudPermalink.site(self.site_id).where(:url_name => self.url_name).first
+					if permalink.blank? == false
+						if permalink.attachment == self
+							permalink.destroy
+						else
+							self.errors.add :url_name, "This permalink has already been used by another page."
+							return false
+						end
 					end
+					self.spud_permalinks.create(:url_name => page.url_name,:site_id => self.site_id)
 				end
-				self.spud_permalinks.create(:url_name => page.url_name,:site_id => self.site_id)
-			end
-      	end
-      	return true
+    	end
+    	return true
      end
 
      def is_private?