ecm_pictures 1.0.0.pre → 1.0.1.pre

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

@@ -0,0 +1,9 @@
+class Ecm::Pictures::PictureGalleriesController < ApplicationController
+  def index
+    @picture_galleries = Ecm::Pictures::PictureGallery.all
+  end
+
+  def show
+    @picture_gallery = Ecm::Pictures::PictureGallery.find(params[:id])
+  end
+end

data/app/controllers/ecm/pictures/pictures_controller.rb

@@ -0,0 +1,9 @@
+class Ecm::Pictures::PicturesController < ApplicationController
+  def index
+    @pictures = Ecm::Pictures::Picture.all
+  end
+
+  def show
+    @picture = Ecm::Pictures::Picture.find(params[:id])
+  end
+end

data/app/helpers/ecm/pictures_helper.rb

@@ -59,7 +59,9 @@ module Ecm::PicturesHelper
           content_tag(:p, I18n.t('ecm.pictures.picture.warnings.missing', :name => name.to_s))
         end
       else
-        render picture
+        content_tag(:div, :class => 'row') do
+          render picture
+        end
       end
 
     rescue Exception => e

data/app/views/ecm/pictures/picture_galleries/_picture_gallery_for_index.html.erb

@@ -1,7 +1,9 @@
 <div class="thumbnail picture_gallery-preview span3" id="picture-gallery-<%= picture_gallery.id %>">
-  <div class="picture-image">
-    <%= image_tag picture_gallery.pictures.first.image.url(:default_thumb) %>  
-  </div>
+  <% if picture_gallery.pictures.first.respond_to?(:image) %>
+    <div class="picture-image">
+      <%= image_tag picture_gallery.pictures.first.image.url(:default_thumb) %>  
+    </div>
+  <% end %>
   <div class="caption"> 
     <h3><%= picture_gallery.name %></h3>
     <div class="description"><%= mu(picture_gallery, :description) %></div>

data/app/views/ecm/pictures/picture_galleries/index.html.erb

@@ -0,0 +1,5 @@
+<h1>Picture Galleries</h1>
+
+<% @picture_galleries.each do |pg| %>
+  <%= render :partial => 'ecm/pictures/picture_galleries/picture_gallery_for_index', :locals => { :picture_gallery => pg } %>
+<% end %>

data/app/views/ecm/pictures/picture_galleries/show.html.erb

@@ -0,0 +1,7 @@
+<h1><%= @picture_gallery.to_s %></h1>
+
+<%= render @picture_gallery %>
+
+<p><%= link_to Ecm::Pictures::PictureGallery.model_name.human(:count => :other), ecm_pictures_picture_galleries_path, :class => 'btn' %></p>
+
+<p><%= link_to t('back'), :back %></p>

data/app/views/ecm/pictures/pictures/_picture.html.erb

@@ -1,7 +1,6 @@
-<div class="row">
-  <div class="picture span3" id="picture-<%= picture.to_param %>">
-    <%= link_to("#{picture.image.url}#{File.extname(picture.image_file_name)}", :class => 'thumbnail') do %>
-      <%= image_tag(picture.image.url(:default_thumb)) %>
-    <% end %>
-  </div>
+<div class="picture span3" id="picture-<%= picture.to_param %>">
+  <%= link_to("#{picture.image.url}#{File.extname(picture.image_file_name).downcase}", :class => 'thumbnail') do %>
+    <% image_tag(picture.image.url(:default_thumb)) %>
+  <% end %>
 </div>
+

data/app/views/ecm/pictures/pictures/index.html.erb

@@ -0,0 +1,10 @@
+<h1><%= Ecm::Pictures::Picture.model_name.human %></h1>
+
+<% @pictures.each do |picture| %>
+  <p>
+    <h2><%= picture %></h2>
+    <div class="row">
+      <%= render picture %>
+    </div>
+  </p>
+<% end %>

data/app/views/ecm/pictures/pictures/show.html.erb

@@ -0,0 +1,11 @@
+<h1><%= @picture.to_s %></h1>
+
+<p>
+  <div class="row">
+    <%= render @picture %>
+  </div>
+</p>
+
+<p><%= link_to @picture.picture_gallery, @picture.picture_gallery, :class => 'btn' %></p>
+
+<p><%= link_to t('back'), :back %></p>

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

@@ -20,3 +20,6 @@ de:
         position: Position
         thumbnail: Vorschau
         updated_at: Aktualisiert am
+  resources:
+    ecm_pictures_pictures: bilder
+

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

@@ -20,4 +20,6 @@ en:
         position: position
         thumbnail: thumbnail
         updated_at: updated at
+  resources:
+    ecm_pictures_pictures: pictures
 

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

@@ -16,3 +16,6 @@ de:
         pictures_count: Bilder
         position: Position
         updated_at: Aktualisiert am
+  resources:
+    ecm_pictures_picture_galleries: bildgalerien
+

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

@@ -16,4 +16,6 @@ en:
         pictures_count: pictures
         position: position
         updated_at: updated at
+  resources:
+    ecm_pictures_picture_galleries: picture-galleries
 

data/lib/ecm/pictures/routing.rb

@@ -0,0 +1,22 @@
+module Ecm
+  module Pictures
+    class Routing
+      # Creates the routes for pictures and galleries. You can pass options to
+      # specify the actions for both pictures and/or galleries.
+      #
+      #   Ecm::Pictures::Routing.routes(self, { :picture_gallery_actions => [ :show ]})
+      #
+      # This will only create the show action for picture galleries, but omit the index action.
+      def self.routes(router, options = {})
+        options.reverse_merge!(
+          { :picture_gallery_actions => [:index, :show], 
+            :picture_actions => [:index, :show] 
+          }
+        )
+        
+        router.resources :ecm_pictures_picture_galleries, :only => options[:picture_gallery_actions], :controller => 'ecm/pictures/picture_galleries'
+        router.resources :ecm_pictures_pictures,:only => options[:picture_actions], :controller => 'ecm/pictures/pictures'      
+      end  
+    end
+  end
+end    

data/lib/ecm/pictures/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Pictures
-    VERSION = "1.0.0.pre"
+    VERSION = "1.0.1.pre"
   end  
 end

data/lib/ecm_pictures.rb

@@ -6,6 +6,7 @@ require 'paperclip'
 
 require 'ecm/pictures/engine'
 require 'ecm/pictures/configuration'
+require 'ecm/pictures/routing'
 require 'ecm/pictures/version'
 
 module Ecm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_pictures
 version: !ruby/object:Gem::Version 
-  hash: 961915988
+  hash: 961915984
   prerelease: 6
   segments: 
   - 1
   - 0
-  - 0
+  - 1
   - pre
-  version: 1.0.0.pre
+  version: 1.0.1.pre
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-03 00:00:00 Z
+date: 2012-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -351,12 +351,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- app/controllers/ecm/pictures/picture_galleries_controller.rb
+- app/controllers/ecm/pictures/pictures_controller.rb
 - app/helpers/ecm/pictures_helper.rb
 - app/helpers/markup_helper.rb
+- app/views/ecm/pictures/picture_galleries/show.html.erb
 - app/views/ecm/pictures/picture_galleries/_picture_gallery.html.erb
+- app/views/ecm/pictures/picture_galleries/index.html.erb
 - app/views/ecm/pictures/picture_galleries/_picture_gallery_for_index.html.erb
 - app/views/ecm/pictures/pictures/_picture.html.erb
+- 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/picture_gallery.rb
 - app/models/ecm/pictures/picture.rb
 - config/locales/ecm.pictures.picture_gallery.de.yml
@@ -376,6 +382,7 @@ files:
 - lib/ecm/pictures/active_admin/ecm_pictures_pictures.rb
 - lib/ecm/pictures/engine.rb
 - lib/ecm/pictures/version.rb
+- lib/ecm/pictures/routing.rb
 - lib/ecm/pictures/configuration.rb
 - MIT-LICENSE
 - Rakefile