Merge branch 'develop'

ElliottAYoung · ElliottAYoung · commit 76f52cabee2a · 2017-04-10T13:14:52.000-05:00
diff --git a/app/cells/plugins/core/asset/input.haml b/app/cells/plugins/core/asset/input.haml
@@ -5,5 +5,8 @@
 = render_max_asset_size
 %br
 = render_field_id
+- if @options[:tooltip]
+  %p
+    = render_tooltip
 = render_label
 = render_input
diff --git a/app/cells/plugins/core/asset_cell.rb b/app/cells/plugins/core/asset_cell.rb
@@ -39,6 +39,10 @@ def render_input
         @options[:form].file_field 'data[asset]'
       end
 
+      def render_tooltip
+        @options[:tooltip]
+      end
+
       def associated_content_item_thumb_url
         data['asset']['style_urls']['mini']
       end
diff --git a/app/cells/plugins/core/author/input.haml b/app/cells/plugins/core/author/input.haml
@@ -1,5 +1,6 @@
-.mdl-textfield.mdl-js-textfield.authorfield
+.mdl-textfield.mdl-js-textfield.authorfield.mdl-textfield--floating-label
   = render_field_id
   = render_label
   = render_input
+  = render_tooltip unless @options[:tooltip].nil?
   = render_default_value
diff --git a/app/cells/plugins/core/boolean/checkbox.haml b/app/cells/plugins/core/boolean/checkbox.haml
@@ -2,5 +2,6 @@
 %label.mdl-checkbox.mdl-js-checkbox.mdl-js-ripple-effect{ for: checkbox_id }
   = render_checkbox
   = render_checkbox_label
+  = render_tooltip unless @options[:tooltip].nil?
 
 %br
diff --git a/app/cells/plugins/core/boolean/switch.haml b/app/cells/plugins/core/boolean/switch.haml
@@ -1,3 +1,4 @@
 = render_field_id
 = render_label
+= render_tooltip unless @options[:tooltip].nil?
 = render_switch
diff --git a/app/cells/plugins/core/content_item/popup.haml b/app/cells/plugins/core/content_item/popup.haml
@@ -2,6 +2,7 @@
 = render_content_item_id
 
 = render_label
+= render_tooltip unless @options[:tooltip].nil?
 %br
 %button.content-item-button#featured-button__select
   .content-item-button__select.content-item-button__select--selected
diff --git a/app/cells/plugins/core/date_time/datepicker.haml b/app/cells/plugins/core/date_time/datepicker.haml
@@ -1,4 +1,5 @@
-.mdl-textfield.mdl-js-textfield
+.mdl-textfield.mdl-js-textfield.mdl-textfield--floating-label
   = render_field_id
   = render_label
+  = render_tooltip unless @options[:tooltip].nil?
   = render_datepicker
diff --git a/app/cells/plugins/core/float/input.haml b/app/cells/plugins/core/float/input.haml
@@ -1,5 +1,5 @@
 .mdl-textfield.mdl-js-textfield.mdl-textfield--floating-label
   = render_field_id
   = render_label
+  = render_tooltip unless @options[:tooltip].nil?
   = render_input
-  
diff --git a/app/cells/plugins/core/integer/input.haml b/app/cells/plugins/core/integer/input.haml
@@ -1,5 +1,5 @@
-.mdl-textfield.mdl-js-textfield
+.mdl-textfield.mdl-js-textfield.mdl-textfield--floating-label
   = render_field_id
   = render_label
+  = render_tooltip unless @options[:tooltip].nil?
   = render_input
-  
diff --git a/app/cells/plugins/core/tag/tag_picker.haml b/app/cells/plugins/core/tag/tag_picker.haml
@@ -1,5 +1,6 @@
 = render_field_id
 = render_label
+= render_tooltip unless @options[:tooltip].nil?
 %br
 %span{class: 'cortex-bootstrap'}
   = render_tag_field
diff --git a/app/cells/plugins/core/text/input.haml b/app/cells/plugins/core/text/input.haml
@@ -1,5 +1,5 @@
-.mdl-textfield.mdl-js-textfield
+.mdl-textfield.mdl-js-textfield.mdl-textfield--floating-label
   = render_field_id
   = render_label
+  = render_tooltip unless @options[:tooltip].nil?
   = render_input
-  
diff --git a/app/cells/plugins/core/text/multiline_input.haml b/app/cells/plugins/core/text/multiline_input.haml
@@ -1,4 +1,5 @@
-.mdl-textfield.mdl-js-textfield
+.mdl-textfield.mdl-js-textfield.mdl-textfield--floating-label
   = render_label
+  = render_tooltip unless @options[:tooltip].nil?
   = render_field_id
   = render_multiline_input
diff --git a/app/cells/plugins/core/tooltip/show.haml b/app/cells/plugins/core/tooltip/show.haml
@@ -0,0 +1,3 @@
+.icon.material-icons.tooltip-icon{ :id => tooltip_id } help
+.mdl-tooltip.mdl-tooltip--large{ "data-mdl-for" => tooltip_id }
+  = @options[:tooltip]
diff --git a/app/cells/plugins/core/tooltip_cell.rb b/app/cells/plugins/core/tooltip_cell.rb
@@ -0,0 +1,15 @@
+module Plugins
+  module Core
+    class TooltipCell < Plugins::Core::Cell
+      def show
+        render
+      end
+
+      private
+
+      def tooltip_id
+        @options[:id].parameterize('_')
+      end
+    end
+  end
+end
diff --git a/app/cells/plugins/core/tree/checkboxes.haml b/app/cells/plugins/core/tree/checkboxes.haml
@@ -1,4 +1,5 @@
 = render_label
+= render_tooltip unless @options[:tooltip].nil?
 
 %p
   Please select 1-2 Categories.
diff --git a/app/cells/plugins/core/tree/dropdown.haml b/app/cells/plugins/core/tree/dropdown.haml
@@ -1,4 +1,5 @@
 = render_label
+= render_tooltip unless @options[:tooltip].nil?
 %br
 = render_field_id
 = render_select
diff --git a/app/cells/plugins/core/user/dropdown.haml b/app/cells/plugins/core/user/dropdown.haml
@@ -1,4 +1,5 @@
 = render_label
+= render_tooltip unless @options[:tooltip].nil?
 %br
 = render_field_id
 = render_select
diff --git a/lib/cortex/plugins/core/version.rb b/lib/cortex/plugins/core/version.rb
@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.11.1'
+      VERSION = '0.11.2'
     end
   end
 end
diff --git a/lib/tasks/cortex/core/media.rake b/lib/tasks/cortex/core/media.rake
@@ -66,7 +66,8 @@ namespace :cortex do
                   "grid_width": 12,
                   "elements": [
                     {
-                      "id": media.fields.find_by_name('Asset').id
+                      "id": media.fields.find_by_name('Asset').id,
+                      "tooltip": "Recommended blog featured image size: 1452px x 530px with a live area of 930px x 530px"
                     }
                   ]
                 }
@@ -154,7 +155,7 @@ namespace :cortex do
                 "name": "Creator",
                 "cells": [{
                             "field": {
-                              "method": "author_image"
+                              "method": "author_email"
                             },
                             "display": {
                               "classes": [
