Merge branch 'develop'

Author: toastercup

app/assets/stylesheets/cortex-plugins-core/application.scss

@@ -2,4 +2,5 @@
 @import 'variables/colors';
 @import 'variables/typography';
 
+@import 'components/tags-input';
 @import 'components/thumbnail-placeholder';

app/assets/stylesheets/cortex-plugins-core/components/tags-input.scss

@@ -0,0 +1,21 @@
+.bootstrap-tagsinput {
+  width: 100%;
+  border-radius: 0 !important;
+  border-top: none;
+  border-right: none;
+  border-left: none;
+  border-bottom: 1px solid $color-grey-light;
+  box-shadow: none;
+}
+.cortex-bootstrap .label {
+  border-radius: 0.75em;
+  font-weight: normal;
+}
+
+.cortex-bootstrap .label-info {
+  background-color: $color-grey;
+}
+
+.bootstrap-tagsinput .tag {
+  text-transform: uppercase;
+}

app/cells/plugins/core/asset_info/show.haml

@@ -8,7 +8,7 @@
     - if asset_is_image?
       .mdl-card__title
         %h2.mdl-card__title-text
-          = image_tag(asset['versions']['original']['url'], style: 'max-height: 200px;')
+          = image_tag(asset['versions']['original']['url'], style: 'min-height: 50px; max-height: 200px;')
     .mdl-card__supporting-text
       %dl
         %dt Original Filename

app/cells/plugins/core/tree/checkboxes.haml

@@ -1,9 +1,6 @@
 = render_label
 = render_tooltip unless @options[:tooltip].nil?
 
-%p
-  Please select 1-2 Categories.
-
 - @options[:metadata]["data"]["tree_array"].each do |node|
   = render_field_id
   = cell(Plugins::Core::CheckboxCell, nil, form: @options[:form], node: node, data: data).(:checkbox)

app/models/asset_field_type.rb

@@ -88,7 +88,7 @@ def attacher
   end
 
   def host_alias
-    metadata[:storage][:host_alias] unless metadata[:storage][:host_alias].empty?
+    metadata&.[](:storage)&.[](:host_alias)
   end
 
   def versions_data

app/models/author_field_type.rb

@@ -30,6 +30,6 @@ def author_name_present
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 end

app/models/date_time_field_type.rb

@@ -35,6 +35,6 @@ def timestamp_is_valid?
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 end

app/models/float_field_type.rb

@@ -1,6 +1,6 @@
 class FloatFieldType < FieldType
   attr_accessor :float
- 
+
   validates :float, presence: true, if: Proc.new { |float| validate_key(:presence) }
   validates_numericality_of :float, unless: "float.nil?"
   validate :less_than, if: Proc.new { |float| validate_key(:max) }
@@ -27,14 +27,14 @@ def mapping_field_name
   end
 
   def validate_key(key)
-    @validations.key? key
+    validations.key? key
   end
 
   def less_than
-     errors.add(:float, "must be less_than #{@validations[:max]}") if :float <= @validations[:max]
+     errors.add(:float, "must be less_than #{validations[:max]}") if :float <= validations[:max]
   end
 
   def greater_than
-     errors.add(:float, "must be greater_than #{@validations[:min]}") if :float >= @validations[:min]
+     errors.add(:float, "must be greater_than #{validations[:min]}") if :float >= validations[:min]
   end
 end

app/models/integer_field_type.rb

@@ -27,14 +27,14 @@ def mapping_field_name
   end
 
   def validate_key
-    @validations.key? key
+    validations.key? key
   end
 
   def less_than
-     errors.add(:integer, "must be less_than #{@validations[:max]}") if :integer <= @validations[:max]
+     errors.add(:integer, "must be less_than #{validations[:max]}") if :integer <= validations[:max]
   end
 
   def greater_than
-     errors.add(:integer, "must be greater_than #{@validations[:min]}") if :integer >= @validations[:min]
+     errors.add(:integer, "must be greater_than #{validations[:min]}") if :integer >= validations[:min]
   end
 end

app/models/tag_field_type.rb

@@ -25,6 +25,6 @@ def mapping_field_name
   end
 
   def validate_presence?
-    @validations.key? :presence
+    validations.key? :presence
   end
 end