refinerycms-photo-gallery 0.2.0 → 0.3.0

data/README.md

@@ -4,13 +4,15 @@ __Photo gallery engine for Refinery CMS.__
 
 ## Requirements
 
-Currently unreleased version 0.2.x in master branch supports Rails 4.2.x and Refinery CMS ~> 3.0.0
+Currently unreleased version 0.3.x in master branch supports Rails 5.1.x and Refinery CMS ~> 4.0.3
 
-Previous versions of refinerycms-photo-gallery supports Rails 3.2.x and Refinery CMS ~> 2.0.3.
+Previous branches supports:
+* 0-2-stable: Rails 4.2.x and Refinery CMS ~> 3.0.0
+* 0-1-stable: Rails 3.2.x and Refinery CMS ~> 2.0.3
 
 ## Features
 
-* Multiple photo uploading with [Plupload](http://www.plupload.com/) 1.5.4
+* Multiple photo uploading with [Plupload](http://www.plupload.com/) 2.1.9
 * Only HTML5 runtime is supported
 * Client side photo resizing to do faster uploading on slow connections
 * Server side resizing with Carrierwave
@@ -47,7 +49,7 @@ All screenshots are in branch screenshots
 
 ## Language
 
-Gem is fully translated to slovak and english. Plupload is translated to 24 languages. You can add your own to
+Gem is fully translated to de, en, no, pl, sk, zh-CN languages. Plupload is translated to 24 languages. You can add your own to
 photo_gallery/app/assets/javascripts/refinery/photo_gallery/admin/plupload/i18n and enable it in config.plupload_locale
 
 ## Browser support
@@ -55,7 +57,7 @@ Client side image resizing with Plupload is possible on Firefox 3.5+ (with fixed
 Safari doesn't support direct data access to the selected files. Opera 12.00 + supports drag&drop and also client side image resizing.
 
 
-## Installation for ~> 0.2.0
+## Installation for ~> 0.3.0
 
 Make sure, you [have installed ImageMagick](http://www.imagemagick.org/script/install-source.php#unix) and ImageMagick dev.
 On Ubuntu 12.04 you can install dev suite with commands:
@@ -69,14 +71,14 @@ Instructions for installation you can find under [www.sno.phy.queensu.ca/~phil/e
 
 
 Open up your ``Gemfile`` and add at the bottom this line:
--for edge version:
+* for edge version:
 ```ruby
-gem 'refinerycms-photo-gallery', '~> 0.2.0', :github=>"Matho/refinerycms-photo-gallery", :branch=>"master"
+gem 'refinerycms-photo-gallery', '~> 0.3.0', :github=>"Matho/refinerycms-photo-gallery", :branch=>"master"
 ```
 
--for latest stable version
+* for latest stable version
 ```ruby
-gem 'refinerycms-photo-gallery', '~> 0.1.0'
+gem 'refinerycms-photo-gallery', '~> 0.2.0'
 ```
 
 Now, run 
@@ -257,9 +259,8 @@ Remove gem from Gemfile
 * cd to this engine path
 * bundle install
 * rake refinery:testing:dummy_app
+* Add at the end of file `Rails.application.config.assets.precompile += %w( refinery/photo_gallery/admin/jquery.chosen.min.js refinery/photo_gallery/admin/photo_gallery.js refinery/photo_gallery/admin/photo_gallery.css refinery/photo_gallery/admin/chosen.css refinery/photo_gallery/admin/icons/loading.gif refinery/wymeditor.js )` to `spec/dummy/config/initializers/assets.rb`
 * rake spec
-* Probably you will need to set some asset manifest to dummy's app manifest - see console output for errors
-
 
 ## Todo list
 

data/app/assets/javascripts/refinery/photo_gallery/admin/photo_gallery.js.erb

@@ -16,15 +16,6 @@ $(function() {
     return false;
   });
 
-  $('#more_photo_options_field #toggle_advanced_options').click(function(e){
-    e.preventDefault();
-    $('#more_options').animate({opacity: 'toggle', height: 'toggle'}, 250);
-
-    $('html,body').animate({
-      scrollTop: $('#toggle_advanced_options').parent().offset().top
-    }, 250);
-  });
-
   $(".chzn-select").chosen(
       {
         no_results_text: "<%= I18n.t('chosen.no_results') %>"
@@ -50,4 +41,4 @@ $(function() {
     return false;
   });
 
-});
+});

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

@@ -34,7 +34,7 @@ module Refinery
 
 
         def update_multiple
-          photo_ids = update_multiple_photo_params["photo"].map{ |key, hash| key }
+          photo_ids = update_multiple_photo_params["photo"].keys
 
           @photos = Photo.find(photo_ids)
           @photos.each do |photo|
@@ -77,4 +77,4 @@ module Refinery
       end
     end
   end
-end
+end

data/app/models/refinery/album_page.rb

@@ -1,7 +1,7 @@
 module Refinery
     class AlbumPage < Refinery::Core::BaseModel
 
-      belongs_to  :album , :class_name => Refinery::PhotoGallery::Album
+      belongs_to  :album , class_name: 'Refinery::PhotoGallery::Album'
       belongs_to :page, :polymorphic => true
 
 

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

@@ -19,13 +19,12 @@ module Refinery
         select("refinery_photo_gallery_albums.*, refinery_photo_gallery_collection_albums.collection_id ").joins(:collection_albums)
       end
 
-      scope :find_by_collection_id, lambda {|collection_id|
-        select("refinery_photo_gallery_albums.*").
-            joins(:collection_albums).
-            where("refinery_photo_gallery_collection_albums.collection_id = ?
-                    ", collection_id).
-            order('created_at DESC, title ASC')
-      }
+      # scope :find_by_collection_id, ->(collection_id) {
+      #   select("refinery_photo_gallery_albums.*").
+      #     joins(:collection_albums).
+      #     where("refinery_photo_gallery_collection_albums.collection_id = ?", collection_id).
+      #     order('created_at DESC, title ASC')
+      # }
 
       def collection_ids
         Refinery::PhotoGallery::CollectionAlbum.select('collection_id').where("album_id = ?", self.id ).map{|ca| ca.collection_id }

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

@@ -7,7 +7,7 @@
                                                                 :placeholder=> t('.choose_album')},
                                                                 :multiple=> false,
                                                                 :class=> "chzn-select-deselect",
-                                                                :style=>"min-width: 300px;"
+                                                                :style=>"width: 300px;"
                                                    }) %>
 <% end %>
 

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

@@ -9,4 +9,4 @@
 
     <%= render "/refinery/admin/pages/tabs/form", :f => f %>
   </div>
-</div>
+</div>

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

@@ -20,7 +20,7 @@
     <%= link_to (image_tag 'refinery/photo_gallery/admin/icons/album_edit.png'),
                 refinery.edit_photo_gallery_admin_album_path(album),
          :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), refinery.photo_gallery_admin_album_path(album),
+    <%= link_to image_tag('refinery/icons/delete.png'), refinery.photo_gallery_admin_album_path(album),
         :class => "cancel confirm-delete",
         :title => t('.delete'),
         :method => :delete,

data/config/locales/de.yml

@@ -0,0 +1,109 @@
+de:
+  chosen:
+    no_results: Keine Ergebnisse
+  refinery:
+    admin:
+      pages:
+        tabs:
+          form:
+            join_page_with_album: "Seite mit Album verbinden:"
+            choose_album: "Fotoalbum wählen"
+            flash:
+              connection_destroyed: "Foto aus Album entfernt."
+    plugins:
+      refinerycms_photo_gallery:
+        title: Fotogalerie
+        description: Fotogalerie-Plugin mit Uploads, Tagging usw.
+        tab_name: Fotogalerie
+    photo_gallery:
+      admin:
+        submenu:
+          collections:
+            title: Sammlungen
+            manage: Sammlungen verwalten
+            new: Neue Sammlung anlegen
+          albums:
+            title: Alben
+            manage: Alben verwalten
+            new: Neues Album anlegen
+        collections:
+          collection:
+            view_live_html: Sammlung zeigen <br/><em>(in neuem Fenster)</em>
+            delete: Sammlung permanent löschen
+            edit: Sammlung bearbeiten
+          index:
+            no_items_yet: Es gibt noch keine Sammlungen. "%{create}" klicken, um eine anzulegen.
+          new:
+            title: Neue Sammlung erstellen
+          edit:
+            title: Sammlung verwalten
+        albums:
+          album:
+            view_live_html: Album anzeigen <br/><em>(in neuem Fenster)</em>
+            delete: Album permanent löschen
+            edit: Album verwalten
+            upload_photos: Neue Fotos für Album hochladen
+            edit_photos: Fotos im Album verwalten
+          index:
+            no_items_yet: Es gibt noch keine Alben. "%{create}" klicken, um eins anzulegen.
+          new:
+            title: Neues Album anlegen
+          edit:
+            title: Album verwalten
+          form:
+            album_belongs_to_collection: Album gehört Sammlung(en)
+            more_options: Weitere Eigenschaften
+            more_options_tooltip: "Weitere Eigenschaften: Anschrift, Notiz, Breiten- und Längengrad"
+            choose_collection: Sammlung auswählen
+            path_prefix: Verzeichnisname
+            number_of_photos: "%{number} Fotos"
+        photos:
+          updated: Fotos aktualisiert
+          title: Fotos
+          manage: Verwalten
+          new: Neue Fotos hochladen
+          edit_multiple:
+            no_photos_yet: Dieses Album enthält noch keine Fotos. "%{create}" klicken, um welche zuzufügen.
+          photo:
+            delete: Foto permanent löschen
+            deleted: Foto "%{title}" gelöscht
+          form_fields:
+            use_decimal_format: Dezimal verwenden
+      photo_pages:
+        show:
+          other: Andere Fotoseiten
+      albums:
+        show:
+          no_photos: Keine Fotos im Album
+        photos:
+          image: Foto
+      collections:
+        show:
+          no_albums: Diese Sammlung enthält noch keine Alben
+        index:
+          no_collections: Es gibt noch keine Sammlungen
+  activerecord:
+    attributes:
+      refinery/photo_gallery/photo_page:
+        page_id: Seite
+      refinery/photo_gallery/collection:
+        title: Titel
+        description: Beschreibung
+      refinery/photo_gallery/album:
+        title: Titel
+        description: Beschreibung
+        longitude: Längengrad
+        latitude: Breitengrad
+        path: Verzeichnis
+        address: Anschrift
+        note: Notiz
+        tags: Tags
+      refinery/photo_gallery/photo:
+        title: Titel
+        description: Beschreibung
+        longitude: Längengrad
+        latitude: Breitengrad
+        path: Verzeichnis
+        file: Datei
+    models:
+      refinery/photo_gallery/collection: Album

data/config/locales/no.yml

@@ -0,0 +1,109 @@
+"no":
+  chosen:
+    no_results: Ingen treff
+  refinery:
+    admin:
+      pages:
+        tabs:
+          form:
+            join_page_with_album: "Koble side med album:"
+            choose_album: "Klikk for å velge album"
+            flash:
+              connection_destroyed: "Slettet kobling mellom album og side."
+    plugins:
+      refinerycms_photo_gallery:
+        title: Fotogalleri
+        description: Galleri med opplasting, tagging osv.
+        tab_name: Fotogalleri
+    photo_gallery:
+      admin:
+        submenu:
+          collections:
+            title: Samlinger
+            manage: Behandle samlingene
+            new: Lag en ny fotosamling
+          albums:
+            title: Album
+            manage: Behandle albumene
+            new: Lag et nytt album
+        collections:
+          collection:
+            view_live_html: Vis denne samlingen <br/><em>(i et nytt vindu)</em>
+            delete: Slett denne samlingen permanent
+            edit: Rediger denne samlingen
+          index:
+            no_items_yet: Det finnes ikke noen samlinger enda. Klikk "%{create}" for å lage en samling.
+          new:
+            title: Lag en ny samling
+          edit:
+            title: Behandle denne samlingen
+        albums:
+          album:
+            view_live_html: Vis dette albumet <br/><em>(i et nytt vindu)</em>
+            delete: Slett dette albumet permanent
+            edit: Rediger dette elbumet
+            upload_photos: Last opp et nytt foto til albumet
+            edit_photos: Rediger fotoene i albumet
+          index:
+            no_items_yet: Det finnes ingen album enda. Klikk "%{create}" for å lage et nytt album.
+          new:
+            title: Lag et nytt album.
+          edit:
+            title: Sett tittel
+          form:
+            album_belongs_to_collection: Albumet hører til samling/er
+            more_options: Muligheter
+            more_options_tooltip: Endre andre felt, f.eks. adresse, notat, bredde- og lengdegrad
+            choose_collection: Velg samlinger
+            path_prefix: Katalogprefiks
+            number_of_photos: "Inneholder %{number} foto(s)"
+        photos:
+          updated: Fotos oppdatert
+          title: Fotos
+          manage: Behandle
+          new: Last opp nye fotos
+          edit_multiple:
+            no_photos_yet: Det er ingen fotos i albumet enda. Klikk "%{create} for å legge til noen fotos.
+          photo:
+            delete: Slett dette bildet permanent.
+            deleted: Slettet "%{title}"
+          form_fields:
+            use_decimal_format: Bruk desimalformat
+      photo_pages:
+        show:
+          other: Andre fotosider
+      albums:
+        show:
+          no_photos: Det er ingen fotos i dette albumet enda
+        photos:
+          image: Foto
+      collections:
+        show:
+          no_albums: Det er ingen album i denne samlingen enda
+        index:
+          no_collections: Det er ingen samlinger her enda
+  activerecord:
+    attributes:
+      refinery/photo_gallery/photo_page:
+        page_id: Side
+      refinery/photo_gallery/collection:
+        title: Tittel
+        description: Beskrivelse
+      refinery/photo_gallery/album:
+        title: Tittel
+        description: Beskrivelse
+        longitude: Lengdegrad
+        latitude: Breddegrad
+        path: Katalog
+        address: Adresse
+        note: Notat
+        tags: Tagger
+      refinery/photo_gallery/photo:
+        title: Tittel
+        description: Beskrivelse
+        longitude: Lengdegrad
+        latitude: Breddegrad
+        path: Katalog
+        file: Fil
+    models:
+      refinery/photo_gallery/collection: Album

data/config/locales/zh-CN.yml

@@ -0,0 +1,109 @@
+zh-CN:
+  chosen:
+    no_results: "没有匹配的结果"
+  refinery:
+    admin:
+      pages:
+        tabs:
+          form:
+            join_page_with_album: "添加相册到页面"
+            choose_album: "点击选择相册"
+            flash:
+              connection_destroyed: "相册与页面之间的关联已经成功删除。"
+    plugins:
+      refinerycms_photo_gallery:
+        title: 图片库
+        description: 提供高级的图片库
+        tab_name: 图片库
+    photo_gallery:
+      admin:
+        submenu:
+          collections:
+            title: 合辑
+            manage: 管理合辑
+            new: 新建合辑
+          albums:
+            title: 相册
+            manage: 管理相册
+            new: 新建相册
+        collections:
+          collection:
+            view_live_html: 查看合辑的最新内容.<br/><em>(新窗口中打开)</em>
+            delete: 永久删除合辑
+            edit: 编辑合辑
+          index:
+            no_items_yet: 目前没有合辑。点击"%{create}"创建你的第一个合辑。
+          new:
+            title: 新建合辑
+          edit:
+            title: 编辑合辑
+        albums:
+          album:
+            view_live_html: 查看相册的最新内容.<br/><em>(新窗口中打开)</em>
+            delete: 永久删除相册
+            edit: 编辑相册
+            upload_photos: 上传新图片到相册
+            edit_photos: 编辑当前相册的图片
+          index:
+            no_items_yet: 目前没有相册。点击"%{create}"创建你的第一个相册。
+          new:
+            title: 新建相册
+          edit:
+            title: 编辑相册
+          form:
+            album_belongs_to_collection: 相册从属于合辑
+            more_options: 更多选项
+            more_options_tooltip: 编辑更多字段，例如地址、纬度、经度和注释
+            choose_collection: 选择合辑
+            path_prefix: 路径前缀
+            number_of_photos: 包含 %{number} 张图片
+        photos:
+          updated: 图片已上传
+          title: 图片
+          manage: 管理
+          new: 上传新图片
+          edit_multiple:
+            no_items_yet: 目前相册里没有图片。点击"%{create}"添加你的第一张图片到相册。
+          photo:
+            delete: 永久删除图片
+            deleted: 图片已删除 "%{title}"
+          form_fields:
+            use_decimal_format: 使用十进制
+      photo_pages:
+        show:
+          other: 其他带相册的页面
+      albums:
+        show:
+          no_photos: 相册内目前没有图片
+        photos:
+          image: 图片
+      collections:
+        show:
+          no_albums: 合辑内目前没有相册
+        index:
+          no_collections: 目前没有合辑
+  activerecord:
+    attributes:
+      refinery/photo_gallery/photo_page:
+        page_id: 页面
+      refinery/photo_gallery/collection:
+        title: 标题
+        description: 描述
+      refinery/photo_gallery/album:
+        title: 标题
+        description: 描述
+        longitude: 经度
+        latitude: 纬度
+        path: 路径
+        address: 地址
+        note: 注释
+        tags: 标签
+      refinery/photo_gallery/photo:
+        title: 标题
+        description: 描述
+        longitude: 经度
+        latitude: 纬度
+        path: 路径
+        file: 文件
+    models:
+      refinery/photo_gallery/collection: 相册