tb_cms 1.1.5 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8489bda6705051746c0d9bfc282aa87958d6b94e
-  data.tar.gz: b5d332e0e887e04ec5ce00b1f6d19d20e8768ea5
+  metadata.gz: 6d493436489707a83b24c42f45f4c28da810f6eb
+  data.tar.gz: 0b85e51660ae264c80f50e063fa2ebca8538cf02
 SHA512:
-  metadata.gz: 2e3b9246f237eabdb5465c408b0c8635c18733bf388fcc574da2faaaba2ec4d1f0fa206c1c5ab27b212b09684d76d4e5e4fc9d6bfb08f8cabd07bcd2ab4294e1
-  data.tar.gz: dce96636d73c406842425ec2a3905b68b92a0d005c21bb2468d2ad7a9a85fe53d816b545e4fe1af01d2539a16e0b142fc72496790eb7cac9b75208cef96b803e
+  metadata.gz: 9106c75d5cd3f91334426eb8dd51e4006bb9cfbe04d6b8c5d1a8569e76537e2302361bc9dcf396ce0976045712ca4b58ac0f01f50604b4d9d22c44eda5295d64
+  data.tar.gz: 89588fb1c7d5ccf19e299ea1b6c076e41564a45a0268781df4b124d3d1085f89459100dab67752cba18f5dd55e24cf7011b68b59480c81a540f122dc2840dd84

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

@@ -1,25 +0,0 @@
-
-.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/admin/pages_controller.rb

@@ -4,14 +4,11 @@ class Admin::PagesController < Admin::ApplicationController
 	before_filter :load_page,:only => [:edit,:update,:show,:destroy]
 
 	def index
-
-		@pages = SpudPage.site(session[:admin_site]).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)
     home_page = SpudPage.where(:url_name => Spud::Cms.root_page_name).first
     if home_page.blank?
       flash.now[:warning] = "You have not setup your default CMS page. This page will be your homepage. To do so, create a page with the name '#{Spud::Cms.root_page_name.titlecase}'"
     end
-
 		respond_with @pages
 	end
 
@@ -48,8 +45,7 @@ class Admin::PagesController < Admin::ApplicationController
 	end
 
 	def edit
-		add_breadcrumb "#{@page.name}", :admin_page_path
-		add_breadcrumb "Edit", :edit_admin_page_path
+		add_breadcrumb @page.name, :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

data/app/models/spud_menu.rb

@@ -1,6 +1,7 @@
 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
 	

data/app/models/spud_page_partial.rb

@@ -4,7 +4,7 @@ class SpudPagePartial < ActiveRecord::Base
 	validates :name,:presence => true
 	before_save :maintain_revisions
 	before_save :update_symbol_name
-	acts_as_spud_liquid_content
+	acts_as_tb_liquid_content
 
 	def update_symbol_name
 		self.symbol_name = self.name.parameterize.underscore

data/app/models/spud_snippet.rb

@@ -5,7 +5,7 @@ class SpudSnippet < ActiveRecord::Base
 
   scope :site, lambda {|sid| where(:site_id => sid)}
 
-  acts_as_spud_liquid_content
+  acts_as_tb_liquid_content
 
   def postprocess_content
     template = Liquid::Template.parse(self.content)

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

@@ -1,51 +1,50 @@
-<%=error_messages_for(f.object)%>
-<fieldset>
-<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">
+<%= tb_form_errors(f.object)%>
 
-	<%=f.label :menu_order, :required=>true,:class => "control-label"%>
-	<div class="controls">
-	  <%=f.text_field :menu_order,:title => "",:size=>5%>
+<div class="form-group">
+	<%= f.label :name, :required=>true, :class=>"col-sm-2 control-label" %>
+	<div class="col-sm-10">
+		<%= f.text_field :name, :title => "", :class=>"form-control" %>
 	</div>
-  
 </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(: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 class="form-group">
+	<%=f.label :menu_order, :required=>true,:class => "col-sm-2 control-label"%>
+	<div class="col-sm-10">
+		<%=f.text_field :menu_order, :title => "", :class=>'form-control'%>
 	</div>
-  
 </div>
 
+<div class="form-group">
+	<%=f.label :spud_page_id, "Page", :class=>"col-sm-2 control-label"%>
+	<div class="col-sm-10">
+		<%=	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'}, {:class=>'form-control',:title => "", :onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
+	</div>  
+</div>
 
-
-<div class="control-group">
-	<%=f.label :url,:class => "control-label"%>
-	<div class="controls">
-		<%=f.text_field :url,:title => "",:size=>40%>
+<div class="form-group">
+	<%=f.label :url, :class => "col-sm-2 control-label"%>
+	<div class="col-sm-10">
+		<%=f.text_field :url, :title => "", :class=>'form-control' %>
 	</div>
 </div>
-<div class="control-group">
-	<%=f.label :classes,:class => "control-label"%>
-	<div class="controls">
-		<%=f.text_field :classes,:title => "",:size=>40%>
+
+<div class="form-group">
+	<%=f.label :classes, :class => "col-sm-2 control-label"%>
+	<div class="col-sm-10">
+		<%=f.text_field :classes, :title => "", :class=>'form-control'%>
 	</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 class="form-group">
+	<%= f.label :parent, "Parent Menu", :class=>"col-sm-2 control-label" %>
+	<div class="col-sm-10">
+		<%=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}"},{:class => 'form-control', :title => ""}%>
 	</div>
-  
 </div>
 
-</fieldset>
-
-
-
+<div class="form-group">
+  <div class="col-sm-offset-2 col-sm-10">
+    <%= f.submit "Save Menu Item", :class => "btn btn-primary" %>
+    <%= link_to "Cancel", admin_menu_menu_items_path, :class => "btn btn-default" %>
+  </div>
+</div>

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

@@ -1,22 +1,14 @@
-<div class="page_row" menu_item_id="<%=menu_item.id%>">
-
-	<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_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', :data => {:confirm => "Are you sure you want to remove this menu item?"}%></span>
-	<br style="clear:both;"/>
-</div>
-<ul class="menu_list subitem sortable connectedSortable">
-
-<% if menu_item.spud_menu_items.length > 0 %>
-
-
-	<%menu_item.spud_menu_items.order(:menu_order).each do |menu_item|%>
-	<li>
-		<%=render :partial => 'menu_item_row',:locals => {:menu_item => menu_item}%>
-	</li>
-	<%end%>
-
-
-
-<%end%>
-</ul>
+<tr>
+	<td>
+		<%= table_nesting_indicator(depth) %>
+		<%= menu_item.name %>
+	</td>
+	<td><%= link_to menu_item.get_url, menu_item.get_url %></td>
+	<td class="table-actions">
+		<%=link_to 'Edit', edit_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item", :class => 'btn btn-default btn-sm' %>
+		<%=link_to 'Delete', admin_menu_menu_item_path(:id => menu_item.id), :method => :delete, :class => 'btn btn-danger btn-sm', :data => {:confirm => "Are you sure you want to remove this menu item?"} %>
+	</td>
+</tr>
+<% menu_item.spud_menu_items.each do |item| %>
+  <%= render :partial => 'menu_item_row', :locals => {:menu_item => item, :depth => depth+1} %>
+<% end %>

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

@@ -1,10 +1,3 @@
-
-  
-
-  <%=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%>
-
+<%= 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}%>
+<% end %>

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

@@ -1,17 +1,27 @@
-<%=content_for :data_controls do%>
-<%=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">
-			<%@menu_items.each do |menu_item|%>
-        <li>
-  				<%=render :partial => "menu_item_row",:locals => {:menu_item => menu_item}%>
-        </li>
-			<%end%>
+<% content_for :data_controls do %>
+  <%= link_to "New Menu Item", new_admin_menu_menu_item_path(), :class => "btn btn-primary", :title => "New Menu Item" %>
+<% end %>
 
-	</ul>
+<% content_for :detail do %>
+  <div class="table-responsive">
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>URL</th>
+          <th>&nbsp;</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @menu_items.each do |item| %>
+          <%= render :partial => 'menu_item_row', :locals => {:menu_item => item, :depth => 0} %>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 
 <script type="text/javascript">
-$(document).ready(function() { spud.admin.cms.menu_items.init();})
+  $(document).ready(function() { spud.admin.cms.menu_items.init();})
 </script>
-<%end%>
+
+<% end %>

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

@@ -1,12 +1,3 @@
-
-  
-
-  <%=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%>
-
- 
-
+<%= form_for @menu_item, :url => admin_menu_menu_items_path, :html => {:class=>"form-horizontal"} do |f| %>
+  <%= render :partial => "form",:locals => {:f => f} %>
+<% end %>

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

@@ -1,11 +1,15 @@
-<%=error_messages_for(f.object)%>
-<fieldset>
-<div class="control-group">
-	<%=f.label :name, :required=>true,:class => "control-label"%>
-	<div class="controls">
-	  <%=f.text_field :name,:title => "",:size=>40%>
-	</div>
+<%=tb_form_errors(f.object)%>
 
+<div class="form-group">
+  <%= f.label :name, nil, :class=>"col-sm-2 control-label" %>
+  <div class="col-sm-10">
+    <%= f.text_field :name, :class => "form-control" %>
+  </div>
 </div>
-</fieldset>
 
+<div class="form-group">
+  <div class="col-sm-offset-2 col-sm-10">
+    <%= f.submit "Save Menu", :class => "btn btn-primary" %>
+    <%= link_to "Cancel", admin_menus_path, :class => "btn btn-default" %>
+  </div>
+</div>

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

@@ -1,13 +1,3 @@
-
-  
-
-  <%=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",admin_menus_path,:class => "btn"%>
-    </div>
-
-  <%end%>
-
-
-
+<%=form_for @menu,:url => admin_menu_path(:id => @menu.id),:html=>{:class=>"form-horizontal"} do |f|%>
+  <%= render :partial => "form",:locals => {:f => f} %>
+<% end %>

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

@@ -1,21 +1,31 @@
 <% content_for :data_controls do%>
-	<%= link_to "New Menu",new_admin_menu_path(),:class => "btn btn-primary",:title => "New Menu" %>
+	<%= 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 'Items', admin_menu_menu_items_path(:menu_id => menu.id), :class => 'btn' %>
-						<%=link_to "Remove",admin_menu_path(:id => menu.id),:method => :delete,:class => 'btn btn-danger', :data => {: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%>
+<% content_for :detail do %>
+  <div class="table-responsive">
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th># Items</th>
+          <th>&nbsp;</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @menus.each do |menu| %>
+          <tr>
+            <td><%= menu.name %></td>
+            <td><%= menu.spud_menu_items.count %></td>
+            <td class="table-actions">
+              <%= link_to 'Items', admin_menu_menu_items_path(:menu_id => menu.id), :class => 'btn btn-default btn-sm' %>
+              <%= link_to 'Edit', edit_admin_menu_path(:id => menu.id), :class => 'btn btn-default btn-sm' %>
+              <%= link_to 'Delete', admin_menu_path(:id => menu.id), :method => :delete, :data => {:confirm => 'Are you sure?"'}, :class => 'btn btn-danger btn-sm' %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+  <%= will_paginate @menus, :renderer => BootstrapPagination::Rails %>
+<% end %>

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

@@ -1,7 +1,3 @@
-<%=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",admin_menus_path,:class => "btn"%>
-  </div>
-
-<%end%>
+<%= form_for @menu,:url => admin_menus_path,:html=>{:class=>"form-horizontal"} do |f| %>
+  <%= render :partial => "form",:locals => {:f => f} %>
+<% end %>

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

@@ -1,97 +1,97 @@
-<%=error_messages_for(f.object)%>
-<fieldset>
-  <div class="control-group">
-  <legend>Page Title</legend>
-    	<%=f.label :name, :required=>true,:style =>"display:none;", :class=>"control-label"%>
+<%= tb_form_errors(f.object) %>
 
-        <%=f.text_field :name, :class => "full-width"%>
+<h4>Page Title</h4>
 
+<div class="form-group">
+  <%= f.label :name, :required => true, :style =>"display:none;", :class=>"form-label" %>
+  <div class="col-lg-12">
+    <%= f.text_field :name, :class => "form-control" %>
   </div>
-</fieldset>
+</div>
+
+<h4>Page Content</h4>
+
 <div id="page_partials_form" class="formtabs tab-content">
 	<ul class="formtab_buttons nav nav-tabs">
 	</ul>
 	<%= f.fields_for :spud_page_partials do |b| %>
 		<div class="formtab tab-pane">
-			<%= b.hidden_field :name,:class => "tab_name" %>
-			<%= b.text_area :content,:class => "tinymce" %>
+			<%= b.hidden_field :name, :class => "tab_name" %>
+			<%= b.text_area :content, :class => "tinymce" %>
 		</div>
 	<% end %>
 </div>
-<br />
-<fieldset>
-  <legend>Advanced Settings (optional)</legend>
 
-    	<div class="control-group">
+<h4>Advanced Settings</h4>
 
-      	<%=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_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>
+<div class="form-group">
+  <%= f.label :layout, "Template", :class=>"col-lg-2 control-label"%>
+  <div class="col-lg-10">
+    <%= f.select :layout, options_for_select(layout_options,@page.layout),{},{:title => "", 'data-source' => page_parts_admin_pages_path(:page => @page.id), class: 'form-control' }%>
+    <span class="help-block">Use this to control the layout template to be used for this page if they are available.</span>
+  </div>
+</div>
 
-    <div class="control-group">
+<div class="form-group">
+  <%= f.label :spud_page_id, "Parent Page", :class=>"col-lg-2 control-label"%>
+  <div class="col-lg-10">
+    <%= 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 => "", :class=>'form-control' }%>
+  </div>
+</div>
 
-      <%=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,:site_id => session[:admin_site]),@page.spud_page_id),{:include_blank => 'None'},{:title => ""}%>
+<div class="form-group">
+  <%= f.label :url_name, "Perma Link",:disabled => true, :class=>"col-lg-2 control-label"%>
+  <div class="col-lg-10">
+    <%= root_url %>
+    <%= f.text_field :url_name, :title => "", :size=>20, :class=>'form-inline' %>
+  </div>
+  <div class="col-lg-10">
+    <%= f.check_box :use_custom_url_name, :onchange => "$('#spud_page_url_name').attr('disabled',!this.checked);" %>
+    <%= f.label :use_custom_url_name, 'Customize this pages url' %>
+  </div>
+</div>
 
-      </div>
-    </div>
-    <div class="control-group">
+<h4>Meta Information</h4>
+<p>These fields are used to notify search engines about important keywords and the appropriate description to display in a search result.</p>
 
-      <%=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>
+<div class="form-group">
+  <%= f.label :meta_keywords, "Keywords", :class=>"col-lg-2 control-label" %>
+  <div class="col-lg-10">
+    <%= f.text_field :meta_keywords, :class=>"form-control" %>
+    <span class="help-block">A Comma seperated list of keywords for search engines. Keep it short (no more than 10 keywords)</span>
+  </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>
+<div class="form-group">
+  <%= f.label :meta_description, "Description", :class=>"col-lg-2 control-label" %>
+  <div class="col-lg-10">
+    <%= f.text_area :meta_description, :class=>"form-control", :rows=>3 %>
+    <span class="help-block">A short description of the page. This is what appears on a search engines search result page.</span>
+  </div>
+</div>
+
+<div class="form-group">
+  <%= f.label :visibility, :class=>"col-lg-2 control-label" %>
+  <div class="col-lg-10">
+   <%= f.select(:visibility, [["Public",0],["Private",1]], {}, {class: 'form-control'})%>
+  </div>
+</div>
 
-    <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>
+<div class="form-group">
+  <%= f.label :published, "Published", class: "col-lg-2 control-label" %>
+  <div class="col-lg-10">
+    <%= f.check_box :published %>
+  </div>
+</div>
 
-    </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>
-  <%= hidden_field_tag "preview", 0 %>
-</fieldset>
+<div class="form-group">
+  <%= f.label :notes, "Notes", class: "col-lg-2 control-label" %>
+  <div class="col-lg-10">
+    <%= f.text_area :notes, :class=>"form-control", :rows=>2 %>
+    <span class="help-block">Have a note to make about this page while you work? Place it here for later.</span>
+  </div>
+</div>
+<%= hidden_field_tag "preview", 0 %>
 
 <script type="text/javascript">
   $(document).ready(spud.admin.cms.pages.edit);

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

@@ -1,18 +1,15 @@
-<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 btn-mini'%>
-		<%=link_to "Remove",admin_page_path(:id => page.id),:method => :delete,:class => 'btn btn-mini btn-danger', :data =>{:confirm => "Are you sure you want to remove this page?"} %>
-	</span>
-	<br style="clear:both;"/>
-</div>
-
-<% if !page.spud_pages.load.blank? %>
-	<div class="left_guide">
-		<% page.spud_pages.each do |spud_page| %>
-			<%= render :partial => 'page_row', :locals => {:page => spud_page} %>
-		<%end%>
-	</div>
+<tr>
+  <td>
+    <%= table_nesting_indicator(depth) %>
+  	<%= page.name %>
+  </td>
+  <td><%= link_to page_path(page.url_name), page_path(page.url_name) %></td>
+  <td class="table-actions">
+    <%= link_to 'View', page_path(page.url_name), :class => 'btn btn-default btn-sm' %>
+    <%= link_to 'Edit', edit_admin_page_path(page), :class => 'btn btn-default btn-sm' %>
+    <%= link_to 'Delete', admin_page_path(page), :method => :delete, :data => {:confirm => 'Are you sure?"'}, :class => 'btn btn-danger btn-sm' %>
+  </td>
+</tr>
+<% page.spud_pages.each do |page| %>
+	<%= render :partial => 'page_row', :locals => {:depth => depth+1, :page => page} %>
 <% end %>

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

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

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

@@ -1,13 +1,22 @@
-<%=content_for :data_controls do%>
-<%=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 :data_controls do%>
+  <%=link_to "New Page",new_admin_page_path(),:class => "btn btn-primary",:title => "New Page"%>&nbsp;
+<% end %>
 
-<%=content_for :detail do%>
-	<div class="page_list">
-			<%@pages.each do |page|%>
-				<%=render :partial => "page_row",:locals => {:page => page}%>
-			<%end%>
-			<%=will_paginate @pages%>
-	</div>
-
-<%end%>
+<%= content_for :detail do %>
+  <div class="table-responsive">
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>URL</th>
+          <th>&nbsp;</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @pages.each do |page| %>
+          <%= render :partial => 'page_row', :locals => {:depth => 0, :page => page} %>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>

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

@@ -1,7 +1,9 @@
-<%=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",admin_pages_path,:class => "btn"%>
+<%= form_for @page,:url => admin_pages_path(), :html => {:class => "form-horizontal page_form"} do |f| %>
+  <%= render :partial => "form",:locals => {:f => f} %>
+  <div class="row">
+    <div class="col-lg-10 col-offset-2">
+      <%= f.submit "Create Page", :class => "btn btn-primary form-btn btn-save", "data-loading-text" => "Saving..." %>
+      <%= f.submit "Preview", :class => "btn btn-primary btn-preview" %> or <%=link_to "cancel", admin_pages_path,:class => "btn btn-link" %>
     </div>
-
-<%end%>
+  </div>
+<% end %>

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

@@ -3,11 +3,11 @@
 	<meta name="description" content="<%=@page.meta_description%>" />
 
 	  <meta name="keywords" content="<%=@page.meta_keywords%>" />
-<%end%>
+<% end %>
 
 <%if !@inline.blank?%>
 	<%=render :inline => @inline%>
-<%end%>
+<% end %>
 <%@page.spud_page_partials.each do |page_partial|%>
 
 	<%if(page_partial.name.downcase == 'body' && Spud::Cms.yield_body_as_content_block == false)%>
@@ -15,6 +15,6 @@
 	<%else%>
 		<%=content_for page_partial.name.parameterize.underscore.to_sym do%>
 			<%=page_partial.postprocess_content.html_safe%>
-		<%end%>
-	<%end%>
-<%end%>
+		<% end %>
+	<% end %>
+<% end %>

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

@@ -1,8 +1,16 @@
-<fieldset>
-  <%= f.label :name, :required=>true,:style =>"display:none;" %>
-  <%= f.text_field :name, :class => "full-width",:placeholder=>"Enter title here" %>
-</fieldset>
-<br/>
-<div>
+<%= tb_form_errors(f.object)%>
+
+<div class="form-group">
+  <%= f.label :name, :required => true, :class => "control-label" %>
+  <%= f.text_field :name, :title => "", :class=>"form-control" %>
+</div>
+
+<div class="form-group">
+  <%= f.label :content, :required => true, :class => "control-label" %>
   <%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width' %>
 </div>
+
+<div class="form-group">
+  <%= f.submit "Save Snippet", :class => "btn btn-primary" %>
+  <%= link_to "Cancel", admin_snippets_path, :class => "btn btn-default" %>
+</div>

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

@@ -1,7 +1,3 @@
-<%=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%>
+<%= form_for @snippet, :url => admin_snippet_path(@snippet) do |f| %>
+  <%= render :partial => "form", :locals => {:f => f} %>
+<% end %>

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

@@ -1,24 +1,27 @@
-<%=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', :data => {:confirm => "Are you sure you want to remove this snippet?"} %>
-          </span>
-          <br style="clear:both;"/>
-        </div>
-      <%end%>
-      <%=will_paginate @snippets%>
+<% 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="table-responsive">
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>&nbsp;</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @snippets.each do |snippet| %>
+          <tr>
+            <td><%= snippet.name %></td>
+            <td class="table-actions">
+              <%= link_to 'Edit', edit_admin_snippet_path(snippet), :class => 'btn btn-sm btn-default' %>
+              <%= link_to 'delete', admin_snippet_path(snippet), :method => :delete, :class => 'btn btn-sm btn-danger', :data => {:confirm => 'Are you sure you want to delete this snippet?'} %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
-
-
-
-<%end%>
+<% end %>

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

@@ -1,7 +1,3 @@
-<%=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",admin_snippets_path,:class => "btn"%>
-  </div>
-
-<%end%>
+<%= form_for @snippet, :url => admin_snippets_path do |f| %>
+  <%= render :partial => "form",:locals => {:f => f} %>
+<% end %>

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.1.5"
+		VERSION = "1.2.0.beta1"
 	end
 end

data/spec/controllers/cms/sitemaps_controller_spec.rb

@@ -16,9 +16,8 @@ describe Cms::SitemapsController do
     end
 
     it "should only respond to an XML format" do
-      expect {
-        get :show
-      }.to raise_exception(ActionController::UnknownFormat)
+      get :show, :format => :html
+      response.response_code.should == 404
     end
 
     describe :multisite do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0.beta1
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.0.beta1
 - !ruby/object:Gem::Dependency
   name: tb_permalinks
   requirement: !ruby/object:Gem::Requirement
@@ -363,9 +363,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.1