refinerycms-photo-gallery 0.0.2.dev → 0.1.0

data/app/sweepers/refinery/photo_gallery/admin/photo_sweeper.rb

@@ -0,0 +1,27 @@
+module Refinery
+  module PhotoGallery
+    module Admin
+      class PhotoSweeper < ActionController::Caching::Sweeper
+        observe Photo
+
+        def sweep(photo)
+          # only file store supports regexp
+          begin
+            # TODO This is slow, but I was unable to get the actual cache folder path. 
+            # This should be replaced with FileUtils.rm to get better speed
+            expire_fragment( %r{refinery/photo_gallery/albums/#{photo.album_id}/page/\d*})
+          rescue NotImplementedError
+            Rails.cache.clear
+            warn "**** [REFINERY PHOTO GALLERY] The cache store you are using is not compatible with this engine. Only file_store is supported. Clearing entire cache instead ***"
+          ensure
+            return true
+          end
+        end
+
+        alias_method :after_create, :sweep
+        alias_method :after_update, :sweep
+        alias_method :after_destroy, :sweep
+      end
+    end
+  end
+end

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

@@ -27,12 +27,6 @@ module Refinery
           storage :file
         end
 
-=begin
-        #Fix for bug TypeError: can't convert nil into String  #TODO it should work without this method, but don't. Why?
-        def to_s
-          store_dir + '/' + full_filename(original_filename)
-        end
-=end
 
         # Override the directory where uploaded files will be stored
         # This is a sensible default for uploaders that are meant to be mounted:
@@ -44,44 +38,33 @@ module Refinery
           "tmp"
         end
 
-        # Provide a default URL as a default if there hasn't been a file uploaded
-        #     def default_url
-        #       "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-        #     end
 
-        # Process files as they are uploaded.
-        #     process :scale => [200, 300]
-        #
-        #     def scale(width, height)
-        #       # do something
-        #     end
-
-        # Create different versions of your uploaded files
-        version :collection do
-          process :resize_to_fill => Refinery::PhotoGallery.collection_dimensions
-          def store_dir
-            "thumbs/#{model.album.path}"
-          end
-        end
         version :album do
-          process :resize_to_fill => Refinery::PhotoGallery.album_dimensions
+          resize_to_fill(Refinery::PhotoGallery.album_dimensions[0], Refinery::PhotoGallery.album_dimensions[1], 'North')
+          process :auto_orient
+
           def store_dir
             "thumbs/#{model.album.path}"
           end
         end
         version :preview do
           process :resize_to_fit => Refinery::PhotoGallery.preview_dimensions
+          process :auto_orient
           def store_dir
             "thumbs/#{model.album.path}"
           end
         end
         version :single do
+
           process :resize_to_limit => Refinery::PhotoGallery.single_dimensions
+          process :auto_orient
+
           def store_dir
             "thumbs/#{model.album.path}"
           end
         end
 
+
         # Add a white list of extensions which are allowed to be uploaded,
         def extension_white_list
           Refinery::PhotoGallery.extension_white_list
@@ -93,12 +76,20 @@ module Refinery
         #     end
 
 
+        def auto_orient
+          manipulate! do |image|
+            image.auto_orient
+            image
+          end
+        end
+
+
         # Deleting uploaded file in files/ dir. This method dont do removing of original file in tmp
         def delete_uploaded_file(new_file)
-         if version_name.blank? && Refinery::PhotoGallery.delete_uploaded_file
-           filename_to_delete =  File.join(Rails.root.to_s,Refinery::PhotoGallery.photo_gallery_dir_relative_to_root, store_dir, filename )
-           File.delete(filename_to_delete)
-         end
+          if version_name.blank? && Refinery::PhotoGallery.delete_uploaded_file
+            filename_to_delete =  File.join(Rails.root.to_s,Refinery::PhotoGallery.photo_gallery_dir_relative_to_root, store_dir, filename )
+            File.delete(filename_to_delete)
+          end
         end
 
         # store! nil's the cache_id after it finishes so we need to remember it for deletion

data/app/views/refinery/admin/pages/tabs/_form.html.erb

@@ -0,0 +1,13 @@
+
+<%= f.fields_for @page.album_page do |album_page_form| %>
+    <%= album_page_form.label :album_id,  t('.join_page_with_album')  %>
+    <%= album_page_form.grouped_collection_select( :album_id, Refinery::PhotoGallery::Collection.includes(:albums).all, :albums, :title, :id, :title,
+                                                   { :include_blank => true},
+                                                   { :data => {
+                                                                :placeholder=> t('.choose_album')},
+                                                                :multiple=> false,
+                                                                :class=> "chzn-select-deselect",
+                                                                :style=>"min-width: 300px;"
+                                                   }) %>
+<% end %>
+

data/app/views/refinery/admin/pages/tabs/_photo_gallery.html.erb

@@ -0,0 +1,12 @@
+<div class='wym_skin_refinery page_part'>
+  <%= render '/refinery/admin/pages/tabs/photo_pages_bar' %>
+
+  <div id="photo_gallery_wym_editation" class='wym_box field ' style="height: 300px;">
+    <% if @page.album_page.nil?
+         @page.build_album_page
+       end %>
+
+
+    <%= render "/refinery/admin/pages/tabs/form", :f => f %>
+  </div>
+</div>

data/app/views/refinery/admin/pages/tabs/_photo_pages_bar.html.erb

@@ -0,0 +1,4 @@
+<div >
+  <span class='clearfix label_inline_with_link'></span>
+
+</div>

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

@@ -1,44 +1,51 @@
 <nav id='actions' class='multilist'>
   <ul class='search_list'>
     <li class='not_a_link'>
-      <%= render :partial => "/refinery/admin/search",
-                 :locals => {
-                         :url => refinery.photo_gallery_admin_collections_path
-                 } %>
-    </li>
-  </ul>
+      <% 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('.collections.title'), '#',
-                  :class => 'folder_icon' %>
-    </li>
-    <li>
-      <%= link_to t('.collections.manage'), refinery.photo_gallery_admin_collections_path,
-                  :class => 'folder_edit_icon' %>
-    </li>
-    <li>
-      <%= link_to t('.collections.new'), refinery.new_photo_gallery_admin_collection_path,
-                  :class => 'folder_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' %>
+            </li>
+            <li>
+              <%= link_to t('.collections.new'), refinery.new_photo_gallery_admin_collection_path,
+                          :class => 'folder_add_icon' %>
+            </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' %>
-    </li>
-    <li>
-      <%= link_to t('.albums.new'), refinery.new_photo_gallery_admin_album_path,
-                  :class => 'album_add_icon' %>
-    </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' %>
+            </li>
+            <li>
+              <%= link_to t('.albums.new'), refinery.new_photo_gallery_admin_album_path,
+                          :class => 'album_add_icon' %>
+            </li>
+          </ul>
 
 
-</nav>
+          </nav>
 
-<% content_for :stylesheets, stylesheet_link_tag('refinery/photo_gallery/admin/backend') %>
+          <% content_for :stylesheets, stylesheet_link_tag('refinery/photo_gallery/admin/backend') %>

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

@@ -5,7 +5,7 @@
       <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
       <% if @albums.any? %>
           <ul>
-            <%= render :partial => "album", :album => @albums %>
+            <%= render :partial => "album", :collection => @albums %>
           </ul>
       <% else %>
           <p><%= t('no_results', :scope => 'refinery.admin.search') %></p>
@@ -25,4 +25,4 @@
           </p>
       <% end %>
   <% end %>
-</div>
+</div>

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

@@ -1,7 +1,7 @@
 <div id="photo-<%=  photo.id %>" class="form-photo-field">
   <%= fields_for "photos[photo]", photo, :index => photo.id do |p|%>
       <div class="form_photo_left">
-        <%= link_to (image_tag  photo.file.collection.url), photo.file.single.url, {:target=> "_blank"} %>
+        <%= link_to (image_tag  photo.file.preview.url), photo.file.single.url, {:target=> "_blank"} %>
       </div>
 
       <div class="form_photo_right">

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

@@ -3,9 +3,7 @@
 
     <%= 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"  -%>
-    <% if Refinery::PhotoGallery.plupload_locale.present? %>
-        <%= javascript_include_tag "/assets/refinery/photo_gallery/admin/plupload/i18n/" + Refinery::PhotoGallery.plupload_locale + ".js"  -%>
-    <% end %>
+    <%= javascript_include_tag "/assets/refinery/photo_gallery/admin/plupload/i18n/" + Refinery::PhotoGallery.plupload_locale.to_s + ".js"  -%>
 
     <script type="text/javascript">
         <% session_key = Rails.application.config.session_options[:key] %>
@@ -31,12 +29,6 @@
                     quality : <%= Refinery::PhotoGallery.client_side_resize_params[:quality] %>},
                 <% end %>
 
-                // Flash settings
-                flash_swf_url : '/assets/refinery/photo_gallery/admin/plupload/plupload.flash.swf',
-
-                // Silverlight settings
-                silverlight_xap_url : '/assets/refinery/photo_gallery/admin/plupload/plupload.silverlight.xap',
-
                 // Post init events, bound after the internal events
                 init : {
                     FileUploaded: function(up, file, info) {
@@ -81,7 +73,4 @@
     </div>
 <% end %>
 
-
-
-<br><%#= link_to "Edit uploaded photos", untouched_album_photos_path( @album ) %>
-<br><%#= link_to "Back to #{@album.title}", @album %>
+<br><br>

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

@@ -0,0 +1,20 @@
+<% cache "refinery/photo_gallery/albums/#{@page.album.id}/page/#{params[:page]}" do %>
+<% photos_for_page = @page.photos_for_page(params[:page])  %>
+
+<%= will_paginate photos_for_page %>
+
+<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, {
+                :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},
+                :rel=>"group",
+                :title=> photo.title } %>
+      </li>
+  <% end %>
+</ul>
+
+    <%= will_paginate photos_for_page %>
+<% end %>

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

@@ -0,0 +1,5 @@
+$(document).ready(function(){
+    $('#photo_gallery').html("<%= escape_javascript( render :partial => "refinery/photo_gallery/albums/photos", :formats => [:html]  ) %>");
+    // Needed for Fancybox 1.3.4. Fancybox v2 can handle ajax content replacement
+    $('#photo_gallery').trigger('gallery_loaded');
+});

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

@@ -0,0 +1,18 @@
+<% if @page.album.present? %>
+
+    <% cache "refinery/photo_gallery/albums/#{@page.album.id}" do %>
+        <h2 >
+          <%= @page.album.title %>
+        </h2>
+
+        <div>
+          <%= raw @page.album.description %>
+        </div>
+    <% end %>
+
+    <div id="photo_gallery">
+      <%= render :partial => "/refinery/photo_gallery/albums/photos" %>
+    </div>
+
+<% end %>
+

data/config/locales/en.yml

@@ -1,19 +1,21 @@
 en:
+  chosen:
+    no_results: "No results matched"
   refinery:
+    admin:
+      pages:
+        tabs:
+          form:
+            join_page_with_album: "Join page with album:"
+            choose_album: "Click to choose photo album"
+            flash:
+              connection_destroyed: "Connection between album and page was successfully deleted."
     plugins:
       refinerycms_photo_gallery:
         title: Photo Gallery
         description: Provides advanced photo gallery
+        tab_name: Photo Gallery
     photo_gallery:
-      albums:
-        show:
-          image: Image
-          no_photos: There are no photos in this album yet
-      collections:
-        show:
-          no_albums: There are no albums in this collection yet
-        index:
-          no_collections: There are no collections yet
       admin:
         submenu:
           collections:
@@ -26,24 +28,26 @@ en:
             new: Create new album
         collections:
           collection:
-            view_live_html: 'View this collection live <br/><em>(opens in a new window)</em>'
+            view_live_html: View this collection live <br/><em>(opens in a new window)</em>
             delete: Remove this collection forever
             edit: Edit this collection
           index:
-            no_items_yet: 'There are no collections yet. Click "%{create}" to add your first collection.'
+            no_items_yet: There are no collections yet. Click "%{create}" to add your
+              first collection.
           new:
             title: Create new collection
           edit:
             title: Edit collection
         albums:
           album:
-            view_live_html: 'View this album live <br/><em>(opens in a new window)</em>'
+            view_live_html: View this album live <br/><em>(opens in a new window)</em>
             delete: Remove this album forever
             edit: Edit this album
             upload_photos: Upload new photos to album
             edit_photos: Edit photos in album
           index:
-            no_items_yet: 'There are no albums yet. Click "%{create}" to add your first album.'
+            no_items_yet: There are no albums yet. Click "%{create}" to add your first
+              album.
           new:
             title: Create new album
           edit:
@@ -51,7 +55,8 @@ en:
           form:
             album_belongs_to_collection: Album belongs to collection(s)
             more_options: More options
-            more_options_tooltip: Enable edit more fields like adress, latitude, longitude, note
+            more_options_tooltip: Enable edit more fields like adress, latitude, longitude,
+              note
             choose_collection: Choose collection(s)
             path_prefix: Path prefix
             number_of_photos: Contains %{number} photos
@@ -61,19 +66,30 @@ en:
           manage: Manage
           new: Upload new photos
           edit_multiple:
-            no_photos_yet: There are no photos in album yet. Click "%{create} to add your first photos to album.'
+            no_photos_yet: There are no photos in album yet. Click "%{create} to add
+              your first photos to album.'
           photo:
             delete: Remove this photo forever
             deleted: Deleted photo "%{title}"
           form_fields:
             use_decimal_format: Use decimal format
-
-
+      photo_pages:
+        show:
+          other: Other Photo Pages
+      albums:
+        show:
+          no_photos: There are no photos in this album yet
+        photos:
+          image: Image
+      collections:
+        show:
+          no_albums: There are no albums in this collection yet
+        index:
+          no_collections: There are no collections yet
   activerecord:
-    models:
-      refinery/photo_gallery/collection: Collection
-      refinery/photo_gallery/collection: Album
     attributes:
+      refinery/photo_gallery/photo_page:
+        page_id: Page
       refinery/photo_gallery/collection:
         title: Title
         description: Description
@@ -81,15 +97,17 @@ en:
         title: Title
         description: Description
         longitude: Longitude
-        latitude:  Latitude
+        latitude: Latitude
         path: Path
         adress: Adress
         note: Note
         tags: Tags
       refinery/photo_gallery/photo:
-         title: Title
-         description: Description
-         longitude: Longitude
-         latitude:  Latitude
-         path: Path
-         file: File
+        title: Title
+        description: Description
+        longitude: Longitude
+        latitude: Latitude
+        path: Path
+        file: File
+    models:
+      refinery/photo_gallery/collection: Album