spud_cms 0.7.2 → 0.8.0

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

@@ -1,5 +1,5 @@
 class Spud::Admin::MenusController < Spud::Admin::ApplicationController
-	layout 'spud/admin/cms/detail'
+	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]

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

@@ -130,6 +130,25 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
     end
   end
 
+  def clear
+  	Rails.cache.clear
+	SpudPage.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
+		    else
+  				expire_page page_path(:id => record.url_name)
+  			end
+    	elsif Spud::Cms.enable_action_caching
+    		if record.url_name == Spud::Cms.root_page_name
+	        	expire_action root_path
+		    else
+				expire_action page_path(:id => record.url_name)
+			end 
+		end
+	end
+  end
+
 private
 	def load_page
 		@page = SpudPage.where(:id => params[:id]).includes(:spud_page_partials).first

data/app/views/layouts/spud/admin/cms/detail.html.erb

@@ -1,5 +1,4 @@
 <%=content_for :head do%>
-  <%= javascript_include_tag "wymeditor/jquery.wymeditor.min" %>
   <%= stylesheet_link_tag "spud/admin/cms/application" %>
   <%= javascript_include_tag "spud/admin/cms/application" %>
 <%end%>

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

@@ -1,33 +1,50 @@
 <%=error_messages_for(f.object)%>
 <fieldset>
-<ol>
-<li><%=f.label :name, :required=>true%>
-  <%=f.text_field :name,:title => "",:size=>40%>
+<div class="control-group">
+	<%=f.label :name, :required=>true,:class => "control-label"%>
+	<div class="controls">
+		<%=f.text_field :name,:title => "",:size=>40%>
+	</div>
   
-</li>
-<li><%=f.label :menu_order, :required=>true%>
-  <%=f.text_field :menu_order,:title => "",:size=>5%>
+</div>
+<div class="control-group">
+
+	<%=f.label :menu_order, :required=>true,:class => "control-label"%>
+	<div class="controls">
+	  <%=f.text_field :menu_order,:title => "",:size=>5%>
+	</div>
   
-</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('');}"}%>
+</div>
+<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('');}"}%>
+	</div>
   
-</li>
+</div>
 
 
 
-<li><%=f.label :url%>
-  <%=f.text_field :url,:title => "",:size=>40%>
-</li>
-<li><%=f.label :classes%>
-  <%=f.text_field :classes,:title => "",:size=>40%>
-  
-</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 => ""}%>
+<div class="control-group">
+	<%=f.label :url,:class => "control-label"%>
+	<div class="controls">
+		<%=f.text_field :url,:title => "",:size=>40%>
+	</div>
+</div>
+<div class="control-group">
+	<%=f.label :classes,:class => "control-label"%>
+	<div class="controls">
+		<%=f.text_field :classes,:title => "",:size=>40%>
+	</div>
+</div>
+<div class="control-group">
+	<%=f.label :parent, "Parent Menu",:class => "control-label"%>
+	<div class="controls">
+		<%=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 => ""}%>
+	</div>
   
-</li>
-</ol>
+</div>
+
 </fieldset>
 
 

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

@@ -2,7 +2,7 @@
 					
 	<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="edit_controls"><%=link_to "Edit",edit_spud_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'button'%>&nbsp;&nbsp;<%=link_to "Remove",spud_admin_menu_menu_item_path(:id => menu_item.id),:method => :delete,:class => 'button',:confirm => "Are you sure you want to remove this menu item?"%></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>
 	<br style="clear:both;"/>
 </div>
 <%if !menu_item.spud_menu_items.all.blank?%>

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

@@ -1,13 +1,10 @@
 
   
 
-  <%=form_for @menu_item,:url => spud_admin_menu_menu_item_path(:id => @menu_item.id),:html=>{:class=>"right_aligned_form"} do |f|%>
+  <%=form_for @menu_item,:url => spud_admin_menu_menu_item_path(:id => @menu_item.id),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <fieldset class="submit"><%=f.submit%> or <%=link_to "cancel",request.referer%></fieldset>
+    <div class="form-actions">
+    	<%=f.submit "Save Menu Item", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menu_menu_items_path,:class => "btn"%>
+    </div>
   <%end%>
 
-  <script type="text/javascript">
-  	$('input[type=submit],.close_dialog').button();
-  	
-  </script>
-

data/app/views/spud/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 => "button",:title => "New Menu Item"%>
+<%=link_to "New Menu Item",new_spud_admin_menu_menu_item_path(),:class => "btn btn-primary",:title => "New Menu Item"%>
 <%end%>
 <%=content_for :detail do%>
 	<div class="page_list">

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

@@ -1,13 +1,12 @@
 
   
 
-  <%=form_for @menu_item,:url => spud_admin_menu_menu_items_path,:html=>{:class=>"right_aligned_form"} do |f|%>
+  <%=form_for @menu_item,:url => spud_admin_menu_menu_items_path,:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <fieldset class="submit"><%=f.submit%> or <%=link_to "cancel",request.referer%></fieldset>
+    <div class="form-actions">
+    	<%=f.submit "Create Menu Item", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menu_menu_items_path,:class => "btn"%>
+    </div>
   <%end%>
 
-  <script type="text/javascript">
-  	$('input[type=submit],.close_dialog').button();
-  	
-  </script>
+ 
 

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

@@ -1,9 +1,11 @@
 <%=error_messages_for(f.object)%>
 <fieldset>
-<ol>
-<li><%=f.label :name, :required=>true%>
-  <%=f.text_field :name,:title => "",:size=>40%>
-</li>
-</ol>
+<div class="control-group">
+	<%=f.label :name, :required=>true,:class => "control-label"%>
+	<div class="controls">
+	  <%=f.text_field :name,:title => "",:size=>40%>
+	</div>
+
+</div>
 </fieldset>
 

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

@@ -1,13 +1,13 @@
 
   
 
-  <%=form_for @menu,:url => spud_admin_menu_path(:id => @menu.id),:html=>{:class=>"right_aligned_form"} do |f|%>
+  <%=form_for @menu,:url => spud_admin_menu_path(:id => @menu.id),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <fieldset class="submit"><%=f.submit%> or <%=link_to "cancel",request.referer%></fieldset>
+    <div class="form-actions">
+    	<%=f.submit "Save Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menus_path,:class => "btn"%>
+    </div>
+
   <%end%>
 
-  <script type="text/javascript">
-  	$('input[type=submit],.close_dialog').button();
-  	
-  </script>
+
 

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

@@ -1,5 +1,5 @@
 <%=content_for :data_controls do%>
-<%=link_to "New Menu",new_spud_admin_menu_path(),:class => "button",:title => "New Menu"%>
+<%=link_to "New Menu",new_spud_admin_menu_path(),:class => "btn btn-primary",:title => "New Menu"%>
 <%end%>
 <%=content_for :detail do%>
 	<div class="page_list">
@@ -9,8 +9,8 @@
 					<span class="row_meta"><%=link_to menu.name,spud_admin_menu_menu_items_path(:menu_id => menu.id)%></span>
 
 					<span class="edit_controls">
-						<%=link_to "Edit",edit_spud_admin_menu_path(:id => menu.id),:class => 'button'%>
-						<%=link_to "Remove",spud_admin_menu_path(:id => menu.id),:method => :delete,:class => 'button',:confirm => "Are you sure you want to remove this menu and all items associated with it?"%>
+						<%=link_to "Edit",edit_spud_admin_menu_path(:id => menu.id),:class => 'btn'%>
+						<%=link_to "Remove",spud_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>

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

@@ -1,13 +1,10 @@
 
   
 
-  <%=form_for @menu,:url => spud_admin_menus_path,:html=>{:class=>"right_aligned_form"} do |f|%>
+  <%=form_for @menu,:url => spud_admin_menus_path,:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <fieldset class="submit"><%=f.submit%> or <%=link_to "cancel",request.referer%></fieldset>
-  <%end%>
-
-  <script type="text/javascript">
-  	$('input[type=submit],.close_dialog').button();
-  	
-  </script>
+	<div class="form-actions">
+    	<%=f.submit "Create Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menus_path,:class => "btn"%>
+    </div>
 
+  <%end%>

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

@@ -1,10 +1,12 @@
 <%=error_messages_for(f.object)%>
 <fieldset>
+  <div class="control-group">
   <legend>Page Title</legend>
-  <p>
-    	<%=f.label :name, :required=>true, :style => "display:none;" %>
-      <%=f.text_field :name, :class => "full-width" %>
-  </p>
+    	<%=f.label :name, :required=>true,:style =>"display:none;", :class=>"control-label"%>
+      
+        <%=f.text_field :name, :class => "full-width"%>
+      
+  </div>
 </fieldset>
 <div id="page_partials_form" class="formtabs">
 	<ul class="formtab_buttons">
@@ -12,59 +14,83 @@
 	<%=f.fields_for :spud_page_partials do |b|%>
 		<div class="formtab">
 			<%=b.hidden_field :name,:class => "tab_name"%>
-			<%=b.text_area :content,:class => "wysiwym tinymce"%>
+			<%=b.text_area :content,:class => "tinymce"%>
 		</div>
 	<%end%>
 </div>
 <br />
 <fieldset>
   <legend>Advanced Settings (optional)</legend>
-  <ol>
+  
      <%if Spud::Cms.templates_enabled%>
-    	<li>
+    	<div class="control-group">
       	
-      	<%=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>
+      	<%=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) }%>
+          <span class="help-inline">Use this to control the layout template to be used for this page if they are available.</span>
+        </div>
+  	  </div>
       <%end%>
-    <li>
+    <div class="control-group">
       
-      <%=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>
+      <%=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 => ""}%>
+
+      </div>
+    </div>
+    <div class="control-group">
       
-      <%=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>
-  </ol>
+      <%=f.label :url_name, "Perma Link",:disabled => true, :class=>"control-label"%>
+      <div class="controls">
+        <%=root_url%><%=f.text_field :url_name,:title => "",:size=>20%>
+        <label class="checkbox inline">
+        <%=f.check_box :use_custom_url_name,:onchange => "$('#spud_page_url_name').attr('disabled',!this.checked);"%>
+        Customize this pages url
+        </label>
+      </div>
+    </div>
+  
 </fieldset>
 <fieldset>
   <legend>Meta Information (optional)</legend>
   <p>These fields are used to notify search engines about important keywords and the appropriate description to display in a search result.</p>
-  <ol>
-    <li>
-      <%=f.label :meta_keywords,"Keywords"%>
-      <%=f.text_field :meta_keywords,:title => "" %>
-      
-    </li>
-    <li>
-      <%=f.label :meta_description,"Description"%>
-      <%=f.text_area :meta_description,:rows => 4,:cols=>75%>
+  
+    <div class="control-group">
+      <%=f.label :meta_keywords,"Keywords", :class=>"control-label"%>
+      <div class="controls">
+        <%=f.text_field :meta_keywords,:title => "",:style=>"width:600px;" %>
+        <span class="help-inline">A Comma seperated list of keywords for search engines. Keep it short (no more than 10 keywords)</span>
+      </div>
       
-    </li>
-    <li>
-      <%=f.label :visibility%>
-  		<%=f.select :visibility, [["Public",0],["Private",1]]%>
-  	</li>
-  	<li>
-      <%=f.label :published%>
-  		<%=f.check_box :published%>
-  	</li>
-    <li>
-      <%=f.label :notes,"Notes"%>
-      <%=f.text_area :notes,:rows => 4,:cols=>75 %>
-    </li>
-  </ol>
+    </div>
+    <div class="control-group">
+      <%=f.label :meta_description,"Description", :class=>"control-label"%>
+      <div class="controls">
+        <%=f.text_area :meta_description,:style =>"width:600px;height:40px;"%>
+        <span class="help-inline">A short description of the page. This is what appears on a search engines search result page.</span>
+      </div>
+    </div>
+    <div class="control-group">
+      <%=f.label :visibility, :class=>"control-label"%>
+      <div class="controls">
+    		<%=f.select :visibility, [["Public",0],["Private",1]]%>
+      </div>
+  	</div>
+  	<div class="control-group">
+      <%=f.label :published, :class=>"control-label"%>
+      <div class="controls">
+    		<%=f.check_box :published%>
+      </div>
+  	</div>
+    <div class="control-group">
+      <%=f.label :notes,"Notes", :class=>"control-label"%>
+      <div class="controls">
+        <%=f.text_area :notes,:style =>"width:400px;height:40px;"%>
+        <span class="help-inline">Have a note to make about this page while you work? Place it here for later.</span>
+      </div>
+    </div>
+  
 </fieldset>
 

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

@@ -2,7 +2,7 @@
 					
 	<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 "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>
+	<span class="edit_controls"><%=link_to "Preview",spud_admin_page_path(:id => page.id), :title => "Preview",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",spud_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?%>

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

@@ -1,13 +1,8 @@
-<%=form_for @page,:url => spud_admin_page_path(:id => @page.id),:html=>{:class=>"right_aligned_form"} do |f|%>
+<%=form_for @page,:url => spud_admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal"} do |f|%>
 	<%=render :partial => "form",:locals => {:f => f}%>
-    <fieldset class="submit">
-		<%=f.submit :class => "wymupdate"%> or <%=link_to "cancel",request.referer%>
-	</fieldset>
+    <div class="form-actions">
+    	<%=f.submit "Save Page", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
+    </div>
 <%end%>
 <br />
 
-  <script type="text/javascript">
-  	$('input[type=submit],.close_dialog').button();
-  	
-  </script>
-

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

@@ -1,6 +1,7 @@
 <%=content_for :data_controls do%>
-<%=link_to "New Page",new_spud_admin_page_path(),:class => "button",:title => "New Page"%>
+<%=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.enable_full_page_caching || Spud::Cms.enable_action_caching%>
 <%end%>
+
 <%=content_for :detail do%>
 	<div class="page_list">
 			<%@pages.each do |page|%>

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

@@ -1,12 +1,10 @@
-<%=form_for @page,:url => spud_admin_pages_path(),:html=>{:class=>"right_aligned_form"} do |f|%>
+<%=form_for @page,:url => spud_admin_pages_path(),:html=>{:class=>"form-horizontal"} do |f|%>
 	<%=render :partial => "form",:locals => {:f => f}%>
-	<fieldset class="submit">
-		<%=f.submit :class => "wymupdate"%> or <%=link_to "cancel",request.referer%>
-	</fieldset>
+	<div class="form-actions">
+    	<%=f.submit "Create Page", :class=>"btn btn-primary form-btn","data-loading-text"=>"Saving..."%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
+    </div>
+
 <%end%>
-<br />
 
-  <script type="text/javascript">
-  	$('input[type=submit],.close_dialog').button();  	
-  </script>
 
+  

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

@@ -1,23 +1,35 @@
 <%=error_messages_for(f.object)%>
 <fieldset>
-<ol>
-<li><%=f.label :name, :required=>true%>
-  <%=f.text_field :name,:title => "",:size=>40%>
-</li>
 
+<div class="control-group">
+  <%=f.label :name, :required=>true,:class=>"control-label"%>
+  <div class="controls">
+    <%=f.text_field :name,:title => "",:size=>40%>
+  </div>
+</div>
+
+
+<div class="control-group">
+  <%=f.label :base_layout, "Base Layout",:class=>"control-label"%>
+  <div class="controls">
+    <%=f.text_field :base_layout%>
+  </div>
+</div>
+<div class="control-group">
+  <%=f.label :content, "Content",:class=>"control-label"%>
+  <div class="controls">
+    <%=f.text_area :content, :rows => 20,:cols => 110%>
+  </div>
+</div>
+<div class="control-group">
+  <%=f.label :page_parts, "Page Parts",:class=>"control-label"%>
+  <div class="controls">
+    <%=f.text_field :page_parts%>
+  </div>
+</div>
 
-<li><%=f.label :base_layout, "Base Layout"%>
-  <%=f.text_field :base_layout%>
-</li>
-<li><%=f.label :content, "Content"%>
-  <%=f.text_area :content, :rows => 20,:cols => 110%>
-</li>
-<li><%=f.label :page_parts, "Page Parts"%>
-  <%=f.text_field :page_parts%>
-</li>
 
 
-</ol>
 </fieldset>
 
 

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

@@ -1,11 +1,9 @@
 
-  <%=form_for @template,:url => spud_admin_template_path(:id => @template.id),:html=>{:class=>"right_aligned_form"} do |f|%>
+  <%=form_for @template,:url => spud_admin_template_path(:id => @template.id),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <fieldset class="submit"><%=f.submit%> or <%=link_to "cancel",request.referer%></fieldset>
+	<div class="form-actions">
+    	<%=f.submit "Save Template", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_templates_path,:class => "btn"%>
+	</div>
   <%end%>
 
-  <script type="text/javascript">
-  	$('input[type=submit],.close_dialog').button();
-  	
-  </script>
-
+ 

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

@@ -1,5 +1,5 @@
 <%=content_for :data_controls do%>
-<%=link_to "New Template",new_spud_admin_template_path(),:class => "button",:title => "New Template"%>
+<%=link_to "New Template",new_spud_admin_template_path(),:class => "btn btn-primary",:title => "New Template"%>
 <%end%>
 <%=content_for :detail do%>
 	<div class="page_list">
@@ -7,7 +7,7 @@
 				<div class="page_row">
 					<span class="row_meta"><%=link_to template.name,edit_spud_admin_template_path(:id => template.id)%></span>
 
-					<span class="edit_controls"><%=link_to "Edit",edit_spud_admin_template_path(:id => template.id), :title => "Edit Template",:class => 'button'%>&nbsp;&nbsp;<%=link_to "Remove",spud_admin_template_path(:id => template.id),:method => :delete,:class => 'button',:confirm => "Are you sure you want to remove this template?"%></span>
+					<span class="edit_controls"><%=link_to "Edit",edit_spud_admin_template_path(:id => template.id), :title => "Edit Template",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",spud_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%>

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

@@ -1,13 +1,11 @@
 
   
 
-  <%=form_for @template,:url => spud_admin_templates_path(),:html=>{:class=>"right_aligned_form"} do |f|%>
+  <%=form_for @template,:url => spud_admin_templates_path(),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <fieldset class="submit"><%=f.submit%> or <%=link_to "cancel",request.referer%></fieldset>
+     <div class="form-actions">
+    	<%=f.submit "Create Template", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_templates_path,:class => "btn"%>
+    </div>
   <%end%>
 
-  <script type="text/javascript">
-  	$('input[type=submit],.close_dialog').button();
-  	
-  </script>
 

data/config/routes.rb

@@ -3,6 +3,7 @@ Rails.application.routes.draw do
    	namespace :admin do
          resources :pages do
            get :page_parts, :on => :collection
+           get :clear, :on => :collection
          end
          resources :templates 
    		

data/lib/spud_cms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70300504706080 !ruby/object:Gem::Requirement
+  requirement: &70107591862880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,24 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70300504706080
+  version_requirements: *70107591862880
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70300504705560 !ruby/object:Gem::Requirement
+  requirement: &70107591862360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - <
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300504705560
+  version_requirements: *70107591862360
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
-  requirement: &70300504705080 !ruby/object:Gem::Requirement
+  requirement: &70107591861480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +46,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70300504705080
+  version_requirements: *70107591861480
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &70300504704700 !ruby/object:Gem::Requirement
+  requirement: &70107591861080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300504704700
+  version_requirements: *70107591861080
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70300504704220 !ruby/object:Gem::Requirement
+  requirement: &70107591860480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300504704220
+  version_requirements: *70107591860480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300504703800 !ruby/object:Gem::Requirement
+  requirement: &70107591860060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300504703800
+  version_requirements: *70107591860060
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70300504703380 !ruby/object:Gem::Requirement
+  requirement: &70107591859520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300504703380
+  version_requirements: *70107591859520
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70300504702860 !ruby/object:Gem::Requirement
+  requirement: &70107591858980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +101,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70300504702860
+  version_requirements: *70107591858980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70300504702360 !ruby/object:Gem::Requirement
+  requirement: &70107591858300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +112,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70300504702360
+  version_requirements: *70107591858300
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70300504701880 !ruby/object:Gem::Requirement
+  requirement: &70107591857680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,7 +123,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70300504701880
+  version_requirements: *70107591857680
 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
@@ -248,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1342933116980746766
+      hash: -1833908218773550740
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -257,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1342933116980746766
+      hash: -1833908218773550740
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15