tenon 1.0.76 → 1.1.1

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

@@ -1,5 +1,11 @@
 class Tenon.features.tenonContent.AssetLink extends Tenon.features.tenonContent.AssetAttachment
   _setFields: ($li) =>
-    $input = @$browseButton.closest('div').find('input.medium-editor-toolbar-anchor-input')
-    $input[0].value = $li.data('style-urls')['original']
-    Tenon.mediumEditor.createLink($input[0], '')
+    $link = $('<a />').attr('href', $li.data('style-urls')['original'])
+    selected = @$browseButton.getSelection().getSelectedText()
+    text = if selected.length then selected else 'Asset Link'
+    $link.html(text)
+    @$browseButton.insertHtml($link[0].outerHTML)
+
+  # Create a virtual input to hold the data
+  _getAssetField: =>
+    $('<input />').attr('type', 'hidden')

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

@@ -6,10 +6,14 @@ class Tenon.features.tenonContent.Editor
     for div in $('.tn-tc')
       @_updateButtons($(div))
 
+    CKEDITOR.on 'instanceReady', ->
+      Tenon.features.Editor.watchChanges()
+
   _rowInserted: (e) =>
-    Tenon.mediumEditor.deactivate()
-    new Tenon.features.Medium
-    @_updateButtons($(e.currentTarget).closest('.tn-tc'))
+    # Reactivate Editor
+    $wrap = $(e.currentTarget).closest('.tn-tc')
+    @_redrawCkeditor()
+    @_updateButtons($wrap)
 
   _rowRemoved: (e) =>
     @_updateButtons($(e.currentTarget).closest('.tn-tc'))
@@ -25,3 +29,6 @@ class Tenon.features.tenonContent.Editor
     else
       $wrap.find('.tn-tc-add-content').hide()
       $wrap.find('.tn-tc-pop-out').show()
+
+  _redrawCkeditor: =>
+    Tenon.features.Editor.reinitInline()

data/app/assets/javascripts/tenon/tenon.js

@@ -45,7 +45,7 @@ var Tenon = {
     new Tenon.features.QuickSearch();
     new Tenon.features.DateTimePicker();
     new Tenon.features.ItemVersionAutosave();
-    new Tenon.features.ModalWindows();
+    Tenon.modals = new Tenon.features.ModalWindows();
     new Tenon.features.ModalForms();
     new Tenon.features.ProtectChanges();
     new Tenon.features.RecordApproval();
@@ -60,7 +60,6 @@ var Tenon = {
     new Tenon.features.SortableNestedFields();
     new Tenon.features.videoFeeds();
     new Tenon.features.tenonContent.Base();
-    new Tenon.features.Medium();
 
 
     Tenon.dispatcher.initialize();

data/app/assets/javascripts/tenon/tenon_manifest.js

@@ -8,6 +8,7 @@
 //= require bootstrap.modal
 //= require bootstrap.tabs
 //= require canvasjs.min
+//= require ckeditor/ckeditor
 //= require cocoon
 //= require imagesloaded
 //= require jquery-fileupload/basic
@@ -21,7 +22,6 @@
 //= require jquery.twoLevelSort
 //= require jquery.ui.sortable
 //= require js-routes
-//= require ./medium-on-tenon
 //= require select2
 //= require uri
 

data/app/assets/stylesheets/tenon/ui/{forms.css.scss → forms.scss}

@@ -44,6 +44,22 @@ textarea {
   height: 180px;
 }
 
+.editable-text {
+  min-height: 50px;
+  padding: 5px;
+  outline: none;
+  background: #fff;
+  h1, h2, h3, h4, h5, h6, p, ul, ol {
+    margin: 0 0 $tn-margin;
+    padding-top: 0;
+  }
+  .btn {
+    margin: 0 10px;
+    color: white;
+    background-color: $tn-primary;
+  }
+}
+
 label, h4.box-label {
   color: $tn-box-label;
   text-transform: uppercase;

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

@@ -136,21 +136,6 @@
   > div {
     min-height: 100%;
   }
-  .editable-text {
-    min-height: 50px;
-    padding: 5px;
-    outline: none;
-    background: #fff;
-    h1, h2, h3, h4, h5, h6, p, ul, ol {
-      margin: 0 0 $tn-margin;
-      padding-top: 0;
-    }
-    .btn {
-      margin: 0 10px;
-      color: white;
-      background-color: $tn-primary;
-    }
-  }
   a.add-image {
     span {
       font-family: $tn-open-sans;

data/app/form_builders/tenon/form_builder.rb

@@ -5,20 +5,40 @@ module Tenon
     alias_method :super_label, :label
 
     def tenon_content(method_name)
-      @template.render 'tenon/tenon_content/builder', f: self, field: method_name
+      @template.render 'tenon/tenon_content/builder',
+        f: self,
+        field: method_name
     end
 
-    def title_field(method_name, options = {})
-      options[:last] = true
-      content = build_content(:title_field_content, method_name, options)
+    def asset(method_name, opts = {})
+      defaults = {
+        label: nil,
+        # Remove button triggers cocoon's remove child event?
+        remove_association: false
+      }
+      opts = defaults.merge(opts)
+
+      @template.render 'tenon/fields/asset',
+        f: self,
+        label_tag: label(method_name, opts[:label]),
+        field: method_name,
+        proxy_attachment: object.send(method_name),
+        opts: opts
     end
 
-    def title_field_content(method_name, options = {}, language = nil, language_title = nil)
-      label = label(method_name, options[:label], language, language_title)
-      explanation = explanation(options[:explanation])
-      row_label = content_tag(:div, label + explanation, class: 'label')
-      row_label.html_safe + @template.text_field(@object_name, get_method(method_name, language), options.merge(class: 'title')) + content_tag(:div, '', class: 'spacer')
+    def rich_text(method_name, opts = {})
+      defaults = {
+        placeholder: '--',
+      }
+      opts = defaults.merge(opts)
+
+      @template.render 'tenon/fields/rich_text',
+        f: self,
+        field: method_name,
+        label_tag: label(method_name, opts[:label]),
+        opts: opts
     end
+    alias_method :me_text, :rich_text
 
     alias_method :super_text_field, :text_field
     def text_field(method_name, options = {})
@@ -73,6 +93,16 @@ module Tenon
 
     private
 
+    def label(method_name, label, language = nil, language_title = nil)
+      if label == false
+        ''.html_safe
+      else
+        label ||= method_name.to_s.titleize
+        label = language_title ? label + " (#{language_title.to_s.titleize})" : label
+        super(get_method(method_name, language), label.html_safe)
+      end
+    end
+
     def build_content(generator, method_name, options)
       content = send(generator, method_name, options)
       content = internationalize_content(generator, method_name, content, options) if Tenon::I18nLookup.new(@object.class).fields.include? method_name.to_s
@@ -95,16 +125,6 @@ module Tenon
       explanation ? content_tag(:div, explanation.html_safe, class: 'explanation') : ''
     end
 
-    def label(method_name, label, language = nil, language_title = nil)
-      if label == false
-        ''.html_safe
-      else
-        label ||= method_name.to_s.titleize
-        label = language_title ? label + " (#{language_title.to_s.titleize})" : label
-        super(get_method(method_name, language), label.html_safe)
-      end
-    end
-
     def get_method(method, language = nil)
       language ? "#{method}_#{language}" : method
     end

data/app/models/tenon/page.rb

@@ -71,6 +71,12 @@ module Tenon
       publish_at.present? ? publish_at <= Time.now : false
     end
 
+    # Update each subpage.path up the tree:
+    after_save :update_subpage_slugs
+    def update_subpage_slugs
+      subpages.each(&:save)
+    end
+
     protected
 
     def path_is_not_route

data/app/views/tenon/fields/_asset.html.haml

@@ -0,0 +1,32 @@
+= raw(label_tag)
+
+- if opts[:explanation].present?
+  .explanation= raw opts[:explanation]
+
+.tn-tc-asset-field
+  = f.hidden_field "#{field}_id", class: 'asset-id-field'
+
+  .thumbnail
+    - if proxy_attachment.try(:asset)
+      = asset_icon(proxy_attachment.asset)
+    - else
+      = image_tag default_asset_thumbnail(proxy_attachment)
+
+  .details
+    .asset-info
+      - if proxy_attachment
+        = proxy_attachment.display_name
+      - else
+        No asset selected.
+
+    .browse-button-holder{ class: ('with-remove' if opts[:remove_association]) }
+      .browse-button
+        = link_to 'Browse', new_item_asset_path, class: 'btn btn-comp browse', data: { modal_remote: true, modal_title: "Select #{field.to_s.titleize}", modal_handler: 'Tenon.features.AssetAttachment' }
+        - if opts[:remove_association]
+          %small
+            or
+            = link_to_remove_association "remove", f
+        - else
+          %small
+            or
+            = link_to "remove", '#', class: 'remove-asset', data: { confirm: 'Are you sure?' }

data/app/views/tenon/fields/_rich_text.html.haml

@@ -0,0 +1,8 @@
+= raw(label_tag)
+
+- if opts[:explanation].present?
+  .explanation= raw opts[:explanation]
+
+.editable-text{ contenteditable: 'true', data: { placeholder: opts[:placeholder] } }= raw f.object.try(field)
+
+= f.hidden_field field

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

@@ -1,3 +1,3 @@
 %li.nested-fields{:style => ('display: none;' if f.object._destroy)}
-  = render "tenon/shared/asset_field", f: f, asset: :file, remove_association: true
-  = f.hidden_field :list_order
+  = f.asset :file, remove_association: true, label: false
+  = f.hidden_field :list_order

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

@@ -20,11 +20,8 @@
       .form-group
         = f.text_field :title, :explanation => "Give your post a title."
 
-      .form-group.tenon-content
-        %label Excerpt
-        .editable-text{contenteditable: true}
-          = raw @post.excerpt
-        = f.hidden_field :excerpt
+      .form-group
+        = f.rich_text :excerpt
 
       .form-group
         = f.tenon_content :content

data/app/views/tenon/tenon_content/_row.html.haml

@@ -5,7 +5,7 @@
       %i.fa.fa-arrows.drag-anchor
 
       = link_to '#', class: 'tn-tc-open-library above', data: { modal_target: ".tenon-library", modal_closest: '.tn-tc', modal_title: "Insert Content", modal_handler: 'Tenon.features.tenonContent.Library', modal_clone: 'true', tooltip: '' }, title: 'Insert Content' do
-        = fa_icon('plus-circle')
+        %i.fa.fa-fw.fa-plus-circle
 
       = link_to_remove_association(fa_icon('trash-o'), f, {'data-confirm' => 'Are you sure?', 'data-wrapper-class' => 'tn-tc-row'})
 
@@ -16,4 +16,4 @@
   .tn-tc-bottombar
     .actions
       = link_to '#', class: 'tn-tc-open-library below', data: { modal_target: ".tenon-library", modal_closest: '.tn-tc', modal_title: "Insert Content", modal_handler: 'Tenon.features.tenonContent.Library', modal_clone: 'true', modal_closest: '.tn-tc', tooltip: ''}, title: 'Insert Content' do
-        = fa_icon('plus-circle')
+        %i.fa.fa-fw.fa-plus-circle

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

@@ -1,4 +1,3 @@
-.editable-text{ 'data-placeholder' => "--" }= raw f.object.try(:content)
-= f.hidden_field :content
+= f.rich_text :content, label: false
 = f.hidden_field :position
-= f.hidden_field :size
+= f.hidden_field :size

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

@@ -23,7 +23,7 @@
 <% end -%>
 <% assets.each do |field| -%>
       .form-group
-        = render "tenon/shared/asset_field", f: f, asset: :<%= field.name %>
+        = f.asset :<%= field.name %>
 <% end -%>
 <% text_areas.each do |field| -%>
       .form-group

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.76'
+  VERSION = '1.1.1'
 end

data/spec/controllers/tenon/pages_controller_spec.rb

@@ -61,7 +61,7 @@ describe Tenon::PagesController do
     it "shouldn't render anything" do
       Tenon::Page.stub(:reorder!)
       post :reorder, item_list: [1, 2, 3], parent_id: 1
-      expect(response.body).to eq(' ')
+      expect(response.body).to eq('')
     end
   end
 end