mix-rails-albums 0.16.0 → 0.22.0

data/app/assets/javascripts/backbone/models/photo.js.coffee

@@ -3,7 +3,7 @@ class Application.Models.Photo extends Backbone.Model
   idAttribute: '_id'
   defaults:
     image: null
-    description: null
+    description: ''
     progress: 0
   
   initialize: ->

data/app/assets/javascripts/backbone/routers/photos_router.js.coffee

@@ -1,16 +1,20 @@
 class Application.Routers.PhotosRouter extends Backbone.Router
   initialize: (options) ->
     @photos = new Application.Collections.PhotosCollection()
+    @upload_index()
+
     @photos.url = options.collectionUrl
     @photos.reset options.photos
 
+
   routes:
-    "new"      : "newPhoto"
-    "index"    : "index"
-    "upload_index" : "upload_index"
-    ":id/edit" : "edit"
-    ":id"      : "show"
-    ".*"        : "upload_index"
+    "new"           : "newPhoto"
+    "index"         : "index"
+    "upload_index"  : "upload_index"
+    "photo_edited"  : "photo_edited"
+    ":id/edit"      : "edit"
+    ":id"           : "show"
+    ".*"            : "upload_index"
 
   newPhoto: ->
     @view = new Application.Views.Photos.NewView(collection: @photos)
@@ -32,6 +36,10 @@ class Application.Routers.PhotosRouter extends Backbone.Router
 
   edit: (id) ->
     photo = @photos.get(id)
-    console.log 'Editando a foto!' + photo
+    console.log 'Editando a foto!', id
+    $("#photo-modal-#{id}").modal()
     #@view = new Application.Views.Photos.EditView(model: photo)
     #$("#upload-container").html(@view.render().el)
+    
+  photo_edited: () ->
+

data/app/assets/javascripts/backbone/templates/photos/photo_modal_edit.hamlc.erb

@@ -0,0 +1,14 @@
+.modal.hide.fade.admix-photo-modal{id: "photo-modal-#{@_id}"}
+  .modal-header
+    %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
+    %h3 Detalhes da foto
+  .modal-body
+    .edit-area.pull-right
+      %textarea.span5{id: "input_photo_description_#{@_id}",placeholder: 'Adicione uma descrição para esta foto.'}
+        #{@description}
+    .photo
+      %img{src: @image.medium.url}
+    %p One fine body…
+  .modal-footer
+    %a.btn{href:"#", "data-dismiss": "modal"} Cancelar
+    %a.btn.btn-primary.save{:href => "#", "data-dismiss": "modal"} Salvar mudanças

data/app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb

@@ -1,18 +1,21 @@
 .thumbnail
-  .file-title
-    = @title
   %a.link-popover{"data-content" => "<i class=icon-edit></i> Edit"}
     .loading-file
-      - if @image.url
-        %a.photo-link{href: "#"}
-          %img{src: ROOT_PATH + @image.medium.url}
+      - if @get('image').url
+        %a.edit{href: "#"}
+          %img{src: ROOT_PATH + @get('image').medium.url}
       - else
         %img{src: "http://placehold.it/130x90&text=Carregando"}
     -if (@progress != null && @progress < 100)
       %div{class: (@progress < 100) ? 'progress progress-striped active' : 'progress'}
         .bar{style: "width:#{@progress}%;"}
+  %textarea.span12{style: 'margin-top:5px;', placeholder:'Adicione uma descrição'}
+    = @get('description')
   .caption
     %a.file-action.btn.destroy{href: "#", tooltip: 'Excluir'} 
       <%= image_tag "admix/icons/delete.png" %>
-    %a.file-action.btn.edit{href: "#", tooltip: 'Editar'} 
-      <%= image_tag "admix/icons/picture_edit.png" %>
+    -#%a.file-action.btn.edit{href: "#", tooltip: 'Editar'} 
+      <%= image_tag "admix/icons/picture_edit.png" %>
+    
+    %a.file-action.btn.btn-primary.save{style: 'display:none', href: "#", tooltip: 'Salvar mudanças'} 
+      = 'Salvar mudanças'

data/app/assets/javascripts/backbone/views/photos/photo_modal_view.js.coffee

@@ -0,0 +1,26 @@
+Application.Views.Photos ||= {}
+
+class Application.Views.Photos.PhotoModalEditView extends Backbone.View
+  template: JST["backbone/templates/photos/photo_modal_edit"]
+  tagName: "div"
+  #className: "span2"
+  events:
+    "click .save": "save_changes"
+
+  initialize: ->
+    @model.on "change", @render, this
+
+  render: ->
+    data = _.defaults(@model.attributes,
+      id: null
+    )
+    html = @template(@model.attributes)
+    $(@el).html html
+    this
+
+  save_changes: (e) ->
+    e.preventDefault()
+    description = $("#input_photo_description_#{@model.id}").val()
+    @model.set(description: description)
+    $.post @model.url() + '/update_description', @model.attributes, (data) ->
+      Backbone.history.navigate('photo_edited')

data/app/assets/javascripts/backbone/views/photos/thumbnail_view.js.coffee

@@ -6,11 +6,14 @@ class Application.Views.Photos.PhotoView extends Backbone.View
   events:
     "click .destroy" : "destroy"
     "click .edit": "edit",
+    "keydown textarea": 'update_description'
+    "click .save": 'save_description'
 
   tagName: "li"
-  className: 'span4'
+  className: 'span3'
 
   initialize: ->
+    @tmpDescription = null
     @model.on "change", @render, this
     @model.on "uploadCompleted", @removeProgressBar, this
     self = @
@@ -27,12 +30,32 @@ class Application.Views.Photos.PhotoView extends Backbone.View
   destroy: ->
     if confirm('Tem certeza que deseja deletar?')
       @model.destroy()
-      this.remove()
+      @$el.fadeOut 500, () =>
+        @remove()
       $(".qtip-#{@model.get('id')}").remove()
     false
   edit: () ->
     Backbone.history.navigate("#/#{@model.id}/edit")
     false
+  update_description: () ->
+    self = @
+    $(@el).find('textarea').livequery ->
+      new_description = $(this).val()
+      self.tmpDescription = new_description
+      $(self.el).find('.save').show()
+
+  save_description: (e) ->
+    e.preventDefault()
+    @doHighlighter = true
+    new_description = $(@el).find('textarea').val()
+    @model.set(description : new_description)
+    @tmpDescription = null
+    $.post @model.url() + '/update_description', @model.attributes, (data) =>
+      $(@el).find('.save').hide()
+
   render: ->
-    @$el.html(@template(@model.toJSON() ))
+    @$el.html(@template(@model))
+    if @doHighlighter?
+      @$el.find('textarea').effect('highlight', {}, 3000)
+      @doHighlighter = undefined
     return this

data/app/controllers/admix/photos_controller.rb

@@ -9,9 +9,16 @@ class Admix::PhotosController < Admix::AdmixController
 
   polymorphic_belongs_to :album, param: :album_id
 
-  # load_and_authorize_resource :album
-  # load_and_authorize_resource :photo, :through => :album_id
-  skip_load_and_authorize_resource
+  # TODO: Maybe we need to skip authorization here. But not authetication.
+
+  def update_description
+    @album = Album.find(params[:album_id])
+    @photo = @album.photos.find(params[:id])
+    @photo.description = params[:description]
+    @photo.save()
+    render :json => @photo
+  end
+
 
   def upload
     render inline: params.to_s

data/app/controllers/albums_controller.rb

@@ -2,18 +2,10 @@ class AlbumsController < ApplicationController
   
   def index
     @albums = Album.published.paginate(:page => params[:page], :per_page => 12)
-    # @albums.each do |a|
-    #   a.photos.each do |p|
-    #     p.image.recreate_versions!
-    #   end
-    # end
-
   end
 
   def show
     @album = Album.find(params[:id])
   end
-
   
-
 end

data/app/controllers/photos_controller.rb

@@ -0,0 +1,12 @@
+class PhotosController < ApplicationController
+  
+  def index
+    #@albums = Album.published.paginate(:page => params[:page], :per_page => 12)
+  end
+
+  def show
+    @album = Album.find(params[:album_id])
+    @photo = @album.photos.find(params[:id])
+  end
+  
+end

data/app/models/admix/albums_datagrid.rb

@@ -2,30 +2,28 @@ class Admix::AlbumsDatagrid
 
   include Datagrid
 
+  extend AdmixHelper
+
 
   scope do
     Album.desc(:date)
   end
 
-  filter :name, :string
+  filter :title, :string
   filter :date do |value|
     value.to_s(:created_at)
   end
 
-  column :name, header: I18n.t('albums.name')
-  column :date, header: I18n.t('albums.date') do |album|
+  column :title, header: input_label(:albums, :title)
+  column :date, header: input_label(:albums, :date) do |album|
     album.date.strftime("%d/%m/%Y") #album.date.to_s(:created_at)
   end
-  column :photos_quantity, header: I18n.t('albums.photos_quantity') do |album|
+  column :photos_quantity, header: input_label(:albums, :photos_quantity) do |album|
     album.photos.count
   end
 
-  column :published, header: I18n.t('albums.published') do |album|
-    if album.published 
-      I18n.t("albums.published_yes")
-    else 
-      I18n.t("albums.published_no")
-    end
+  column :published, header: input_label(:albums, :status) do |album|
+    album.status.text
   end
   
 

data/app/models/album.rb

@@ -1,27 +1,3 @@
 class Album
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Mongoid::Slug
-
-  field :name,          type: String
-  field :description,   type: String
-  field :date,          type: Date
-  field :published,     type: Boolean, default: true
-
-
-  validates_presence_of :name
-  validates_presence_of :date
-
-  #slug :name, history: true
-
-  slug :name, history: true do |current_object|
-    current_object.name.parameterize
-  end
-
-  embeds_many :photos, cascade_callbacks: true
-
-  scope :published, where(published: true, :photos.ne => nil, :photos.exists => true)
-
-
+  include MixRailsAlbums::Concerns::Models::Album
 end

data/app/models/photo.rb

@@ -2,8 +2,6 @@ class Photo
   
   include Mongoid::Document
   include Mongoid::Timestamps
-  
-  attr_accessible :description, :image, :image_cache
 
   field :description
   

data/app/uploaders/albums/image_uploader.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'carrierwave/processing/mini_magick'
+require 'mix-rails-core/gridfs'
 
 class Albums::ImageUploader < CarrierWave::Uploader::Base
 
@@ -22,7 +23,7 @@ class Albums::ImageUploader < CarrierWave::Uploader::Base
   end
 
   def cache_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "system/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:
@@ -45,8 +46,35 @@ class Albums::ImageUploader < CarrierWave::Uploader::Base
   #   process :resize_to_fit => [80, 80]
   # end
 
+  def watermark
+    manipulate! do |img|
+      
+      albums_watermark = Setting.albums_watermark
+      
+      watermark_image = if albums_watermark
+        gridfs_file = MixRailsCore::Gridfs::read_file(albums_watermark.image.url)
+        MiniMagick::Image.read(gridfs_file, "png")
+      else
+        # We can read a file from system too.
+        #MiniMagick::Image.open("#{Rails.root}/app/assets/images/watermarks/watermark.png", "png")
+        false
+      end
+
+      if watermark_image
+        result = img.composite(watermark_image) do |c|
+          c.gravity "SouthEast"
+        end
+        result
+      else
+        img
+      end
+
+    end
+  end
+
   version :medium do
     process :resize_to_fill => [640,420]
+    process :watermark
   end
 
   version :thumb do

data/app/views/admix/albums/_form_fields.html.haml

@@ -1,4 +1,4 @@
-= f.input :name,          as: 'string'
+= f.input :title,         as: 'string'
 = f.input :description,   as: 'text'
 = f.input :date,          as: 'datepicker'
-= f.input :published,     as: 'boolean' 
+= f.input :status

data/app/views/admix/albums/_show.html.haml

@@ -1,7 +1,7 @@
 %dl
-  %dt= t('albums.name')
-  %dd= resource.name
-  %dt= t('albums.date')
+  %dt= input_label(:albums, :title)
+  %dd= resource.title
+  %dt= input_label(:albums, :date)
   %dd= resource.date
 
 = render('admix/photos/upload')

data/app/views/photos/index.html.haml

@@ -0,0 +1,4 @@
+- content_for(:photos_content) do
+  = render @photos
+  = will_paginate @photos
+= render template: 'templates/photos/index'

data/app/views/photos/show.html.haml

@@ -0,0 +1,3 @@
+- content_for(:photo_content) do
+  = render partial: 'photo_show', locals: {album: @album, photo: @photo}
+= render template: 'templates/photos/show'

data/config/locales/albums.pt-BR.yml

@@ -1,6 +1,7 @@
 pt-BR:
   resources:
-    albums: 'fotos'
+    albums: 'albuns'
+    photos: 'fotos'
   will_paginate:
     previous_label: "<< admix"
     next_label: "próximo >>"
@@ -14,4 +15,15 @@ pt-BR:
     name: 'Nome'
     date: 'Data'
     published: 'Publicado?'
-    photos_quantity: "Quantidade de fotos"
+    photos_quantity: "Quantidade de fotos"
+  
+  photos:
+    photos: 'Fotos'
+    photo: 'Foto'
+    legend: 'Legenda'
+    or: 'ou'
+    upload:
+      explanation: 'Clique no botão abaixo para adicionar as fotos.'
+    btn:
+      upload_pictures: 'Enviar arquivos de imagem'
+      upload_zip: 'Enviar arquivo ZIP'

data/config/routes.rb

@@ -1,7 +1,9 @@
 Rails.application.routes.draw do
   
   localized do
-    resources :albums
+    resources :albums, :only => [:index, :show] do
+      resources :photos, :only => [:index, :show]
+    end
   end
     
   scope Admix::namespace_path, as: :admix, module: :admix do
@@ -9,6 +11,7 @@ Rails.application.routes.draw do
       resources :photos do
         member do
           get :edit_ajax
+          post :update_description
         end
       end
     end

data/lib/concerns/models/album.rb

@@ -0,0 +1,43 @@
+module MixRailsAlbums::Concerns::Models::Album
+  extend ActiveSupport::Concern
+
+  included do
+
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include Mongoid::Slug
+
+    extend Enumerize
+
+    field :title,         type: String
+    field :description,   type: String
+    field :date,          type: Date
+    field :status,        type: String
+    enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
+
+    validation_for_title
+    validation_for_date
+
+    slug :title, history: true do |current_object|
+      current_object.title.parameterize
+    end
+
+    embeds_many :photos, cascade_callbacks: true
+    
+    scope :published, where(status: :published, :photos.ne => nil, :photos.exists => true)
+
+  end
+
+  module ClassMethods
+    
+    def validation_for_title
+      validates_presence_of :title
+    end
+
+    def validation_for_date
+      validates_presence_of :date
+    end
+
+  end
+
+end

data/lib/mix-rails-albums/engine.rb

@@ -7,7 +7,7 @@ module MixRailsAlbums
           Admix::Navigation::NavBar.find(:content) do |menu|
             menu.submenu do |submenu|
               submenu.key   = :albums
-              submenu.title = I18n.t 'albums.albums'
+              submenu.title = I18n.t('albums.albums')
               submenu.url   = 'admix_albums_url'
             end
           end

data/lib/mix-rails-albums/version.rb

@@ -1,7 +1,7 @@
 module MixRailsAlbums
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 16
+    MINOR = 22
     TINY  = 0
     PRE   = nil
 

data/lib/mix-rails-albums.rb

@@ -7,4 +7,10 @@ require "mini_magick"
 require "haml_coffee_assets"
 
 module MixRailsAlbums
-end
+  module Concerns
+    module Models
+    end
+  end
+end
+
+require 'concerns/models/album'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-albums
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.22.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,87 +114,89 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/stylesheets/skins/tango/next-vertical.png
-- app/assets/stylesheets/skins/tango/skin.css
+- app/uploaders/albums/image_uploader.rb
+- app/controllers/admix/albums_controller.rb
+- app/controllers/admix/photos_controller.rb
+- app/controllers/albums_controller.rb
+- app/controllers/photos_controller.rb
 - app/assets/stylesheets/skins/tango/next-horizontal.png
+- app/assets/stylesheets/skins/tango/skin.css
 - app/assets/stylesheets/skins/tango/prev-vertical.png
+- app/assets/stylesheets/skins/tango/next-vertical.png
 - app/assets/stylesheets/skins/tango/credits.txt
 - app/assets/stylesheets/skins/tango/prev-horizontal.png
-- app/assets/stylesheets/skins/ie7/loading-small.gif
-- app/assets/stylesheets/skins/ie7/skin.css
-- app/assets/stylesheets/skins/ie7/next-horizontal.gif
-- app/assets/stylesheets/skins/ie7/credits.txt
-- app/assets/stylesheets/skins/ie7/loading_small.gif
 - app/assets/stylesheets/skins/ie7/loading.gif
 - app/assets/stylesheets/skins/ie7/prev-horizontal.gif
+- app/assets/stylesheets/skins/ie7/skin.css
+- app/assets/stylesheets/skins/ie7/loading_small.gif
+- app/assets/stylesheets/skins/ie7/credits.txt
+- app/assets/stylesheets/skins/ie7/loading-small.gif
+- app/assets/stylesheets/skins/ie7/next-horizontal.gif
 - app/assets/stylesheets/colorbox/colorbox.css.scss
-- app/assets/images/colorbox/ie6/borderMiddleLeft.png
-- app/assets/images/colorbox/ie6/borderTopRight.png
-- app/assets/images/colorbox/ie6/borderBottomLeft.png
-- app/assets/images/colorbox/ie6/borderTopLeft.png
-- app/assets/images/colorbox/ie6/borderBottomCenter.png
-- app/assets/images/colorbox/ie6/borderTopCenter.png
-- app/assets/images/colorbox/ie6/borderMiddleRight.png
-- app/assets/images/colorbox/ie6/borderBottomRight.png
+- app/assets/images/albums/photos.png
+- app/assets/images/albums/delete.png
+- app/assets/images/albums/rotate_cw.png
+- app/assets/images/albums/crop.png
+- app/assets/images/albums/rotate_ccw.png
 - app/assets/images/colorbox/border.png
+- app/assets/images/colorbox/loading.gif
 - app/assets/images/colorbox/loading_background.png
 - app/assets/images/colorbox/controls.png
-- app/assets/images/colorbox/loading.gif
+- app/assets/images/colorbox/ie6/borderTopCenter.png
+- app/assets/images/colorbox/ie6/borderMiddleRight.png
+- app/assets/images/colorbox/ie6/borderBottomRight.png
+- app/assets/images/colorbox/ie6/borderBottomCenter.png
+- app/assets/images/colorbox/ie6/borderTopLeft.png
+- app/assets/images/colorbox/ie6/borderTopRight.png
+- app/assets/images/colorbox/ie6/borderBottomLeft.png
+- app/assets/images/colorbox/ie6/borderMiddleLeft.png
 - app/assets/images/colorbox/overlay.png
-- app/assets/images/albums/delete.png
-- app/assets/images/albums/photos.png
-- app/assets/images/albums/rotate_cw.png
-- app/assets/images/albums/rotate_ccw.png
-- app/assets/images/albums/crop.png
-- app/assets/javascripts/application.js
-- app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee
-- app/assets/javascripts/backbone/views/photos/thumbnail_view.js.coffee
-- app/assets/javascripts/backbone/models/photo.js.coffee
-- app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb
+- app/assets/javascripts/admix/photos.js.erb
+- app/assets/javascripts/templates/photo_modal_edit.hamlc.erb
+- app/assets/javascripts/templates/photo_view.hamlc.erb
+- app/assets/javascripts/backbone/templates/photos/photo_modal_edit.hamlc.erb
 - app/assets/javascripts/backbone/templates/photos/upload_index.hamlc.erb
+- app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb
 - app/assets/javascripts/backbone/application.js.coffee
 - app/assets/javascripts/backbone/routers/photos_router.js.coffee
-- app/assets/javascripts/admix/photos.js.erb
-- app/assets/javascripts/views/fileview.js
-- app/assets/javascripts/views/filezipview.js
-- app/assets/javascripts/views/photo_modal_view.js.coffee
-- app/assets/javascripts/views/filelistview.js
+- app/assets/javascripts/backbone/models/photo.js.coffee
+- app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee
+- app/assets/javascripts/backbone/views/photos/photo_modal_view.js.coffee
+- app/assets/javascripts/backbone/views/photos/thumbnail_view.js.coffee
 - app/assets/javascripts/photos/upload.js.coffee.erb
-- app/assets/javascripts/models/filezip.js
-- app/assets/javascripts/models/fileitem.js
 - app/assets/javascripts/collections/filelist.js
-- app/assets/javascripts/templates/photo_view.hamlc.erb
-- app/assets/javascripts/templates/photo_modal_edit.hamlc.erb
 - app/assets/javascripts/routers/photo_router.js.coffee.erb
-- app/assets/javascripts/albums/show.js.coffee
-- app/assets/javascripts/albums/jquery.jcarousel.min.js
+- app/assets/javascripts/models/fileitem.js
+- app/assets/javascripts/models/filezip.js
+- app/assets/javascripts/application.js
+- app/assets/javascripts/views/filelistview.js
+- app/assets/javascripts/views/photo_modal_view.js.coffee
+- app/assets/javascripts/views/filezipview.js
+- app/assets/javascripts/views/fileview.js
+- app/helpers/admix/albums_helper.rb
+- app/models/admix/photos_datagrid.rb
+- app/models/admix/albums_datagrid.rb
+- app/models/album.rb
+- app/models/photo.rb
+- app/views/admix/albums/_show.html.haml
+- app/views/admix/albums/_table_actions.html.haml
+- app/views/admix/albums/_form_fields.html.haml
 - app/views/admix/photos/index.html.haml
 - app/views/admix/photos/_upload.html.haml
-- app/views/admix/albums/_form_fields.html.haml
-- app/views/admix/albums/_table_actions.html.haml
-- app/views/admix/albums/_show.html.haml
 - app/views/albums/index.html.haml
 - app/views/albums/show.html.haml
-- app/controllers/albums_controller.rb
-- app/controllers/admix/albums_controller.rb
-- app/controllers/admix/photos_controller.rb
-- app/models/album.rb
-- app/models/admix/photos_datagrid.rb
-- app/models/admix/albums_datagrid.rb
-- app/models/photo.rb
-- app/helpers/admix/albums_helper.rb
-- app/uploaders/albums/image_uploader.rb
-- config/initializers/carrierwave.rb
+- app/views/photos/index.html.haml
+- app/views/photos/show.html.haml
+- config/locales/albums.pt-BR.yml
+- config/locales/albums.en.yml
 - config/initializers/albums.rb
 - config/routes.rb
 - config/application.rb
-- config/locales/photos.pt-BR.yml
-- config/locales/albums.pt-BR.yml
-- config/locales/albums.en.yml
 - lib/tasks/albums_tasks.rake
+- lib/mix-rails-albums.rb
+- lib/concerns/models/album.rb
 - lib/mix-rails-albums/version.rb
 - lib/mix-rails-albums/engine.rb
-- lib/mix-rails-albums.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -212,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3421642337988709305
+      hash: -3474028709906897679
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3421642337988709305
+      hash: -3474028709906897679
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/assets/javascripts/albums/jquery.jcarousel.min.js

@@ -1,16 +0,0 @@
-/*!
- * jCarousel - Riding carousels with jQuery
- *   http://sorgalla.com/jcarousel/
- *
- * Copyright (c) 2006 Jan Sorgalla (http://sorgalla.com)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- * Built on top of the jQuery library
- *   http://jquery.com
- *
- * Inspired by the "Carousel Component" by Bill Scott
- *   http://billwscott.com/carousel/
- */
-
-(function(g){var q={vertical:!1,rtl:!1,start:1,offset:1,size:null,scroll:3,visible:null,animation:"normal",easing:"swing",auto:0,wrap:null,initCallback:null,setupCallback:null,reloadCallback:null,itemLoadCallback:null,itemFirstInCallback:null,itemFirstOutCallback:null,itemLastInCallback:null,itemLastOutCallback:null,itemVisibleInCallback:null,itemVisibleOutCallback:null,animationStepCallback:null,buttonNextHTML:"<div></div>",buttonPrevHTML:"<div></div>",buttonNextEvent:"click",buttonPrevEvent:"click", buttonNextCallback:null,buttonPrevCallback:null,itemFallbackDimension:null},m=!1;g(window).bind("load.jcarousel",function(){m=!0});g.jcarousel=function(a,c){this.options=g.extend({},q,c||{});this.autoStopped=this.locked=!1;this.buttonPrevState=this.buttonNextState=this.buttonPrev=this.buttonNext=this.list=this.clip=this.container=null;if(!c||c.rtl===void 0)this.options.rtl=(g(a).attr("dir")||g("html").attr("dir")||"").toLowerCase()=="rtl";this.wh=!this.options.vertical?"width":"height";this.lt=!this.options.vertical? this.options.rtl?"right":"left":"top";for(var b="",d=a.className.split(" "),f=0;f<d.length;f++)if(d[f].indexOf("jcarousel-skin")!=-1){g(a).removeClass(d[f]);b=d[f];break}a.nodeName.toUpperCase()=="UL"||a.nodeName.toUpperCase()=="OL"?(this.list=g(a),this.clip=this.list.parents(".jcarousel-clip"),this.container=this.list.parents(".jcarousel-container")):(this.container=g(a),this.list=this.container.find("ul,ol").eq(0),this.clip=this.container.find(".jcarousel-clip"));if(this.clip.size()===0)this.clip= this.list.wrap("<div></div>").parent();if(this.container.size()===0)this.container=this.clip.wrap("<div></div>").parent();b!==""&&this.container.parent()[0].className.indexOf("jcarousel-skin")==-1&&this.container.wrap('<div class=" '+b+'"></div>');this.buttonPrev=g(".jcarousel-prev",this.container);if(this.buttonPrev.size()===0&&this.options.buttonPrevHTML!==null)this.buttonPrev=g(this.options.buttonPrevHTML).appendTo(this.container);this.buttonPrev.addClass(this.className("jcarousel-prev"));this.buttonNext= g(".jcarousel-next",this.container);if(this.buttonNext.size()===0&&this.options.buttonNextHTML!==null)this.buttonNext=g(this.options.buttonNextHTML).appendTo(this.container);this.buttonNext.addClass(this.className("jcarousel-next"));this.clip.addClass(this.className("jcarousel-clip")).css({position:"relative"});this.list.addClass(this.className("jcarousel-list")).css({overflow:"hidden",position:"relative",top:0,margin:0,padding:0}).css(this.options.rtl?"right":"left",0);this.container.addClass(this.className("jcarousel-container")).css({position:"relative"}); !this.options.vertical&&this.options.rtl&&this.container.addClass("jcarousel-direction-rtl").attr("dir","rtl");var j=this.options.visible!==null?Math.ceil(this.clipping()/this.options.visible):null,b=this.list.children("li"),e=this;if(b.size()>0){var h=0,i=this.options.offset;b.each(function(){e.format(this,i++);h+=e.dimension(this,j)});this.list.css(this.wh,h+100+"px");if(!c||c.size===void 0)this.options.size=b.size()}this.container.css("display","block");this.buttonNext.css("display","block");this.buttonPrev.css("display", "block");this.funcNext=function(){e.next()};this.funcPrev=function(){e.prev()};this.funcResize=function(){e.resizeTimer&&clearTimeout(e.resizeTimer);e.resizeTimer=setTimeout(function(){e.reload()},100)};this.options.initCallback!==null&&this.options.initCallback(this,"init");!m&&g.browser.safari?(this.buttons(!1,!1),g(window).bind("load.jcarousel",function(){e.setup()})):this.setup()};var f=g.jcarousel;f.fn=f.prototype={jcarousel:"0.2.8"};f.fn.extend=f.extend=g.extend;f.fn.extend({setup:function(){this.prevLast= this.prevFirst=this.last=this.first=null;this.animating=!1;this.tail=this.resizeTimer=this.timer=null;this.inTail=!1;if(!this.locked){this.list.css(this.lt,this.pos(this.options.offset)+"px");var a=this.pos(this.options.start,!0);this.prevFirst=this.prevLast=null;this.animate(a,!1);g(window).unbind("resize.jcarousel",this.funcResize).bind("resize.jcarousel",this.funcResize);this.options.setupCallback!==null&&this.options.setupCallback(this)}},reset:function(){this.list.empty();this.list.css(this.lt, "0px");this.list.css(this.wh,"10px");this.options.initCallback!==null&&this.options.initCallback(this,"reset");this.setup()},reload:function(){this.tail!==null&&this.inTail&&this.list.css(this.lt,f.intval(this.list.css(this.lt))+this.tail);this.tail=null;this.inTail=!1;this.options.reloadCallback!==null&&this.options.reloadCallback(this);if(this.options.visible!==null){var a=this,c=Math.ceil(this.clipping()/this.options.visible),b=0,d=0;this.list.children("li").each(function(f){b+=a.dimension(this, c);f+1<a.first&&(d=b)});this.list.css(this.wh,b+"px");this.list.css(this.lt,-d+"px")}this.scroll(this.first,!1)},lock:function(){this.locked=!0;this.buttons()},unlock:function(){this.locked=!1;this.buttons()},size:function(a){if(a!==void 0)this.options.size=a,this.locked||this.buttons();return this.options.size},has:function(a,c){if(c===void 0||!c)c=a;if(this.options.size!==null&&c>this.options.size)c=this.options.size;for(var b=a;b<=c;b++){var d=this.get(b);if(!d.length||d.hasClass("jcarousel-item-placeholder"))return!1}return!0}, get:function(a){return g(">.jcarousel-item-"+a,this.list)},add:function(a,c){var b=this.get(a),d=0,p=g(c);if(b.length===0)for(var j,e=f.intval(a),b=this.create(a);;){if(j=this.get(--e),e<=0||j.length){e<=0?this.list.prepend(b):j.after(b);break}}else d=this.dimension(b);p.get(0).nodeName.toUpperCase()=="LI"?(b.replaceWith(p),b=p):b.empty().append(c);this.format(b.removeClass(this.className("jcarousel-item-placeholder")),a);p=this.options.visible!==null?Math.ceil(this.clipping()/this.options.visible): null;d=this.dimension(b,p)-d;a>0&&a<this.first&&this.list.css(this.lt,f.intval(this.list.css(this.lt))-d+"px");this.list.css(this.wh,f.intval(this.list.css(this.wh))+d+"px");return b},remove:function(a){var c=this.get(a);if(c.length&&!(a>=this.first&&a<=this.last)){var b=this.dimension(c);a<this.first&&this.list.css(this.lt,f.intval(this.list.css(this.lt))+b+"px");c.remove();this.list.css(this.wh,f.intval(this.list.css(this.wh))-b+"px")}},next:function(){this.tail!==null&&!this.inTail?this.scrollTail(!1): this.scroll((this.options.wrap=="both"||this.options.wrap=="last")&&this.options.size!==null&&this.last==this.options.size?1:this.first+this.options.scroll)},prev:function(){this.tail!==null&&this.inTail?this.scrollTail(!0):this.scroll((this.options.wrap=="both"||this.options.wrap=="first")&&this.options.size!==null&&this.first==1?this.options.size:this.first-this.options.scroll)},scrollTail:function(a){if(!this.locked&&!this.animating&&this.tail){this.pauseAuto();var c=f.intval(this.list.css(this.lt)), c=!a?c-this.tail:c+this.tail;this.inTail=!a;this.prevFirst=this.first;this.prevLast=this.last;this.animate(c)}},scroll:function(a,c){!this.locked&&!this.animating&&(this.pauseAuto(),this.animate(this.pos(a),c))},pos:function(a,c){var b=f.intval(this.list.css(this.lt));if(this.locked||this.animating)return b;this.options.wrap!="circular"&&(a=a<1?1:this.options.size&&a>this.options.size?this.options.size:a);for(var d=this.first>a,g=this.options.wrap!="circular"&&this.first<=1?1:this.first,j=d?this.get(g): this.get(this.last),e=d?g:g-1,h=null,i=0,k=!1,l=0;d?--e>=a:++e<a;){h=this.get(e);k=!h.length;if(h.length===0&&(h=this.create(e).addClass(this.className("jcarousel-item-placeholder")),j[d?"before":"after"](h),this.first!==null&&this.options.wrap=="circular"&&this.options.size!==null&&(e<=0||e>this.options.size)))j=this.get(this.index(e)),j.length&&(h=this.add(e,j.clone(!0)));j=h;l=this.dimension(h);k&&(i+=l);if(this.first!==null&&(this.options.wrap=="circular"||e>=1&&(this.options.size===null||e<= this.options.size)))b=d?b+l:b-l}for(var g=this.clipping(),m=[],o=0,n=0,j=this.get(a-1),e=a;++o;){h=this.get(e);k=!h.length;if(h.length===0){h=this.create(e).addClass(this.className("jcarousel-item-placeholder"));if(j.length===0)this.list.prepend(h);else j[d?"before":"after"](h);if(this.first!==null&&this.options.wrap=="circular"&&this.options.size!==null&&(e<=0||e>this.options.size))j=this.get(this.index(e)),j.length&&(h=this.add(e,j.clone(!0)))}j=h;l=this.dimension(h);if(l===0)throw Error("jCarousel: No width/height set for items. This will cause an infinite loop. Aborting..."); this.options.wrap!="circular"&&this.options.size!==null&&e>this.options.size?m.push(h):k&&(i+=l);n+=l;if(n>=g)break;e++}for(h=0;h<m.length;h++)m[h].remove();i>0&&(this.list.css(this.wh,this.dimension(this.list)+i+"px"),d&&(b-=i,this.list.css(this.lt,f.intval(this.list.css(this.lt))-i+"px")));i=a+o-1;if(this.options.wrap!="circular"&&this.options.size&&i>this.options.size)i=this.options.size;if(e>i){o=0;e=i;for(n=0;++o;){h=this.get(e--);if(!h.length)break;n+=this.dimension(h);if(n>=g)break}}e=i-o+ 1;this.options.wrap!="circular"&&e<1&&(e=1);if(this.inTail&&d)b+=this.tail,this.inTail=!1;this.tail=null;if(this.options.wrap!="circular"&&i==this.options.size&&i-o+1>=1&&(d=f.intval(this.get(i).css(!this.options.vertical?"marginRight":"marginBottom")),n-d>g))this.tail=n-g-d;if(c&&a===this.options.size&&this.tail)b-=this.tail,this.inTail=!0;for(;a-- >e;)b+=this.dimension(this.get(a));this.prevFirst=this.first;this.prevLast=this.last;this.first=e;this.last=i;return b},animate:function(a,c){if(!this.locked&& !this.animating){this.animating=!0;var b=this,d=function(){b.animating=!1;a===0&&b.list.css(b.lt,0);!b.autoStopped&&(b.options.wrap=="circular"||b.options.wrap=="both"||b.options.wrap=="last"||b.options.size===null||b.last<b.options.size||b.last==b.options.size&&b.tail!==null&&!b.inTail)&&b.startAuto();b.buttons();b.notify("onAfterAnimation");if(b.options.wrap=="circular"&&b.options.size!==null)for(var c=b.prevFirst;c<=b.prevLast;c++)c!==null&&!(c>=b.first&&c<=b.last)&&(c<1||c>b.options.size)&&b.remove(c)}; this.notify("onBeforeAnimation");if(!this.options.animation||c===!1)this.list.css(this.lt,a+"px"),d();else{var f=!this.options.vertical?this.options.rtl?{right:a}:{left:a}:{top:a},d={duration:this.options.animation,easing:this.options.easing,complete:d};if(g.isFunction(this.options.animationStepCallback))d.step=this.options.animationStepCallback;this.list.animate(f,d)}}},startAuto:function(a){if(a!==void 0)this.options.auto=a;if(this.options.auto===0)return this.stopAuto();if(this.timer===null){this.autoStopped= !1;var c=this;this.timer=window.setTimeout(function(){c.next()},this.options.auto*1E3)}},stopAuto:function(){this.pauseAuto();this.autoStopped=!0},pauseAuto:function(){if(this.timer!==null)window.clearTimeout(this.timer),this.timer=null},buttons:function(a,c){if(a==null&&(a=!this.locked&&this.options.size!==0&&(this.options.wrap&&this.options.wrap!="first"||this.options.size===null||this.last<this.options.size),!this.locked&&(!this.options.wrap||this.options.wrap=="first")&&this.options.size!==null&& this.last>=this.options.size))a=this.tail!==null&&!this.inTail;if(c==null&&(c=!this.locked&&this.options.size!==0&&(this.options.wrap&&this.options.wrap!="last"||this.first>1),!this.locked&&(!this.options.wrap||this.options.wrap=="last")&&this.options.size!==null&&this.first==1))c=this.tail!==null&&this.inTail;var b=this;this.buttonNext.size()>0?(this.buttonNext.unbind(this.options.buttonNextEvent+".jcarousel",this.funcNext),a&&this.buttonNext.bind(this.options.buttonNextEvent+".jcarousel",this.funcNext), this.buttonNext[a?"removeClass":"addClass"](this.className("jcarousel-next-disabled")).attr("disabled",a?!1:!0),this.options.buttonNextCallback!==null&&this.buttonNext.data("jcarouselstate")!=a&&this.buttonNext.each(function(){b.options.buttonNextCallback(b,this,a)}).data("jcarouselstate",a)):this.options.buttonNextCallback!==null&&this.buttonNextState!=a&&this.options.buttonNextCallback(b,null,a);this.buttonPrev.size()>0?(this.buttonPrev.unbind(this.options.buttonPrevEvent+".jcarousel",this.funcPrev), c&&this.buttonPrev.bind(this.options.buttonPrevEvent+".jcarousel",this.funcPrev),this.buttonPrev[c?"removeClass":"addClass"](this.className("jcarousel-prev-disabled")).attr("disabled",c?!1:!0),this.options.buttonPrevCallback!==null&&this.buttonPrev.data("jcarouselstate")!=c&&this.buttonPrev.each(function(){b.options.buttonPrevCallback(b,this,c)}).data("jcarouselstate",c)):this.options.buttonPrevCallback!==null&&this.buttonPrevState!=c&&this.options.buttonPrevCallback(b,null,c);this.buttonNextState= a;this.buttonPrevState=c},notify:function(a){var c=this.prevFirst===null?"init":this.prevFirst<this.first?"next":"prev";this.callback("itemLoadCallback",a,c);this.prevFirst!==this.first&&(this.callback("itemFirstInCallback",a,c,this.first),this.callback("itemFirstOutCallback",a,c,this.prevFirst));this.prevLast!==this.last&&(this.callback("itemLastInCallback",a,c,this.last),this.callback("itemLastOutCallback",a,c,this.prevLast));this.callback("itemVisibleInCallback",a,c,this.first,this.last,this.prevFirst, this.prevLast);this.callback("itemVisibleOutCallback",a,c,this.prevFirst,this.prevLast,this.first,this.last)},callback:function(a,c,b,d,f,j,e){if(!(this.options[a]==null||typeof this.options[a]!="object"&&c!="onAfterAnimation")){var h=typeof this.options[a]=="object"?this.options[a][c]:this.options[a];if(g.isFunction(h)){var i=this;if(d===void 0)h(i,b,c);else if(f===void 0)this.get(d).each(function(){h(i,this,d,b,c)});else for(var a=function(a){i.get(a).each(function(){h(i,this,a,b,c)})},k=d;k<=f;k++)k!== null&&!(k>=j&&k<=e)&&a(k)}}},create:function(a){return this.format("<li></li>",a)},format:function(a,c){for(var a=g(a),b=a.get(0).className.split(" "),d=0;d<b.length;d++)b[d].indexOf("jcarousel-")!=-1&&a.removeClass(b[d]);a.addClass(this.className("jcarousel-item")).addClass(this.className("jcarousel-item-"+c)).css({"float":this.options.rtl?"right":"left","list-style":"none"}).attr("jcarouselindex",c);return a},className:function(a){return a+" "+a+(!this.options.vertical?"-horizontal":"-vertical")}, dimension:function(a,c){var b=g(a);if(c==null)return!this.options.vertical?b.outerWidth(!0)||f.intval(this.options.itemFallbackDimension):b.outerHeight(!0)||f.intval(this.options.itemFallbackDimension);else{var d=!this.options.vertical?c-f.intval(b.css("marginLeft"))-f.intval(b.css("marginRight")):c-f.intval(b.css("marginTop"))-f.intval(b.css("marginBottom"));g(b).css(this.wh,d+"px");return this.dimension(b)}},clipping:function(){return!this.options.vertical?this.clip[0].offsetWidth-f.intval(this.clip.css("borderLeftWidth"))- f.intval(this.clip.css("borderRightWidth")):this.clip[0].offsetHeight-f.intval(this.clip.css("borderTopWidth"))-f.intval(this.clip.css("borderBottomWidth"))},index:function(a,c){if(c==null)c=this.options.size;return Math.round(((a-1)/c-Math.floor((a-1)/c))*c)+1}});f.extend({defaults:function(a){return g.extend(q,a||{})},intval:function(a){a=parseInt(a,10);return isNaN(a)?0:a},windowLoaded:function(){m=!0}});g.fn.jcarousel=function(a){if(typeof a=="string"){var c=g(this).data("jcarousel"),b=Array.prototype.slice.call(arguments, 1);return c[a].apply(c,b)}else return this.each(function(){var b=g(this).data("jcarousel");b?(a&&g.extend(b.options,a),b.reload()):g(this).data("jcarousel",new f(this,a))})}})(jQuery);

data/app/assets/javascripts/albums/show.js.coffee

@@ -1,62 +0,0 @@
-photos_initCallback = (carousel) ->
-  jQuery(".jcarousel-control a").bind "click", ->
-    carousel.scroll jQuery.jcarousel.intval(jQuery(this).text())
-    false
-
-  jQuery(".jcarousel-scroll select").bind "change", ->
-    carousel.options.scroll = jQuery.jcarousel.intval(@options[@selectedIndex].value)
-    false
-
-  jQuery(".s-next").bind "click", (e) ->
-    e.preventDefault()
-    carousel.next()
-    false
-
-  jQuery(".s-prev").bind "click", (e)->
-    e.preventDefault()
-    carousel.prev()
-    false
-
-  $("a.trigger").click (e)->
-    e.preventDefault()
-    index = jQuery(this).attr('href').replace('#', "")
-    carousel.scroll jQuery.jcarousel.intval(index)
-
-
-mycarousel_initCallback = (carousel) ->
-  jQuery(".jcarousel-control a").bind "click", ->
-    carousel.scroll jQuery.jcarousel.intval(jQuery(this).text())
-    false
-
-  jQuery(".jcarousel-scroll select").bind "change", ->
-    carousel.options.scroll = jQuery.jcarousel.intval(@options[@selectedIndex].value)
-    false
-
-  jQuery(".next-thumbs").bind "click", (e) ->
-    e.preventDefault()
-    carousel.next()
-    false
-
-  jQuery(".prev-thumbs").bind "click", (e) ->
-    e.preventDefault()
-    carousel.prev()
-    false
-
-$ ->
-
-  photos = $("#photos-carousel").jcarousel
-    visible: 1
-    scroll: 1
-    initCallback: photos_initCallback
-    # This tells jCarousel NOT to autobuild prev/next buttons
-    buttonNextHTML: null
-    buttonPrevHTML: null
-
-
-  $(".mycarousel").jcarousel
-    visible: 6
-    initCallback: mycarousel_initCallback
-    # This tells jCarousel NOT to autobuild prev/next buttons
-    buttonNextHTML: null
-    buttonPrevHTML: null
-

data/config/initializers/carrierwave.rb

@@ -1,9 +0,0 @@
-require 'mongoid/railtie'
-
-CarrierWave.configure do |config|
-
-  config.storage              = :grid_fs
-  config.grid_fs_access_url   = "/files"
-  config.cache_dir = "uploads"
-  config.root = Rails.root.join('public')
-end

data/config/locales/photos.pt-BR.yml

@@ -1,11 +0,0 @@
-pt-BR:
-  photos:
-    photos: 'Fotos'
-    photo: 'Foto'
-    legend: 'Legenda'
-    or: 'ou'
-    upload:
-      explanation: 'Clique no botão abaixo para adicionar as fotos.'
-    btn:
-      upload_pictures: 'Enviar arquivos de imagem'
-      upload_zip: 'Enviar arquivo ZIP'