refinerycms-photo-gallery 0.1.2 → 0.2.0

data/app/assets/stylesheets/refinery/photo_gallery/admin/photo_gallery.css.scss

@@ -1,6 +1,3 @@
-.folder_icon {
-  background-image: image-url('refinery/photo_gallery/admin/icons/folder.png');
-}
 .folder_add_icon {
   background-image: image-url('refinery/photo_gallery/admin/icons/folder_add.png');
 }
@@ -31,10 +28,6 @@
 
 
 
-.settings_icon {
-  background-image: image-url('refinery/photo_gallery/admin/icons/cog.png');
-}
-
 ul.collapsible_menu li {
   position: relative;
 }
@@ -47,12 +40,7 @@ ul.collapsible_menu li span.arrow {
   height: 7px;
   cursor: pointer;
 }
-ul.collapsible_menu li span.arrow {
-  background-image: image-url('refinery/photo_gallery/admin/icons/up.gif');
-}
-ul.collapsible_menu li.closed span.arrow {
-  background-image: image-url('refinery/photo_gallery/admin/icons/down.gif');
-}
+
 ul.collapsible_menu > div {
   width: 93%;
   margin: 0px auto;

data/app/controllers/refinery/photo_gallery/admin/albums_controller.rb

@@ -2,13 +2,12 @@ module Refinery
   module PhotoGallery
     module Admin
       class AlbumsController < ::Refinery::AdminController
-        cache_sweeper AlbumSweeper
         crudify :'refinery/photo_gallery/album', :order => "created_at DESC" , :xhr_paging => true
 
         def create
-          @album = Album.new(params[:album])
+          @album = Album.new(album_params)
 
-          if @album.save(params[:album])
+          if @album.save
             flash[:notice]= t('refinery.crudify.created',:what => "'#{@album.title}'" )
 
             redirect_to  refinery.upload_photo_gallery_admin_album_photos_path(@album)
@@ -17,6 +16,14 @@ module Refinery
           end
         end
 
+        protected
+
+        def album_params
+          params.require(:album).permit(:title, :description, :address, :note, :tags, :longitude, :latitude, :path, :path_prefix, :collection_ids => [])
+        end
+
+        alias_method :new_album_params, :album_params
+        alias_method :edit_album_params, :album_params
 
       end
     end

data/app/controllers/refinery/photo_gallery/admin/collections_controller.rb

@@ -4,6 +4,14 @@ module Refinery
       class CollectionsController < ::Refinery::AdminController
 
         crudify :'refinery/photo_gallery/collection', :order => "created_at DESC" , :xhr_paging => true
+
+        protected
+
+        def collection_params
+          params.require(:collection).permit(:title, :description)
+        end
+
+        alias_method :new_collection_params, :collection_params
       end
     end
   end

data/app/controllers/refinery/photo_gallery/admin/photos_controller.rb

@@ -5,8 +5,6 @@ module Refinery
     module Admin
       class PhotosController < ::Refinery::AdminController
         include PhotosHelper
-        helper :"refinery/photo_gallery/admin/photos"
-        cache_sweeper PhotoSweeper
 
         #TODO delete update method from routes
         #TODO delete edit action from routes
@@ -14,11 +12,11 @@ module Refinery
         #TODO after destroying album, delete empty folders
 
         def upload
-          @album = Album.find( params[:album_id])
+          @album = Album.find( params[:album_id].to_i)
         end
 
         def create
-          @photo = Photo.new(params[:photo])
+          @photo = Photo.new(new_photo_params)
           @photo.file = params[:file]
           @photo.title = get_filename_part(params[:name])
 
@@ -30,17 +28,17 @@ module Refinery
         end
 
         def edit_multiple
-          @album = Album.find( params[:album_id] )
+          @album = Album.find( params[:album_id].to_i )
           @photos = @album.photos.order("created_at DESC")
         end
 
 
         def update_multiple
-          photo_ids = params[:photos][:photo].map{ |key, hash| key }
+          photo_ids = update_multiple_photo_params["photo"].map{ |key, hash| key }
 
           @photos = Photo.find(photo_ids)
           @photos.each do |photo|
-            photo.update_attributes(params[:photos][:photo][photo.id.to_s]) #TODO use ! method and validate exceptions
+            photo.update_attributes(update_multiple_photo_params["photo"][photo.id.to_s]) #TODO use ! method and validate exceptions
           end
 
           flash[:notice] = t('updated', :scope=> 'refinery.photo_gallery.admin.photos')
@@ -49,10 +47,13 @@ module Refinery
 
 
         def destroy
-          @photo = Photo.find( params[:id])
+          @photo = Photo.find( params[:id].to_i)
 
           if @photo.destroy
             respond_to do |format|
+              format.html {
+                redirect_to refinery.photo_gallery_admin_albums_path
+              }
               format.js {
                 render :partial=> "destroy", :locals => {:photo => @photo}
               }
@@ -62,7 +63,17 @@ module Refinery
           end
         end
 
+        protected
+
+        def update_multiple_photo_params
+          params.require(:photos).permit(:photo => [ :id, :title, :description, :url, :css_class, :preview_type, :longitude, :latitude ] )
+        end
+
+        def photo_params
+          params.require(:photo).permit(:album_id, :title, :description, :longitude, :latitude, :url, :css_class, :preview_type)
+        end
 
+        alias_method :new_photo_params, :photo_params
       end
     end
   end

data/app/helpers/refinery/photo_gallery/admin/photos_helper.rb

@@ -4,7 +4,11 @@ module Refinery
       module PhotosHelper
 
         def get_filename_part(filename)
-          filename[0, filename.rindex('.') ]
+          if filename.present?
+            filename[0, filename.rindex('.') ]
+          else
+            ""
+          end
         end
       end
     end

data/app/models/refinery/album_page.rb

@@ -5,7 +5,6 @@ module Refinery
       belongs_to :page, :polymorphic => true
 
 
-      attr_accessible :page_id, :page_type, :album_id
 
     end
 end

data/app/models/refinery/photo_gallery/album.rb

@@ -11,8 +11,6 @@ module Refinery
       validates :path, :presence => true, :uniqueness => true
 
       attr_accessor :path_prefix
-      attr_accessible :title, :description, :address, :note, :tags, :longitude, :latitude, :path, :path_prefix, :collection_ids
-      acts_as_indexed :fields => [:title, :description]
 
       self.per_page = Refinery::PhotoGallery.albums_per_page
 

data/app/models/refinery/photo_gallery/collection.rb

@@ -6,10 +6,8 @@ module Refinery
 
       #TODO Allow to remove collection only if no album belongs to it
 
-      attr_accessible :title, :description
 
       validates :title, :presence => true
-      acts_as_indexed :fields => [:title, :description]
 
       self.per_page = Refinery::PhotoGallery.collections_per_page
 

data/app/models/refinery/photo_gallery/photo.rb

@@ -4,8 +4,7 @@ module Refinery
       belongs_to :album
 
       mount_uploader :file, Refinery::PhotoGallery::Admin::FileUploader
-      acts_as_indexed :fields => [:title, :description]
-      attr_accessible :album_id, :title, :description, :longitude, :latitude
+
       validates :title, :presence => true
       #TODO validate latitude/longitude - convert from nondecimal to decimal using inspiration from https://github.com/airblade/geo_tools/tree/master/lib/geo_tools
 
@@ -20,6 +19,19 @@ module Refinery
         "#{id}-#{title.parameterize}"
       end
 
+      def link_url
+        self.url.blank? ? file.single.url : self.url
+      end
+
+      def preview_link(ext_type = :album)
+        begin
+          type = self.preview_type.blank? ? ext_type : self.preview_type
+          file.url(type)
+        rescue Exception => e
+          file.url(:error_wrong_preview_version)
+        end
+      end
+
       private
 
       def set_title
@@ -44,20 +56,6 @@ module Refinery
       end
 
 
-=begin
-      #TODO add checkbox to check if it should be writed to exif, globally on/off writing
-      def exif_write
-        # should only write if tags are changed as images can be large and thus ExifTool will take a while to write to the file
-        photo = MiniExiftool.new(self.file.file.file)
-        photo.GPSLongitude = self.longitude
-        photo.GPSLatitude = self.latitude
-        photo.DocumentName = self.title
-        photo.ImageDescription = self.description
-        photo.Keywords = self.tags
-        photo.save
-      end
-=end
-
     end
   end
 end

data/app/uploaders/refinery/photo_gallery/admin/file_uploader.rb

@@ -47,6 +47,7 @@ module Refinery
             "thumbs/#{model.album.path}"
           end
         end
+
         version :preview do
           process :resize_to_fit => Refinery::PhotoGallery.preview_dimensions
           process :auto_orient
@@ -54,8 +55,8 @@ module Refinery
             "thumbs/#{model.album.path}"
           end
         end
-        version :single do
 
+        version :single do
           process :resize_to_limit => Refinery::PhotoGallery.single_dimensions
           process :auto_orient
 
@@ -64,6 +65,11 @@ module Refinery
           end
         end
 
+        version :error_wrong_preview_version do
+          def store_dir
+            "error/wrong_preview_version.png"
+          end
+        end
 
         # Add a white list of extensions which are allowed to be uploaded,
         def extension_white_list

data/app/views/refinery/photo_gallery/admin/_submenu.html.erb

@@ -1,51 +1,25 @@
 <nav id='actions' class='multilist'>
-  <ul class='search_list'>
-    <li class='not_a_link'>
-      <% if params[:controller] == "refinery/photo_gallery/admin/collections" %>
-          <%= render :partial => "/refinery/admin/search",
-                     :locals => {
-                             :url => refinery.photo_gallery_admin_collections_path
-                     } %>
-      <% elsif params[:controller] == "refinery/photo_gallery/admin/albums" %>
-          <%= render :partial => "/refinery/admin/search",
-                     :locals => {
-                             :url => refinery.photo_gallery_admin_albums_path
-                     } %>
-      <% end %>
-    </li>
-  </ul>
 
   <ul  class='collapsible_menu'>
     <li class='not_a_link'>
-      <%= link_to t('.albums.title'), '#',
-                  :class => 'album_icon' %>
-    </li>
-    <li>
       <%= link_to t('.albums.manage'), refinery.photo_gallery_admin_albums_path,
-                  :class => 'album_edit_icon' %>
+                  :class => 'folder_icon' %>
     </li>
     <li>
       <%= link_to t('.albums.new'), refinery.new_photo_gallery_admin_album_path,
-                  :class => 'album_add_icon' %>
+                  :class => 'add_icon' %>
     </li>
   </ul>
 
   <ul  class='collapsible_menu'>
     <li class='not_a_link'>
-      <%= link_to t('.collections.title'), '#',
-                  :class => 'folder_icon' %>
-    </li>
-    <li>
       <%= link_to t('.collections.manage'), refinery.photo_gallery_admin_collections_path,
-                  :class => 'folder_edit_icon' %>
+                  :class => 'folder_icon' %>
     </li>
     <li>
       <%= link_to t('.collections.new'), refinery.new_photo_gallery_admin_collection_path,
-                  :class => 'folder_add_icon' %>
+                  :class => 'add_icon' %>
     </li>
   </ul>
-
-
 </nav>
 
-<% content_for :stylesheets, stylesheet_link_tag('refinery/photo_gallery/admin/backend') %>

data/app/views/refinery/photo_gallery/admin/albums/_form.html.erb

@@ -11,10 +11,9 @@
       <%= f.text_field :title, {:class => 'larger widest'} %><br />
     </div>
 
-    <%# TODO  use pop up to create collection %>
     <div class='field'>
       <%= label :collection, t('.album_belongs_to_collection')   %>
-      <%= collection_select(:album, :collection_ids, Refinery::PhotoGallery::Collection.all(:order=> "title ASC"), :id, :title,
+      <%= collection_select(:album, :collection_ids, Refinery::PhotoGallery::Collection.all.order("title ASC"), :id, :title,
                             { },
                             { :data => {:placeholder=> t('.choose_collection')}, :multiple=> true, :class=> "chzn-select", :style=>"width:400px;"}) %>
     </div>

data/app/views/refinery/photo_gallery/admin/collections/index.html.erb

@@ -18,4 +18,5 @@
     <% end %>
   </div>
 </section>
+
 <%= render :partial => '/refinery/photo_gallery/admin/submenu' %>

data/app/views/refinery/photo_gallery/admin/photos/_form_fields.html.erb

@@ -15,6 +15,7 @@
           <%= p.text_area :description, :rows => "5", :cols=> "57" %>
         </div>
 
+
         <div class='field-group'>
             <%= p.label :longitude, :tooltip=> t('.use_decimal_format') %>
             <%= p.text_field :longitude, :size=> 13 %>

data/app/views/refinery/photo_gallery/admin/photos/upload.html.erb

@@ -1,9 +1,10 @@
 <%= content_for :javascripts do  %>
-    <style type="text/css">@import url('/assets/refinery/photo_gallery/admin/plupload/jquery.plupload.queue.css');</style>
 
-    <%= javascript_include_tag "/assets/refinery/photo_gallery/admin/plupload/plupload.full.js" -%>
-    <%= javascript_include_tag "/assets/refinery/photo_gallery/admin/plupload/jquery.plupload.queue.js"  -%>
+    <%= javascript_include_tag "/assets/refinery/photo_gallery/admin/plupload/plupload.full.min.js" -%>
+    <%= javascript_include_tag "/assets/refinery/photo_gallery/admin/plupload/jquery.plupload.queue/jquery.plupload.queue.js"  -%>
     <%= javascript_include_tag "/assets/refinery/photo_gallery/admin/plupload/i18n/" + Refinery::PhotoGallery.plupload_locale.to_s + ".js"  -%>
+    <style type="text/css">@import url('/assets/refinery/photo_gallery/admin/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css');</style>
+
 
     <script type="text/javascript">
         <% session_key = Rails.application.config.session_options[:key] %>

data/app/views/refinery/photo_gallery/albums/_photos.html.erb

@@ -5,8 +5,12 @@
 
 <ul id="gallery" class="clearfix">
   <% photos_for_page.each_with_index do |photo, index|  %>
-      <li>
-        <%= link_to (image_tag  photo.file.url(:album), :width => Refinery::PhotoGallery.album_dimensions[0], :height => Refinery::PhotoGallery.album_dimensions[1]  ), photo.file.single.url, {
+      <% if photo.css_class.present? %>
+          <li class="<%= photo.css_class %>" >
+      <% else %>
+        <li>
+      <% end %>
+      <%= link_to (image_tag  photo.preview_link(:album), :width => Refinery::PhotoGallery.album_dimensions[0], :height => Refinery::PhotoGallery.album_dimensions[1]  ), photo.link_url, {
                 :target=> "_blank",
                 :class=>"fancybox",
                 :data =>{:title=> t('.image') + ' ' + (index + 1 ).to_s + '/' + photos_for_page.total_pages.to_s + ' ' + photo.title + '<br/><br/>' + photo.description},