tb_cms 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb4c30b7c4e397f11e7a61298f72afc3ca7cc037
-  data.tar.gz: 1d8bb49c58f150e2dcd4974a41069fea937ec51f
+  metadata.gz: ca05ee4d7457942e5e0e8888ac4cd735ed6f12a2
+  data.tar.gz: c424ef034dde75480e71b01ba42fb29f4a58983f
 SHA512:
-  metadata.gz: 65e1663eaceeb04f7a82f785e84efa71cc5e0f0246c73d114ef6a19c4ca21f710dfd7e5d53ab4474945447ef6dd1877b8c9ef401807c45b91bab0a5e293588f6
-  data.tar.gz: 53ac03e900dd63e3a50e67fef342cb7e0012a0b3c6a652f80c42c2c8e900f9b978eece9e3d48f7f2c170519d565a603d210a3012508d8690c25a46034e343a42
+  metadata.gz: f01e9b141e79e53d697d2c6f17b5738c092bf485aa994ae8a931be992da0088ec1774c671f59373aace6aba6621ef23fb0750a9d3253db40bd3dbab575e81e96
+  data.tar.gz: c51608c5dc6b307dc9075c7ed6f8980832aecef2ee99d511a560c3f94c4d4da17399d9e352f4201e8f01f8982767b3c8edae18b49147f7547991a751606e0252

data/app/controllers/admin/pages_controller.rb

@@ -157,7 +157,7 @@ private
 
   def page_params
     params.require(:spud_page).permit(:name, :url_name, :created_by, :updated_by, :layout, :visibility, :spud_page_id,
-      :publish_at, :format, :meta_description, :meta_keywords, :page_order, :spud_page_partials_attributes, :use_custom_url_name,
+      :publish_at, :format, :meta_description, :meta_keywords, :page_order, :spud_page_partials_attributes, :use_custom_url_name, :page_title,
       :published, :notes, :spud_page_partials_attributes => [:id, :name, :content, :format, :_destroy])
   end
 

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

@@ -1,6 +1,6 @@
 <%= tb_form_errors(f.object) %>
 
-<h4>Page Title</h4>
+<h4>Page Name</h4>
 
 <div class="form-group">
   <%= f.label :name, :required => true, :style =>"display:none;", :class=>"form-label" %>
@@ -53,6 +53,13 @@
 
 <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>
+<div class="form-group">
+  <%= f.label :page_title, "Page Title", :class=>"col-lg-2 control-label" %>
+  <div class="col-lg-10">
+    <%= f.text_field :page_title, :class=>"form-control" %>
+    <span class="help-block">The page title is the most important SEO ranking factor. <a href="https://moz.com/learn/seo/title-tag" target="_blank">Learn more</a> </span>
+  </div>
+</div>
 
 <div class="form-group">
   <%= f.label :meta_keywords, "Keywords", :class=>"col-lg-2 control-label" %>

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

@@ -4,7 +4,7 @@
 		  <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" %>
+	    	<%= link_to "Cancel", admin_pages_path, :class => "btn btn-default" %>
     	</div>
     </div>
 <% end %>

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

@@ -3,7 +3,7 @@
   <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" %>
+      <%= f.submit "Preview", :class => "btn btn-primary btn-preview" %> or <%=link_to "Cancel", admin_pages_path,:class => "btn btn-default" %>
     </div>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% @page_title = @page.name %>
+<% @page_title = (@page.page_title)? @page.page_title : @page.name %>
 
 <%= content_for :head do %>
 	<% cache([@page, 'head']) do %>

data/db/migrate/20150622161403_add_title_tag_to_spud_page.rb

@@ -0,0 +1,5 @@
+class AddTitleTagToSpudPage < ActiveRecord::Migration
+  def change
+    add_column :spud_pages, :page_title, :string
+  end
+end

data/lib/spud_cms/configuration.rb

@@ -4,7 +4,7 @@ module Spud
 
     config_accessor :menus_enabled,:root_page_name,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:multisite_config,:max_revisions,:template_404, :cache_mode, :snippets_enabled
     self.menus_enabled = true
-    self.snippets_enabled = true
+    self.snippets_enabled = false
     self.root_page_name = "home"
     self.default_page_layout = 'application'
   	self.yield_body_as_content_block = false

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.2.1"
+		VERSION = "1.2.2"
 	end
 end

data/spec/dummy/db/migrate/20150911185843_add_requires_password_change_to_spud_users.tb_core.rb

@@ -0,0 +1,6 @@
+# This migration comes from tb_core (originally 20150610143438)
+class AddRequiresPasswordChangeToSpudUsers < ActiveRecord::Migration
+  def change
+    add_column :spud_users, :requires_password_change, :boolean, :default => false
+  end
+end

data/spec/dummy/db/migrate/20150911185844_add_title_tag_to_spud_page.tb_cms.rb

@@ -0,0 +1,6 @@
+# This migration comes from tb_cms (originally 20150622161403)
+class AddTitleTagToSpudPage < ActiveRecord::Migration
+  def change
+    add_column :spud_pages, :page_title, :string
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150108164814) do
+ActiveRecord::Schema.define(version: 20150911185844) do
 
   create_table "spud_liquid_tags", force: :cascade do |t|
     t.integer  "attachment_id",   limit: 4
@@ -91,6 +91,7 @@ ActiveRecord::Schema.define(version: 20150108164814) do
     t.boolean  "use_custom_url_name", limit: 1,     default: false
     t.text     "notes",               limit: 65535
     t.string   "layout",              limit: 255
+    t.string   "page_title",          limit: 255
   end
 
   create_table "spud_permalinks", force: :cascade do |t|
@@ -150,27 +151,28 @@ ActiveRecord::Schema.define(version: 20150108164814) do
   end
 
   create_table "spud_users", force: :cascade do |t|
-    t.string   "first_name",          limit: 255
-    t.string   "last_name",           limit: 255
-    t.boolean  "super_admin",         limit: 1
-    t.string   "login",               limit: 255,             null: false
-    t.string   "email",               limit: 255,             null: false
-    t.string   "crypted_password",    limit: 255,             null: false
-    t.string   "password_salt",       limit: 255,             null: false
-    t.string   "persistence_token",   limit: 255,             null: false
-    t.string   "single_access_token", limit: 255,             null: false
-    t.string   "perishable_token",    limit: 255,             null: false
-    t.integer  "login_count",         limit: 4,   default: 0, null: false
-    t.integer  "failed_login_count",  limit: 4,   default: 0, null: false
+    t.string   "first_name",               limit: 255
+    t.string   "last_name",                limit: 255
+    t.boolean  "super_admin",              limit: 1
+    t.string   "login",                    limit: 255,                 null: false
+    t.string   "email",                    limit: 255,                 null: false
+    t.string   "crypted_password",         limit: 255,                 null: false
+    t.string   "password_salt",            limit: 255,                 null: false
+    t.string   "persistence_token",        limit: 255,                 null: false
+    t.string   "single_access_token",      limit: 255,                 null: false
+    t.string   "perishable_token",         limit: 255,                 null: false
+    t.integer  "login_count",              limit: 4,   default: 0,     null: false
+    t.integer  "failed_login_count",       limit: 4,   default: 0,     null: false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
-    t.string   "current_login_ip",    limit: 255
-    t.string   "last_login_ip",       limit: 255
+    t.string   "current_login_ip",         limit: 255
+    t.string   "last_login_ip",            limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "time_zone",           limit: 255
-    t.integer  "spud_role_id",        limit: 4
+    t.string   "time_zone",                limit: 255
+    t.integer  "spud_role_id",             limit: 4
+    t.boolean  "requires_password_change", limit: 1,   default: false
   end
 
   add_index "spud_users", ["email"], name: "index_spud_users_on_email", using: :btree

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tb_core
@@ -217,6 +217,7 @@ files:
 - db/migrate/20121119030136_change_liquid_tags_to_polymorphic.rb
 - db/migrate/20140110142037_drop_spud_page_liquid_tags.rb
 - db/migrate/20150108162839_remove_site_id_from_cms_tables.rb
+- db/migrate/20150622161403_add_title_tag_to_spud_page.rb
 - lib/generators/spud/cms/layout_generator.rb
 - lib/generators/spud/cms/templates/layout.html.erb
 - lib/generators/spud/cms/templates/layout_actions.rb
@@ -296,6 +297,8 @@ files:
 - spec/dummy/db/migrate/20141231214480_change_liquid_tags_to_polymorphic.tb_cms.rb
 - spec/dummy/db/migrate/20141231214481_drop_spud_page_liquid_tags.tb_cms.rb
 - spec/dummy/db/migrate/20150108164814_remove_site_id_from_cms_tables.tb_cms.rb
+- spec/dummy/db/migrate/20150911185843_add_requires_password_change_to_spud_users.tb_core.rb
+- spec/dummy/db/migrate/20150911185844_add_title_tag_to_spud_page.tb_cms.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -329,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Twice Baked CMS
@@ -399,6 +402,8 @@ test_files:
 - spec/dummy/db/migrate/20141231214480_change_liquid_tags_to_polymorphic.tb_cms.rb
 - spec/dummy/db/migrate/20141231214481_drop_spud_page_liquid_tags.tb_cms.rb
 - spec/dummy/db/migrate/20150108164814_remove_site_id_from_cms_tables.tb_cms.rb
+- spec/dummy/db/migrate/20150911185843_add_requires_password_change_to_spud_users.tb_core.rb
+- spec/dummy/db/migrate/20150911185844_add_title_tag_to_spud_page.tb_cms.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html