Merge branch 'develop'

Author: toastercup

Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.0.1'
 
 # Cortex-specific
 gem 'cortex-exceptions', '= 0.0.4'
-gem 'cortex-plugins-core', '= 0.8.0'
+gem 'cortex-plugins-core', '= 0.9.0'
 
 # API
 gem 'grape', '~> 0.17'

Gemfile.lock

@@ -136,7 +136,7 @@ GEM
     concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     cortex-exceptions (0.0.4)
-    cortex-plugins-core (0.8.0)
+    cortex-plugins-core (0.9.0)
       cells (~> 4.1)
       cells-haml (~> 0.0.10)
       cells-rails (~> 0.0.6)
@@ -704,7 +704,7 @@ DEPENDENCIES
   cells-rails (~> 0.0.6)
   codeclimate-test-reporter (~> 0.6)
   cortex-exceptions (= 0.0.4)
-  cortex-plugins-core (= 0.8.0)
+  cortex-plugins-core (= 0.9.0)
   database_cleaner (~> 1.5)
   devise (~> 4.2.0)
   doorkeeper (~> 4.2)

app/assets/javascripts/media_popups.js

@@ -55,8 +55,9 @@ $(".media-select--wysiwyg").on("click", function (ev) {
   var element = $(this),
     id = element.data().id,
     title = element.data().title,
-    src = element.data().src,
-    alt = element.data().alt;
+    url = element.data().url,
+    alt = element.data().alt,
+    asset_type = element.data().assetType;
 
-  media_select_defer.resolve({id: id, title: title, src: src, alt: alt});
+  media_select_defer.resolve({id: id, title: title, url: url, alt: alt, asset_type: asset_type});
 });

app/cells/index/table_body.haml

@@ -1,12 +1,12 @@
 %tbody
-  - context[:content_type].content_items.each do |content_item|
+  - context[:content_items].each do |content_item|
     %tr
       - @options[:data][:columns].each do |column|
         %td{ class: 'mdl-data-table__cell--non-numeric' }
           = cell('index/content_item', nil, { cells: column[:cells], content_item: content_item }).(:column)
       - if context[:popup]
         %td{ class: 'mdl-data-table__cell--non-numeric' }
-          %a{ href: "#", data: { id: content_item.id, title: content_item_title(content_item), thumb: content_item_thumb_url(content_item), src: content_item_asset_url(content_item), alt: content_item_asset_alt_text(content_item) }, class: "media-select--#{context[:popup]} mdl-button mdl-js-button mdl-button--icon" }
+          %a{ href: "#", data: { id: content_item.id, title: content_item_title(content_item), thumb: content_item_thumb_url(content_item), url: content_item_asset_url(content_item), alt: content_item_asset_alt_text(content_item), asset_type: content_item_asset_type(content_item) }, class: "media-select--#{context[:popup]} mdl-button mdl-js-button mdl-button--icon" }
             %i{ class: 'material-icons' }
               add
       - else

app/cells/index_cell.rb

@@ -19,16 +19,24 @@ def render_table_header(column_data)
     column_data[:name]
   end
 
+  def asset_field_item(content_item)
+    content_item.field_items.find { |field_item| field_item.field.name == 'Asset' }
+  end
+
   def content_item_title(content_item)
     content_item.field_items.find { |field_item| field_item.field.name == 'Title' }.data['text']
   end
 
   def content_item_thumb_url(content_item)
-    content_item.field_items.find { |field_item| field_item.field.name == 'Asset' }.data['asset']['style_urls']['mini']
+    asset_field_item(content_item).data['asset']['style_urls']['mini']
   end
 
   def content_item_asset_url(content_item)
-    content_item.field_items.find { |field_item| field_item.field.name == 'Asset' }.data['asset']['url']
+    asset_field_item(content_item).data['asset']['url']
+  end
+
+  def content_item_asset_type(content_item)
+    MimeMagic.new(asset_field_item(content_item).data['asset']['content_type']).mediatype
   end
 
   def content_item_asset_alt_text(content_item)

app/controllers/content_items_controller.rb

@@ -4,6 +4,7 @@ class ContentItemsController < AdminController
 
   def index
     @index = IndexDecoratorService.new(content_type: content_type)
+    @content_items = content_type.content_items
     add_breadcrumb content_type.name.pluralize
   end
 
@@ -22,8 +23,10 @@ def edit
     @content_item = content_type.content_items.find_by_id(params[:id])
     @wizard = WizardDecoratorService.new(content_item: @content_item)
 
+    title = @content_item.field_items.find { |field_item| field_item.field.name == 'Title' }.data['text']
     add_breadcrumb content_type.name.pluralize, :content_type_content_items_path
-    add_breadcrumb "Edit #{@content_item.id}"
+    add_breadcrumb title
+    add_breadcrumb 'Edit'
   end
 
   def update

app/helpers/popup_helper.rb

@@ -1,6 +1,20 @@
 module PopupHelper
   def media_content_type
-    @media_content_type ||= ContentType.find_by_name("Media")
+    @media_content_type ||= ContentType.find_by_name('Media')
+  end
+
+  def media_content_items
+    @media_content_items ||= media_content_type.content_items
+  end
+
+  def media_asset_field
+    @media_asset_field ||= media_content_type.fields.find_by_name('Asset')
+  end
+
+  def media_image_content_items
+    @media_image_content_items ||= media_content_items.select do |content_item|
+      MimeMagic.new(content_item.field_items.find_by_field_id(media_asset_field).data['asset']['content_type']).mediatype == 'image'
+    end
   end
 
   def media_index

app/helpers/widget_parsers/media_helper.rb

@@ -21,11 +21,7 @@ def self.widget_nodes_for(document)
     def self.render_widget_inner(widget)
       Nokogiri::HTML::Builder.new do |doc|
         element, tag_type = content_item_element(widget['id'])
-        if widget['scale']
-          element.merge!({scale: widget['scale']})
-        else
-          element.merge!({width: widget['width'], height: widget['height']})
-        end
+        element.merge!({width: widget['width'], height: widget['height'], alt: widget['alt'], style: widget['style'], class: widget['class']})
 
         doc.send(tag_type, element)
       end.doc.root
@@ -37,10 +33,10 @@ def self.content_item_element(id)
 
       if asset_field_item.data["asset"]["content_type"].include?("image")
         element = { src: url }
-        tag_type = "img"
+        tag_type = 'img'
       else
         element = { href: url }
-        tag_type = "a"
+        tag_type = 'a'
       end
 
       [element, tag_type]

app/views/content_items/_grid.html.haml

@@ -1 +1 @@
-= cell("index", @index, context: { content_type: content_type }).(:index)
+= cell("index", @index, context: { content_type: content_type, content_items: @content_items }).(:index)

app/views/content_items/_popup.haml

@@ -2,18 +2,18 @@
   .dialog-backdrop.hidden{ 'data-type': 'wysiwyg'}
     %div.dialog-div.mdl-dialog#mediaInsert
       .mdl-dialog__content.mdl-dialog-media
-        = cell('index', media_index, context: { content_type: media_content_type, popup: 'wysiwyg' }).(:index)
+        = cell('index', media_index, context: { content_type: content_type, content_items: media_content_items, popup: 'wysiwyg' }).(:index)
       .mdl-dialog__actions.mdl-dialog__actions.modal-footer
         .mdl-button.mdl-js-button.mdl-button--raised.close CLOSE
   .dialog-backdrop.hidden{ 'data-type': 'featured' }
     %div.dialog-div.mdl-dialog#mediaFeatured
       .mdl-dialog__content.mdl-dialog-media
-        = cell('index', media_index, context: { content_type: media_content_type, popup: 'featured' }).(:index)
+        = cell('index', media_index, context: { content_type: content_type, content_items: media_image_content_items, popup: 'featured' }).(:index)
       .mdl-dialog__actions.mdl-dialog__actions.modal-footer
         .mdl-button.mdl-js-button.mdl-button--raised.close CLOSE
   .dialog-backdrop.hidden{ 'data-type': 'tile' }
     %div.dialog-div.mdl-dialog#mediaTile
       .mdl-dialog__content.mdl-dialog-media
-        = cell('index', media_index, context: { content_type: media_content_type, popup: 'tile' }).(:index)
+        = cell('index', media_index, context: { content_type: content_type, content_items: media_image_content_items, popup: 'tile' }).(:index)
       .mdl-dialog__actions.mdl-dialog__actions.modal-footer
         .mdl-button.mdl-js-button.mdl-button--raised.close CLOSE