mix-rails-albums 0.12.1 → 0.12.2

data/app/assets/javascripts/admix/photos.js.erb

@@ -1,6 +1,4 @@
 //= require hamlcoffee
-//= require ../photo_uploader
-//
 //= require_tree ../models
 //= require_tree ../collections
 //= require_tree ../views
@@ -9,25 +7,14 @@
 
 <% url = Rails.application.routes.url_helpers %>
 
-var oldSet = Backbone.Model.prototype.set;
-_.extend(Backbone.Model.prototype, {
-    set: function(attrs, options) {
-        if ('_id' in attrs) { this.id = attrs._id; }
-        oldSet.apply(this, [attrs, options]);
-        return this;
-    }
-});
+new PhotoRouter();
 
+jQuery(function() {
 
-jQuery(function(){
-
-  var fileZip, fileZipView;
-  
-
+  var fileZip, fileZipView, fileListView;
   var fileList = new FileList();
   fileList.url = $("#files").data('url');
-  var fileListView;
-
+  
   jQuery("#uploader").change(function(el) {        
       
       var files = el.currentTarget.files;

data/app/assets/javascripts/backbone/application.js.coffee

@@ -0,0 +1,12 @@
+#= require hamlcoffee
+#= require_self
+#= require_tree ./templates
+#= require_tree ./models
+#= require_tree ./views
+#= require_tree ./routers
+
+window.Application =
+  Models: {}
+  Collections: {}
+  Routers: {}
+  Views: {}

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

@@ -0,0 +1,39 @@
+class Application.Models.Photo extends Backbone.Model
+  paramRoot: 'photo'
+  idAttribute: '_id'
+  defaults:
+    image: null
+    description: null
+    progress: 0
+  
+  initialize: ->
+    @on 'add', @onAdd, @
+
+  onAdd: ->
+    xhr = new XMLHttpRequest()
+    xhr.open "POST", @url
+    datas = new FormData()
+    datas.append "image", @get("image")
+    xhr.upload.addEventListener "progress", (e) =>
+      if e.lengthComputable
+        currentState = (e.loaded / e.total) * 100
+        @set progress: currentState
+
+    xhr.onreadystatechange = (e) =>
+      if e.currentTarget.readyState is 4
+        @set progress: 100
+        @trigger "uploadCompleted"
+        if xhr.responseText
+          responseObject = JSON.parse(xhr.responseText)
+          @set responseObject
+        else
+          console.log "Não foi possível enviar o arquivo"
+
+
+    # Start send the file.
+    xhr.send datas
+
+class Application.Collections.PhotosCollection extends Backbone.Collection
+  model: Application.Models.Photo
+  url: '/photos'
+

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

@@ -0,0 +1,36 @@
+class Application.Routers.PhotosRouter extends Backbone.Router
+  initialize: (options) ->
+    @photos = new Application.Collections.PhotosCollection()
+    @photos.reset options.photos
+
+  routes:
+    "new"      : "newPhoto"
+    "index"    : "index"
+    "upload_index" : "upload_index"
+    ":id/edit" : "edit"
+    ":id"      : "show"
+    ".*"        : "index"
+
+  newPhoto: ->
+    @view = new Application.Views.Photos.NewView(collection: @photos)
+    $("#photos").html(@view.render().el)
+
+  index: ->
+    @view = new Application.Views.Photos.IndexView(photos: @photos)
+    $("#photos").html(@view.render().el)
+
+  upload_index: ->
+    @view = new Application.Views.Photos.UploadIndexView(photos: @photos)
+    $("#photos").html(@view.render().el)
+
+  show: (id) ->
+    photo = @photos.get(id)
+
+    @view = new Application.Views.Photos.ShowView(model: photo)
+    $("#photos").html(@view.render().el)
+
+  edit: (id) ->
+    photo = @photos.get(id)
+
+    @view = new Application.Views.Photos.EditView(model: photo)
+    $("#photos").html(@view.render().el)

data/app/assets/javascripts/backbone/templates/photos/edit.jst.ejs

@@ -0,0 +1,20 @@
+<h1>Edit photo</h1>
+
+<form id="edit-photo" name="photo">
+  <div class="field">
+    <label for="image"> image:</label>
+    <input type="text" name="image" id="image" value="<%= image %>" >
+  </div>
+
+  <div class="field">
+    <label for="description"> description:</label>
+    <input type="text" name="description" id="description" value="<%= description %>" >
+  </div>
+
+  <div class="actions">
+    <input type="submit" value="Update Photo" />
+  </div>
+
+</form>
+
+<a href="#/index">Back</a>

data/app/assets/javascripts/backbone/templates/photos/index.jst.ejs

@@ -0,0 +1,15 @@
+<h1>Listing photos</h1>
+
+<table id="photos-table">
+  <tr>
+    <th>Image</th>
+    <th>Description</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+</table>
+
+<br/>
+
+<a href="#/new">New Photo</a>

data/app/assets/javascripts/backbone/templates/photos/modal.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 => "#"} Salvar mudanças

data/app/assets/javascripts/backbone/templates/photos/new.jst.ejs

@@ -0,0 +1,20 @@
+<h1>New photo</h1>
+
+<form id="new-photo" name="photo">
+  <div class="field">
+    <label for="image"> image:</label>
+    <input type="text" name="image" id="image" value="<%= image %>" >
+  </div>
+
+  <div class="field">
+    <label for="description"> description:</label>
+    <input type="text" name="description" id="description" value="<%= description %>" >
+  </div>
+
+  <div class="actions">
+    <input type="submit" value="Create Photo" />
+  </div>
+
+</form>
+
+<a href="#/index">Back</a>

data/app/assets/javascripts/backbone/templates/photos/photo.jst.ejs

@@ -0,0 +1,6 @@
+<td><%= image %></td>
+<td><%= description %></td>
+
+<td><a href="#/<%= id %>">Show</td>
+<td><a href="#/<%= id %>/edit">Edit</td>
+<td><a href="#/<%= id %>/destroy" class="destroy">Destroy</a></td>

data/app/assets/javascripts/backbone/templates/photos/show.jst.ejs

@@ -0,0 +1,12 @@
+<p>
+  <b>Image:</b>
+  <%= image %>
+</p>
+
+<p>
+  <b>Description:</b>
+  <%= description %>
+</p>
+
+
+<a href="#/index">Back</a>

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

@@ -0,0 +1,16 @@
+.thumbnail.file-item
+  .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.thumb.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}%;"}
+  .caption
+    %a.file-action.delete{href: "#"} 
+      <%= image_tag "albums/delete.png" %>

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

@@ -0,0 +1 @@
+.photos-container

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

@@ -0,0 +1,24 @@
+Application.Views.Photos ||= {}
+
+class Application.Views.Photos.EditView extends Backbone.View
+  template: JST["backbone/templates/photos/edit"]
+
+  events:
+    "submit #edit-photo": "update"
+
+  update: (e) ->
+    e.preventDefault()
+    e.stopPropagation()
+
+    @model.save(null,
+      success: (photo) =>
+        @model = photo
+        window.location.hash = "/#{@model.id}"
+    )
+
+  render: ->
+    @$el.html(@template(@model.toJSON() ))
+
+    this.$("form").backboneLink(@model)
+
+    return this

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

@@ -0,0 +1,20 @@
+Application.Views.Photos ||= {}
+
+class Application.Views.Photos.IndexView extends Backbone.View
+  template: JST["backbone/templates/photos/index"]
+
+  initialize: () ->
+    @options.photos.bind('reset', @addAll)
+
+  addAll: () =>
+    @options.photos.each(@addOne)
+
+  addOne: (photo) =>
+    view = new Application.Views.Photos.PhotoView({model : photo})
+    @$("tbody").append(view.render().el)
+
+  render: =>
+    @$el.html(@template(photos: @options.photos.toJSON() ))
+    @addAll()
+
+    return this

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

@@ -0,0 +1,37 @@
+Application.Views.Photos ||= {}
+
+class Application.Views.Photos.NewView extends Backbone.View
+  template: JST["backbone/templates/photos/new"]
+
+  events:
+    "submit #new-photo": "save"
+
+  constructor: (options) ->
+    super(options)
+    @model = new @collection.model()
+
+    @model.bind("change:errors", () =>
+      this.render()
+    )
+
+  save: (e) ->
+    e.preventDefault()
+    e.stopPropagation()
+
+    @model.unset("errors")
+
+    @collection.create(@model.toJSON(),
+      success: (photo) =>
+        @model = photo
+        window.location.hash = "/#{@model.id}"
+
+      error: (photo, jqXHR) =>
+        @model.set({errors: $.parseJSON(jqXHR.responseText)})
+    )
+
+  render: ->
+    @$el.html(@template(@model.toJSON() ))
+
+    this.$("form").backboneLink(@model)
+
+    return this

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

@@ -0,0 +1,19 @@
+Application.Views.Photos ||= {}
+
+class Application.Views.Photos.PhotoView extends Backbone.View
+  template: JST["backbone/templates/photos/photo"]
+
+  events:
+    "click .destroy" : "destroy"
+
+  tagName: "tr"
+
+  destroy: () ->
+    @model.destroy()
+    this.remove()
+
+    return false
+
+  render: ->
+    @$el.html(@template(@model.toJSON() ))
+    return this

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

@@ -0,0 +1,8 @@
+Application.Views.Photos ||= {}
+
+class Application.Views.Photos.ShowView extends Backbone.View
+  template: JST["backbone/templates/photos/show"]
+
+  render: ->
+    @$el.html(@template(@model.toJSON() ))
+    return this

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

@@ -0,0 +1,30 @@
+Application.Views.Photos ||= {}
+
+class Application.Views.Photos.PhotoView extends Backbone.View
+  template: JST["backbone/templates/photos/thumbnail"]
+
+  events:
+    "click .destroy" : "destroy"
+    "click .photo-link": "photo_link",
+
+  tagName: "li"
+  className: 'span2'
+
+  initialize: ->
+    @model.on "change", @render, this
+    @model.on "uploadCompleted", @removeProgressBar, this
+
+  removeProgressBar: ->
+    @$el.find(".progress").fadeOut()  unless @$el is undefined
+
+  destroy: () ->
+    @model.destroy()
+    this.remove()
+
+    return false
+
+  photo_link: () ->
+
+  render: ->
+    @$el.html(@template(@model.toJSON() ))
+    return this

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

@@ -0,0 +1,22 @@
+Application.Views.Photos ||= {}
+
+class Application.Views.Photos.UploadIndexView extends Backbone.View
+  template: JST["backbone/templates/photos/upload_index"]
+  tagName: 'ul'
+  className: 'thumbnails'
+
+  initialize: () ->
+    @options.photos.bind('reset', @addAll)
+
+  addAll: () =>
+    @options.photos.each(@addOne)
+
+  addOne: (photo) =>
+    view = new Application.Views.Photos.PhotoView({model : photo})
+    @$(".photos-container").append(view.render().el)
+
+  render: =>
+    @$el.html(@template(photos: @options.photos.toJSON() ))
+    @addAll()
+
+    return this

data/app/assets/javascripts/collections/filelist.js

@@ -1,4 +1,5 @@
 var FileList = Backbone.Collection.extend({
+    name: 'photos',
     initialize: function(){
         
     }

data/app/assets/javascripts/models/fileitem.js

@@ -1,4 +1,7 @@
 var FileItem = Backbone.Model.extend({
+    name: 'photo',
+    url: 'photos',
+    idAttribute: '_id',
     defaults: {
         progress:0
     },

data/app/assets/javascripts/photos/upload.js.coffee.erb

@@ -0,0 +1,9 @@
+#= require ../backbone/application
+#= require_self
+
+<% url = Rails.application.routes.url_helpers %>
+
+$ ->
+  $.getJSON $("#photos").data('url'),(json) ->
+    new Application.Routers.PhotosRouter(photos: json)
+    Backbone.history.start()

data/app/assets/javascripts/routers/photo_router.js.coffee.erb

@@ -0,0 +1,7 @@
+class window.PhotoRouter extends Backbone.Router
+  routes:
+    ":photo_id/ajax_edit": "ajax_edit"
+
+  ajax_edit: (photo_id) ->
+    console.log "Editando foto #{photo_id}"
+    $("#photo-modal-#{photo_id}").modal()

data/app/assets/javascripts/templates/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 => "#"} Salvar mudanças

data/app/assets/javascripts/templates/photo_view.hamlc.erb

@@ -4,7 +4,7 @@
   %a.link-popover{"data-content" => "<i class=icon-edit></i> Edit"}
     .loading-file
       - if @image.url
-        %a.fancybox{href: ROOT_PATH + @image.medium.url, rel: 'photo-album'}
+        %a.photo-link{href: "#"}
           %img{src: ROOT_PATH + @image.thumb.url}
       - else
         %img{src: "http://placehold.it/130x90&text=Carregando"}

data/app/assets/javascripts/views/filelistview.js

@@ -9,7 +9,9 @@ var FileListView    = Backbone.View.extend({
     },
     addOne: function(fileItem){
         var fileView = new FileView({model: fileItem});
+        var photoModalView = new PhotoModalView({model: fileItem});
         this.$el.append(fileView.render().el);
+        this.$el.append(photoModalView.render().el);
     }
 
 });

data/app/assets/javascripts/views/fileview.js

@@ -2,7 +2,8 @@ var FileView = Backbone.View.extend({
     tagName: 'li',
     className: 'span2',
     events: {
-        "click .delete": "delete"
+        "click .delete": "delete",
+        "click .photo-link": "photo_link",
     },
     initialize: function(){
         this.template = JST['photo_view']
@@ -30,5 +31,9 @@ var FileView = Backbone.View.extend({
           }
         });
         this.$el.fadeOut();
+    },
+    photo_link: function(e) {
+        e.preventDefault();
+        Backbone.history.navigate(":photo_id/ajax_edit".replace(':photo_id', this.model.get('id')), {trigger: true});
     }
 });

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

@@ -0,0 +1,25 @@
+class window.PhotoModalView extends Backbone.View
+  tagName: "div"
+  #className: "span2"
+  events:
+    "click .save": "save_changes"
+
+  initialize: ->
+    @template = JST["photo_modal_edit"]
+    @model.on "change", @render, this
+
+  render: ->
+    data = _.defaults(@model.attributes,
+      progress: null
+      id: null
+      title: null
+    )
+    html = @template(@model.attributes)
+    $(@el).html html
+    this
+
+  save_changes: (e) ->
+    e.preventDefault()
+    description = $("#input_photo_description_#{@model.get('id')}").val()
+    @model.set(description: description)
+    @model.save()

data/app/models/photo.rb

@@ -3,9 +3,9 @@ class Photo
   include Mongoid::Document
   include Mongoid::Timestamps
   
-  attr_accessible :image, :image_cache
+  attr_accessible :description, :image, :image_cache
 
-  field :legend
+  field :description
   
   embedded_in :album
 

data/app/views/admix/photos/_upload.html.haml

@@ -1,5 +1,5 @@
 - content_for :javascripts do
-  = javascript_include_tag 'admix/photos'
+  = javascript_include_tag 'photos/upload'
   
 %h3 Upload de fotos
 #upload-buttons{:style => "padding: 20px;"}
@@ -14,4 +14,4 @@
     %a.btn.btn-primary.btn-upload{:onclick => "jQuery('#uploaderZip').click();"}= t('photos.btn.upload_zip')
 
 #fileZip
-%ul#files.thumbnails{'data-url' => admix_album_photos_path(defined?(parent) ? parent : resource, format: :json)}
+%ul#photos.thumbnails{'data-url' => admix_album_photos_path(defined?(parent) ? parent : resource)}

data/config/routes.rb

@@ -6,7 +6,11 @@ Rails.application.routes.draw do
     
   scope Admix::namespace_path, as: :admix, module: :admix do
     resources :albums do
-      resources :photos
+      resources :photos do
+        member do
+          get :edit_ajax
+        end
+      end
     end
   end
 

data/lib/mix-rails-albums.rb

@@ -6,5 +6,5 @@ require "mini_magick"
 
 require "haml_coffee_assets"
 
-module Albums
+module MixRailsAlbums
 end

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

@@ -2,7 +2,7 @@ module MixRailsAlbums
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 12
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-albums
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,78 +114,98 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/uploaders/albums/image_uploader.rb
-- app/controllers/admix/albums_controller.rb
-- app/controllers/admix/photos_controller.rb
-- app/controllers/albums_controller.rb
-- app/assets/stylesheets/skins/tango/next-horizontal.png
+- app/assets/stylesheets/skins/tango/next-vertical.png
 - app/assets/stylesheets/skins/tango/skin.css
+- app/assets/stylesheets/skins/tango/next-horizontal.png
 - 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.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/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/colorbox/colorbox.css.scss
-- 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/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/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/border.png
+- app/assets/images/colorbox/loading_background.png
+- app/assets/images/colorbox/controls.png
+- app/assets/images/colorbox/loading.gif
 - 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/views/photos/index_view.js.coffee
+- app/assets/javascripts/backbone/views/photos/show_view.js.coffee
+- app/assets/javascripts/backbone/views/photos/photo_view.js.coffee
+- app/assets/javascripts/backbone/views/photos/new_view.js.coffee
+- app/assets/javascripts/backbone/views/photos/edit_view.js.coffee
+- app/assets/javascripts/backbone/models/photo.js.coffee
+- app/assets/javascripts/backbone/templates/photos/index.jst.ejs
+- app/assets/javascripts/backbone/templates/photos/show.jst.ejs
+- app/assets/javascripts/backbone/templates/photos/edit.jst.ejs
+- app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb
+- app/assets/javascripts/backbone/templates/photos/photo.jst.ejs
+- app/assets/javascripts/backbone/templates/photos/modal.hamlc.erb
+- app/assets/javascripts/backbone/templates/photos/new.jst.ejs
+- app/assets/javascripts/backbone/templates/photos/upload_index.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/albums/jquery.jcarousel.min.js
-- app/assets/javascripts/albums/show.js.coffee
-- app/assets/javascripts/templates/photo_view.hamlc.erb
-- app/assets/javascripts/collections/filelist.js
-- app/assets/javascripts/colorbox/jquery.colorbox-min.js
-- app/assets/javascripts/photo_uploader.coffee
-- app/assets/javascripts/models/fileitem.js
-- app/assets/javascripts/models/filezip.js
-- app/assets/javascripts/albums.js
-- app/assets/javascripts/views/filelistview.js
-- 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/assets/javascripts/views/filezipview.js
+- app/assets/javascripts/views/photo_modal_view.js.coffee
+- app/assets/javascripts/views/filelistview.js
+- 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/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
-- config/locales/photos.pt-BR.yml
-- config/locales/albums.pt-BR.yml
-- config/locales/albums.en.yml
+- 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
 - 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/mix-rails-albums/version.rb
 - lib/mix-rails-albums/engine.rb
+- lib/mix-rails-albums.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -203,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3744313959906207215
+      hash: -52676259253557303
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3744313959906207215
+      hash: -52676259253557303
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/assets/javascripts/colorbox/jquery.colorbox-min.js

@@ -1,4 +0,0 @@
-// ColorBox v1.3.20.2 - jQuery lightbox plugin
-// (c) 2012 Jack Moore - jacklmoore.com
-// License: http://www.opensource.org/licenses/mit-license.php
-(function(a,b,c){function Z(c,d,e){var g=b.createElement(c);return d&&(g.id=f+d),e&&(g.style.cssText=e),a(g)}function $(a){var b=y.length,c=(Q+a)%b;return 0>c?b+c:c}function _(a,b){return Math.round((/%/.test(a)?("x"===b?z.width():z.height())/100:1)*parseInt(a,10))}function ab(a){return K.photo||/\.(gif|png|jp(e|g|eg)|bmp|ico)((#|\?).*)?$/i.test(a)}function bb(){var b,c=a.data(P,e);null==c?(K=a.extend({},d),console&&console.log&&console.log("Error: cboxElement missing settings object")):K=a.extend({},c);for(b in K)a.isFunction(K[b])&&"on"!==b.slice(0,2)&&(K[b]=K[b].call(P));K.rel=K.rel||P.rel||a(P).data("rel")||"nofollow",K.href=K.href||a(P).attr("href"),K.title=K.title||P.title,"string"==typeof K.href&&(K.href=a.trim(K.href))}function cb(b,c){a.event.trigger(b),c&&c.call(P)}function db(){var a,d,e,b=f+"Slideshow_",c="click."+f;K.slideshow&&y[1]?(d=function(){F.html(K.slideshowStop).unbind(c).bind(j,function(){(K.loop||y[Q+1])&&(a=setTimeout(W.next,K.slideshowSpeed))}).bind(i,function(){clearTimeout(a)}).one(c+" "+k,e),r.removeClass(b+"off").addClass(b+"on"),a=setTimeout(W.next,K.slideshowSpeed)},e=function(){clearTimeout(a),F.html(K.slideshowStart).unbind([j,i,k,c].join(" ")).one(c,function(){W.next(),d()}),r.removeClass(b+"on").addClass(b+"off")},K.slideshowAuto?d():e()):r.removeClass(b+"off "+b+"on")}function eb(b){U||(P=b,bb(),y=a(P),Q=0,"nofollow"!==K.rel&&(y=a("."+g).filter(function(){var c,b=a.data(this,e);return b&&(c=a(this).data("rel")||b.rel||this.rel),c===K.rel}),Q=y.index(P),-1===Q&&(y=y.add(P),Q=y.length-1)),S||(S=T=!0,r.show(),K.returnFocus&&a(P).blur().one(l,function(){a(this).focus()}),q.css({opacity:+K.opacity,cursor:K.overlayClose?"pointer":"auto"}).show(),K.w=_(K.initialWidth,"x"),K.h=_(K.initialHeight,"y"),W.position(),o&&z.bind("resize."+p+" scroll."+p,function(){q.css({width:z.width(),height:z.height(),top:z.scrollTop(),left:z.scrollLeft()})}).trigger("resize."+p),cb(h,K.onOpen),J.add(D).hide(),I.html(K.close).show()),W.load(!0))}function fb(){!r&&b.body&&(Y=!1,z=a(c),r=Z(X).attr({id:e,"class":n?f+(o?"IE6":"IE"):""}).hide(),q=Z(X,"Overlay",o?"position:absolute":"").hide(),C=Z(X,"LoadingOverlay").add(Z(X,"LoadingGraphic")),s=Z(X,"Wrapper"),t=Z(X,"Content").append(A=Z(X,"LoadedContent","width:0; height:0; overflow:hidden"),D=Z(X,"Title"),E=Z(X,"Current"),G=Z(X,"Next"),H=Z(X,"Previous"),F=Z(X,"Slideshow").bind(h,db),I=Z(X,"Close")),s.append(Z(X).append(Z(X,"TopLeft"),u=Z(X,"TopCenter"),Z(X,"TopRight")),Z(X,!1,"clear:left").append(v=Z(X,"MiddleLeft"),t,w=Z(X,"MiddleRight")),Z(X,!1,"clear:left").append(Z(X,"BottomLeft"),x=Z(X,"BottomCenter"),Z(X,"BottomRight"))).find("div div").css({"float":"left"}),B=Z(X,!1,"position:absolute; width:9999px; visibility:hidden; display:none"),J=G.add(H).add(E).add(F),a(b.body).append(q,r.append(s,B)))}function gb(){return r?(Y||(Y=!0,L=u.height()+x.height()+t.outerHeight(!0)-t.height(),M=v.width()+w.width()+t.outerWidth(!0)-t.width(),N=A.outerHeight(!0),O=A.outerWidth(!0),r.css({"padding-bottom":L,"padding-right":M}),G.click(function(){W.next()}),H.click(function(){W.prev()}),I.click(function(){W.close()}),q.click(function(){K.overlayClose&&W.close()}),a(b).bind("keydown."+f,function(a){var b=a.keyCode;S&&K.escKey&&27===b&&(a.preventDefault(),W.close()),S&&K.arrowKey&&y[1]&&(37===b?(a.preventDefault(),H.click()):39===b&&(a.preventDefault(),G.click()))}),a(b).delegate("."+g,"click",function(a){a.which>1||a.shiftKey||a.altKey||a.metaKey||(a.preventDefault(),eb(this))})),!0):!1}var q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,Y,d={transition:"elastic",speed:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,inline:!1,html:!1,iframe:!1,fastIframe:!0,photo:!1,href:!1,title:!1,rel:!1,opacity:.9,preloading:!0,current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",open:!1,returnFocus:!0,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0},e="colorbox",f="cbox",g=f+"Element",h=f+"_open",i=f+"_load",j=f+"_complete",k=f+"_cleanup",l=f+"_closed",m=f+"_purge",n=!a.support.opacity&&!a.support.style,o=n&&!c.XMLHttpRequest,p=f+"_IE6",X="div";a.colorbox||(a(fb),W=a.fn[e]=a[e]=function(b,c){var f=this;if(b=b||{},fb(),gb()){if(!f[0]){if(f.selector)return f;f=a("<a/>"),b.open=!0}c&&(b.onComplete=c),f.each(function(){a.data(this,e,a.extend({},a.data(this,e)||d,b))}).addClass(g),(a.isFunction(b.open)&&b.open.call(f)||b.open)&&eb(f[0])}return f},W.position=function(a,b){function j(a){u[0].style.width=x[0].style.width=t[0].style.width=a.style.width,t[0].style.height=v[0].style.height=w[0].style.height=a.style.height}var c,h,i,d=0,e=0,g=r.offset();z.unbind("resize."+f),r.css({top:-9e4,left:-9e4}),h=z.scrollTop(),i=z.scrollLeft(),K.fixed&&!o?(g.top-=h,g.left-=i,r.css({position:"fixed"})):(d=h,e=i,r.css({position:"absolute"})),e+=K.right!==!1?Math.max(z.width()-K.w-O-M-_(K.right,"x"),0):K.left!==!1?_(K.left,"x"):Math.round(Math.max(z.width()-K.w-O-M,0)/2),d+=K.bottom!==!1?Math.max(z.height()-K.h-N-L-_(K.bottom,"y"),0):K.top!==!1?_(K.top,"y"):Math.round(Math.max(z.height()-K.h-N-L,0)/2),r.css({top:g.top,left:g.left}),a=r.width()===K.w+O&&r.height()===K.h+N?0:a||0,s[0].style.width=s[0].style.height="9999px",c={width:K.w+O,height:K.h+N,top:d,left:e},0===a&&r.css(c),r.dequeue().animate(c,{duration:a,complete:function(){j(this),T=!1,s[0].style.width=K.w+O+M+"px",s[0].style.height=K.h+N+L+"px",K.reposition&&setTimeout(function(){z.bind("resize."+f,W.position)},1),b&&b()},step:function(){j(this)}})},W.resize=function(a){S&&(a=a||{},a.width&&(K.w=_(a.width,"x")-O-M),a.innerWidth&&(K.w=_(a.innerWidth,"x")),A.css({width:K.w}),a.height&&(K.h=_(a.height,"y")-N-L),a.innerHeight&&(K.h=_(a.innerHeight,"y")),a.innerHeight||a.height||(A.css({height:"auto"}),K.h=A.height()),A.css({height:K.h}),W.position("none"===K.transition?0:K.speed))},W.prep=function(b){function g(){return K.w=K.w||A.width(),K.w=K.mw&&K.mw<K.w?K.mw:K.w,K.w}function h(){return K.h=K.h||A.height(),K.h=K.mh&&K.mh<K.h?K.mh:K.h,K.h}if(S){var c,d="none"===K.transition?0:K.speed;A.remove(),A=Z(X,"LoadedContent").append(b),A.hide().appendTo(B.show()).css({width:g(),overflow:K.scrolling?"auto":"hidden"}).css({height:h()}).prependTo(t),B.hide(),a(R).css({"float":"none"}),o&&a("select").not(r.find("select")).filter(function(){return"hidden"!==this.style.visibility}).css({visibility:"hidden"}).one(k,function(){this.style.visibility="inherit"}),c=function(){function s(){n&&r[0].style.removeAttribute("filter")}var b,c,h,l,o,p,q,g=y.length,i="frameBorder",k="allowTransparency";if(S){if(l=function(){clearTimeout(V),C.detach().hide(),cb(j,K.onComplete)},n&&R&&A.fadeIn(100),D.html(K.title).add(A).show(),g>1){if("string"==typeof K.current&&E.html(K.current.replace("{current}",Q+1).replace("{total}",g)).show(),G[K.loop||g-1>Q?"show":"hide"]().html(K.next),H[K.loop||Q?"show":"hide"]().html(K.previous),K.slideshow&&F.show(),K.preloading)for(b=[$(-1),$(1)];c=y[b.pop()];)q=a.data(c,e),q&&q.href?(o=q.href,a.isFunction(o)&&(o=o.call(c))):o=c.href,ab(o)&&(p=new Image,p.src=o)}else J.hide();K.iframe?(h=Z("iframe")[0],i in h&&(h[i]=0),k in h&&(h[k]="true"),K.scrolling||(h.scrolling="no"),a(h).attr({src:K.href,name:(new Date).getTime(),"class":f+"Iframe",allowFullScreen:!0,webkitAllowFullScreen:!0,mozallowfullscreen:!0}).one("load",l).one(m,function(){h.src="//about:blank"}).appendTo(A),K.fastIframe&&a(h).trigger("load")):l(),"fade"===K.transition?r.fadeTo(d,1,s):s()}},"fade"===K.transition?r.fadeTo(d,0,function(){W.position(0,c)}):W.position(d,c)}},W.load=function(b){var c,d,e=W.prep;T=!0,R=!1,P=y[Q],b||bb(),cb(m),cb(i,K.onLoad),K.h=K.height?_(K.height,"y")-N-L:K.innerHeight&&_(K.innerHeight,"y"),K.w=K.width?_(K.width,"x")-O-M:K.innerWidth&&_(K.innerWidth,"x"),K.mw=K.w,K.mh=K.h,K.maxWidth&&(K.mw=_(K.maxWidth,"x")-O-M,K.mw=K.w&&K.w<K.mw?K.w:K.mw),K.maxHeight&&(K.mh=_(K.maxHeight,"y")-N-L,K.mh=K.h&&K.h<K.mh?K.h:K.mh),c=K.href,V=setTimeout(function(){C.show().appendTo(t)},100),K.inline?(Z(X).hide().insertBefore(a(c)[0]).one(m,function(){a(this).replaceWith(A.children())}),e(a(c))):K.iframe?e(" "):K.html?e(K.html):ab(c)?(a(R=new Image).addClass(f+"Photo").error(function(){K.title=!1,e(Z(X,"Error").html(K.imgError))}).load(function(){var a;R.onload=null,K.scalePhotos&&(d=function(){R.height-=R.height*a,R.width-=R.width*a},K.mw&&R.width>K.mw&&(a=(R.width-K.mw)/R.width,d()),K.mh&&R.height>K.mh&&(a=(R.height-K.mh)/R.height,d())),K.h&&(R.style.marginTop=Math.max(K.h-R.height,0)/2+"px"),y[1]&&(K.loop||y[Q+1])&&(R.style.cursor="pointer",R.onclick=function(){W.next()}),n&&(R.style.msInterpolationMode="bicubic"),setTimeout(function(){e(R)},1)}),setTimeout(function(){R.src=c},1)):c&&B.load(c,K.data,function(b,c){e("error"===c?Z(X,"Error").html(K.xhrError):a(this).contents())})},W.next=function(){!T&&y[1]&&(K.loop||y[Q+1])&&(Q=$(1),W.load())},W.prev=function(){!T&&y[1]&&(K.loop||Q)&&(Q=$(-1),W.load())},W.close=function(){S&&!U&&(U=!0,S=!1,cb(k,K.onCleanup),z.unbind("."+f+" ."+p),q.fadeTo(200,0),r.stop().fadeTo(300,0,function(){r.add(q).css({opacity:1,cursor:"auto"}).hide(),cb(m),A.remove(),setTimeout(function(){U=!1,cb(l,K.onClosed)},1)}))},W.remove=function(){a([]).add(r).add(q).remove(),r=null,a("."+g).removeData(e).removeClass(g),a(b).undelegate("."+g)},W.element=function(){return a(P)},W.settings=d)})(jQuery,document,window);

data/app/assets/javascripts/photo_uploader.coffee

@@ -1,2 +0,0 @@
-class window.PhotoUploader
-  sanity: -> true