tenon 1.0.67 → 1.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83c7e86103a80528486fef7dc264e16e465048f
-  data.tar.gz: 637ffc3abfd7f5bda03ebc603d84aeb925fe8718
+  metadata.gz: 3bcdeacf12a76cb1e60d096b7bd141c7cf44d985
+  data.tar.gz: d58719f677142abd25adc5b0b24ff2875726a97f
 SHA512:
-  metadata.gz: 540fa189161e7248d7cd6648ea5d043a943f5d3fc513ba19dd9f783fa9b0ea09ec252427dc7917a7614688981e93d898a3b8b40912d8807cdf191cc0c0ed4b8f
-  data.tar.gz: 05043c0ca2eea462525c122ddde922873b8cd5bf96ee78eebd6730bfce6b97c26816de78e7e8b9fcc89ef31e4fe5a3616a35d7499704e9f1923229d393bf718a
+  metadata.gz: ade7f0c577456bd46361a87252c17afa87e4ba8252d48a80eb35116abd99a5231ca07c194ed02850f13b3693e530aff93336af548abcf6783c21789d64ed715f
+  data.tar.gz: dda1e868b51926fce0bf10f498e7ecd93d6812ec9f2c662005f0a29cc497fa274fc7700d96173111b9832a9e4fd0bd3e6f48b73c00aa28406cd263338cd2befb

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

@@ -34,4 +34,4 @@ class Tenon.features.AssetAttachment
     if @$browseButton.data('asset-field')
       $(@$browseButton.data('asset-field'))
     else
-      @$browseButton.closest('.asset-field')
+      @$browseButton.closest('.tn-tc-asset-field')

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

@@ -5,7 +5,7 @@ class Tenon.features.AssetDetachment
   _removeAsset: (e) =>
     e.preventDefault()
     e.stopPropagation()
-    @$assetField = $(e.currentTarget).closest('.asset-field')
+    @$assetField = $(e.currentTarget).closest('.tn-tc-asset-field')
     @$assetField.find('.asset-id-field').removeAttr('value')
     @$assetField.find('.thumbnail img').attr('src', '/assets/tenon/thumb-doc.png')
     @$assetField.find('.asset-info').html('No asset selected.')

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

@@ -5,4 +5,4 @@ class Tenon.features.MultipleAssetAttachment extends Tenon.features.AssetAttachm
 
   _addAssociation: ->
     $('.add_fields').click()
-    @$assetField = $('.nested-fields .asset-field:last')
+    @$assetField = $('.nested-fields .tn-tc-asset-field:last')

data/app/assets/javascripts/tenon/features/tenon_content/aesthetics.js.coffee

@@ -4,7 +4,7 @@ class Tenon.features.tenonContent.Aesthetics
     @$container.imagesLoaded(@_applyAesthetics)
     $(window).on('resize', @_applyAesthetics)
     $(document).on('cocoon:after-insert', '.tenon-content', @_applyAesthetics)
-    @$container.on('tenon.asset_attached', '.asset-field', @_applyAesthetics)
+    @$container.on('tenon.asset_attached', '.tn-tc-asset-field', @_applyAesthetics)
     @$container.on('tenon.content.column_resized', 'div', @_applyAesthetics)
     @$wrap.on('tenon.content.popped', @_applyAesthetics)
     @$wrap.on('tenon.content.resized', @_applyAesthetics)
@@ -18,7 +18,7 @@ class Tenon.features.tenonContent.Aesthetics
       @_setMinimumWrappedEditorHeight()
 
   _setMinimumEditorHeightWithImage: =>
-    $.each @$container.find('.image-and-text, .multi-text'), (i, row) ->
+    $.each @$container.find('.tn-tc-image-and-text, .tn-tc-multi-text'), (i, row) ->
       $images = $(row).find('.image, .editable-text')
       $images.css('min-height', '0px')
       heights = $.map($images, (img, i) -> $(img).outerHeight())
@@ -26,6 +26,6 @@ class Tenon.features.tenonContent.Aesthetics
       $(row).find('.editable-text').css('min-height', height)
 
   _setMinimumWrappedEditorHeight: =>
-    $.each @$container.find('.wrapped-image-with-text'), (i, row) ->
+    $.each @$container.find('.tn-tc-wrapped-image-with-text'), (i, row) ->
       height = $(row).find('.image').height();
       $(row).find('.editable-text').css('min-height', height + 20)

data/app/assets/javascripts/tenon/features/tenon_content/column_swap.js.coffee

@@ -13,7 +13,7 @@ class Tenon.features.tenonContent.ColumnSwap
   _swapWrapped: (e) =>
     e.preventDefault()
     @$row = @_getRow(e)
-    @$row.find('.asset-field').toggleClass('left').toggleClass('right')
+    @$row.find('.tn-tc-asset-field').toggleClass('left').toggleClass('right')
     @_saveRowType()
 
   _swapDOM: =>

data/app/assets/javascripts/tenon/features/tenon_content/image_controls.js.coffee

@@ -40,10 +40,10 @@ class Tenon.features.tenonContent.ImageControls
     # Add some data for use in operations
     @$controls.data('image', @$image)
     @$controls.find('.replace-image')
-      .data('asset-field', @$image.closest('.asset-field'))
+      .data('asset-field', @$image.closest('.tn-tc-asset-field'))
 
     # Add some classes for targeting and styling
-    if @$image.closest('.wrapped-image-with-text').length > 0
+    if @$image.closest('.tn-tc-wrapped-image-with-text').length > 0
       @$controls.addClass('wrapped-image', true)
     else if @$image.closest('.full-width-image').length > 0
       @$controls.addClass('full-width-image')

data/app/assets/javascripts/tenon/features/tenon_content/post_crop_handler.js.coffee

@@ -14,7 +14,7 @@ class Tenon.features.tenonContent.PostCropHandler
     # let's kick it OLD SCHOOL
     img = new Image()
     img.onload = =>
-      @$piece.closest('.asset-field').trigger('tenon.asset_attached')
+      @$piece.closest('.tn-tc-asset-field').trigger('tenon.asset_attached')
     img.src = $img.attr('src')
 
   _updateFields: =>

data/app/assets/stylesheets/tenon/ui/asset-attachment.css.scss

@@ -1,4 +1,4 @@
-.asset-field {
+.tn-tc-asset-field {
   position: relative;
 
   .thumbnail {
@@ -124,7 +124,7 @@
     display: none;
   }
 
-  .asset-field {
+  .tn-tc-asset-field {
     margin-bottom: 10px;
   }
 }

data/app/assets/stylesheets/tenon/ui/asset-cropping.css.scss

@@ -1,50 +1,41 @@
 .asset-cropping {
-
   .preview {
     @include transform(translate(-50%, 0));
     position: fixed;
+    z-index: $tn-z-asset-cropping;
     top: $tn-margin;
     left: 50%;
-    z-index: $tn-z-asset-cropping;
     max-width: 90vw;
     max-height: 90vh;
     background-color: $tn-light-grey;
-
     .image-holder {
       padding: $tn-padding;
       background-color: $tn-light-grey;
     }
-
     .spinner {
       @include transform(translate(-50%, -50%));
       position: fixed;
+      z-index: $tn-z-asset-cropping-spinner;
       top: 50%;
       left: 50%;
-      z-index: $tn-z-asset-cropping-spinner;
       display: none;
-
       i {
-        color: #fff;
         font-size: 90px;
-        opacity: 0.5;
+        opacity: .5;
+        color: #fff;
       }
     }
-
     .crop_buttons {
-
       input {
         margin: 0;
       }
-
       label {
-        margin: 2px 10px 0 0;
-
+        margin: 2px 10px 0 20px;
         &:before {
-          margin-left: 5px;
+          left: 0;
         }
       }
     }
-
     .edit_asset {
       @include clearfix;
       margin: 0;

data/app/assets/stylesheets/tenon/ui/tenon-content.css.scss

@@ -41,6 +41,8 @@
   .tn-tc-row {
     @include transition(box-shadow .2s ease-in);
     @include transition(border .2s ease-in);
+    position: relative;
+    overflow: hidden;
     min-height: 50px;
     margin-bottom: 10px;
     padding: 0;
@@ -65,9 +67,6 @@
       display: none;
     }
   }
-  .tn-tc-row {
-    position: relative;
-  }
   .drag-anchor {
     float: left;
   }
@@ -146,9 +145,9 @@
       padding-top: 0;
     }
     .btn {
-      background-color: $tn-primary;
-      color: white;
       margin: 0 10px;
+      color: white;
+      background-color: $tn-primary;
     }
   }
   a.add-image {
@@ -186,7 +185,7 @@
     position: static;
     display: none;
   }
-  .asset-field img {
+  .tn-tc-asset-field img {
     width: 100%;
   }
   .image {
@@ -226,18 +225,41 @@
   display: none;
 }
 
-.wrapped-image-with-text {
+.tn-tc-wrapped-image-with-text {
   .editable-text {
     min-height: 200px;
   }
 }
 
-.image-and-text {
+.tn-tc-image-and-text {
   > div {
     height: 100%;
   }
 }
 
+.tn-tc-with-background-image {
+  padding: 60px 0 40px;
+  .tn-text-overlay {
+    position: relative;
+    z-index: 10;
+    float: left;
+    width: 46%;
+    margin: 0 2%;
+    .editable-text {
+      background-color: rgba(#fff, .8);
+    }
+  }
+  .tn-tc-background-image {
+    position: absolute;
+    top: 40px;
+    a.add-image span {
+      line-height: 60px;
+      height: 140px;
+    }
+  }
+}
+
+
 .image-controls {
   @include transition(none);
   &.full-width-image, &.three-column-image, &.four-column-image, &.stacked-image-and-text {
@@ -286,3 +308,25 @@ a.open-embed-modal {
 .modal .edit-embed-code {
   display: block;
 }
+
+.tn-tc-with-background-image {
+  padding: 60px 0 40px;
+  .tn-text-overlay {
+    position: relative;
+    z-index: 10;
+    float: left;
+    width: 46%;
+    margin: 0 2%;
+    .editable-text {
+      background-color: rgba(#fff, .8);
+    }
+  }
+  .tn-tc-background-image {
+    position: absolute;
+    top: 40px;
+    a.add-image span {
+      line-height: 60px;
+      height: 140px;
+    }
+  }
+}

data/app/models/tenon/tenon_content/row_types/two_column_with_background_image.rb

@@ -0,0 +1,18 @@
+module Tenon
+  module TenonContent
+    module RowTypes
+      class TwoColumnWithBackgroundImage < TenonContent::RowTypes::Base
+        class << self
+          def add_pieces_to(row)
+            if row.pieces.empty?
+              row.pieces.build(piece_type: 'Image', position: 0, size: 'twelve')
+
+              row.pieces.build(piece_type: 'Text', position: 1, size: 'six')
+              row.pieces.build(piece_type: 'Text', position: 2, size: 'six')
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/tenon/tenon_content/row_types.rb

@@ -2,22 +2,23 @@ module Tenon
   module TenonContent
     module RowTypes
       LIBRARY_ROW_TYPES = {
-        'One Column of Text'          => 'FullWidthText',
-        'One Column Image'            => 'FullWidthImage',
-        'Two Columns of Text'         => 'TwoColumnText',
-        'Two Images'                  => 'TwoColumnImage',
-        'Three Columns of Text'       => 'ThreeColumnText',
-        'Three Images'                => 'ThreeColumnImage',
-        'Four Columns of Text'        => 'FourColumnText',
-        'Four Images'                 => 'FourColumnImage',
-        'Wrapped Image with Text'     => 'LeftWrappedImageWithText',
-        'Six Images'                  => 'SixColumnImage',
-        'Embedded Content'            => 'FullWidthEmbeddedContent',
-        'Image and Text (No Wrap)'    => 'LeftImageRightText',
-        'Two Column Image and Text'   => 'TwoColumnImageAndText',
-        'Three Column Image and Text' => 'ThreeColumnImageAndText',
-        'Four Column Image and Text'  => 'FourColumnImageAndText',
-        'Six Column Image and Text'   => 'SixColumnImageAndText'
+        'One Column of Text'                => 'FullWidthText',
+        'One Column Image'                  => 'FullWidthImage',
+        'Two Columns of Text'               => 'TwoColumnText',
+        'Two Images'                        => 'TwoColumnImage',
+        'Three Columns of Text'             => 'ThreeColumnText',
+        'Three Images'                      => 'ThreeColumnImage',
+        'Four Columns of Text'              => 'FourColumnText',
+        'Four Images'                       => 'FourColumnImage',
+        'Wrapped Image with Text'           => 'LeftWrappedImageWithText',
+        'Six Images'                        => 'SixColumnImage',
+        'Embedded Content'                  => 'FullWidthEmbeddedContent',
+        'Image and Text (No Wrap)'          => 'LeftImageRightText',
+        'Two Column Image and Text'         => 'TwoColumnImageAndText',
+        'Three Column Image and Text'       => 'ThreeColumnImageAndText',
+        'Four Column Image and Text'        => 'FourColumnImageAndText',
+        'Six Column Image and Text'         => 'SixColumnImageAndText',
+        'Two Columns with Background Image' => 'TwoColumnWithBackgroundImage'
       }
     end
   end

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

@@ -14,7 +14,7 @@
     .form-group
       %p
         = link_to_add_association "Add another photo", f, :photos, 'data-association-insertion-node' => '#photo-list', 'data-association-insertion-method' => 'append'
-        = link_to 'Add several', new_item_asset_path(multiple: true), class: 'btn btn-comp browse', data: {'modal-remote' => true, 'modal-title' => "Select file", 'modal-handler' => 'Tenon.features.MultipleAssetAttachment', target: '.asset-fields' }
+        = link_to 'Add several', new_item_asset_path(multiple: true), class: 'btn btn-comp browse', data: {'modal-remote' => true, 'modal-title' => "Select file", 'modal-handler' => 'Tenon.features.MultipleAssetAttachment', target: '.tn-tc-asset-fields' }
 
       %ul.nested-field-list.sortable#photo-list
         = f.nested_fields :photo

data/app/views/tenon/shared/_asset_field.html.haml

@@ -2,7 +2,7 @@
 - asset_name = asset
 - proxy_attachment = f.object.send(asset_name)
 %label.asset-label= asset_name.to_s.titleize
-.asset-field
+.tn-tc-asset-field
   = f.hidden_field "#{asset_name}_id", class: 'asset-id-field'
   .thumbnail
     - if proxy_attachment.try(:asset)

data/app/views/tenon/tenon_content/piece_types/form/_background_image.html.haml

@@ -0,0 +1,22 @@
+= f.hidden_field :image_id, class: 'asset-id-field'
+= f.hidden_field :position
+= f.hidden_field :size
+= f.hidden_field :stretch_to_fill
+.image{class: 'stretch'}
+  - if f.object.image
+    = backend_piece_image_tag(f.object)
+  - else
+    = link_to(new_item_asset_path, class: 'add-image', data: {'modal-remote' => true, 'modal-title' => 'Select Image', 'modal-handler' => 'Tenon.features.tenonContent.AssetAttachment'}) do
+      %span Add Image
+
+  .medium-editor-toolbar.medium-toolbar-arrow-under.medium-editor-toolbar-active.image-controls{style: 'display: none; margin-top: -65px;'}
+    %ul.medium-editor-toolbar-actions.clearfix
+      %li
+        %button{title: 'Crop', class: 'asset-crop medium-editor-action medium-editor-button-first', data: {'tooltip' => true, 'post-crop-handler' => 'Tenon.features.tenonContent.PostCropHandler', 'asset-id' => f.object.image_id}}
+          %i.fa.fa-crop
+      %li
+        %button{href: new_item_asset_path, title: 'Replace Image', class: 'replace-image medium-editor-action  medium-editor-button-last', data: {'modal-remote' => 'true', 'modal-title' => "Select Image", 'modal-handler' => 'Tenon.features.tenonContent.AssetAttachment', 'tooltip' => true}}
+          %i.fa.fa-picture-o
+
+    .medium-editor-toolbar-form-anchor
+

data/app/views/tenon/tenon_content/piece_types/form/_image.html.haml

@@ -12,11 +12,11 @@
   = f.super_text_area :caption, class: 'caption', placeholder: 'Enter caption here...', style: ("display: none;" unless f.object.show_caption)
   = f.hidden_field :show_caption
 
-  .medium-editor-toolbar-form-anchor.link-form{style: 'position: absolute; z-index: 2000;'}
-    = f.super_text_field :link_url, placeholder: 'Paste or type a link', style: 'display; inline; width: 316px;';
+  .medium-editor-toolbar-form-anchor.link-form{style: 'position: absolute; z-index: 10;'}
     = link_to new_item_asset_path(hide_upload: true), 'title' => 'Link to an Asset', 'data-modal-remote' => 'true', 'data-modal-handler' => 'Tenon.features.tenonContent.ImageAssetLink', 'data-modal-title' => 'Link to Asset', 'data-tooltip' => true do
       %i.fa.fa-file-pdf-o
-    = link_to '×'.html_safe, '#', class: 'medium-editor-cancel'
+    = f.super_text_field :link_url, placeholder: 'Paste or type a link', style: 'display; inline; width: 316px;';
+    = link_to '', '#', class: 'medium-editor-cancel', title: 'Cancel', data: { tooltip: true }
 
   .medium-editor-toolbar.medium-toolbar-arrow-under.medium-editor-toolbar-active.image-controls{style: "display: none; margin-top: -65px;"}
     %ul.medium-editor-toolbar-actions.clearfix

data/app/views/tenon/tenon_content/row_types/display/_four_column_image.html.haml

@@ -1,5 +1,5 @@
 .four-column-image
   - row.pieces.each do |piece|
-    .tn-tc-piece.asset-field.three{class: cycle('', '', '', 'omega')}
+    .tn-tc-piece.tn-tc-asset-field.three{class: cycle('', '', '', 'omega')}
       = render "tenon/tenon_content/piece_types/display/image", piece: piece
   .spacer

data/app/views/tenon/tenon_content/row_types/display/_four_column_image_and_text.html.haml

@@ -3,7 +3,7 @@
     .three{class: cycle('', '', '', 'omega')}
       - row.pieces.select { |p| positions.include?(p.position) }.each do |piece|
         - if piece.piece_type == 'Image'
-          .tn-tc-piece.asset-field
+          .tn-tc-piece.tn-tc-asset-field
             = render "tenon/tenon_content/piece_types/display/image", piece: piece
         - else
           .tn-tc-piece

data/app/views/tenon/tenon_content/row_types/display/_four_column_text.html.haml

@@ -1,4 +1,4 @@
-.four-column-text.multi-text
+.four-column-text.tn-tc-multi-text
   - row.pieces.each do |piece|
     .tn-tc-piece.three{class: cycle('', '', '', 'omega')}
       = render "tenon/tenon_content/piece_types/display/text", piece: piece

data/app/views/tenon/tenon_content/row_types/display/_full_width_image.html.haml

@@ -1,4 +1,4 @@
-.full-width-image
-  .tn-tc-piece.twelve.asset-field
+.two-column-text-with-background-image
+  .tn-tc-piece.twelve.tn-tc-asset-field
     = render "tenon/tenon_content/piece_types/display/image", piece: row.pieces.first
   .spacer

data/app/views/tenon/tenon_content/row_types/display/_left_image_right_text.html.haml

@@ -1,7 +1,7 @@
-.left-image-right-text.image-and-text
+.tn-tc-left-image-right-text.tn-tc-image-and-text
   - row.pieces.each do |piece|
     - if piece.piece_type == "Image"
-      .tn-tc-piece.asset-field{:class => piece.size}
+      .tn-tc-piece.tn-tc-asset-field{:class => piece.size}
         = render "tenon/tenon_content/piece_types/display/image", piece: piece
     - elsif piece.piece_type == "Text"
       .tn-tc-piece.omega{:class => piece.size}

data/app/views/tenon/tenon_content/row_types/display/_left_text_right_image.html.haml

@@ -1,9 +1,9 @@
-.left-text-right-image.image-and-text
+.tn-tc-left-text-right-image.tn-tc-image-and-text
   - row.pieces.each do |piece|
     - if piece.piece_type == "Text"
       .tn-tc-piece{class: piece.size}
         = render "tenon/tenon_content/piece_types/display/text", piece: piece
     - if piece.piece_type == "Image"
-      .tn-tc-piece.asset-field.omega{class: piece.size}
+      .tn-tc-piece.tn-tc-asset-field.omega{class: piece.size}
         = render "tenon/tenon_content/piece_types/display/image", piece: piece
   .spacer

data/app/views/tenon/tenon_content/row_types/display/_left_wrapped_image_with_text.html.haml

@@ -1,4 +1,4 @@
-.left-wrapped-image-with-text.wrapped-image-with-text
+.tn-tc-left-wrapped-image-with-text.tn-tc-wrapped-image-with-text
   .twelve
     - row.pieces.each do |piece|
       - if piece.piece_type == "Image"

data/app/views/tenon/tenon_content/row_types/display/_right_wrapped_image_with_text.html.haml

@@ -1,4 +1,4 @@
-.right-wrapped-image-with-text.wrapped-image-with-text
+.tn-tc-right-wrapped-image-with-text.tn-tc-wrapped-image-with-text
   .twelve
     - row.pieces.each do |piece|
       - if piece.piece_type == "Image"

data/app/views/tenon/tenon_content/row_types/display/_six_column_image.html.haml

@@ -2,7 +2,7 @@
   - [ [0, 1], [2, 3], [4, 5] ].each_with_index do |columns, i|
     .tn-tc-piece.four{class: i == 2 ? 'omega' : ''}
       - columns.each do |position|
-        .tn-tc-piece.asset-field.six{class: cycle('', 'omega')}
+        .tn-tc-piece.tn-tc-asset-field.six{class: cycle('', 'omega')}
           - row.pieces.select { |p| p.position == position }.each do |piece|
             = render 'tenon/tenon_content/piece_types/display/image', piece: piece
   .spacer

data/app/views/tenon/tenon_content/row_types/display/_six_column_image_and_text.html.haml

@@ -5,7 +5,7 @@
         .six{class: cycle('', 'omega')}
           - row.pieces.select { |p| positions.include?(p.position) }.each do |piece|
             - if piece.piece_type == 'Image'
-              .tn-tc-piece.asset-field
+              .tn-tc-piece.tn-tc-asset-field
                 = render "tenon/tenon_content/piece_types/display/image", piece: piece
             - else
               .tn-tc-piece

data/app/views/tenon/tenon_content/row_types/display/_three_column_image.html.haml

@@ -1,5 +1,5 @@
 .three-column-image
   - row.pieces.each do |piece|
-    .tn-tc-piece.asset-field.four{class: cycle('', '', 'omega')}
+    .tn-tc-piece.tn-tc-asset-field.four{class: cycle('', '', 'omega')}
       = render "tenon/tenon_content/piece_types/display/image", piece: piece
   .spacer

data/app/views/tenon/tenon_content/row_types/display/_three_column_image_and_text.html.haml

@@ -3,7 +3,7 @@
     .four{class: cycle('', '', 'omega')}
       - row.pieces.select { |p| positions.include?(p.position) }.each do |piece|
         - if piece.piece_type == 'Image'
-          .tn-tc-piece.asset-field
+          .tn-tc-piece.tn-tc-asset-field
             = render "tenon/tenon_content/piece_types/display/image", piece: piece
         - else
           .tn-tc-piece

data/app/views/tenon/tenon_content/row_types/display/_three_column_text.html.haml

@@ -1,4 +1,4 @@
-.three-column-text.multi-text
+.three-column-text.tn-tc-multi-text
   - row.pieces.each do |piece|
     .tn-tc-piece.four{class: cycle('', '', 'omega')}
       = render "tenon/tenon_content/piece_types/display/text", piece: piece

data/app/views/tenon/tenon_content/row_types/display/_two_column_image.html.haml

@@ -1,5 +1,5 @@
 .two-column-image
   - row.pieces.each do |piece|
-    .tn-tc-piece.asset-field{ class: [piece.size, cycle('', 'omega')] }
+    .tn-tc-piece.tn-tc-asset-field{ class: [piece.size, cycle('', 'omega')] }
       = render "tenon/tenon_content/piece_types/display/image", piece: piece
   .spacer

data/app/views/tenon/tenon_content/row_types/display/_two_column_image_and_text.html.haml

@@ -3,7 +3,7 @@
     .six{class: cycle('', 'omega')}
       - row.pieces.select { |p| positions.include?(p.position) }.each do |piece|
         - if piece.piece_type == 'Image'
-          .tn-tc-piece.asset-field
+          .tn-tc-piece.tn-tc-asset-field
             = render "tenon/tenon_content/piece_types/display/image", piece: piece
         - else
           .tn-tc-piece

data/app/views/tenon/tenon_content/row_types/display/_two_column_with_background_image.html.haml

@@ -0,0 +1,5 @@
+.two-column-with-background-image.tn-tc-background-image{style: "background-image: url(#{row.pieces.first.image.url})"}
+  - row.pieces[1..-1].each do |piece|
+    .tn-tc-piece.six{class: cycle('', 'omega')}
+      = render "tenon/tenon_content/piece_types/display/text", piece: piece
+  .spacer

data/app/views/tenon/tenon_content/row_types/form/_four_column_image.html.haml

@@ -2,6 +2,6 @@
   = f.hidden_field :list_order
   = f.hidden_field :row_type
   = f.fields_for :pieces do |piece|
-    .tn-tc-piece.asset-field.three{ class: cycle('', '', '', 'omega') }
+    .tn-tc-piece.tn-tc-asset-field.three{ class: cycle('', '', '', 'omega') }
       = render "tenon/tenon_content/piece_types/form/image", f: piece, position: piece.object.position
   .spacer

data/app/views/tenon/tenon_content/row_types/form/_four_column_image_and_text.html.haml

@@ -6,7 +6,7 @@
       = f.fields_for :pieces, f.object.pieces.select { |p| positions.include?(p.position) } do |piece|
         = piece.hidden_field :piece_type
         - if piece.object.piece_type == 'Image'
-          .tn-tc-piece.asset-field
+          .tn-tc-piece.tn-tc-asset-field
             = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'half'
         - else
           .tn-tc-piece

data/app/views/tenon/tenon_content/row_types/form/_full_width_image.html.haml

@@ -2,6 +2,6 @@
   = f.hidden_field :list_order
   = f.hidden_field :row_type
   = f.fields_for :pieces do |piece|
-    .tn-tc-piece.asset-field.twelve
+    .tn-tc-piece.tn-tc-asset-field.twelve
       = render "tenon/tenon_content/piece_types/form/image", f: piece, position: 0, style: 'full'
   .spacer

data/app/views/tenon/tenon_content/row_types/form/_left_image_right_text.html.haml

@@ -1,10 +1,10 @@
-.left-image-right-text.image-and-text
+.tn-tc-left-image-right-text.tn-tc-image-and-text
   = f.hidden_field :row_type
   = f.hidden_field :list_order
   = f.fields_for :pieces do |piece|
     = piece.hidden_field :piece_type
     - if piece.object.piece_type == "Image"
-      .tn-tc-piece.asset-field{:class => piece.object.size}
+      .tn-tc-piece.tn-tc-asset-field{:class => piece.object.size}
         = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'half'
     - elsif piece.object.piece_type == "Text"
       .tn-tc-piece.omega{:class => piece.object.size}

data/app/views/tenon/tenon_content/row_types/form/_left_text_right_image.html.haml

@@ -1,4 +1,4 @@
-.left-text-right-image.image-and-text
+.tn-tc-left-text-right-image.tn-tc-image-and-text
   = f.hidden_field :row_type
   = f.hidden_field :list_order
   = f.fields_for :pieces do |piece|
@@ -7,6 +7,6 @@
       .tn-tc-piece{class: piece.object.size}
         = render "tenon/tenon_content/piece_types/form/text", f: piece
     - if piece.object.piece_type == "Image"
-      .tn-tc-piece.asset-field.omega{class: piece.object.size}
+      . tn-tc-piece.tn-tc-asset-field.omega{class: piece.object.size}
         = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'half'
   .spacer

data/app/views/tenon/tenon_content/row_types/form/_left_wrapped_image_with_text.html.haml

@@ -1,11 +1,11 @@
-.left-wrapped-image-with-text.wrapped-image-with-text
+.tn-tc-left-wrapped-image-with-text.tn-tc-wrapped-image-with-text
   = f.hidden_field :row_type
   = f.hidden_field :list_order
   .twelve
     = f.fields_for :pieces do |piece|
       = piece.hidden_field :piece_type
       - if piece.object.piece_type == "Image"
-        .wrapped-image.left.asset-field.omega.tn-tc-piece{class: piece.object.size}
+        .wrapped-image.left.tn-tc-asset-field.omega.tn-tc-piece{class: piece.object.size}
           = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'wrap'
       - if piece.object.piece_type == "Text"
         = render "tenon/tenon_content/piece_types/form/text", f: piece

data/app/views/tenon/tenon_content/row_types/form/_right_wrapped_image_with_text.html.haml

@@ -1,11 +1,11 @@
-.right-wrapped-image-with-text.wrapped-image-with-text
+.tn-tc-right-wrapped-image-with-text.tn-tc-wrapped-image-with-text
   = f.hidden_field :row_type
   = f.hidden_field :list_order
   .twelve
     = f.fields_for :pieces do |piece|
       = piece.hidden_field :piece_type
       - if piece.object.piece_type == "Image"
-        .wrapped-image.right.asset-field.omega.tn-tc-piece{class: piece.object.size}
+        .wrapped-image.right.tn-tc-asset-field.omega.tn-tc-piece{class: piece.object.size}
           = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'wrap'
       - if piece.object.piece_type == "Text"
         = render "tenon/tenon_content/piece_types/form/text", f: piece

data/app/views/tenon/tenon_content/row_types/form/_six_column_image.html.haml

@@ -4,7 +4,7 @@
   - [ [0, 1], [2, 3], [4, 5] ].each_with_index do |columns, i|
     .four{class: i == 2 ? 'omega' : ''}
       - columns.each do |position|
-        .tn-tc-piece.asset-field.six{class: cycle('', 'omega')}
+        .tn-tc-piece.tn-tc-asset-field.six{class: cycle('', 'omega')}
           = f.fields_for :pieces, f.object.pieces.select{ |p| p.position == position } do |piece|
             = render 'tenon/tenon_content/piece_types/form/image', f: piece, position: piece.object.position
   .spacer

data/app/views/tenon/tenon_content/row_types/form/_six_column_image_and_text.html.haml

@@ -8,7 +8,7 @@
           = f.fields_for :pieces, f.object.pieces.select { |p| positions.include?(p.position) } do |piece|
             = piece.hidden_field :piece_type
             - if piece.object.piece_type == 'Image'
-              .tn-tc-piece.asset-field
+              .tn-tc-piece.tn-tc-asset-field
                 = render 'tenon/tenon_content/piece_types/form/image', f: piece, style: 'half'
             - else
               .tn-tc-piece

data/app/views/tenon/tenon_content/row_types/form/_three_column_image.html.haml

@@ -2,6 +2,6 @@
   = f.hidden_field :list_order
   = f.hidden_field :row_type
   = f.fields_for :pieces do |piece|
-    .tn-tc-piece.asset-field.four{ class: cycle('', '', 'omega') }
+    .tn-tc-piece.tn-tc-asset-field.four{ class: cycle('', '', 'omega') }
       = render "tenon/tenon_content/piece_types/form/image", f: piece, position: piece.object.position
   .spacer

data/app/views/tenon/tenon_content/row_types/form/_three_column_image_and_text.html.haml

@@ -6,7 +6,7 @@
       = f.fields_for :pieces, f.object.pieces.select { |p| positions.include?(p.position) } do |piece|
         = piece.hidden_field :piece_type
         - if piece.object.piece_type == 'Image'
-          .tn-tc-piece.asset-field
+          .tn-tc-piece.tn-tc-asset-field
             = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'half'
         - else
           .tn-tc-piece

data/app/views/tenon/tenon_content/row_types/form/_two_column_image.html.haml

@@ -3,6 +3,6 @@
   = f.hidden_field :list_order
   = f.fields_for :pieces do |piece|
     = piece.hidden_field :piece_type
-    .tn-tc-piece.asset-field{ class: [piece.object.size, cycle('', 'omega')] }
+    .tn-tc-piece.tn-tc-asset-field{ class: [piece.object.size, cycle('', 'omega')] }
       = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'half'
   .spacer

data/app/views/tenon/tenon_content/row_types/form/_two_column_image_and_text.html.haml

@@ -6,7 +6,7 @@
       = f.fields_for :pieces, f.object.pieces.select { |p| positions.include?(p.position) } do |piece|
         = piece.hidden_field :piece_type
         - if piece.object.piece_type == 'Image'
-          .tn-tc-piece.asset-field
+          .tn-tc-piece.tn-tc-asset-field
             = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'half'
         - else
           .tn-tc-piece

data/app/views/tenon/tenon_content/row_types/form/_two_column_text.html.haml

@@ -1,4 +1,4 @@
-.two-column-text.multi-text
+.two-column-text.tn-tc-multi-text
   = f.hidden_field :list_order
   = f.hidden_field :row_type
   = f.fields_for :pieces do |piece|

data/app/views/tenon/tenon_content/row_types/form/_two_column_with_background_image.html.haml

@@ -0,0 +1,12 @@
+.two-column-text-with-background-image.tn-tc-with-background-image
+  = f.hidden_field :list_order
+  = f.hidden_field :row_type
+  = f.fields_for :pieces do |piece|
+    - if piece.object.position == 0
+      .tn-tc-piece.tn-tc-background-image.tn-tc-asset-field.twelve
+        = render "tenon/tenon_content/piece_types/form/background_image", f: piece, position: 0, style: 'full'
+    - else
+      .tn-tc-piece.tn-text-overlay{class: cycle('', 'omega')}
+        = render "tenon/tenon_content/piece_types/form/text", f: piece, position: piece.object.position
+
+  .spacer

data/config/initializers/devise.rb

@@ -10,7 +10,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'noreply@factore.ca'
+  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.67'
+  VERSION = '1.0.68'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.67
+  version: 1.0.68
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -923,6 +923,8 @@ files:
 - app/assets/images/tenon/tenon-content/TwoColumnImage_hover.png
 - app/assets/images/tenon/tenon-content/TwoColumnText.png
 - app/assets/images/tenon/tenon-content/TwoColumnText_hover.png
+- app/assets/images/tenon/tenon-content/TwoColumnWithBackgroundImage.png
+- app/assets/images/tenon/tenon-content/TwoColumnWithBackgroundImage_hover.png
 - app/assets/images/tenon/tenon_icon.png
 - app/assets/images/tenon/thumb-doc.png
 - app/assets/images/tenon/thumb-video.png
@@ -1146,6 +1148,7 @@ files:
 - app/models/tenon/tenon_content/row_types/two_column_image.rb
 - app/models/tenon/tenon_content/row_types/two_column_image_and_text.rb
 - app/models/tenon/tenon_content/row_types/two_column_text.rb
+- app/models/tenon/tenon_content/row_types/two_column_with_background_image.rb
 - app/models/tenon/thinger.rb
 - app/models/tenon/user.rb
 - app/services/tenon/redirector.rb
@@ -1260,6 +1263,7 @@ files:
 - app/views/tenon/tenon_content/piece_types/display/_embedded_content.html.haml
 - app/views/tenon/tenon_content/piece_types/display/_image.html.haml
 - app/views/tenon/tenon_content/piece_types/display/_text.html.haml
+- app/views/tenon/tenon_content/piece_types/form/_background_image.html.haml
 - app/views/tenon/tenon_content/piece_types/form/_embedded_content.html.haml
 - app/views/tenon/tenon_content/piece_types/form/_image.html.haml
 - app/views/tenon/tenon_content/piece_types/form/_text.html.haml
@@ -1281,6 +1285,7 @@ files:
 - app/views/tenon/tenon_content/row_types/display/_two_column_image.html.haml
 - app/views/tenon/tenon_content/row_types/display/_two_column_image_and_text.html.haml
 - app/views/tenon/tenon_content/row_types/display/_two_column_text.html.haml
+- app/views/tenon/tenon_content/row_types/display/_two_column_with_background_image.html.haml
 - app/views/tenon/tenon_content/row_types/form/_four_column_image.html.haml
 - app/views/tenon/tenon_content/row_types/form/_four_column_image_and_text.html.haml
 - app/views/tenon/tenon_content/row_types/form/_four_column_text.html.haml
@@ -1299,6 +1304,7 @@ files:
 - app/views/tenon/tenon_content/row_types/form/_two_column_image.html.haml
 - app/views/tenon/tenon_content/row_types/form/_two_column_image_and_text.html.haml
 - app/views/tenon/tenon_content/row_types/form/_two_column_text.html.haml
+- app/views/tenon/tenon_content/row_types/form/_two_column_with_background_image.html.haml
 - app/views/tenon/users/_form.html.haml
 - app/views/tenon/users/edit.html.haml
 - app/views/tenon/users/index.html.haml