biola_wcms_components 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad43cf94ae5f7f3c298b9863ec8acae5fa28e5d2
-  data.tar.gz: d653206bde30cee1b55c8068b1497c23a0b70874
+  metadata.gz: e8923842f9aa5259010d882588b06970b3bfd005
+  data.tar.gz: af976f1cb38616b4424f28583c1f73af615c3e58
 SHA512:
-  metadata.gz: 1f68c613bfe2f706da1ab5718266a066ba60ef2c68d857ef212f879a73f904da3c2b1edccc17a617b1eb4d0cc78df6b537569e045bc36e1e2deb0f2a0f58247b
-  data.tar.gz: 586484d9d7e6385b37503c9b6cbf193cbe4cbd656f6e5796c323fdb7fdc4febddc06fd71a78fa60972f07dc0054a5a8c78dfe0ffb78346bbaa8b2085bf6b9f48
+  metadata.gz: b128af6f966ae9eaacb5073a0313a2d6a8dddc6615a21d59884d33f0d7e691d5f44ebddada43c1c2090099907616cf608140d490b186ca52d34b1ae9efbb4260
+  data.tar.gz: ea35749a0432ddee47197d3acdc3ddf79edaa0049c169bf16f8b715805347e84cdd8ef441970416a8605f17563410729adcecd1723f83bda7b3b8f59411713e7

data/app/assets/javascripts/components/forms/presentation_data_editor.js.coffee

@@ -49,6 +49,7 @@ $(document).ready ->
     uploadImage = (file, input) ->
       fileUploader.sendFileToServer file, 'embedded_image', ((url) ->
         input.value = url
+        $(input).trigger('change')
       ), ->
         alert('There was a problem uploading the image')
 
@@ -67,3 +68,7 @@ $(document).ready ->
       event.stopPropagation()
       uploadImage(e.originalEvent.dataTransfer.files[0], this)
       $(this).removeClass('dragging')
+
+    # Update preview image whenever value changes
+    $('#presentation_data_editor').on 'change', 'input.drop-image-uploader', (e) ->
+      $(this).siblings('.image_preview').find('img').attr('src', this.value)

data/app/assets/javascripts/configuration/setup_redactor.js.coffee

@@ -4,10 +4,15 @@ setupRedactor = (obj) ->
     minHeight: 200
     allowedTags: ['p', 'br']
     buttons: []
+    toolbarFixed: false
+
+  if fileUploader.uploaders && fileUploader.uploaders.embedded_image
+    options.imageUpload = fileUploader.uploaders.embedded_image
+    options.allowedTags = $.merge(options.allowedTags, ['img'])
 
   # Add any custom data attributes to the default options
   if obj.data('linkable')  # in case you want to support links without explicitly giving a link button.
-    options.allowedTags = $.merge(options.allowedTags, 'a')
+    options.allowedTags = $.merge(options.allowedTags, ['a'])
   if data = obj.data('buttons')
     buttons = data.split(' ')
     options.buttons = $.merge(options.buttons, buttons)

data/app/assets/stylesheets/components/forms/_presentation_data_editor.scss

@@ -32,6 +32,9 @@
     }
   }
 
+  .type-image-uploader {
+    .image_preview img { margin-top: 5px; max-height: 300px; max-width: 100%; }
+  }
   .drop-image-uploader {
     &.dragging { background-color: #deedff; }
   }

data/app/controllers/wcms_components/embedded_images_controller.rb

@@ -13,7 +13,7 @@ class WcmsComponents::EmbeddedImagesController < ApplicationController
     if @embedded_image.save
       render json: { filelink: @embedded_image.upload.url }
     else
-      render json: { error: true, messages: @embedded_image.errors.full_messages}
+      render json: { error: true, messages: @embedded_image.errors.full_messages }
     end
   end
 

data/app/views/wcms_components/forms/_person_lookup.html.slim

@@ -4,16 +4,28 @@ ruby:
   lookup_url ||= wcms_components_people_url
   placeholder ||= 'First or last name'
   required ||= false
+  person ||= nil
+  value ||= nil  # just an alias for person
+
+  html_options = { placeholder: placeholder, required: required, class: 'form-control typeahead' }
+
+  # Find person object
+  if person
+    # don't override person if it is already set.
+  elsif value
+    person = value if value.is_a?(Person)
+  elsif form
+    person = Person.where(id: form.object[person_id_key]).first if form.object.respond_to?(person_id_key)
+  end
 
-  html_options = {placeholder: placeholder, required: required, class: 'form-control typeahead'}
 
 - if lookup_url
   .person-lookup data-lookup-url=lookup_url
     - if form
       = form.hidden_field person_id_key, class: 'hidden-person-id'
     - else
-      = hidden_field_tag person_id_key, '', class: 'hidden-person-id'
-    = text_field_tag :person_name, '', html_options
+      = hidden_field_tag person_id_key, person.try(:id), class: 'hidden-person-id'
+    = text_field_tag :person_name, person.try(:name), html_options
 
 - else
   p

data/app/views/wcms_components/forms/_redactor_editor.html.slim

@@ -30,6 +30,8 @@ ruby:
   buttons = buttons.uniq.join(' ')
   formatting = formatting.uniq.join(' ')
 
+= wcms_component "shared/embedded_image_uploader"
+
 - if form
   = form.text_area attribute, class: input_class, 'data-buttons' => buttons, 'data-formatting' => formatting
 - else

data/app/views/wcms_components/shared/_embedded_image_uploader.html.slim

@@ -1,5 +1,5 @@
 ruby:
-  embedded_image_url ||= wcms_components_embedded_images_url
+  embedded_image_url ||= wcms_components_embedded_images_url(authenticity_token: form_authenticity_token)
 
 - if embedded_image_url
   javascript:

data/lib/biola_wcms_components/version.rb

@@ -1,3 +1,3 @@
 module BiolaWcmsComponents
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/components/presentation_data_editor.rb

@@ -110,7 +110,7 @@ class PresentationDataEditor
   end
 
   def build_image_uploader(attribute, parent_keys)
-    view.content_tag :div, class: 'form-group' do
+    view.content_tag :div, class: 'form-group type-image-uploader' do
       view.label_tag(attribute[:name]) +
       view.text_field_tag(
         form_name(parent_keys, attribute[:name]),
@@ -120,7 +120,10 @@ class PresentationDataEditor
           id: attribute_id(parent_keys, attribute[:name]),
           placeholder: "Drop image here"
         }
-      )
+      ) +
+      view.content_tag(:div, class: 'image_preview') do
+        view.image_tag data_grab(parent_keys, attribute[:name])
+      end
     end
   end
 

data/vendor/assets/stylesheets/redactor.css

@@ -1,3 +1,7 @@
+/* ON CHANGE:
+  remove the .redactor-toolbar z-index;
+*/
+
 /*
   Icon font
 */
@@ -51,14 +55,11 @@
   z-index: auto !important;
 }
 .redactor-box-fullscreen {
-  z-index: 5000 !important;
-  /*z-index: 1052 !important;
-    Changed by Ryan -> This needs to be above other toolbars
-  */
+  z-index: 1052 !important;
 }
 .redactor-toolbar,
 .redactor-dropdown {
-  z-index: 1053 !important;
+  /*z-index: 1053 !important; -- [Ryan] This get shown above a lot of things. */
 }
 #redactor-modal-overlay,
 #redactor-modal-box,
@@ -110,6 +111,7 @@ body .redactor-box-fullscreen {
   font-family: Arial, Helvetica, Verdana, Tahoma, sans-serif;
   font-size: 14px;
   line-height: 1.6em;
+  border-radius: 0 0 4px 4px; /* [Ryan] - added */
 }
 .redactor-editor:focus {
   outline: none;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biola_wcms_components
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Hall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-rails-ap