refinerycms-photo-gallery 0.0.2.dev → 0.1.0

data/config/locales/sk.yml

@@ -1,19 +1,21 @@
 sk:
+  chosen:
+    no_results: "Žiadne výsledky pre zadané kritériá"
   refinery:
+    admin:
+      pages:
+        tabs:
+          form:
+            join_page_with_album: "K stránke pripojiť fotoalbum"
+            choose_album: "Kliknite pre výber fotoalbumu"
+            flash:
+              connection_destroyed: "Prepojenie albumu so stránkou bolo zmazané"
     plugins:
       refinerycms_photo_gallery:
         title: Fotogaléria
         description: Poskytuje fotogalériu
+        tab_name: Fotogaléria
     photo_gallery:
-      albums:
-        show:
-          image: Obrázok
-          no_photos: V albume sa zatiaľ nenachádzajú žiadne fotografie
-      collections:
-        show:
-          no_albums: V tejto skupine albumov sa zatiať nenachádza žiadny album
-        index:
-          no_collections: Zatiaľ neboli vytvorené žiadne skupiny albumov
       admin:
         submenu:
           collections:
@@ -26,24 +28,27 @@ sk:
             new: Vytvoriť nový albun
         collections:
           collection:
-            view_live_html: 'Pozrieť náhľad skupiny albumov<br/><em>(otvorí sa v novom okne)</em>'
+            view_live_html: Pozrieť náhľad skupiny albumov<br/><em>(otvorí sa v novom
+              okne)</em>
             delete: Zmazať skupinu albumov
             edit: Upraviť skupinu albumov
           index:
-            no_items_yet: 'Zatiaľ neboli vytvorené žiadne skupiny albumov. Klikni  "%{create}" pre vytvorenie prvej.'
+            no_items_yet: Zatiaľ neboli vytvorené žiadne skupiny albumov. Klikni  "%{create}"
+              pre vytvorenie prvej.
           new:
             title: Vytvoriť novú skupinu albumov
           edit:
             title: Upraviť skupinu albumov
         albums:
           album:
-            view_live_html: 'Zobraziť náhľad albumu <br/><em>(otvorí sa v novom okne)</em>'
+            view_live_html: Zobraziť náhľad albumu <br/><em>(otvorí sa v novom okne)</em>
             delete: Zmazať album
             edit: Upraviť album
             upload_photos: Nahrať fotografie do albumu
             edit_photos: Upraviť fotografie v albume
           index:
-            no_items_yet: 'Zatiaľ neboli vytvorené žiadne albumy. Klikni "%{create}" pre vytvorenie prvého.'
+            no_items_yet: Zatiaľ neboli vytvorené žiadne albumy. Klikni "%{create}"
+              pre vytvorenie prvého.
           new:
             title: Vytvoriť nový album
           edit:
@@ -51,28 +56,41 @@ sk:
           form:
             album_belongs_to_collection: Album patrí do skupiny albumov
             more_options: Rozšírené nastavenia
-            more_options_tooltip: Umožní upraviť ďalšie polia ako adresa, zemepisná dĺžka/šírka, poznámka
+            more_options_tooltip: Umožní upraviť ďalšie polia ako adresa, zemepisná
+              dĺžka/šírka, poznámka
             choose_collection: Vyber skupiny albumov
             path_prefix: Prefix priečinka
-            number_of_photos: 'Obsahuje fotografií:  %{number}'
+            number_of_photos: ! 'Obsahuje fotografií:  %{number}'
         photos:
           updated: Fotografie upravené
           title: Fotografie
           manage: Spravovať
           new: Nahrať nové fotografie
           edit_multiple:
-            no_photos_yet: Zatiaľ neboli nahrané žiadne fotografie. Klikni "%{create}" pre pridanie prvých.
+            no_photos_yet: Zatiaľ neboli nahrané žiadne fotografie. Klikni "%{create}"
+              pre pridanie prvých.
           photo:
             delete: Zmazať fotografiu
             deleted: Fotografia "%{title}" zmazaná
           form_fields:
             use_decimal_format: Použi decimálny zápis
-
+      photo_pages:
+        show:
+          other: Daľšie Photo Pages
+      albums:
+        show:
+          no_photos: V albume sa zatiaľ nenachádzajú žiadne fotografie
+        photos:
+          image: Obrázok
+      collections:
+        show:
+          no_albums: V tejto skupine albumov sa zatiať nenachádza žiadny album
+        index:
+          no_collections: Zatiaľ neboli vytvorené žiadne skupiny albumov
   activerecord:
-    models:
-      refinery/photo_gallery/collection: Skupina albumov
-      refinery/photo_gallery/collection: Album
     attributes:
+      refinery/photo_gallery/photo_page:
+        page_id: Page
       refinery/photo_gallery/collection:
         title: Názov
         description: Popis
@@ -80,15 +98,17 @@ sk:
         title: Názov
         description: Popis
         longitude: Zemepisná dĺžka
-        latitude:  Zemepisná šírka
+        latitude: Zemepisná šírka
         path: Názov priečinku
         adress: Adresa
         note: Poznámka
         tags: Tagy
       refinery/photo_gallery/photo:
-         title: Názov
-         description: Popis
-         longitude: Zemepisná dĺžka
-         latitude:  Zemepisná šírka
-         path: Názov priečinku
-         file: Súbor
+        title: Názov
+        description: Popis
+        longitude: Zemepisná dĺžka
+        latitude: Zemepisná šírka
+        path: Názov priečinku
+        file: Súbor
+    models:
+      refinery/photo_gallery/collection: Album

data/config/routes.rb

@@ -1,14 +1,4 @@
 Refinery::Core::Engine.routes.draw do
-  namespace "photo_gallery", :path => 'photo-gallery' do
-    root :to => "collections#index"
-
-    resources :collections, :only => [:index,:show] do
-      resources :albums, :only => [:show] do
-      end
-    end
-  end
-
-
   namespace "photo_gallery", :path => '' do
     namespace :admin, :path => 'refinery' do
       scope :path => 'photo-gallery' do
@@ -34,4 +24,4 @@ Refinery::Core::Engine.routes.draw do
       end
     end
   end
-end
+end

data/db/migrate/20120805222126_create_album_pages.rb

@@ -0,0 +1,19 @@
+class CreateAlbumPages < ActiveRecord::Migration
+
+  def up
+    create_table :refinery_album_pages do |t|
+      t.integer :album_id
+      t.integer :page_id
+      t.string  :page_type, :default => "Refinery::Page"
+    end
+
+    add_index :refinery_album_pages, :album_id
+    add_index :refinery_album_pages, :page_id
+
+  end
+
+  def down
+    drop_table :refinery_album_pages
+  end
+
+end

data/lib/generators/refinery/templates/config/initializers/refinery/photo_gallery.rb.erb

@@ -1,7 +1,4 @@
 Refinery::PhotoGallery.configure do |config|
-  # At least one or more comma-separated values from list: html5,flash,browserplus,silverlight,gears
-  # config.runtimes = <%= Refinery::PhotoGallery.runtimes.inspect %>
-
   # Max file size of uploaded image
   # config.max_file_size = <%= Refinery::PhotoGallery.max_file_size.inspect %>
 
@@ -9,12 +6,12 @@ Refinery::PhotoGallery.configure do |config|
   # If you want to achieve better quality, choose false.
   # config.client_side_resize = <%= Refinery::PhotoGallery.client_side_resize.inspect %>
 
-  # Params for client side resizing. E.g:  {:width => 800, :height=> 600, :quality=> 100}
+  # Params for client side resizing. E.g:  {:width => 950, :height=> 950, :quality=> 100} 
+  # This dimmensions should be equal with config.single_dimensions
   # config.client_side_resize_params = <%= Refinery::PhotoGallery.client_side_resize_params.inspect %>
 
   # Locale name for Plupload. Put your locale file in /app/assets/javascripts/refinery/photo_gallery/admin/plupload/i18n/ and write here filename WITHOUT file extension. E.g: cs
-  # To leave english, put ''
-  # config.locale = <%= Refinery::PhotoGallery.plupload_locale.inspect %>
+  # config.plupload_locale = <%= Refinery::PhotoGallery.plupload_locale.inspect %>
 
   # Case insensitive extension white list for carrierwave
   #  config.extension_white_list = <%= Refinery::PhotoGallery.extension_white_list.inspect %>
@@ -26,7 +23,6 @@ Refinery::PhotoGallery.configure do |config|
   # config.delete_uploaded_file = <%= Refinery::PhotoGallery.delete_uploaded_file.inspect %>
 
   # Thumbs dimensions in pixels. E.g: [950,950] for width:950, height: 950
-  # config.collection_dimensions = <%= Refinery::PhotoGallery.collection_dimensions.inspect %>
   # config.album_dimensions = <%= Refinery::PhotoGallery.album_dimensions.inspect %>
   # config.preview_dimensions = <%= Refinery::PhotoGallery.preview_dimensions.inspect %>
   # config.single_dimensions = <%= Refinery::PhotoGallery.single_dimensions.inspect %>

data/lib/refinery/photo_gallery.rb

@@ -6,9 +6,6 @@ module Refinery
   autoload :PhotoGalleryGenerator, 'generators/refinery/photo_gallery_generator'
 
   module PhotoGallery
-    require 'refinery/photo_gallery/engine'
-    require 'refinery/photo_gallery/configuration'
-
     autoload :Version, 'refinery/photo_gallery/version'
 
     class << self
@@ -26,5 +23,10 @@ module Refinery
         @factory_paths ||= [ root.join("spec/factories").to_s ]
       end
     end
+
+    require 'refinery/photo_gallery/engine'
+    require 'refinery/photo_gallery/configuration'
+    require 'refinery/photo_gallery/extensions/pages_extension'
+    require 'refinery/photo_gallery/extensions/pages_controller_extension'
   end
 end

data/lib/refinery/photo_gallery/configuration.rb

@@ -8,23 +8,21 @@ module Refinery
 
 
 
-    self.runtimes = 'html5,flash,browserplus,silverlight,gears'
+    #self.runtimes = 'html5,flash,browserplus,silverlight,gears'
+    self.runtimes = 'html5'
     self.max_file_size = '10mb'
-    #TODO or per album?
-    #TODO by default false!
     self.client_side_resize = true
-    self.client_side_resize_params = {:width => 800, :height=> 600, :quality=> 100}
-    #TODO leave blank before publishing this gem!
-    self.plupload_locale = ''
+    self.client_side_resize_params = {:width => 950, :height=> 950, :quality=> 100}
+    self.plupload_locale = Refinery::I18n.default_locale.to_s
     self.extension_white_list = %w(jpg jpeg gif png bmp tiff)
     self.photo_gallery_dir = "/system/refinery/photo_gallery"
     self.photo_gallery_dir_relative_to_root = '/public' + self.photo_gallery_dir
     #TODO or per album?
     self.delete_uploaded_file = true
-    self.collection_dimensions = [200, 200]
-    self.album_dimensions = [150, 150]
+    #self.collection_dimensions = [200, 200]
+    self.album_dimensions = [140, 105]
     self.preview_dimensions = [210, 210]
-    self.single_dimensions = [950, 950]
+    self.single_dimensions = [900, 900]
 
     self.albums_per_page = 10
     self.collections_per_page = 10

data/lib/refinery/photo_gallery/engine.rb

@@ -4,6 +4,12 @@ module Refinery
       include Refinery::Engine
 
       isolate_namespace Refinery::PhotoGallery
+      engine_name :refinery_photo_gallery
+
+      def self.register(tab)
+        tab.name = tab.name = ::I18n.t(:'refinery.plugins.refinerycms_photo_gallery.tab_name')
+        tab.partial = "/refinery/admin/pages/tabs/photo_gallery"
+      end
 
       initializer "init plugin" do
         Refinery::Plugin.register do |plugin|
@@ -15,6 +21,12 @@ module Refinery
         end
       end
 
+      config.to_prepare do
+        require 'refinerycms-pages'
+        Refinery::Page.send :has_one_page_album
+        Refinery::PagesController.send :include, Refinery::PhotoGallery::Extensions::PagesController
+      end
+
       config.before_initialize do
         require 'carrierwave'
         require 'carrierwave/orm/activerecord'
@@ -23,11 +35,14 @@ module Refinery
         require 'mini_exiftool'
       end
 
+
       config.after_initialize do
+        Refinery::Pages::Tab.register do |tab|
+          register tab
+        end
+
         Refinery.register_engine(Refinery::PhotoGallery)
       end
-
-
     end
   end
 end

data/lib/refinery/photo_gallery/extensions/pages_controller_extension.rb

@@ -0,0 +1,30 @@
+
+module Refinery
+  module PhotoGallery
+    module Extensions
+      module PagesController
+
+        def self.included(base)
+          base.class_eval do
+            around_filter :wrap_show_action, :only => :show
+
+
+            def wrap_show_action
+              # this is only for fragment caching to create 1 cache file version for first page
+              params[:page].blank? ? params[:page] = 1 : params[:page]
+
+              if request.xhr?
+                respond_to do |format|
+                  format.js { render :partial=> "/refinery/photo_gallery/albums/photos"}
+                end
+              else
+                show
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/refinery/photo_gallery/extensions/pages_extension.rb

@@ -0,0 +1,50 @@
+module Refinery
+  module PhotoGallery
+    module Extensions
+      module Pages
+        def has_one_page_album
+          has_one :album_page, :as => :page
+          has_one :album, :through => :album_page
+          has_many :photos, :class_name => Refinery::PhotoGallery::Photo, :through => :album , :order=> "created_at ASC"
+
+
+          accepts_nested_attributes_for :album_page
+
+          module_eval do
+            def photos_for_page(params_page)
+              Refinery::PhotoGallery::Photo.where("album_id = ?", self.album.id ).
+                                            includes(:album).
+                                            paginate(:page => params_page).
+                                            order("created_at ASC")
+            end
+
+
+            def album_page=(album_page_params)
+              # new
+              if self.album_page.nil?
+                self.build_album_page
+              end
+
+              # destroy
+              if album_page_params[:album_id].blank?
+                self.album_page.destroy
+
+                # create or update if changed
+              elsif self.album_page.album_id.to_s != album_page_params[:album_id]
+                self.album_page.update_attributes( album_page_params)
+                self.album_page.save
+              end
+
+
+            end
+          end
+
+          attr_accessible :album_page
+
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send(:extend, Refinery::PhotoGallery::Extensions::Pages)

data/lib/refinery/photo_gallery/version.rb

@@ -2,8 +2,8 @@ module Refinery
   module PhotoGallery
     class Version
       @major = 0
-      @minor = 0
-      @tiny  = '2.dev'
+      @minor = 1
+      @tiny  = '0'
 
       class << self
         attr_reader :major, :minor, :tiny

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-photo-gallery
 version: !ruby/object:Gem::Version
-  version: 0.0.2.dev
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Espen Antonsen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -131,9 +131,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Changelog.md
 - Gemfile
 - LICENSE.md
 - README.md
+- Rakefile
 - app/assets/images/refinery/photo_gallery/admin/chosen-sprite.png
 - app/assets/images/refinery/photo_gallery/admin/icons/album.png
 - app/assets/images/refinery/photo_gallery/admin/icons/album_add.png
@@ -165,7 +167,7 @@ files:
 - app/assets/images/refinery/photo_gallery/fancybox/fancybox_sprite.png
 - app/assets/images/refinery/photo_gallery/fancybox/helpers/fancybox_buttons.png
 - app/assets/javascripts/refinery/photo_gallery/admin/jquery.chosen.min.js
-- app/assets/javascripts/refinery/photo_gallery/admin/photo_gallery.js
+- app/assets/javascripts/refinery/photo_gallery/admin/photo_gallery.js.erb
 - app/assets/javascripts/refinery/photo_gallery/admin/plupload/changelog.txt
 - app/assets/javascripts/refinery/photo_gallery/admin/plupload/i18n/cs.js
 - app/assets/javascripts/refinery/photo_gallery/admin/plupload/i18n/da.js
@@ -214,6 +216,7 @@ files:
 - app/assets/javascripts/refinery/photo_gallery/fancybox/jquery.fancybox.js
 - app/assets/javascripts/refinery/photo_gallery/fancybox/jquery.fancybox.pack.js
 - app/assets/javascripts/refinery/photo_gallery/fancybox/lib/jquery.mousewheel-3.0.6.pack.js
+- app/assets/javascripts/refinery/photo_gallery/photo_gallery.js
 - app/assets/stylesheets/refinery/photo_gallery/admin/chosen.css.scss
 - app/assets/stylesheets/refinery/photo_gallery/admin/photo_gallery.css.scss
 - app/assets/stylesheets/refinery/photo_gallery/admin/plupload/jquery.plupload.queue.css.scss
@@ -224,17 +227,20 @@ files:
 - app/controllers/refinery/photo_gallery/admin/albums_controller.rb
 - app/controllers/refinery/photo_gallery/admin/collections_controller.rb
 - app/controllers/refinery/photo_gallery/admin/photos_controller.rb
-- app/controllers/refinery/photo_gallery/albums_controller.rb
-- app/controllers/refinery/photo_gallery/collections_controller.rb
 - app/helpers/refinery/photo_gallery/admin/photos_helper.rb
 - app/helpers/refinery/photo_gallery/albums_helper.rb
 - app/helpers/refinery/photo_gallery/photo_gallery_helper.rb
-- app/middleware/refinery/photo_gallery/admin/flash_session_cookie_middleware.rb
+- app/models/refinery/album_page.rb
 - app/models/refinery/photo_gallery/album.rb
 - app/models/refinery/photo_gallery/collection.rb
 - app/models/refinery/photo_gallery/collection_album.rb
 - app/models/refinery/photo_gallery/photo.rb
+- app/sweepers/refinery/photo_gallery/admin/album_sweeper.rb
+- app/sweepers/refinery/photo_gallery/admin/photo_sweeper.rb
 - app/uploaders/refinery/photo_gallery/admin/file_uploader.rb
+- app/views/refinery/admin/pages/tabs/_form.html.erb
+- app/views/refinery/admin/pages/tabs/_photo_gallery.html.erb
+- app/views/refinery/admin/pages/tabs/_photo_pages_bar.html.erb
 - app/views/refinery/photo_gallery/admin/_submenu.html.erb
 - app/views/refinery/photo_gallery/admin/albums/_album.html.erb
 - app/views/refinery/photo_gallery/admin/albums/_form.html.erb
@@ -256,16 +262,13 @@ files:
 - app/views/refinery/photo_gallery/admin/photos/_form_fields_actions.html.erb
 - app/views/refinery/photo_gallery/admin/photos/edit_multiple.html.erb
 - app/views/refinery/photo_gallery/admin/photos/upload.html.erb
-- app/views/refinery/photo_gallery/albums/show.html.erb
-- app/views/refinery/photo_gallery/collections/index.html.erb
-- app/views/refinery/photo_gallery/collections/show.html.erb
-- app/views/refinery/photo_gallery/shared/_layout.html.erb
-- app/views/refinery/photo_gallery/shared/_submenu.html.erb
+- app/views/refinery/photo_gallery/albums/_photos.html.erb
+- app/views/refinery/photo_gallery/albums/_photos.js.erb
+- app/views/refinery/photo_gallery/albums/_show.html.erb
 - config/initializers/carrierwave.rb
 - config/initializers/form_builder.rb
 - config/initializers/refinery/core.rb
 - config/initializers/s3.rb
-- config/initializers/session_store.rb
 - config/locales/en.yml
 - config/locales/sk.yml
 - config/routes.rb
@@ -274,15 +277,18 @@ files:
 - db/migrate/20120805131547_create_collection_albums.rb
 - db/migrate/20120805165238_create_photos.rb
 - db/migrate/20120805222125_add_indexes.rb
+- db/migrate/20120805222126_create_album_pages.rb
 - db/seeds.rb
 - lib/generators/refinery/photo_gallery_generator.rb
 - lib/generators/refinery/templates/config/initializers/refinery/photo_gallery.rb.erb
 - lib/refinery/photo_gallery.rb
 - lib/refinery/photo_gallery/configuration.rb
 - lib/refinery/photo_gallery/engine.rb
+- lib/refinery/photo_gallery/extensions/pages_controller_extension.rb
+- lib/refinery/photo_gallery/extensions/pages_extension.rb
 - lib/refinery/photo_gallery/version.rb
 - lib/refinerycms-photo-gallery.rb
-- refinerycms-balder-photo-gallery.gemspec
+- refinerycms-photo-gallery.gemspec
 - screenshots/01_collections#index.png
 - screenshots/02_albums#create.png
 - screenshots/03_photos#upload.png
@@ -295,6 +301,7 @@ files:
 - screenshots/10_albums_EXIF_reading.png
 - screenshots/11_frontend_show.png
 - screenshots/12_show_photo_using_fancybox.png
+- screenshots/13_pages.png
 homepage: http://github.com/Matho/refinerycms-photo-gallery
 licenses: []
 post_install_message: 
@@ -310,9 +317,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24