ecm_pictures 1.0.5.pre → 1.0.6.pre

data/app/admin/ecm_pictures_attached_pictures.rb

@@ -0,0 +1,14 @@
+ActiveAdmin.register Ecm::Pictures::AttachedPicture do
+  menu false
+
+  actions :destroy
+
+  controller do
+    def destroy
+      destroy! do |format|
+         format.html { redirect_to :back }
+      end
+    end
+  end
+end
+

data/{lib/ecm/pictures/active_admin → app/admin}/ecm_pictures_picture_galleries.rb

@@ -65,18 +65,18 @@ ActiveAdmin.register Ecm::Pictures::PictureGallery do
         sortable_columns
         column :thumbnail do |picture|
           link_to(image_tag(picture.image.url(:default_thumb)), [:admin, picture])
-        end
+        end # column
         column :name
         column :image_file_size, :sortable => :image_file_size do |picture|
           number_to_human_size(picture.image_file_size)
-        end
+        end # column
         column :created_at
         column do |picture|
           link_to(I18n.t('active_admin.view'), [:admin, picture], :class => "member_link view_link") +
           link_to(I18n.t('active_admin.edit'), [:edit, :admin, picture], :class => "member_link edit_link")
-        end
-      end
-    end
+        end # column
+      end # table_for
+    end # panel
   end # show
 
   sidebar Ecm::Pictures::PictureGallery.human_attribute_name(:details), :only => :show do

data/{lib/ecm/pictures/active_admin → app/admin}/ecm_pictures_pictures.rb

@@ -7,6 +7,14 @@ ActiveAdmin.register Ecm::Pictures::Picture do
   config.sort_order = 'picture_gallery_id, position'
   sortable_member_actions
 
+  controller do
+    def destroy
+      destroy! do |format|
+         format.html { redirect_to :back }
+      end
+    end
+  end
+
   form :html => { :enctype => "multipart/form-data" } do |f|
     f.inputs do
       f.input :picture_gallery
@@ -52,7 +60,19 @@ ActiveAdmin.register Ecm::Pictures::Picture do
         ecm_pictures_picture.display_code(:textile)
       end
     end
-  end
+
+    ecm_pictures_picture.attached_pictures.all.group_by(&:pictureable_type).each do |type, attached_pictures|
+      panel type.constantize.model_name.human do
+        table_for attached_pictures.map(&:pictureable) do
+          column :to_s
+        column do |obj|
+          link_to(I18n.t('active_admin.view'), [:admin, obj], :class => "member_link view_link") +
+          link_to(I18n.t('active_admin.edit'), [:edit, :admin, obj], :class => "member_link edit_link")
+        end # column
+        end # table_for
+      end # panel
+    end # each
+  end # show
 
   sidebar Ecm::Pictures::Picture.human_attribute_name(:details), :only => :show do
     attributes_table_for ecm_pictures_picture do

data/app/assets/stylesheets/ecm_pictures.css.less

@@ -0,0 +1,5 @@
+.picture-gallery .row-fluid [class*="span"] {
+  margin-left: 0px;
+  margin-right: 1.9%;
+}
+

data/app/models/ecm/pictures/attached_picture.rb

@@ -0,0 +1,16 @@
+module Ecm::Pictures
+  class AttachedPicture < ActiveRecord::Base
+    self.table_name = 'ecm_pictures_attached_pictures'
+
+    # associations
+    belongs_to :picture, :foreign_key => 'ecm_pictures_picture_id'
+    belongs_to :pictureable, :polymorphic => true
+
+    # attributes
+    attr_accessible :ecm_pictures_picture_id
+
+    # validations
+    validates :picture, :pictureable, :presence => true
+  end # class AttachedPicture < ActiveRecord::Base
+end# module Ecm::Pictures
+

data/app/models/ecm/pictures/picture.rb

@@ -3,7 +3,7 @@ class Ecm::Pictures::Picture < ActiveRecord::Base
 
   # associations
   belongs_to :picture_gallery, :counter_cache => true
-
+  has_many :attached_pictures, :foreign_key => 'ecm_pictures_picture_id'
   # attributes
   attr_accessible :description,
                   :image,

data/config/locales/ecm.pictures.attached_picture.de.yml

@@ -0,0 +1,15 @@
+de:
+  activerecord:
+    models:
+      ecm/pictures/attached_picture:
+        one: Verknüpftes Bild
+        other: Verknüpfte Bilder
+    attributes:
+      ecm/pictures/attached_picture:
+        picture: Bild
+        pictureable: Verknüpft mit
+        created_at: Erstellt am
+        updated_at: Aktualisiert am
+  resources:
+    ecm_pictures_pictures: verknuepfte-bilder
+

data/config/locales/ecm.pictures.attached_picture.en.yml

@@ -0,0 +1,15 @@
+en:
+  activerecord:
+    models:
+      ecm/pictures/attached_picture:
+        one: attached picture
+        other: attached pictures
+    attributes:
+      ecm/pictures/attached_picture:
+        picture: picture
+        pictureable: attached to
+        created_at: created at
+        updated_at: updated at
+  resources:
+    ecm_pictures_pictures: attached-pictures
+

data/config/locales/ecm.pictures.de.yml

@@ -1,4 +1,6 @@
 de:
+  active_admin:
+    delete_link: "Verknüpfung entfernen"
   back: Zurück
   ecm:
     pictures:

data/db/migrate/003_create_ecm_pictures_attached_pictures.rb

@@ -0,0 +1,10 @@
+class CreateEcmPicturesAttachedPictures < ActiveRecord::Migration
+  def change
+    create_table :ecm_pictures_attached_pictures do |t|
+      t.references :ecm_pictures_picture
+      t.references :pictureable, :polymorphic => true
+      t.timestamps
+    end
+  end
+end
+

data/lib/ecm/pictures/active_admin/pictureable_helper.rb

@@ -0,0 +1,53 @@
+require 'active_admin'
+
+module Ecm::Pictures
+  module ActiveAdmin
+    module PictureableHelper
+      def form_inputs_for_pictureable(f)
+        f.inputs do
+          f.has_many :pictures do |p|
+            p.input :name
+            p.input :image, :as => :file, :hint => p.template.image_tag(p.object.image.url(:default_thumb))
+            p.input :description
+
+            p.inputs do
+              p.input :markup_language, :as => :select, :collection => Ecm::Pictures::Configuration.markup_languages
+            end # p.inputs
+          end # f.has_many :pictures
+        end # f.inputs
+
+        f.inputs do
+          f.has_many :attached_pictures do |p|
+            p.input :picture, :as => :select, :collection => Ecm::Pictures::Picture.all.collect { |picture| [picture, picture.id, {:style => "background-image: url('#{picture.image.url(:medium_thumb)}'); width: #{Ecm::Pictures::Configuration.picture_image_styles[:medium_thumb].split('x').first}px; height: #{Ecm::Pictures::Configuration.picture_image_styles[:medium_thumb].split('x').last}px; background-repeat: no-repeat; background-position: center;"}] }
+          end # f.has_many :attached_pictures
+        end # f.inputs
+      end # def
+
+      def panel_for_pictureable
+        panel Ecm::Pictures::PictureGallery.human_attribute_name(:pictures) do
+          table_for resource.pictures, :i18n => Ecm::Pictures::Picture do
+            sortable_columns
+            column :thumbnail do |picture|
+              link_to(image_tag(picture.image.url(:default_thumb)), [:admin, picture])
+            end # column
+            column :name
+            column :image_file_size, :sortable => :image_file_size do |picture|
+              number_to_human_size(picture.image_file_size)
+            end # column
+            column :created_at
+            column do |picture|
+              link_to(I18n.t('active_admin.view'), [:admin, picture], :class => "member_link view_link") +
+              link_to(I18n.t('active_admin.edit'), [:edit, :admin, picture], :class => "member_link edit_link") +
+              link_to(I18n.t('active_admin.delete'), [:admin, picture], :class => "member_link delete_link", :method => :delete) +
+              link_to(I18n.t('active_admin.delete_link'), [:admin, picture.attached_pictures.where(:pictureable_type => resource.class, :pictureable_id => resource).first], :class => "member_link delete_link", :method => :delete)
+            end # column
+          end # table_for
+        end # panel
+      end # def
+    end # module PictureableHelper
+  end # module ActiveAdmin
+end # module Ecm::Pictures
+
+::ActiveAdmin::ResourceDSL.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
+::ActiveAdmin::Views::Pages::Show.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper
+::ActiveAdmin::Views::Pages::Form.send :include, Ecm::Pictures::ActiveAdmin::PictureableHelper

data/lib/ecm/pictures/engine.rb

@@ -2,9 +2,9 @@ module Ecm
   module Pictures
     class Engine < Rails::Engine
       initializer :ecm_pictures_engine do
-        ActiveAdmin.setup do |active_admin_config|
-          active_admin_config.load_paths += Dir[File.dirname(__FILE__) + '/active_admin']
-        end if defined?(ActiveAdmin)
+        ::ActiveAdmin.setup do |config|
+          config.load_paths << File.join(self.root, 'app/admin')
+        end
       end
     end
   end

data/lib/ecm/pictures/version.rb

@@ -1,5 +1,6 @@
 module Ecm
   module Pictures
-    VERSION = "1.0.5.pre"
-  end  
+    VERSION = "1.0.6.pre"
+  end
 end
+

data/lib/ecm_pictures.rb

@@ -8,6 +8,7 @@ require 'ecm/pictures/engine'
 require 'ecm/pictures/configuration'
 require 'ecm/pictures/routing'
 require 'ecm/pictures/version'
+require 'ecm/pictures/active_admin/pictureable_helper'
 
 module Ecm
   module Pictures

data/lib/generators/ecm/pictures/locales/locales_generator.rb

@@ -10,6 +10,9 @@ module Ecm
           copy_file "ecm.pictures.en.yml", "config/locales/ecm.pictures.en.yml"
           copy_file "ecm.pictures.de.yml", "config/locales/ecm.pictures.de.yml"
 
+          copy_file "ecm.pictures.attached_picture.en.yml", "config/locales/ecm.pictures.attached_picture.en.yml"
+          copy_file "ecm.pictures.attached_picture.de.yml", "config/locales/ecm.pictures.attached_picture.de.yml"          
+
           copy_file "ecm.pictures.picture.en.yml", "config/locales/ecm.pictures.picture.en.yml"
           copy_file "ecm.pictures.picture.de.yml", "config/locales/ecm.pictures.picture.de.yml"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_pictures
 version: !ruby/object:Gem::Version 
-  hash: 961915968
+  hash: 961915980
   prerelease: 6
   segments: 
   - 1
   - 0
-  - 5
+  - 6
   - pre
-  version: 1.0.5.pre
+  version: 1.0.6.pre
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-27 00:00:00 Z
+date: 2014-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 21
         segments: 
         - 3
         - 2
-        - 11
-        version: 3.2.11
+        - 13
+        version: 3.2.13
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -227,12 +227,14 @@ dependencies:
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
+        - 2
+        - 1
         - 0
-        version: "0"
+        version: 2.1.0
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -296,7 +298,7 @@ dependencies:
   type: :development
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: guard-rails
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
@@ -310,7 +312,7 @@ dependencies:
   type: :development
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: guard-bundler
+  name: guard-rspec
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
@@ -323,6 +325,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: guard-bundler
+  prerelease: false
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id022
 description: Provides picture galleries for active admin.
 email: 
 - roberto@vasquez-angel.de
@@ -345,23 +361,30 @@ files:
 - app/views/ecm/pictures/pictures/show.html.erb
 - app/views/ecm/pictures/pictures/_picture_for_gallery.html.erb
 - app/views/ecm/pictures/pictures/index.html.erb
+- app/models/ecm/pictures/attached_picture.rb
 - app/models/ecm/pictures/picture_gallery.rb
 - app/models/ecm/pictures/picture.rb
+- app/admin/ecm_pictures_picture_galleries.rb
+- app/admin/ecm_pictures_pictures.rb
+- app/admin/ecm_pictures_attached_pictures.rb
+- app/assets/stylesheets/ecm_pictures.css.less
+- config/locales/ecm.pictures.attached_picture.en.yml
 - config/locales/ecm.pictures.picture_gallery.de.yml
 - config/locales/ecm.pictures.de.yml
+- config/locales/ecm.pictures.attached_picture.de.yml
 - config/locales/ecm.pictures.picture.de.yml
 - config/locales/ecm.pictures.picture.en.yml
 - config/locales/ecm.pictures.en.yml
 - config/locales/ecm.pictures.picture_gallery.en.yml
 - db/migrate/002_create_ecm_pictures_pictures.rb
 - db/migrate/001_create_ecm_pictures_picture_galleries.rb
+- db/migrate/003_create_ecm_pictures_attached_pictures.rb
 - lib/generators/ecm/pictures/locales/locales_generator.rb
 - lib/generators/ecm/pictures/install/install_generator.rb
 - lib/generators/ecm/pictures/install/templates/ecm_pictures.rb
 - lib/tasks/ecm_pictures_tasks.rake
 - lib/ecm_pictures.rb
-- lib/ecm/pictures/active_admin/ecm_pictures_picture_galleries.rb
-- lib/ecm/pictures/active_admin/ecm_pictures_pictures.rb
+- lib/ecm/pictures/active_admin/pictureable_helper.rb
 - lib/ecm/pictures/engine.rb
 - lib/ecm/pictures/version.rb
 - lib/ecm/pictures/routing.rb