spud_cms 0.3.4 → 0.3.6

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

@@ -1,28 +1,26 @@
 class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 	add_breadcrumb "Menus", :spud_admin_menus_path
+	belongs_to_spud_app :menus
 	layout 'spud/admin/cms/detail'
 	before_filter :load_menu
 	before_filter :load_menu_item, :only => [:edit,:update,:show,:destroy]
 
 	def index
-		@page_thumbnail = "spud/admin/menus_thumb.png"
-		@page_name = "Menus"
+		@page_name = "Menu Items"
 		@menu_items = @menu.spud_menu_items.order(:menu_order).includes(:spud_menu_items).paginate :page => params[:page]
+		respond_with @menu_items
 	end
 
 	def new
 		add_breadcrumb "New", :new_spud_admin_page_path
-
-		@page_thumbnail = "spud/admin/menus_thumb.png"
 		@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_thumbnail = "spud/admin/menus_thumb.png"
 		@page_name = "New Menu Item"
 		@menu_item = SpudMenuItem.new(params[:spud_menu_item])
 		@menu_item.spud_menu_id = @menu.id
@@ -41,28 +39,22 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 				@menu_item.menu_order = highest_sibling.menu_order + 1
 			end
 		end
-		if @menu_item.save
-			flash[:notice] = "Menu Created successfully!"
-			redirect_to spud_admin_menu_menu_items_url() and return
-		else
-			flash[:error] = "Error saving menu item"
-			@error_object_name = "menu_item"
-			render :action => "new"
-		end
+		flash[:notice] = "Menu Created successfully!" if @menu_item.save
+		
+		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
 	end
 
 	def edit
 		add_breadcrumb "Edit #{@menu_item.name}", :edit_spud_admin_menu_menu_item_path
-		@page_thumbnail = "spud/admin/menus_thumb.png"
 		@page_name = "Edit #{@menu_item.name}"
 		if @menu_item.parent_type == "SpudMenu"
 			@menu_item.parent_id = nil
 		end
+		respond_with @menu_item
 	end
 
 	def update
 		add_breadcrumb "Edit #{@menu_item.name}", :edit_spud_admin_menu_menu_item_path
-		@page_thumbnail = "spud/admin/menus_thumb.png"
 		@page_name = "Edit #{@menu_item.name}"
 		if params[:spud_menu_item][:parent_id].blank?
 			params[:spud_menu_item][:parent_type] = "SpudMenu"
@@ -72,35 +64,20 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 		end
 		@menu_item.attributes = params[:spud_menu_item]
 		@menu_item.spud_menu_id = @menu.id
-		if @menu_item.save
-			
-			flash[:notice] = "Menu saved successfully!"
-			redirect_to spud_admin_menu_menu_items_url() and return
+		flash[:notice] = "Menu saved successfully!" if @menu_item.save
 
-		else
-			flash[:error] = "Error saving menu item"
-			render :action => "edit"
-		end
+		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
 	end
 
 	def destroy
-		status = 500
-		if @menu_item.destroy
-			status = 200
-		end
-		respond_to do |format|
-			format.js { render :status => status}
-			format.html {
-				flash[:notice] = "Menu Item removed!" if status == 200
-				flash[:error] = "Error removing menu item!" if status == 500
-				redirect_to spud_admin_menu_menu_items_path() and return
-			}
-		end
+		
+		flash[:notice] = "Menu Item removed!" if @menu_item.destroy
+		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
 	end
 private
 	def load_menu
 
-		@menu = SpudMenu.where(:id => params[:menu_id]).first
+		@menu = SpudMenu.find(params[:menu_id])
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
 			redirect_to spud_admin_menus_url() and return false
@@ -109,7 +86,7 @@ private
 	end
 
 	def load_menu_item
-		@menu_item = SpudMenuItem.where(:id => params[:id]).first
+		@menu_item = SpudMenuItem.find(params[:id])
 		if @menu_item.blank?
 			flash[:error] = "Menu Item not found!"
 			redirect_to spud_admin_menu_menu_items_url() and return false

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

@@ -7,6 +7,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 	def index
 		
 		@pages = SpudPage.where(:spud_page_id => nil).order(:page_order).includes(:spud_pages).paginate :page => params[:page]
+		respond_with @pages
 	end
 
 	def show
@@ -19,8 +20,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 			else
 				return
 			end
-		end
-		
+		end		
 		layout = 'application'
 
 
@@ -42,22 +42,13 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 		Spud::Cms.default_page_parts.each do |part|
 			@page.spud_page_partials.new(:name => part)
 		end
-		
-		# @page.spud_page_partials.new(:name => "Sidebar")
+		respond_with @page		
 	end
 
 	def create
-		
 		@page = SpudPage.new(params[:spud_page])
-		
-		if @page.save
-			flash[:notice] = "Page Saved successfully"
-			redirect_to spud_admin_pages_url() and return
-		else
-			flash[:error] = "Error creating page"
-			@error_object_name = "page"
-			render :action => "new"
-		end
+		flash[:notice] = "Page Saved successfully" if @page.save
+		respond_with @page,:location => spud_admin_pages_url
 	end
 
 	def edit

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

@@ -114,4 +114,21 @@ private
 		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_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? ? page_path(:id => item.url_name) : item.url}'>#{item.name}</a>"]
+		end
+
+		return menu_tags.join(seperator).html_safe
+	end
 end

data/app/models/spud_page.rb

@@ -44,7 +44,8 @@ class SpudPage < ActiveRecord::Base
 
 
      def generate_url_name
-     	return false if self.name.blank?
+     	# return false if self.name.blank?
+     	return true if self.name.blank?
      	if !self.use_custom_url_name || self.url_name.blank?
      	  
      	  url_name = self.name.parameterize.downcase

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

@@ -1,31 +1,31 @@
+<%=error_messages_for(f.object)%>
 <fieldset>
 <ol>
 <li><%=f.label :name, :required=>true%>
   <%=f.text_field :name,:title => "",:size=>40%>
-  <%=error_message_on "menu_item","name"%>
+  
 </li>
 <li><%=f.label :menu_order, :required=>true%>
   <%=f.text_field :menu_order,:title => "",:size=>5%>
-  <%=error_message_on "menu_item","menu_order"%>
+  
 </li>
 <li><%=f.label :spud_page_id, "Page"%>
     <%=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('');}"}%>
-  <%=error_message_on "menu_item","spud_page_id"%>
+  
 </li>
 
 
 
 <li><%=f.label :url%>
   <%=f.text_field :url,:title => "",:size=>40%>
-  <%=error_message_on "menu_item","url"%>
 </li>
 <li><%=f.label :classes%>
   <%=f.text_field :classes,:title => "",:size=>40%>
-  <%=error_message_on "menu_item","classes"%>
+  
 </li>
 <li><%=f.label :parent, "Parent Menu"%>
   <%=f.select :parent_id,options_for_select(SpudMenuItem.options_tree_for_item(@menu,:filter => @menu_item),@menu_item.parent_type == 'SpudMenuItem' ? @menu_item.parent_id : nil),{:include_blank => "#{@menu.name}"},{:title => ""}%>
-  <%=error_message_on "menu_item","parent"%>
+  
 </li>
 </ol>
 </fieldset>

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

@@ -1,8 +1,8 @@
+<%=error_messages_for(f.object)%>
 <fieldset>
 <ol>
 <li><%=f.label :name, :required=>true%>
   <%=f.text_field :name,:title => "",:size=>40%>
-  <%=error_message_on "menu","name"%>
 </li>
 </ol>
 </fieldset>

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

@@ -1,7 +1,7 @@
+<%=error_messages_for(f.object)%>
 <fieldset>
   <legend>Page Title</legend>
   <p>
-      <%=error_message_on "page","name"%>
     	<%=f.label :name, :required=>true, :style => "display:none;" %>
       <%=f.text_field :name, :class => "full-width" %>
   </p>
@@ -22,18 +22,18 @@
   <ol>
      <%if Spud::Cms.templates_enabled%>
     	<li>
-      	<%=error_message_on "page","template_id"%>
+      	
       	<%=f.label :template_id, "Template"%>
       	<%=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) }%>
   	  </li>
       <%end%>
     <li>
-      <%=error_message_on "page","spud_page_id"%>
+      
       <%=f.label :spud_page_id, "Parent Page"%>
       <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page),@page.spud_page_id),{:include_blank => 'None'},{:title => ""}%>
     </li>
     <li>
-      <%=error_message_on "page","url_name"%>
+      
       <%=f.label :url_name, "Perma Link",:disabled => true%>
       <%=root_url%><%=f.text_field :url_name,:title => "",:size=>20%><%=f.check_box :use_custom_url_name,:onchange => "$('#spud_page_url_name').attr('disabled',!this.checked);"%>
     </li>
@@ -46,12 +46,12 @@
     <li>
       <%=f.label :meta_keywords,"Keywords"%>
       <%=f.text_field :meta_keywords,:title => "" %>
-      <%=error_message_on "page","meta_keywords"%>
+      
     </li>
     <li>
       <%=f.label :meta_description,"Description"%>
       <%=f.text_area :meta_description,:rows => 4,:cols=>75%>
-      <%=error_message_on "page","meta_description"%>
+      
     </li>
     <li>
       <%=f.label :visibility%>
@@ -62,7 +62,6 @@
   		<%=f.check_box :published%>
   	</li>
     <li>
-      <%=error_message_on "page","notes"%>
       <%=f.label :notes,"Notes"%>
       <%=f.text_area :notes,:rows => 4,:cols=>75 %>
     </li>

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

@@ -1,8 +1,8 @@
 <div class="page_row">
 					
-	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to page.name,spud_admin_page_path(:id => page.id)%></span>
+	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to page.name,edit_spud_admin_page_path(:id => page.id)%></span>
 
-	<span class="edit_controls"><%=link_to "Edit",edit_spud_admin_page_path(:id => page.id), :title => "Edit Page",:class => 'button'%>&nbsp;&nbsp;<%=link_to "Remove",spud_admin_page_path(:id => page.id),:method => :delete,:class => 'button',:confirm => "Are you sure you want to remove this page?"%></span>
+	<span class="edit_controls"><%=link_to "Preview",spud_admin_page_path(:id => page.id), :title => "Preview",:class => 'button'%>&nbsp;&nbsp;<%=link_to "Remove",spud_admin_page_path(:id => page.id),:method => :delete,:class => 'button',:confirm => "Are you sure you want to remove this page?"%></span>
 	<br style="clear:both;"/>
 </div>
 <%if !page.spud_pages.all.blank?%>

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

@@ -1,8 +1,8 @@
+<%=error_messages_for(f.object)%>
 <fieldset>
 <ol>
 <li><%=f.label :name, :required=>true%>
   <%=f.text_field :name,:title => "",:size=>40%>
-  <%=error_message_on "template","name"%>
 </li>
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70139647374180 !ruby/object:Gem::Requirement
+  requirement: &70353867613180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70139647374180
+  version_requirements: *70353867613180
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &70139647373700 !ruby/object:Gem::Requirement
+  requirement: &70353867612440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139647373700
+  version_requirements: *70353867612440
 description: 
 email: destes@redwindsw.com
 executables: []
@@ -57,18 +57,7 @@ files:
 - app/controllers/spud/admin/pages_controller.rb
 - app/controllers/spud/admin/templates_controller.rb
 - app/controllers/spud/cms/sitemaps_controller.rb
-- app/helpers/pages_helper.rb
-- app/helpers/spud/admin/contacts_helper.rb
-- app/helpers/spud/admin/media_helper.rb
-- app/helpers/spud/admin/menu_items_helper.rb
-- app/helpers/spud/admin/menus_helper.rb
-- app/helpers/spud/admin/pages_helper.rb
-- app/helpers/spud/admin/posts_helper.rb
-- app/helpers/spud/admin/templates_helper.rb
-- app/helpers/spud/admin/users_helper.rb
 - app/helpers/spud/cms/application_helper.rb
-- app/helpers/spud/cms/sitemaps_helper.rb
-- app/helpers/spud/user_sessions_helper.rb
 - app/models/spud_menu.rb
 - app/models/spud_menu_item.rb
 - app/models/spud_page.rb
@@ -76,7 +65,6 @@ files:
 - app/models/spud_template.rb
 - app/views/layouts/spud/admin/cms/detail.html.erb
 - app/views/pages/show.html.erb
-- app/views/spud/admin/contacts/index.html.erb
 - app/views/spud/admin/menu_items/_form.html.erb
 - app/views/spud/admin/menu_items/_menu_item_row.html.erb
 - app/views/spud/admin/menu_items/edit.html.erb

data/app/helpers/pages_helper.rb

@@ -1,2 +0,0 @@
-module PagesHelper
-end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,2 +0,0 @@
-module Spud::Cms::SitemapsHelper
-end

data/app/helpers/spud/user_sessions_helper.rb

@@ -1,2 +0,0 @@
-module Spud::UserSessionsHelper
-end