Merge 41c233ee2c into db9176a283

Gemfile

@@ -53,6 +53,9 @@ group :production do
 end
 
 gem 'administrate'
+gem 'administrate-field-image'
+gem 'administrate-field-color'
+gem 'administrate-field-markdown'
 gem 'dragonfly'
 gem 'dragonfly-s3_data_store'
 gem 'kaminari'

Gemfile.lock

@@ -37,7 +37,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    administrate (0.1.5)
+    administrate (0.2.0)
       autoprefixer-rails (~> 6.0)
       datetime_picker_rails (~> 0.0.7)
       jquery-rails (~> 4.0)
@@ -48,6 +48,16 @@ GEM
       rails (~> 4.2)
       sass-rails (~> 5.0)
       selectize-rails (~> 0.6)
+    administrate-field-color (0.0.1)
+      administrate (>= 0.2.0.rc1, < 0.3.0)
+      rails (~> 4.2)
+    administrate-field-image (0.0.2)
+      administrate (>= 0.2.0.rc1, < 0.3.0)
+      rails (~> 4.2)
+    administrate-field-markdown (0.0.2)
+      administrate (>= 0.2.0.rc1, < 0.3.0)
+      kramdown (~> 1.10)
+      rails (~> 4.2)
     arel (6.0.3)
     ast (2.2.0)
     autoprefixer-rails (6.3.6)
@@ -316,6 +326,9 @@ PLATFORMS
 
 DEPENDENCIES
   administrate
+  administrate-field-color
+  administrate-field-image
+  administrate-field-markdown
   aws-sdk
   better_errors
   binding_of_caller

app/dashboards/category_dashboard.rb

@@ -15,7 +15,7 @@ class CategoryDashboard < Administrate::BaseDashboard
     created_at: Field::DateTime,
     updated_at: Field::DateTime,
     photo_id: Field::Number,
-    base_colour: ColourField,
+    base_colour: Field::Color,
     sort: Field::Number,
     slug: Field::String,
   }

app/dashboards/page_dashboard.rb

@@ -11,7 +11,7 @@ class PageDashboard < Administrate::BaseDashboard
     id: Field::Number,
     name: Field::String,
     title: Field::String,
-    content: MarkdownField,
+    content: Field::Markdown,
     created_at: Field::DateTime,
     updated_at: Field::DateTime,
   }

app/dashboards/photo_dashboard.rb

@@ -14,7 +14,7 @@ class PhotoDashboard < Administrate::BaseDashboard
     created_at: Field::DateTime,
     updated_at: Field::DateTime,
     title: Field::String,
-    description: MarkdownField,
+    description: Field::Markdown,
     sort: Field::Number,
     featured: Field::Boolean,
     enabled: Field::Boolean,

app/fields/colour_field.rb

@@ -1,7 +0,0 @@
-require "administrate/field/base"
-
-class ColourField < Administrate::Field::Base
-  def to_s
-    data
-  end
-end

app/fields/markdown_field.rb

@@ -1,21 +0,0 @@
-require "administrate/field/base"
-
-class MarkdownField < Administrate::Field::Base
-  def to_s
-    data
-  end
-
-  def rendered
-    Kramdown::Document.new(data).to_html.html_safe
-  end
-
-  def truncate
-    data.to_s[0...truncation_length]
-  end
-
-  private
-
-  def truncation_length
-    options.fetch(:truncate, 50)
-  end
-end

app/views/fields/colour_field/_form.html.erb

@@ -1,6 +0,0 @@
-<div class="field-unit__label">
-  <%= f.label field.attribute %>
-</div>
-<div class="field-unit__field">
-  <%= f.color_field field.attribute, style: 'height: 2.35em; width: 5em;' %>
-</div>

app/views/fields/colour_field/_index.html.erb

@@ -1,2 +0,0 @@
-<%= content_tag :div, nil,
-  style: "height: 1.5em; width: 1.5em; background-color: #{field.data}" %>

app/views/fields/colour_field/_show.html.erb

@@ -1,2 +0,0 @@
-<%= content_tag :span, field.data,
-  style: "color: white; padding: 0.2em 0.5em; background-color: #{field.data}" %>

app/views/fields/markdown_field/_form.html.erb

@@ -1,6 +0,0 @@
-<div class="field-unit__label">
-  <%= f.label field.attribute %>
-</div>
-<div class="field-unit__field">
-  <%= f.text_area field.attribute %>
-</div>

app/views/fields/markdown_field/_index.html.erb

@@ -1 +0,0 @@
-<%= field.truncate %>

app/views/fields/markdown_field/_show.html.erb

@@ -1 +0,0 @@
-<%= field.rendered %>