ecm_pictures2_backend 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3743c249e5407cbc63a01d94af0d8ee160be989
-  data.tar.gz: 47a4bb3d5469f17a221f77765fe380d8ad39efcb
+  metadata.gz: 4c2b57e9b5e09dc3955d5435ace0b1d820a2f1e2
+  data.tar.gz: 90206866c808f45d1e2a752c9d0531d720a1ff48
 SHA512:
-  metadata.gz: 1dc7eeda66ea36d8d7bf594a23d33d93529f4130b64d967c7608b3b84d85a3f6f221dbc513422495f06e17a5c7a6d1f9f6d1cee4cd2bbdc10f56062a0e828d0f
-  data.tar.gz: 795370db33a9775d06a33267fe3f8dc0c5a7822b8421474841dec4c802135ae5d0a7bb31a87b245e43f73ff0610890538c376aa6542a516d47588f7c9132ce50
+  metadata.gz: 2151fc118550c3ccd4cea03172c8cd2a053a283d57b051135ba49ad469ae3b7d9df2a5c375eb821bf8f8f5917f138feb758072d19c4a6ac68252f2de78ff9b4a
+  data.tar.gz: 400b51db2a4382c0147c72acf39dacaa123cb8668693d2d4eda297398d25ca5aed10347db5c1adb6c2de1db529e3b7109815fdaf39321957541746c1f5de657c

data/app/assets/javascripts/ecm/pictures/backend/application/camera.coffee

@@ -1,49 +1,39 @@
-take_snapshot = (attribute_name) ->
+remove_overlays = (elements) ->
+  $(elements).removeClass('selected')
+
+add_overlay = (element) ->
+   element.parent().toggleClass('selected')
+
+take_snapshot = ->
   Webcam.snap (data_uri) ->
-    console.log attribute_name
-    snapshot_container = $("[name='snapshots-for-#{attribute_name}']").first()
-    img_name = "webcam-snapshot-for-#{attribute_name}"
-    img_taken_at = Date.now()
-    snapshot_container.append('<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2 thumbnail-with-overlay"><img data-taken-at="'+img_taken_at+'" data-attribute-name="'+attribute_name+'" name="'+img_name+'" class="img-responsive thumbnail webcam-snapshot" src="'+data_uri+'"/><span class="text-success glyphicon glyphicon-ok-circle overlay" style="display: none;" /></div>')
+    $('#snapshots').append('<div class="col-xs-12 col-sm-6 col-md-4 col-lg-2"><img class="img-responsive thumbnail" data-onclick-copy-data-to="#ecm_pictures_picture_image_base64" src="'+data_uri+'"/><span class="glyphicon glyphicon-ok overlay" /></div>')
 
 $ ->
-  $('[data-webcam-toggle=true]').each (index) ->
+  $('[data-camera-toggle=true]').each (index) ->
     button = $(@)
     button.on 'click', ->
-      camera_container_name = $(@).data('attribute-name')
-      camera_container = $("[name='webcam-for-#{camera_container_name}']").first()
-      console.log camera_container
-      camera_container.css('width', '640px')
-      camera_container.css('height', '480px')
-      Webcam.attach(camera_container.attr('id'))
+      camera_container = $(@).data('camera-target')
+      $(camera_container).css('width', '640px')
+      $(camera_container).css('height', '480px')
+      Webcam.attach(camera_container)
       false
 
 $ ->
-  $('[data-webcam-trigger=true]').each (index) ->
+  $('[data-capture-picture=true]').each (index) ->
     button = $(@)
     button.on 'click', ->
-      attribute_name = $(@).data('attribute-name')
-      take_snapshot(attribute_name)
+      take_snapshot()
       false
 
 $ ->
-  $('.webcam-snapshots').on 'click', 'img.webcam-snapshot', (e) ->
-    multiple = $(@).parent().data('multiple')
-    console.log multiple
-    attribute_name = $(@).data('attribute-name')
-    taken_at = $(@).data('taken-at')
-    raw_image_data = $(@).attr('src')
-    hidden_tag = '<input type="hidden" name="'+attribute_name+'[]" data-taken-at="'+taken_at+'" class="webcam optional" value="'+raw_image_data+'">'
-    console.log $("input[name='#{attribute_name}[]']")
-    if multiple && (existent = $("input[name='#{attribute_name}[]']")).length
-      console.log('Removing already existent tags')
-      existent.remove()
-      $(@).parent().parent().find('span').hide()
-    if (existent = $("input[name='#{attribute_name}[]'][data-taken-at='#{taken_at}']")).length
-      console.log('Removing already existent tag')
-      existent.remove()
-      $(@).parent().find('span').hide()
-    else
-      console.log('Adding hidden tag')
-      $(@).after(hidden_tag)
-      $(@).parent().find('span').show()
+  $('#snapshots').on 'click', '[data-onclick-copy-data-to]', (e) ->
+    source = $(@)
+    source.on 'click', ->
+      target_id = $(@).attr('data-onclick-copy-data-to')
+      target = $(target_id)
+      # raw_image_data = source.attr('src').replace(/^data\:image\/\w+\;base64\,/, '')
+      raw_image_data = source.attr('src')
+      target.val(raw_image_data)
+      remove_overlays($(@).parent().parent().find('.selected'))
+      add_overlay($(@))
+      e.preventDefault

data/app/assets/stylesheets/ecm/pictures/backend/application/thumbnails_selected.css

@@ -1,18 +1,16 @@
-.thumbnail-with-overlay .glyphicon.overlay {
+#snapshots div.selected {
+  display: relative;
+}
+
+#snapshots .glyphicon.overlay {
+  position: absolute;
   top: 15px;
   left: 30px;
   font-size: 20px;
-  color: light-green;
+   color: green;
+   display: none;
 }
 
 #snapshots div.selected > .glyphicon.overlay {
   display: inline-block;
-}
-
-.thumbnail-with-overlay {
-  display: relative;
-}
-
-.thumbnail-with-overlay  .overlay {
-  position: absolute;
 }

data/app/controllers/ecm/pictures/backend/picture_galleries_controller.rb

@@ -6,20 +6,8 @@ class Ecm::Pictures::Backend::PictureGalleriesController < Itsf::Backend::Resour
   private
 
   def permitted_params
-    # raise params.inspect
-    picture_images_base_64 = params[:ecm_pictures_picture_gallery].delete(:picture_images_base_64)
-    picture_images = picture_images_base_64.collect do |data|
-      Tempfile.new(['image', '.jpg']).tap do |t|
-        t.write(Base64.decode64(data.gsub(/^data\:image\/\w+\;base64\,/, '')).force_encoding('UTF-8'))
-        t.rewind
-      end
-    end
-    # raise picture_images.inspect
-    p = params.require(:ecm_pictures_picture_gallery).permit(:name, :markup_language, :description, :link_images, :tag_list, picture_images: [])
-    if picture_images.any?
-      p.merge(picture_images: picture_images)
-    else
-      p
-    end
+    params
+      .require(:ecm_pictures_picture_gallery)
+      .permit(:name, :markup_language, :description, :link_images, :tag_list, picture_images: [])
   end
 end

data/app/views/ecm/pictures/backend/picture_galleries/_form.html.haml

@@ -3,7 +3,7 @@
 
 .well  
   = form.input :markup_language, collection: Ecm::Pictures::markup_languages
-  = form.input :description, input_html: { 'data-add-editor': true, 'data-editor-syntax': :textile }
+  = form.input :description, input_html: { 'data-add-editor': Itsf::Backend.features?(:'ace-rails-ap'), 'data-editor-syntax': :textile }
 
 .well
   = form.input :link_images
@@ -11,10 +11,6 @@
 .well
   = form.input :picture_images, as: :file, input_html: { multiple: 'multiple' }
 
-- if Ecm::Pictures::Backend::Configuration.enable_html5_camera_support
-  .well
-    = form.input :picture_images, as: :webcam, multiple: true
-
 - if form.object.respond_to?(:tag_list)
   .well
     = form.input :tag_list, input_html: { value: form.object.tag_list.to_s }

data/app/views/ecm/pictures/backend/picture_galleries/_show.haml

@@ -5,7 +5,8 @@
 = table.row :position
 = table.row :markup_language
 = table.row :markup_language
-= table.row :created_at
-= table.row :updated_at
 = table.row(:tenant, as: :association) if table.resource.respond_to?(:tenant)
-= table.row(:tag_list) if table.resource.respond_to?(:tag_list)
+= table.row(:tag_list) if table.resource.respond_to?(:tag_list)
+= table.row :display_code_for_erb
+= table.row :created_at
+= table.row :updated_at

data/app/views/ecm/pictures/backend/pictures/_form.html.haml

@@ -6,15 +6,20 @@
 
 .well  
   = form.input :markup_language, collection: Ecm::Pictures::markup_languages
-  = form.input :description, input_html: { 'data-add-editor': true, 'data-editor-syntax': :textile }
+  = form.input :description, input_html: { 'data-add-editor': Itsf::Backend.features?(:'ace-rails-ap'), 'data-editor-syntax': :textile }
 
 .well
   = form.input :image
   = image_tag(form.object.image.url(:default_thumb)) if form.object.image.present?
 
 - if Ecm::Pictures::Backend::Configuration.enable_html5_camera_support
+  %input{ name: 'ecm_pictures_picture[image_base64]', type: 'hidden', id: 'ecm_pictures_picture_image_base64', value: '' }
   .well
-    = form.input :picture_images, as: :webcam
+    .bottom-margin-1
+      = link_to(t('.enable_camera'), '#', class: 'btn btn-primary', data: { 'camera-toggle': true, 'camera-target': '#camera' })
+      = link_to(t('.capture_picture'), '#', class: 'btn btn-primary', data: { 'capture-picture': true, 'camera-target': '#camera' })
+    #camera.bottom-margin-1
+    #snapshots.row
 
 - if form.object.respond_to?(:tag_list)
   .well

data/app/views/ecm/pictures/backend/pictures/_show.html.haml

@@ -10,5 +10,7 @@
 = table.row :image_fingerprint
 - if table.resource.respond_to?(:tag_list)
   = table.row :tag_list
+= table.row :display_code_for_textile
+= table.row :display_code_for_erb
 = table.row :created_at
 = table.row :updated_at

data/config/locales/de.yml

@@ -1,13 +1,6 @@
 de:
   classes:
     ecm/pictures/backend/engine: 'Bilder'
-  inputs:
-    webcam:
-      capture_picture: Auslösen
-      enable_camera: Kamera aktivieren
-    webcam_multiple:
-      capture_picture: Auslösen
-      enable_camera: Kamera aktivieren
   routes:
     mount:
       ecm_pictures_backend: '/backend/bilder'

data/lib/ecm/pictures/backend/engine.rb

@@ -8,8 +8,6 @@ module Ecm
           app.config.assets.precompile << 'ecm_pictures_backend.js'
           app.config.assets.precompile << 'ecm_pictures_backend.css'
         end
-
-        config.autoload_paths << root.join(*%w(app inputs))
       end
     end
   end

data/lib/ecm/pictures/backend/version.rb

@@ -1,7 +1,7 @@
 module Ecm
   module Pictures
     module Backend
-      VERSION = '2.0.6'.freeze
+      VERSION = '2.0.7'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_pictures2_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -228,7 +228,6 @@ files:
 - app/controllers/ecm/pictures/backend/picture_galleries_controller.rb
 - app/controllers/ecm/pictures/backend/pictures_controller.rb
 - app/helpers/ecm/pictures/backend/application_helper.rb
-- app/inputs/webcam_input.rb
 - app/policies/ecm/pictures/backend/engine_policy.rb
 - app/policies/ecm/pictures/picture_gallery_policy.rb
 - app/policies/ecm/pictures/picture_policy.rb
@@ -239,11 +238,8 @@ files:
 - app/views/ecm/pictures/backend/pictures/_form.html.haml
 - app/views/ecm/pictures/backend/pictures/_show.html.haml
 - app/views/ecm/pictures/backend/pictures/_table.html.haml
-- app/views/inputs/_webcam.haml
-- app/views/inputs/_webcam_multiple.haml
 - app/views/layouts/ecm/pictures/backend/application.html.erb
 - config/locales/de.yml
-- config/locales/en.yml
 - config/rbac.yml
 - config/routes.rb
 - lib/ecm/pictures/backend.rb

data/app/inputs/webcam_input.rb

@@ -1,10 +0,0 @@
-class WebcamInput < SimpleForm::Inputs::Base
-  def input
-    multiple = input_options.delete(:multiple)
-    if multiple
-      template.render partial: 'inputs/webcam_multiple', locals: { f: @builder, attribute_name: attribute_name, input_options: input_options, input_html_options: input_html_options }
-    else
-      template.render partial: 'inputs/webcam', locals: { f: @builder, attribute_name: attribute_name, input_options: input_options, input_html_options: input_html_options }
-    end
-  end
-end

data/app/views/inputs/_webcam.haml

@@ -1,7 +0,0 @@
-.webcam-controls.bottom-margin-1
-  = link_to(t('.enable_camera'), '#', class: 'btn btn-primary', data: { 'webcam-toggle': true, 'attribute-name': "#{f.object.class.name.underscore.gsub('/', '_')}[#{attribute_name}_base_64]" })
-  = link_to(t('.capture_picture'), '#', class: 'btn btn-primary', data: { 'webcam-trigger': true, 'attribute-name': "#{f.object.class.name.underscore.gsub('/', '_')}[#{attribute_name}_base_64]" })
-
-.webcam.bottom-margin-1{ id: "webcam-for-#{f.object.class.name.underscore.gsub('/', '_')}_#{attribute_name}_base_64", name: "webcam-for-#{f.object.class.name.underscore.gsub('/', '_')}[#{attribute_name}_base_64]" }
-
-.webcam-snapshots.row{ 'data-multiple': "false", id: "snapshots-for-#{f.object.class.name.underscore.gsub('/', '_')}_#{attribute_name}_base_64", name: "snapshots-for-#{f.object.class.name.underscore.gsub('/', '_')}[#{attribute_name}_base_64]" }

data/app/views/inputs/_webcam_multiple.haml

@@ -1,7 +0,0 @@
-.webcam-controls.bottom-margin-1
-  = link_to(t('.enable_camera'), '#', class: 'btn btn-primary', data: { 'webcam-toggle': true, 'attribute-name': "#{f.object.class.name.underscore.gsub('/', '_')}[#{attribute_name}_base_64]" })
-  = link_to(t('.capture_picture'), '#', class: 'btn btn-primary', data: { 'webcam-trigger': true, 'attribute-name': "#{f.object.class.name.underscore.gsub('/', '_')}[#{attribute_name}_base_64]" })
-
-.webcam.bottom-margin-1{ id: "webcam-for-#{f.object.class.name.underscore.gsub('/', '_')}_#{attribute_name}_base_64", name: "webcam-for-#{f.object.class.name.underscore.gsub('/', '_')}[#{attribute_name}_base_64]" }
-
-.webcam-snapshots.multiple.row{ 'data-multiple': "true", id: "snapshots-for-#{f.object.class.name.underscore.gsub('/', '_')}_#{attribute_name}_base_64", name: "snapshots-for-#{f.object.class.name.underscore.gsub('/', '_')}[#{attribute_name}_base_64]" }

data/config/locales/en.yml

@@ -1,13 +0,0 @@
-en:
-  classes:
-    ecm/pictures/backend/engine: 'Pictures'
-  inputs:
-    webcam:
-      capture_picture: Capture picture
-      enable_camera: Enable camera
-    webcam_multiple:
-      capture_picture: Capture picture
-      enable_camera: Enable camera
-  routes:
-    mount:
-      ecm_pictures_backend: '/backend/pictures'