mix-rails-albums 0.12.2 → 0.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/app/assets/javascripts/backbone/routers/photos_router.js.coffee +7 -6
  2. data/app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb +2 -2
  3. data/app/assets/javascripts/backbone/templates/photos/upload_index.hamlc.erb +13 -1
  4. data/app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee +1 -1
  5. data/app/assets/javascripts/photos/upload.js.coffee.erb +19 -4
  6. data/app/views/admix/photos/_upload.html.haml +3 -13
  7. data/lib/mix-rails-albums/version.rb +2 -2
  8. metadata +64 -64
data/app/assets/javascripts/backbone/routers/photos_router.js.coffee CHANGED
@@ -1,6 +1,7 @@
1
1
  class Application.Routers.PhotosRouter extends Backbone.Router
2
2
  initialize: (options) ->
3
3
  @photos = new Application.Collections.PhotosCollection()
4
+ @photos.url = options.collectionUrl
4
5
  @photos.reset options.photos
5
6
 
6
7
  routes:
@@ -9,28 +10,28 @@ class Application.Routers.PhotosRouter extends Backbone.Router
9
10
  "upload_index" : "upload_index"
10
11
  ":id/edit" : "edit"
11
12
  ":id" : "show"
12
- ".*" : "index"
13
+ ".*" : "upload_index"
13
14
 
14
15
  newPhoto: ->
15
16
  @view = new Application.Views.Photos.NewView(collection: @photos)
16
- $("#photos").html(@view.render().el)
17
+ $("#upload-container").html(@view.render().el)
17
18
 
18
19
  index: ->
19
20
  @view = new Application.Views.Photos.IndexView(photos: @photos)
20
- $("#photos").html(@view.render().el)
21
+ $("#upload-container").html(@view.render().el)
21
22
 
22
23
  upload_index: ->
23
24
  @view = new Application.Views.Photos.UploadIndexView(photos: @photos)
24
- $("#photos").html(@view.render().el)
25
+ $("#upload-container").html(@view.render().el)
25
26
 
26
27
  show: (id) ->
27
28
  photo = @photos.get(id)
28
29
 
29
30
  @view = new Application.Views.Photos.ShowView(model: photo)
30
- $("#photos").html(@view.render().el)
31
+ $("#upload-container").html(@view.render().el)
31
32
 
32
33
  edit: (id) ->
33
34
  photo = @photos.get(id)
34
35
 
35
36
  @view = new Application.Views.Photos.EditView(model: photo)
36
- $("#photos").html(@view.render().el)
37
+ $("#upload-container").html(@view.render().el)
data/app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb CHANGED
@@ -1,4 +1,4 @@
1
- .thumbnail.file-item
1
+ .thumbnail
2
2
  .file-title
3
3
  = @title
4
4
  %a.link-popover{"data-content" => "<i class=icon-edit></i> Edit"}
@@ -12,5 +12,5 @@
12
12
  %div{class: (@progress < 100) ? 'progress progress-striped active' : 'progress'}
13
13
  .bar{style: "width:#{@progress}%;"}
14
14
  .caption
15
- %a.file-action.delete{href: "#"}
15
+ %a.file-action.destroy{href: "#"}
16
16
  <%= image_tag "albums/delete.png" %>
data/app/assets/javascripts/backbone/templates/photos/upload_index.hamlc.erb CHANGED
@@ -1 +1,13 @@
1
- .photos-container
1
+ #upload-buttons{:style => "padding: 20px;"}
2
+ %div{:style => "display:none;"}
3
+ %input#uploader{:multiple => "multiple", :name => "files", :style => "display:none;", :type => "file", :value => "Selecionar File(s)"}/
4
+ %input#uploaderZip{:name => "files", :style => "display:none;", :type => "file", :value => "Selecionar File(s)"}/
5
+ %p <%= "I18n.t('photos.upload.explanation')" %>
6
+ %div
7
+ %a.btn.btn-primary.btn-upload{:onclick => "jQuery('#uploader').click();"} <%= I18n.t('photos.btn.upload_pictures') %>
8
+ -#
9
+ <%= I18n.t('photos.or') %>
10
+ %a.btn.btn-primary.btn-upload{:onclick => "jQuery('#uploaderZip').click();"} <%= I18n.t('photos.btn.upload_zip') %>
11
+
12
+ #fileZip
13
+ %ul#photos.thumbnails
data/app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee CHANGED
@@ -13,7 +13,7 @@ class Application.Views.Photos.UploadIndexView extends Backbone.View
13
13
 
14
14
  addOne: (photo) =>
15
15
  view = new Application.Views.Photos.PhotoView({model : photo})
16
- @$(".photos-container").append(view.render().el)
16
+ @$("#photos").append(view.render().el)
17
17
 
18
18
  render: =>
19
19
  @$el.html(@template(photos: @options.photos.toJSON() ))
data/app/assets/javascripts/photos/upload.js.coffee.erb CHANGED
@@ -2,8 +2,23 @@
2
2
  #= require_self
3
3
 
4
4
  <% url = Rails.application.routes.url_helpers %>
5
-
6
5
  $ ->
7
- $.getJSON $("#photos").data('url'),(json) ->
8
- new Application.Routers.PhotosRouter(photos: json)
9
- Backbone.history.start()
6
+ $.getJSON RESOURCE_PATH,(json) ->
7
+ new Application.Routers.PhotosRouter(collectionUrl: RESOURCE_PATH, photos: json)
8
+ Backbone.history.start()
9
+
10
+ $("#uploader").change (el) ->
11
+ files = el.currentTarget.files
12
+ i = 0
13
+ while i < files.length
14
+ photo = new Application.Models.Photo(
15
+ image: files[i]
16
+ name: files[i].name
17
+ )
18
+ photo.url = fileList.url
19
+ fileList.add photo
20
+ setTimeout (->
21
+ fileList.add photo
22
+ ), 1000
23
+ i++
24
+ fileListView.render()
data/app/views/admix/photos/_upload.html.haml CHANGED
@@ -1,17 +1,7 @@
1
1
  - content_for :javascripts do
2
2
  = javascript_include_tag 'photos/upload'
3
+ :coffeescript
4
+ window.RESOURCE_PATH = "#{admix_album_photos_path(defined?(parent) ? parent : resource)}"
3
5
 
4
6
  %h3 Upload de fotos
5
- #upload-buttons{:style => "padding: 20px;"}
6
- %div{:style => "display:none;"}
7
- %input#uploader{:multiple => "multiple", :name => "files", :style => "display:none;", :type => "file", :value => "Selecionar File(s)"}/
8
- %input#uploaderZip{:name => "files", :style => "display:none;", :type => "file", :value => "Selecionar File(s)"}/
9
- %p= t('photos.upload.explanation')
10
- %div
11
- %a.btn.btn-primary.btn-upload{:onclick => "jQuery('#uploader').click();"}= t('photos.btn.upload_pictures')
12
- -#
13
- = t('photos.or')
14
- %a.btn.btn-primary.btn-upload{:onclick => "jQuery('#uploaderZip').click();"}= t('photos.btn.upload_zip')
15
-
16
- #fileZip
17
- %ul#photos.thumbnails{'data-url' => admix_album_photos_path(defined?(parent) ? parent : resource)}
7
+ #upload-container
data/lib/mix-rails-albums/version.rb CHANGED
@@ -1,8 +1,8 @@
1
1
  module MixRailsAlbums
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
- MINOR = 12
5
- TINY = 2
4
+ MINOR = 15
5
+ TINY = 0
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mix-rails-albums
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.2
4
+ version: 0.15.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -114,98 +114,98 @@ executables: []
114
114
  extensions: []
115
115
  extra_rdoc_files: []
116
116
  files:
117
- - app/assets/stylesheets/skins/tango/next-vertical.png
118
- - app/assets/stylesheets/skins/tango/skin.css
117
+ - app/uploaders/albums/image_uploader.rb
118
+ - app/controllers/admix/albums_controller.rb
119
+ - app/controllers/admix/photos_controller.rb
120
+ - app/controllers/albums_controller.rb
119
121
  - app/assets/stylesheets/skins/tango/next-horizontal.png
122
+ - app/assets/stylesheets/skins/tango/skin.css
120
123
  - app/assets/stylesheets/skins/tango/prev-vertical.png
124
+ - app/assets/stylesheets/skins/tango/next-vertical.png
121
125
  - app/assets/stylesheets/skins/tango/credits.txt
122
126
  - app/assets/stylesheets/skins/tango/prev-horizontal.png
123
- - app/assets/stylesheets/skins/ie7/loading-small.gif
124
- - app/assets/stylesheets/skins/ie7/skin.css
125
- - app/assets/stylesheets/skins/ie7/next-horizontal.gif
126
- - app/assets/stylesheets/skins/ie7/credits.txt
127
- - app/assets/stylesheets/skins/ie7/loading_small.gif
128
127
  - app/assets/stylesheets/skins/ie7/loading.gif
129
128
  - app/assets/stylesheets/skins/ie7/prev-horizontal.gif
129
+ - app/assets/stylesheets/skins/ie7/skin.css
130
+ - app/assets/stylesheets/skins/ie7/loading_small.gif
131
+ - app/assets/stylesheets/skins/ie7/credits.txt
132
+ - app/assets/stylesheets/skins/ie7/loading-small.gif
133
+ - app/assets/stylesheets/skins/ie7/next-horizontal.gif
130
134
  - app/assets/stylesheets/colorbox/colorbox.css.scss
131
- - app/assets/images/colorbox/ie6/borderMiddleLeft.png
132
- - app/assets/images/colorbox/ie6/borderTopRight.png
133
- - app/assets/images/colorbox/ie6/borderBottomLeft.png
134
- - app/assets/images/colorbox/ie6/borderTopLeft.png
135
- - app/assets/images/colorbox/ie6/borderBottomCenter.png
136
- - app/assets/images/colorbox/ie6/borderTopCenter.png
137
- - app/assets/images/colorbox/ie6/borderMiddleRight.png
138
- - app/assets/images/colorbox/ie6/borderBottomRight.png
135
+ - app/assets/images/albums/photos.png
136
+ - app/assets/images/albums/delete.png
137
+ - app/assets/images/albums/rotate_cw.png
138
+ - app/assets/images/albums/crop.png
139
+ - app/assets/images/albums/rotate_ccw.png
139
140
  - app/assets/images/colorbox/border.png
141
+ - app/assets/images/colorbox/loading.gif
140
142
  - app/assets/images/colorbox/loading_background.png
141
143
  - app/assets/images/colorbox/controls.png
142
- - app/assets/images/colorbox/loading.gif
144
+ - app/assets/images/colorbox/ie6/borderTopCenter.png
145
+ - app/assets/images/colorbox/ie6/borderMiddleRight.png
146
+ - app/assets/images/colorbox/ie6/borderBottomRight.png
147
+ - app/assets/images/colorbox/ie6/borderBottomCenter.png
148
+ - app/assets/images/colorbox/ie6/borderTopLeft.png
149
+ - app/assets/images/colorbox/ie6/borderTopRight.png
150
+ - app/assets/images/colorbox/ie6/borderBottomLeft.png
151
+ - app/assets/images/colorbox/ie6/borderMiddleLeft.png
143
152
  - app/assets/images/colorbox/overlay.png
144
- - app/assets/images/albums/delete.png
145
- - app/assets/images/albums/photos.png
146
- - app/assets/images/albums/rotate_cw.png
147
- - app/assets/images/albums/rotate_ccw.png
148
- - app/assets/images/albums/crop.png
149
- - app/assets/javascripts/application.js
150
- - app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee
151
- - app/assets/javascripts/backbone/views/photos/thumbnail_view.js.coffee
152
- - app/assets/javascripts/backbone/views/photos/index_view.js.coffee
153
- - app/assets/javascripts/backbone/views/photos/show_view.js.coffee
154
- - app/assets/javascripts/backbone/views/photos/photo_view.js.coffee
155
- - app/assets/javascripts/backbone/views/photos/new_view.js.coffee
156
- - app/assets/javascripts/backbone/views/photos/edit_view.js.coffee
157
- - app/assets/javascripts/backbone/models/photo.js.coffee
153
+ - app/assets/javascripts/admix/photos.js.erb
154
+ - app/assets/javascripts/albums/jquery.jcarousel.min.js
155
+ - app/assets/javascripts/albums/show.js.coffee
156
+ - app/assets/javascripts/templates/photo_modal_edit.hamlc.erb
157
+ - app/assets/javascripts/templates/photo_view.hamlc.erb
158
158
  - app/assets/javascripts/backbone/templates/photos/index.jst.ejs
159
+ - app/assets/javascripts/backbone/templates/photos/upload_index.hamlc.erb
160
+ - app/assets/javascripts/backbone/templates/photos/modal.hamlc.erb
159
161
  - app/assets/javascripts/backbone/templates/photos/show.jst.ejs
160
162
  - app/assets/javascripts/backbone/templates/photos/edit.jst.ejs
161
- - app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb
162
- - app/assets/javascripts/backbone/templates/photos/photo.jst.ejs
163
- - app/assets/javascripts/backbone/templates/photos/modal.hamlc.erb
164
163
  - app/assets/javascripts/backbone/templates/photos/new.jst.ejs
165
- - app/assets/javascripts/backbone/templates/photos/upload_index.hamlc.erb
164
+ - app/assets/javascripts/backbone/templates/photos/photo.jst.ejs
165
+ - app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb
166
166
  - app/assets/javascripts/backbone/application.js.coffee
167
167
  - app/assets/javascripts/backbone/routers/photos_router.js.coffee
168
- - app/assets/javascripts/admix/photos.js.erb
169
- - app/assets/javascripts/views/fileview.js
170
- - app/assets/javascripts/views/filezipview.js
171
- - app/assets/javascripts/views/photo_modal_view.js.coffee
172
- - app/assets/javascripts/views/filelistview.js
168
+ - app/assets/javascripts/backbone/models/photo.js.coffee
169
+ - app/assets/javascripts/backbone/views/photos/new_view.js.coffee
170
+ - app/assets/javascripts/backbone/views/photos/index_view.js.coffee
171
+ - app/assets/javascripts/backbone/views/photos/edit_view.js.coffee
172
+ - app/assets/javascripts/backbone/views/photos/photo_view.js.coffee
173
+ - app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee
174
+ - app/assets/javascripts/backbone/views/photos/show_view.js.coffee
175
+ - app/assets/javascripts/backbone/views/photos/thumbnail_view.js.coffee
173
176
  - app/assets/javascripts/photos/upload.js.coffee.erb
174
- - app/assets/javascripts/models/filezip.js
175
- - app/assets/javascripts/models/fileitem.js
176
177
  - app/assets/javascripts/collections/filelist.js
177
- - app/assets/javascripts/templates/photo_view.hamlc.erb
178
- - app/assets/javascripts/templates/photo_modal_edit.hamlc.erb
179
178
  - app/assets/javascripts/routers/photo_router.js.coffee.erb
180
- - app/assets/javascripts/albums/show.js.coffee
181
- - app/assets/javascripts/albums/jquery.jcarousel.min.js
179
+ - app/assets/javascripts/models/fileitem.js
180
+ - app/assets/javascripts/models/filezip.js
181
+ - app/assets/javascripts/application.js
182
+ - app/assets/javascripts/views/filelistview.js
183
+ - app/assets/javascripts/views/photo_modal_view.js.coffee
184
+ - app/assets/javascripts/views/filezipview.js
185
+ - app/assets/javascripts/views/fileview.js
186
+ - app/helpers/admix/albums_helper.rb
187
+ - app/models/admix/photos_datagrid.rb
188
+ - app/models/admix/albums_datagrid.rb
189
+ - app/models/album.rb
190
+ - app/models/photo.rb
191
+ - app/views/admix/albums/_show.html.haml
192
+ - app/views/admix/albums/_table_actions.html.haml
193
+ - app/views/admix/albums/_form_fields.html.haml
182
194
  - app/views/admix/photos/index.html.haml
183
195
  - app/views/admix/photos/_upload.html.haml
184
- - app/views/admix/albums/_form_fields.html.haml
185
- - app/views/admix/albums/_table_actions.html.haml
186
- - app/views/admix/albums/_show.html.haml
187
196
  - app/views/albums/index.html.haml
188
197
  - app/views/albums/show.html.haml
189
- - app/controllers/albums_controller.rb
190
- - app/controllers/admix/albums_controller.rb
191
- - app/controllers/admix/photos_controller.rb
192
- - app/models/album.rb
193
- - app/models/admix/photos_datagrid.rb
194
- - app/models/admix/albums_datagrid.rb
195
- - app/models/photo.rb
196
- - app/helpers/admix/albums_helper.rb
197
- - app/uploaders/albums/image_uploader.rb
198
+ - config/locales/photos.pt-BR.yml
199
+ - config/locales/albums.pt-BR.yml
200
+ - config/locales/albums.en.yml
198
201
  - config/initializers/carrierwave.rb
199
202
  - config/initializers/albums.rb
200
203
  - config/routes.rb
201
204
  - config/application.rb
202
- - config/locales/photos.pt-BR.yml
203
- - config/locales/albums.pt-BR.yml
204
- - config/locales/albums.en.yml
205
205
  - lib/tasks/albums_tasks.rake
206
+ - lib/mix-rails-albums.rb
206
207
  - lib/mix-rails-albums/version.rb
207
208
  - lib/mix-rails-albums/engine.rb
208
- - lib/mix-rails-albums.rb
209
209
  - MIT-LICENSE
210
210
  - Rakefile
211
211
  - README.rdoc
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
223
223
  version: '0'
224
224
  segments:
225
225
  - 0
226
- hash: -52676259253557303
226
+ hash: -408504066564617472
227
227
  required_rubygems_version: !ruby/object:Gem::Requirement
228
228
  none: false
229
229
  requirements:
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
232
232
  version: '0'
233
233
  segments:
234
234
  - 0
235
- hash: -52676259253557303
235
+ hash: -408504066564617472
236
236
  requirements: []
237
237
  rubyforge_project:
238
238
  rubygems_version: 1.8.24