mix-rails 0.16.0 → 0.22.0

data/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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'