tenon 1.0.74 → 1.0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6981cddef12c4929c2dbb9f0b7fc8b08653f708
-  data.tar.gz: f30872e33b82e606756b891c607ca1ea0790074e
+  metadata.gz: 5fd4a384937ea49830fea08eebe3b700e7144f78
+  data.tar.gz: 8217584c00c96aed38263bcabc48780c84d46149
 SHA512:
-  metadata.gz: 507f0524577a8a6926b06a264c0d9fe14a87244519d7bcac0ef64cd7ce351177fa63a1f2f11a1713cd4c02ebd6591cf11aa838fcda4f24d683eefcd8694c4526
-  data.tar.gz: e9c61aa6b4ae173f2b881d84f42c758cfd3f9dcb3fbc66f02734d41880c926ec076d119ad60768bc455991d93a5e091e64683495e9e06cfae7ba4045143e72f4
+  metadata.gz: 2349301eb6a82537e49ea3b748c13e1ac171982c96df098747f598454fca0125fff80684b09c8fa03d73e6d9b66ed3ed3b5a30c3f0a4822d1a257f573bc73034
+  data.tar.gz: 1670a56532c4e3defe57cf62c5561f1201a16e61548ff545886c2b2d239ca874f7c6395e97401ff51538118385d71c34d92289c6e2facf8c73e23ad60d5638cf

data/app/assets/javascripts/tenon/features/cocoon_hooks.js.coffee

@@ -5,7 +5,8 @@ class Tenon.features.CocoonHooks
   afterInsert: (e, insertedItem) =>
     @$insertedItem = $(insertedItem)
     @_checkTenonContent()
+    $('select').select2()
 
   _checkTenonContent: ->
     if @$insertedItem.find('.tn-tc')
-      new Tenon.features.tenonContent.Base
+      new Tenon.features.tenonContent.Base

data/app/controllers/tenon/index_controller.rb

@@ -1,7 +1,7 @@
 module Tenon
   class IndexController < Tenon::BaseController
     def index
-      @warnings = Tenon::WarningGenerator.generate
+      @warnings = Tenon::WarningGenerator.generate(root_path)
       @tenon_callouts = Tenon::TenonCallout.published
     end
   end

data/app/models/tenon/gallery.rb

@@ -1,7 +1,7 @@
 module Tenon
   class Gallery < ActiveRecord::Base
     include Tenon::Reorderable
-    has_many :photos, inverse_of: :gallery
+    has_many :photos, inverse_of: :gallery, dependent: :destroy
     accepts_nested_attributes_for :photos, allow_destroy: true, reject_if: ->(p) { p[:file_id].blank? }
     validates_presence_of :title
     validates_uniqueness_of :title

data/app/views/devise/passwords/edit.html.haml

@@ -8,11 +8,11 @@
 
   .row.bordered
     = f.label :password, class: "font"
-    = f.password_field :password, placeholder: '°°°°°°°°'
+    = f.password_field :password, placeholder: '--'
 
   .row.bordered
     = f.label :password_confirmation, class: "font"
-    = f.password_field :password_confirmation, placeholder: '°°°°°°°°'
+    = f.password_field :password_confirmation, placeholder: '--'
 
   .row.bordered
     = f.submit "Change my password", class: 'btn btn-info'

data/app/views/tenon/assets/crop.html.haml

@@ -14,4 +14,4 @@
       .crop_buttons.right.full
         = f.check_box :duplicate, checked: true, class: 'tn-checkbox-right'
         = f.label :duplicate, "Create New Asset From Crop?", class: 'left'
-        .right= f.submit "Save", class: 'save btn btn-comp'
+        .right= f.submit "Save", class: 'save btn btn-comp', data: { disable_with: "Please wait..." }

data/app/views/tenon/assets/edit.html.haml

@@ -9,4 +9,4 @@
       .spacer
 
   .modal-footer
-    = f.submit "Save", class: 'btn btn-comp'
+    = f.submit "Save", class: 'btn btn-comp', data: { disable_with: "Please wait..." }

data/app/views/tenon/events/_form.html.haml

@@ -30,7 +30,7 @@
 
       .row.content
         - if can?(:publish, @event)
-          %button.btn.btn-comp.btn-block.submit Save
+          %button.btn.btn-comp.btn-block.submit{ data: { disable_with: "Please wait..." } } Save
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@event)
           .last-autosave

data/app/views/tenon/galleries/_form.html.haml

@@ -24,7 +24,7 @@
     .box
       .content
         - if can?(:publish, @gallery)
-          = f.submit 'Save', class: 'btn btn-block btn-comp'
+          = f.submit 'Save', class: 'btn btn-block btn-comp', data: { disable_with: "Please wait..." }
 
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@gallery)

data/app/views/tenon/pages/_form.html.haml

@@ -44,7 +44,7 @@
 
       .row.content
         - if can?(:publish, @page)
-          %button.btn.btn-comp.btn-block.submit Save
+          %button.btn.btn-comp.btn-block.submit{ data: { disable_with: "Please wait..." } } Save
 
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@page)

data/app/views/tenon/post_categories/_form.html.haml

@@ -8,4 +8,4 @@
       .spacer
 
   .modal-footer
-    = f.submit "Save", class: 'btn btn-comp'
+    = f.submit "Save", class: 'btn btn-comp', data: { disable_with: "Please wait..." }

data/app/views/tenon/posts/_form.html.haml

@@ -54,7 +54,7 @@
 
       .row.content
         - if can?(:publish, @post)
-          %button.btn.btn-comp.btn-block.submit Save
+          %button.btn.btn-comp.btn-block.submit{ data: { disable_with: "Please wait..." } } Save
 
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@post)

data/app/views/tenon/redirects/_form.html.haml

@@ -28,7 +28,7 @@
     .box
       .content
         - if can?(:publish, @redirect)
-          %button.btn.btn-block.btn-comp Save
+          %button.btn.btn-block.btn-comp{ data: { disable_with: "Please wait..." } } Save
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@redirect)
           .last-autosave

data/app/views/tenon/settings/show.html.haml

@@ -27,5 +27,5 @@
       %h4.box-label Actions
       .box
         .content
-          %button.btn.btn-primary.btn-block.submit Save
+          %button.btn.btn-primary.btn-block.submit{ data: { disable_with: "Please wait..." } } Save
 

data/app/views/tenon/tenon_callouts/_form.html.haml

@@ -35,8 +35,7 @@
         = f.super_label :published
 
       .content
-        %button.btn.btn-comp.submit.btn-block{:href => 'javascript:;'} Save
-
+        %button.btn.btn-comp.submit.btn-block{:href => 'javascript:;', data: { disable_with: "Please wait..." } } Save
 
       - if @tenon_callout.persisted?
         %hr

data/app/views/tenon/users/_form.html.haml

@@ -42,7 +42,7 @@
         = f.super_label :approved, "Approved?"
 
       .content
-        = f.submit "Save", :class => 'btn btn-block btn-comp'
+        = f.submit "Save", :class => 'btn btn-block btn-comp', data: { disable_with: "Please wait..." }
 
       - if @user.persisted?
         %hr

data/db/migrate/20150928230951_remove_unique_key_from_tenon_pages.rb

@@ -0,0 +1,5 @@
+class RemoveUniqueKeyFromTenonPages < ActiveRecord::Migration
+  def change
+    remove_column :tenon_pages, :unique_key, :string
+  end
+end

data/lib/generators/tenon/scaffold/templates/view__form.html.haml

@@ -66,7 +66,7 @@
 <% end -%>
       .content
         - if can?(:publish, @<%= singular_name %>)
-          %button.btn.btn-block.btn-comp Save
+          %button.btn.btn-block.btn-comp{ data: { disable_with: "Please wait..." } } Save
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@<%= singular_name %>)
           .last-autosave

data/lib/generators/tenon/scaffold_small/templates/view__form.html.haml

@@ -23,4 +23,4 @@
       .spacer
 
   .modal-footer
-    = f.submit "Save", class: 'btn btn-comp'
+    = f.submit "Save", class: 'btn btn-comp', data: { disable_with: "Please wait..." }

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.74'
+  VERSION = '1.0.75'
 end

data/lib/tenon/warning_generator.rb

@@ -1,16 +1,16 @@
 module Tenon
   class WarningGenerator
-    def self.generate
-      new.warnings
+    def self.generate(root_path)
+      new.warnings(root_path)
     end
 
-    def warnings
+    def warnings(root_path)
       warnings = []
-      warnings << "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>".html_safe if Tenon::MySettings.site_title.blank?
-      warnings << "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>".html_safe if Tenon::MySettings.site_url.blank?
-      warnings << "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>".html_safe  if Tenon::MySettings.contact_email.blank?
-      warnings << "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>".html_safe  if Tenon::MySettings.from_email.blank?
-      warnings << "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>".html_safe if Tenon::MySettings.google_analytics.blank?
+      warnings << "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>OK</a>".html_safe if Tenon::MySettings.site_title.blank?
+      warnings << "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>OK</a>".html_safe if Tenon::MySettings.site_url.blank?
+      warnings << "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>".html_safe  if Tenon::MySettings.contact_email.blank?
+      warnings << "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>".html_safe  if Tenon::MySettings.from_email.blank?
+      warnings << "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>".html_safe if Tenon::MySettings.google_analytics.blank?
       warnings << 'You have not included a custom favicon.' unless favicon && favicon.size > 0
       warnings
     end

data/spec/lib/tenon/warning_generator_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Tenon::WarningGenerator do
   let(:settings) { double.as_null_object }
   let(:wg) { Tenon::WarningGenerator.new }
+  root_path = '/tenon/'
   before do
     stub_const('Tenon::MySettings', settings)
   end
@@ -13,8 +14,8 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no site title' do
-      warning = "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>"
-      expect(wg.warnings).to include(warning)
+      warning = "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>OK</a>"
+      expect(wg.warnings(root_path)).to include(warning)
     end
   end
 
@@ -23,9 +24,9 @@ describe Tenon::WarningGenerator do
       settings.stub(:site_title) { 'test' }
     end
 
-    it 'should include a warning about no site title' do
-      warning = "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>"
-      expect(wg.warnings).not_to include(warning)
+    it 'should not include a warning about no site title' do
+      warning = "Your site needs a title.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>OK</a>"
+      expect(wg.warnings(root_path)).not_to include(warning)
     end
   end
 
@@ -34,9 +35,9 @@ describe Tenon::WarningGenerator do
       settings.stub(:site_url) { nil }
     end
 
-    it 'should not include a warning about no site domain' do
-      warning = "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>"
-      expect(wg.warnings).to include(warning)
+    it 'should include a warning about no site domain' do
+      warning = "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>OK</a>"
+      expect(wg.warnings(root_path)).to include(warning)
     end
   end
 
@@ -46,8 +47,8 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should not include a warning about no site title' do
-      warning = "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>OK</a>"
-      expect(wg.warnings).not_to include(warning)
+      warning = "Your site needs an address.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>OK</a>"
+      expect(wg.warnings(root_path)).not_to include(warning)
     end
   end
 
@@ -57,8 +58,8 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no contact email' do
-      warning = "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
-      expect(wg.warnings).to include(warning)
+      warning = "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>"
+      expect(wg.warnings(root_path)).to include(warning)
     end
   end
 
@@ -68,8 +69,8 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no contact email' do
-      warning = "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
-      expect(wg.warnings).not_to include(warning)
+      warning = "You haven't entered an email address to receive contact messages.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>"
+      expect(wg.warnings(root_path)).not_to include(warning)
     end
   end
 
@@ -79,8 +80,8 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no from email' do
-      warning = "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
-      expect(wg.warnings).to include(warning)
+      warning = "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>"
+      expect(wg.warnings(root_path)).to include(warning)
     end
   end
 
@@ -89,9 +90,9 @@ describe Tenon::WarningGenerator do
       settings.stub(:from_email) { 'test' }
     end
 
-    it 'should include a warning about no from email' do
-      warning = "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
-      expect(wg.warnings).not_to include(warning)
+    it 'should not include a warning about no from email' do
+      warning = "You haven't entered an email address from which to send contact messages and other site notices.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>"
+      expect(wg.warnings(root_path)).not_to include(warning)
     end
   end
 
@@ -101,8 +102,8 @@ describe Tenon::WarningGenerator do
     end
 
     it 'should include a warning about no Google Analytics' do
-      warning = "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
-      expect(wg.warnings).to include(warning)
+      warning = "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>"
+      expect(wg.warnings(root_path)).to include(warning)
     end
   end
 
@@ -111,9 +112,9 @@ describe Tenon::WarningGenerator do
       settings.stub(:google_analytics) { 'test' }
     end
 
-    it 'should include a warning about no Google Analytics' do
-      warning = "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='/tenon/settings'>Correct This</a>"
-      expect(wg.warnings).not_to include(warning)
+    it 'should not include a warning about no Google Analytics' do
+      warning = "You haven't entered the Google Analytics code.<br /><br /><a class='btn btn-comp btn-block' href='#{root_path}settings'>Correct This</a>"
+      expect(wg.warnings(root_path)).not_to include(warning)
     end
   end
 
@@ -124,7 +125,7 @@ describe Tenon::WarningGenerator do
 
     it 'should include a warning about no favicon' do
       warning = 'You have not included a custom favicon.'
-      expect(wg.warnings).to include(warning)
+      expect(wg.warnings(root_path)).to include(warning)
     end
   end
 
@@ -135,7 +136,7 @@ describe Tenon::WarningGenerator do
 
     it 'should include a warning about no favicon' do
       warning = 'You have not included a custom favicon.'
-      expect(wg.warnings).to include(warning)
+      expect(wg.warnings(root_path)).to include(warning)
     end
   end
 
@@ -146,7 +147,7 @@ describe Tenon::WarningGenerator do
 
     it 'should not include a warning about no favicon' do
       warning = 'You have not included a custom favicon.'
-      expect(wg.warnings).not_to include(warning)
+      expect(wg.warnings(root_path)).not_to include(warning)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.74
+  version: 1.0.75
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -1335,6 +1335,7 @@ files:
 - db/migrate/20141115154243_remove_unused_tenon_photo_columns.rb
 - db/migrate/20141117202434_remove_dispatches_and_delayed_jobs.rb
 - db/migrate/20150318162013_remove_taggings.rb
+- db/migrate/20150928230951_remove_unique_key_from_tenon_pages.rb
 - db/seeds.rb
 - lib/generators/tenon/i18n_migrations/i18n_migrations_generator.rb
 - lib/generators/tenon/i18n_migrations/templates/migration.rb
@@ -1507,7 +1508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.