tb_cms 1.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmJjMjg2OTkxYjQ2ZGViZTNhZmMwMjc0YzdmMGMxNmQwNDIxMjllMA==
+    OTIxNWM0MWZmMWJlYWJkOTRhZmQ1MjA3OWI3MDdmMzE2Y2Y0ZjFmOA==
   data.tar.gz: !binary |-
-    ZWMxMTdiMTgxN2Y0Y2QwMjRhZTcyODE1NDM2ODk0MDJhN2VkYzdjYw==
+    YjM0ZWIzNGI1NmUxMzg5OTZlNDhlYTMwMTM5YzUyZDFiYjdjN2ZhMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YThlMDgwYzU3ZTc2NDc5OTM2NjRlNDIwMThmOTcwZTAwYzRhMmVjNmRlNDY4
-    ZDRkNzg1ODNhYThjNmQ1NWQ4NzRjYjMyYTg1MjdjNWI2ZTRmZDNmNjdhNzNk
-    Y2QyMmIzNTI4Njk4MGUzYmU4MDE1YWM0ZDQzNWY4ZDNiM2Q1OTE=
+    MWRlMjcyZjRhM2JmNjE4MmQ2NTJlMzZhMmUzMDI2ZjM4Y2IwZWM2MzM0MTcz
+    YmRjODBiOWMzNDRmMDM3ZTkwNDJmYzU2NTU4ZTNjZmVjMzM3YWRhMjZiM2Ux
+    MDU0NzFiMGQzMGI3ZTcxZDBhNmE0Mzk3ZjI0YzkyMjRkNjE3ZTg=
   data.tar.gz: !binary |-
-    ZjdlMjRhMzZkMWE1ZjZkMDc5MGIwNDBiMGVhZGY0N2UwMTdjZWZkNGVkYmU1
-    NjNhMWNlZjUzMmViZTA4ZDlhMmRiNmMxNzU0ZTg2NDg5OGI1ODhlNzkxZmM1
-    MzE1ZmIzZWFhMGM5NDYxNDc5NjAzNjNjOGIwM2IwYmE2ZGY4NTg=
+    NDBmNzNlNjI5NjUxNTg4ZmY4MmY0NTAxMTZmODFiNzc5NDJmODExYTM4YmJm
+    ZDdkODZkNTM0ZDliZTFkYjZhZjU1ZDQxZDk2YTY3MTJiMDMwZDVhZDMxMWQ2
+    NWMyOTMwYTAxOGYxM2NlNjliYWQ2NzMyY2Y3MmJmYWY5MWQyZTY=

data/README.markdown

@@ -84,7 +84,7 @@ In your new engine add spud_admin as a dependency and create an initializer insi
 
 You can use the layouts provided with spud admin by using 'spud/admin/application' or 'spud/admin/detail' layouts
 
-When creating controllers for the admin panel create them in the Spud::Admin Namespace and have them extend Spud::Admin::ApplicationController for automatic user authentication restrictions.
+When creating controllers for the admin panel create them in the Admin Namespace and have them extend Admin::ApplicationController for automatic user authentication restrictions.
 
 Testing
 -----------------

data/app/assets/javascripts/{spud/admin → admin}/cms/application.js

@@ -1,6 +1,6 @@
 //= require_self
-//= require spud/admin/cms/pages
-//= require spud/admin/cms/menu_items
+//= require admin/cms/pages
+//= require admin/cms/menu_items
 
 spud.admin.cms = {};
 

data/app/controllers/{spud/admin → admin}/menu_items_controller.rb

@@ -1,7 +1,6 @@
-class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
-	add_breadcrumb "Menus", :spud_admin_menus_path
+class Admin::MenuItemsController < Admin::ApplicationController
+	add_breadcrumb "Menus", :admin_menus_path
 	belongs_to_spud_app :menus, :page_title => "Menu Items"
-	layout 'spud/admin/detail'
 	before_filter :load_menu
 	before_filter :load_menu_item, :only => [:edit,:update,:show,:destroy,:reorder]
 
@@ -12,7 +11,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 	end
 
 	def new
-		add_breadcrumb "New", :new_spud_admin_page_path
+		add_breadcrumb "New", :new_admin_page_path
 
 		@menu_item = @menu.spud_menu_items.new
 		respond_with @menu_item
@@ -20,7 +19,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 
 	def create
 
-		add_breadcrumb "New", :new_spud_admin_page_path
+		add_breadcrumb "New", :new_admin_page_path
 		@menu_item = SpudMenuItem.new(params[:spud_menu_item])
 		@menu_item.spud_menu_id = @menu.id
 		if params[:spud_menu_item][:parent_id].blank?
@@ -42,11 +41,11 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 
 
 
-		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
+		respond_with @menu_item,:location => admin_menu_menu_items_url
 	end
 
 	def edit
-		add_breadcrumb "Edit #{@menu_item.name}", :edit_spud_admin_menu_menu_item_path
+		add_breadcrumb "Edit #{@menu_item.name}", :edit_admin_menu_menu_item_path
 		if @menu_item.parent_type == "SpudMenu"
 			@menu_item.parent_id = nil
 		end
@@ -55,7 +54,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 
 	def update
 
-		add_breadcrumb "Edit #{@menu_item.name}", :edit_spud_admin_menu_menu_item_path
+		add_breadcrumb "Edit #{@menu_item.name}", :edit_admin_menu_menu_item_path
 		if params[:spud_menu_item][:parent_id].blank?
 			params[:spud_menu_item][:parent_type] = "SpudMenu"
 			params[:spud_menu_item][:parent_id] = @menu.id
@@ -66,14 +65,14 @@ class Spud::Admin::MenuItemsController < Spud::Admin::CmsController
 		@menu_item.spud_menu_id = @menu.id
 		flash[:notice] = "Menu saved successfully!" if @menu_item.save
 
-		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
+		respond_with @menu_item,:location => admin_menu_menu_items_url
 	end
 
 	def destroy
 
 		flash[:notice] = "Menu Item removed!" if @menu_item.destroy
 
-		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
+		respond_with @menu_item,:location => admin_menu_menu_items_url
 	end
 
 	def reorder
@@ -92,19 +91,19 @@ private
 
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
-			redirect_to spud_admin_menus_url() and return false
+			redirect_to 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
+			redirect_to admin_menus_url() and return false
 		end
-		add_breadcrumb "#{@menu.name}", :spud_admin_menu_menu_items_path
+		add_breadcrumb "#{@menu.name}", :admin_menu_menu_items_path
 	end
 
 	def load_menu_item
 		@menu_item = SpudMenuItem.where(:id =>params[:id]).first
 		if @menu_item.blank?
 			flash[:error] = "Menu Item not found!"
-			redirect_to spud_admin_menu_menu_items_url() and return false
+			redirect_to admin_menu_menu_items_url() and return false
 		end
 	end
 

data/app/controllers/{spud/admin → admin}/menus_controller.rb

@@ -1,7 +1,6 @@
-class Spud::Admin::MenusController < Spud::Admin::CmsController
-	layout 'spud/admin/detail'
+class Admin::MenusController < Admin::ApplicationController
 	belongs_to_spud_app :menus
-	add_breadcrumb "Menus", :spud_admin_menus_path
+	add_breadcrumb "Menus", :admin_menus_path
 	before_filter :load_menu,:only => [:edit,:update,:show,:destroy]
 
 	def index
@@ -11,34 +10,34 @@ class Spud::Admin::MenusController < Spud::Admin::CmsController
 
 
 	def new
-		add_breadcrumb "New", :new_spud_admin_menu_path
+		add_breadcrumb "New", :new_admin_menu_path
 		@menu = SpudMenu.new
 		respond_with @menu
 	end
 
 	def create
-		add_breadcrumb "New", :new_spud_admin_menu_path
+		add_breadcrumb "New", :new_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 => @menu.id != nil ? spud_admin_menu_menu_items_url(:menu_id => @menu.id) : spud_admin_menus_url
+		respond_with @menu,:location => @menu.id != nil ? admin_menu_menu_items_url(:menu_id => @menu.id) : admin_menus_url
 	end
 
 	def edit
-		add_breadcrumb "Edit #{@menu.name}", :edit_spud_admin_menu_path
+		add_breadcrumb "Edit #{@menu.name}", :edit_admin_menu_path
 		respond_with @menu
 	end
 
 	def update
-		add_breadcrumb "Edit #{@menu.name}", :edit_spud_admin_menu_path
+		add_breadcrumb "Edit #{@menu.name}", :edit_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)
+		respond_with @menu,:location => admin_menu_menu_items_url(:menu_id => @menu.id)
 	end
 
 	def destroy
 		flash[:notice] = "Menu removed!" if @menu.destroy
-		respond_with @menu,:location => spud_admin_menus_url
+		respond_with @menu,:location => admin_menus_url
 	end
 
 private
@@ -46,10 +45,10 @@ private
 		@menu = SpudMenu.where(:id => params[:id]).first
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
-			redirect_to spud_admin_menus_url() and return false
+			redirect_to 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
+			redirect_to admin_menus_url() and return false
 		end
 	end
 end

data/app/controllers/{spud/admin → admin}/pages_controller.rb

@@ -1,6 +1,5 @@
-class Spud::Admin::PagesController < Spud::Admin::CmsController
-	layout 'spud/admin/detail'
-	add_breadcrumb "Pages", :spud_admin_pages_path
+class Admin::PagesController < Admin::ApplicationController
+	add_breadcrumb "Pages", :admin_pages_path
 	belongs_to_spud_app :pages
 	before_filter :load_page,:only => [:edit,:update,:show,:destroy]
 
@@ -24,7 +23,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 	end
 
 	def new
-		add_breadcrumb "New", :new_spud_admin_page_path
+		add_breadcrumb "New", :new_admin_page_path
 
     layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
     layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
@@ -46,12 +45,12 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 			return
 		end
 		flash[:notice] = "Page Saved successfully" if @page.save
-		respond_with @page,:location => spud_admin_pages_url
+		respond_with @page,:location => admin_pages_url
 	end
 
 	def edit
-		add_breadcrumb "#{@page.name}", :spud_admin_page_path
-		add_breadcrumb "Edit", :edit_spud_admin_page_path
+		add_breadcrumb "#{@page.name}", :admin_page_path
+		add_breadcrumb "Edit", :edit_admin_page_path
 
     layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
     layout, layout_info = layouts.select{|k,v| k == @page.layout}.flatten  if @page.layout.blank? == false
@@ -78,7 +77,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 		end
 		if @page.save
 			flash[:notice] = "Page updated successfully!"
-			redirect_to spud_admin_pages_url() and return
+			redirect_to admin_pages_url() and return
 		else
 			flash[:error] = "There was an error saving this page"
 			render :action => "edit"
@@ -102,7 +101,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
 		end
 		respond_to do |format|
 			format.js {render :status => status}
-			format.html { redirect_to spud_admin_pages_url()}
+			format.html { redirect_to admin_pages_url()}
 		end
 	end
 
@@ -159,7 +158,7 @@ class Spud::Admin::PagesController < Spud::Admin::CmsController
         end
       end
     end
-    redirect_to spud_admin_pages_url
+    redirect_to admin_pages_url
   end
 
 
@@ -169,10 +168,10 @@ private
 		@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
+			redirect_to 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
+			redirect_to admin_pages_url() and return false
 		end
 		return true
 	end

data/app/controllers/{spud/admin → admin}/snippets_controller.rb

@@ -1,7 +1,6 @@
-class Spud::Admin::SnippetsController < Spud::Admin::ApplicationController
+class Admin::SnippetsController < Admin::ApplicationController
   belongs_to_spud_app :snippets
-  layout '/spud/admin/detail'
-  add_breadcrumb "Snippets", :spud_admin_snippets_url
+  add_breadcrumb "Snippets", :admin_snippets_url
 
   before_filter :load_snippet, :only => [:show, :edit, :update, :destroy]
 
@@ -9,41 +8,40 @@ class Spud::Admin::SnippetsController < Spud::Admin::ApplicationController
 
   def index
     @snippets = SpudSnippet.site(session[:admin_site]).order(:name).paginate :page => params[:page]
-
     respond_with @snippets
   end
 
   def new
-    add_breadcrumb "New", :new_spud_admin_snippet_url
+    add_breadcrumb "New", :new_admin_snippet_url
     @snippet = SpudSnippet.new
     respond_with @snippet
   end
 
   def create
-    add_breadcrumb "New", :new_spud_admin_snippet_url
+    add_breadcrumb "New", :new_admin_snippet_url
     @snippet = SpudSnippet.new(params[:spud_snippet])
     @snippet.site_id = session[:admin_site]
 
     @snippet.save
 
-    respond_with @snippet, :location => spud_admin_snippets_url
+    respond_with @snippet, :location => admin_snippets_url
   end
 
   def edit
-    add_breadcrumb "Edit", :edit_spud_admin_snippet_url
+    add_breadcrumb "Edit", :edit_admin_snippet_url
 
     respond_with @snippet
   end
 
   def update
-    add_breadcrumb "Edit", :edit_spud_admin_snippet_url
+    add_breadcrumb "Edit", :edit_admin_snippet_url
     flash[:notice] = "Snippet saved successfully!" if @snippet.update_attributes(params[:spud_snippet])
-    respond_with @snippet, :location => spud_admin_snippets_url
+    respond_with @snippet, :location => admin_snippets_url
   end
 
   def destroy
     flash[:notice] = "Snippet removed!" if @snippet.destroy
-    respond_with @snippet,:location => spud_admin_snippets_url
+    respond_with @snippet,:location => admin_snippets_url
   end
 
 
@@ -52,10 +50,10 @@ private
     @snippet = SpudSnippet.where(:id => params[:id]).first
     if @snippet.blank?
       flash[:error] = "Snippet does not exist!"
-      redirect_to spud_admin_snippets_url and return false
+      redirect_to admin_snippets_url and return false
     elsif Spud::Core.multisite_mode_enabled && @snippet.site_id != session[:admin_site]
       flash[:warning] = "This snippet is for a different site"
-      redirect_to spud_admin_snippets_url and return false
+      redirect_to admin_snippets_url and return false
     end
   end
 end

data/app/controllers/{spud/cms → cms}/sitemaps_controller.rb

@@ -1,4 +1,4 @@
-class Spud::Cms::SitemapsController < Spud::ApplicationController
+class Cms::SitemapsController < Spud::ApplicationController
 	respond_to :xml
 	caches_page :show,:expires_in => 1.day
 	def show

data/app/helpers/{spud/cms → cms}/application_helper.rb

@@ -1,4 +1,4 @@
-module Spud::Cms::ApplicationHelper
+module Cms::ApplicationHelper
 	MENU_INDEX = {}
 
 	def sp_snippet(name,snippets=nil)

data/app/observers/page_sweeper.rb

@@ -13,13 +13,13 @@ class PageSweeper < ActionController::Caching::Sweeper
 
   def after_save(record)
     expire_cache_for(record)
-    expire_page spud_cms_sitemap_path(:format => :xml)
+    expire_page cms_sitemap_path(:format => :xml)
     expire_page spud_sitemap_path(:format => :xml)
   end
 
   def after_destroy(record)
     expire_cache_for(record)
-    expire_page spud_cms_sitemap_path
+    expire_page cms_sitemap_path
     expire_page spud_sitemap_path
   end
 

data/app/views/{spud/admin → admin}/menu_items/_menu_item_row.html.erb

@@ -1,8 +1,8 @@
 <div class="page_row" menu_item_id="<%=menu_item.id%>">
 
-	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to menu_item.name,edit_spud_admin_menu_menu_item_path(:id => menu_item.id)%></span>
+	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to menu_item.name,edit_admin_menu_menu_item_path(:id => menu_item.id)%></span>
 
-	<span class="edit_controls"><%=link_to "Edit",edit_spud_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",spud_admin_menu_menu_item_path(:id => menu_item.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this menu item?"%></span>
+	<span class="edit_controls"><%=link_to "Edit",edit_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",admin_menu_menu_item_path(:id => menu_item.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this menu item?"%></span>
 	<br style="clear:both;"/>
 </div>
 <ul class="menu_list subitem sortable connectedSortable">

data/app/views/admin/menu_items/edit.html.erb

@@ -0,0 +1,10 @@
+
+  
+
+  <%=form_for @menu_item,:url => admin_menu_menu_item_path(:id => @menu_item.id),:html=>{:class=>"form-horizontal"} do |f|%>
+    <%=render :partial => "form",:locals => {:f => f}%>
+    <div class="form-actions">
+    	<%=f.submit "Save Menu Item", :class=>"btn btn-primary"%> or <%=link_to "cancel",admin_menu_menu_items_path,:class => "btn"%>
+    </div>
+  <%end%>
+

data/app/views/{spud/admin → admin}/menu_items/index.html.erb

@@ -1,5 +1,5 @@
 <%=content_for :data_controls do%>
-<%=link_to "New Menu Item",new_spud_admin_menu_menu_item_path(),:class => "btn btn-primary",:title => "New Menu Item"%>
+<%=link_to "New Menu Item",new_admin_menu_menu_item_path(),:class => "btn btn-primary",:title => "New Menu Item"%>
 <%end%>
 <%=content_for :detail do%>
 	<ul id="root_menu_list" class="menu_list page_list sortable connectedSortable">

data/app/views/admin/menu_items/new.html.erb

@@ -0,0 +1,12 @@
+
+  
+
+  <%=form_for @menu_item,:url => admin_menu_menu_items_path,:html=>{:class=>"form-horizontal"} do |f|%>
+    <%=render :partial => "form",:locals => {:f => f}%>
+    <div class="form-actions">
+    	<%=f.submit "Create Menu Item", :class=>"btn btn-primary"%> or <%=link_to "cancel",admin_menu_menu_items_path,:class => "btn"%>
+    </div>
+  <%end%>
+
+ 
+

data/app/views/{spud/admin → admin}/menus/edit.html.erb

@@ -1,10 +1,10 @@
 
   
 
-  <%=form_for @menu,:url => spud_admin_menu_path(:id => @menu.id),:html=>{:class=>"form-horizontal"} do |f|%>
+  <%=form_for @menu,:url => admin_menu_path(:id => @menu.id),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
     <div class="form-actions">
-    	<%=f.submit "Save Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menus_path,:class => "btn"%>
+    	<%=f.submit "Save Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",admin_menus_path,:class => "btn"%>
     </div>
 
   <%end%>

data/app/views/admin/menus/index.html.erb

@@ -0,0 +1,24 @@
+<%=content_for :data_controls do%>
+<%=link_to "New Menu",new_admin_menu_path(),:class => "btn btn-primary",:title => "New Menu"%>
+<%end%>
+<%=content_for :detail do%>
+	<div class="page_list">
+			<%@menus.each do |menu|%>
+				<div class="page_row">
+					
+					<span class="row_meta"><%=link_to menu.name,admin_menu_menu_items_path(:menu_id => menu.id)%></span>
+
+					<span class="edit_controls">
+						<%=link_to "Edit",edit_admin_menu_path(:id => menu.id),:class => 'btn'%>
+						<%=link_to "Remove",admin_menu_path(:id => menu.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this menu and all items associated with it?"%>
+					</span>
+					<br style="clear:both;"/>
+				</div>
+			<%end%>
+			<%=will_paginate @menus%>
+
+	</div>
+
+
+	
+<%end%>

data/app/views/{spud/admin → admin}/menus/new.html.erb

@@ -1,7 +1,7 @@
-<%=form_for @menu,:url => spud_admin_menus_path,:html=>{:class=>"form-horizontal"} do |f|%>
+<%=form_for @menu,:url => admin_menus_path,:html=>{:class=>"form-horizontal"} do |f|%>
   <%=render :partial => "form",:locals => {:f => f}%>
   <div class="form-actions">
-    <%=f.submit "Create Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menus_path,:class => "btn"%>
+    <%=f.submit "Create Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",admin_menus_path,:class => "btn"%>
   </div>
 
 <%end%>

data/app/views/{spud/admin → admin}/pages/_form.html.erb

@@ -26,7 +26,7 @@
 
       	<%=f.label :layout, "Template", :class=>"control-label"%>
         <div class="controls">
-        	<%=f.select :layout, options_for_select(layout_options,@page.layout),{},{:title => "", 'data-source' => page_parts_spud_admin_pages_path(:page => @page.id) }%>
+        	<%=f.select :layout, options_for_select(layout_options,@page.layout),{},{:title => "", 'data-source' => page_parts_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>

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

@@ -0,0 +1,18 @@
+<div class="page_row">
+					
+	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to page.name,edit_admin_page_path(:id => page.id)%></span>
+
+	<span class="edit_controls"><%=link_to "Preview",admin_page_path(:id => page.id), :title => "Preview",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",admin_page_path(:id => page.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this page?"%></span>
+	<br style="clear:both;"/>
+</div>
+<%if !page.spud_pages.all.blank?%>
+	
+		<div class="left_guide">
+	
+	<%page.spud_pages.each do |spud_page|%>
+		<%=render :partial => 'page_row',:locals => {:page => spud_page}%>
+	<%end%>
+	
+		</div>
+	
+<%end%>

data/app/views/{spud/admin → admin}/pages/edit.html.erb

@@ -1,7 +1,7 @@
-<%=form_for @page,:url => spud_admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal page_form",:target => "report" } do |f|%>
+<%=form_for @page,:url => admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal page_form",:target => "report" } do |f|%>
 	<%=render :partial => "form",:locals => {:f => f}%>
     <div class="form-actions">
-    	<%=f.submit "Save Page", :class=>"btn btn-primary btn-save",:onclick => "savePage();"%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-info btn-preview"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
+    	<%=f.submit "Save Page", :class=>"btn btn-primary btn-save",:onclick => "savePage();"%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-info btn-preview"%> or <%=link_to "cancel",admin_pages_path,:class => "btn"%>
     </div>
 <%end%>
 <br />

data/app/views/{spud/admin → admin}/pages/index.html.erb

@@ -1,5 +1,5 @@
 <%=content_for :data_controls do%>
-<%=link_to "New Page",new_spud_admin_page_path(),:class => "btn btn-primary",:title => "New Page"%>&nbsp;<%=link_to "Clear Cache",clear_spud_admin_pages_path(),:class => "btn btn-warning",:title => "Clear Page Cache" if Spud::Cms.cache_mode %>
+<%=link_to "New Page",new_admin_page_path(),:class => "btn btn-primary",:title => "New Page"%>&nbsp;<%=link_to "Clear Cache",clear_admin_pages_path(),:class => "btn btn-warning",:title => "Clear Page Cache" if Spud::Cms.cache_mode %>
 <%end%>
 
 <%=content_for :detail do%>

data/app/views/{spud/admin → admin}/pages/new.html.erb

@@ -1,7 +1,7 @@
-<%=form_for @page,:url => spud_admin_pages_path(),:html=>{:class=>"form-horizontal page_form"} do |f|%>
+<%=form_for @page,:url => admin_pages_path(),:html=>{:class=>"form-horizontal page_form"} do |f|%>
 	<%=render :partial => "form",:locals => {:f => f}%>
 	<div class="form-actions">
-    	<%=f.submit "Create Page", :class=>"btn btn-primary form-btn btn-save","data-loading-text"=>"Saving..."%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-primary btn-preview"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
+    	<%=f.submit "Create Page", :class=>"btn btn-primary form-btn btn-save","data-loading-text"=>"Saving..."%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-primary btn-preview"%> or <%=link_to "cancel",admin_pages_path,:class => "btn"%>
     </div>
 
 <%end%>

data/app/views/admin/snippets/edit.html.erb

@@ -0,0 +1,7 @@
+<%=form_for @snippet,:url => admin_snippet_path(@snippet),:html=>{:class=>"form-horizontal"} do |f|%>
+  <%=render :partial => "form",:locals => {:f => f}%>
+  <div class="form-actions">
+    <%=f.submit "Save Snippet", :class=>"btn btn-primary"%> or <%=link_to "cancel",admin_snippets_path,:class => "btn"%>
+  </div>
+
+<%end%>

data/app/views/admin/snippets/index.html.erb

@@ -0,0 +1,24 @@
+<%=content_for :data_controls do%>
+<%=link_to "New Snippet",new_admin_snippet_path(),:class => "btn btn-primary",:title => "New Snippet"%>
+<%end%>
+<%=content_for :detail do%>
+  <div class="page_list">
+      <%@snippets.each do |snippet|%>
+        <div class="page_row">
+
+          <span class="row_meta"><%=link_to snippet.name,edit_admin_snippet_path(:id => snippet.id)%></span>
+
+          <span class="edit_controls">
+
+            <%=link_to "Remove",admin_snippet_path(:id => snippet.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this snippet?"%>
+          </span>
+          <br style="clear:both;"/>
+        </div>
+      <%end%>
+      <%=will_paginate @snippets%>
+
+  </div>
+
+
+
+<%end%>

data/app/views/{spud/admin → admin}/snippets/new.html.erb

@@ -1,7 +1,7 @@
-<%=form_for @snippet,:url => spud_admin_snippets_path,:html=>{:class=>"form-horizontal"} do |f|%>
+<%=form_for @snippet,:url => admin_snippets_path,:html=>{:class=>"form-horizontal"} do |f|%>
   <%=render :partial => "form",:locals => {:f => f}%>
   <div class="form-actions">
-    <%=f.submit "Create Snippet", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_snippets_path,:class => "btn"%>
+    <%=f.submit "Create Snippet", :class=>"btn btn-primary"%> or <%=link_to "cancel",admin_snippets_path,:class => "btn"%>
   </div>
 
 <%end%>

data/app/views/admin/templates/edit.html.erb

@@ -0,0 +1,9 @@
+
+  <%=form_for @template,:url => admin_template_path(:id => @template.id),:html=>{:class=>"form-horizontal"} do |f|%>
+    <%=render :partial => "form",:locals => {:f => f}%>
+	<div class="form-actions">
+    	<%=f.submit "Save Template", :class=>"btn btn-primary"%> or <%=link_to "cancel",admin_templates_path,:class => "btn"%>
+	</div>
+  <%end%>
+
+ 

data/app/views/admin/templates/index.html.erb

@@ -0,0 +1,17 @@
+<%=content_for :data_controls do%>
+<%=link_to "New Template",new_admin_template_path(),:class => "btn btn-primary",:title => "New Template"%>
+<%end%>
+<%=content_for :detail do%>
+	<div class="page_list">
+			<%@templates.each do |template|%>
+				<div class="page_row">
+					<span class="row_meta"><%=link_to template.name,edit_admin_template_path(:id => template.id)%></span>
+
+					<span class="edit_controls"><%=link_to "Edit",edit_admin_template_path(:id => template.id), :title => "Edit Template",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",admin_template_path(:id => template.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this template?"%></span>
+					<br style="clear:both;"/>
+				</div>
+			<%end%>
+			<%=will_paginate @templates%>
+	</div>
+
+<%end%>

data/app/views/{spud/admin → admin}/templates/new.html.erb

@@ -1,10 +1,10 @@
 
   
 
-  <%=form_for @template,:url => spud_admin_templates_path(),:html=>{:class=>"form-horizontal"} do |f|%>
+  <%=form_for @template,:url => admin_templates_path(),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
      <div class="form-actions">
-    	<%=f.submit "Create Template", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_templates_path,:class => "btn"%>
+    	<%=f.submit "Create Template", :class=>"btn btn-primary"%> or <%=link_to "cancel",admin_templates_path,:class => "btn"%>
     </div>
   <%end%>