alchemy_cms 2.0.rc2 → 2.0.rc3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. data/app/controllers/admin/attachments_controller.rb +47 -21
  2. data/app/controllers/admin/clipboard_controller.rb +2 -0
  3. data/app/controllers/admin/elements_controller.rb +2 -0
  4. data/app/controllers/admin/essence_files_controller.rb +7 -6
  5. data/app/controllers/admin/languages_controller.rb +1 -0
  6. data/app/controllers/admin/pictures_controller.rb +49 -34
  7. data/app/controllers/admin/users_controller.rb +2 -0
  8. data/app/controllers/admin_controller.rb +1 -0
  9. data/app/controllers/alchemy_controller.rb +9 -0
  10. data/app/helpers/alchemy_helper.rb +8 -2
  11. data/app/models/attachment.rb +5 -0
  12. data/app/models/element.rb +4 -0
  13. data/app/sweepers/pictures_sweeper.rb +2 -1
  14. data/app/views/admin/attachments/_archive_overlay.html.erb +25 -0
  15. data/app/views/admin/attachments/_file_to_assign.html.erb +2 -2
  16. data/app/views/admin/attachments/create.js.erb +4 -2
  17. data/app/views/admin/contents/create.js.erb +16 -7
  18. data/app/views/admin/elements/_add_content.html.erb +1 -3
  19. data/app/views/admin/essence_files/edit.html.erb +5 -5
  20. data/app/views/admin/essence_pictures/destroy.js.erb +6 -3
  21. data/app/views/admin/pages/edit.html.erb +1 -1
  22. data/app/views/admin/partials/_remote_search_form.html.erb +4 -3
  23. data/app/views/admin/partials/_upload_form.html.erb +1 -3
  24. data/app/views/admin/pictures/_archive_overlay.html.erb +18 -0
  25. data/app/views/admin/pictures/_filter_and_size_bar.html.erb +6 -17
  26. data/app/views/admin/pictures/_picture.html.erb +14 -16
  27. data/app/views/admin/pictures/_picture_to_assign.html.erb +27 -29
  28. data/app/views/admin/pictures/create.js.erb +10 -10
  29. data/app/views/admin/pictures/index.html.erb +35 -5
  30. data/app/views/essences/_essence_file_editor.html.erb +4 -4
  31. data/app/views/essences/_essence_picture_editor.html.erb +2 -2
  32. data/app/views/essences/_essence_picture_tools.html.erb +1 -3
  33. data/assets/javascripts/alchemy.js +2 -2
  34. data/assets/stylesheets/alchemy.css +127 -132
  35. data/assets/stylesheets/elements.css +19 -39
  36. data/config/routes.rb +6 -8
  37. data/lib/alchemy/remote_pagination_link_renderer.rb +12 -1
  38. data/lib/alchemy/version.rb +1 -1
  39. data/spec/dummy/public/stylesheets/alchemy/alchemy.css +197 -173
  40. data/spec/dummy/public/stylesheets/alchemy/elements.css +6 -6
  41. metadata +6 -8
  42. data/app/views/admin/attachments/archive_overlay.html.erb +0 -8
  43. data/app/views/admin/pictures/_archive_overlay_images.html.erb +0 -16
  44. data/app/views/admin/pictures/archive_overlay.html.erb +0 -3
  45. data/app/views/admin/pictures/update.js.erb +0 -11
data/spec/dummy/public/stylesheets/alchemy/elements.css CHANGED
@@ -267,7 +267,7 @@ div.picture_gallery_images {
267
267
  background-color: #e5dcca;
268
268
  }
269
269
 
270
- div.picture_detail div.picture_image img.img_paddingtop {
270
+ div.picture_thumbnail div.picture_image img.img_paddingtop {
271
271
  -moz-user-select: none;
272
272
  -webkit-user-select: none;
273
273
  user-select: none;
@@ -481,7 +481,7 @@ div.essence_picture_editor .picture_tool_delete {
481
481
  z-index: 2;
482
482
  }
483
483
 
484
- div.essence_picture_editor.validation_failed .picture_detail {
484
+ div.essence_picture_editor.validation_failed .picture_thumbnail {
485
485
  border-color: #931f23;
486
486
  -webkit-box-shadow: #931f23 0px 1px 3px;
487
487
  -moz-box-shadow: #931f23 0px 1px 3px;
@@ -511,23 +511,23 @@ div.essence_picture_editor:hover .picture_tool_delete {
511
511
  float: left;
512
512
  }
513
513
 
514
- .picture_detail div.missing_image {
514
+ .picture_thumbnail div.missing_image {
515
515
  height: 94px;
516
516
  text-align: center;
517
517
  line-height: 47px;
518
518
  color: #b3b3b3;
519
519
  }
520
520
 
521
- .validation_failed .picture_detail div.missing_image {
521
+ .validation_failed .picture_thumbnail div.missing_image {
522
522
  color: #931f23;
523
523
  }
524
524
 
525
- .picture_detail div.missing_image img {
525
+ .picture_thumbnail div.missing_image img {
526
526
  position: relative;
527
527
  top: 10px;
528
528
  }
529
529
 
530
- .picture_detail .picture_handle {
530
+ .picture_thumbnail .picture_handle {
531
531
  position: absolute;
532
532
  z-index: 1;
533
533
  width: 110px;
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424193
4
+ hash: 15424195
5
5
  prerelease: 4
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
9
  - rc
10
- - 2
11
- version: 2.0.rc2
10
+ - 3
11
+ version: 2.0.rc3
12
12
  platform: ruby
13
13
  authors:
14
14
  - Thomas von Deyen
@@ -18,7 +18,7 @@ autorequire:
18
18
  bindir: bin
19
19
  cert_chain: []
20
20
 
21
- date: 2011-10-04 00:00:00 Z
21
+ date: 2011-10-06 00:00:00 Z
22
22
  dependencies:
23
23
  - !ruby/object:Gem::Dependency
24
24
  name: rails
@@ -359,10 +359,10 @@ files:
359
359
  - app/views/_newsletter_layout.html.erb
360
360
  - app/views/_search.html.erb
361
361
  - app/views/_standard.html.erb
362
+ - app/views/admin/attachments/_archive_overlay.html.erb
362
363
  - app/views/admin/attachments/_attachment.html.erb
363
364
  - app/views/admin/attachments/_file_to_assign.html.erb
364
365
  - app/views/admin/attachments/_files_list.html.erb
365
- - app/views/admin/attachments/archive_overlay.html.erb
366
366
  - app/views/admin/attachments/create.js.erb
367
367
  - app/views/admin/attachments/edit.html.erb
368
368
  - app/views/admin/attachments/index.html.erb
@@ -443,17 +443,15 @@ files:
443
443
  - app/views/admin/partials/_search_form.html.erb
444
444
  - app/views/admin/partials/_sub_navigation.html.erb
445
445
  - app/views/admin/partials/_upload_form.html.erb
446
- - app/views/admin/pictures/_archive_overlay_images.html.erb
446
+ - app/views/admin/pictures/_archive_overlay.html.erb
447
447
  - app/views/admin/pictures/_filter_and_size_bar.html.erb
448
448
  - app/views/admin/pictures/_picture.html.erb
449
449
  - app/views/admin/pictures/_picture_to_assign.html.erb
450
450
  - app/views/admin/pictures/_pictures_list.html.erb
451
- - app/views/admin/pictures/archive_overlay.html.erb
452
451
  - app/views/admin/pictures/create.js.erb
453
452
  - app/views/admin/pictures/index.html.erb
454
453
  - app/views/admin/pictures/new.html.erb
455
454
  - app/views/admin/pictures/show_in_window.html.erb
456
- - app/views/admin/pictures/update.js.erb
457
455
  - app/views/admin/signup.html.erb
458
456
  - app/views/admin/trash/index.html.erb
459
457
  - app/views/admin/users/_table.html.erb
data/app/views/admin/attachments/archive_overlay.html.erb DELETED
@@ -1,8 +0,0 @@
1
- <div class="with_padding">
2
- <div id="overlay_toolbar">
3
- <%= js_filter_field( :onkeyup => "Alchemy.ListFilter('.assign_file_file')") %>
4
- </div>
5
- <div id="assign_file_list">
6
- <%= render :partial => 'file_to_assign', :collection => @attachments %>
7
- </div>
8
- </div>
data/app/views/admin/pictures/_archive_overlay_images.html.erb DELETED
@@ -1,16 +0,0 @@
1
- <div id="overlay_toolbar">
2
- <%= render :partial => 'filter_and_size_bar' %>
3
- </div>
4
- <div id="assign_image_list" class="with_padding">
5
- <%- if @pictures.empty? -%>
6
- <p><%= _("no_images_in_archive") %></p>
7
- <%- else -%>
8
- <%= render(
9
- :partial => 'admin/partials/remote_pagination_links',
10
- :locals => {
11
- :items => @pictures
12
- }
13
- ) %>
14
- <%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>
15
- <%- end -%>
16
- </div>
data/app/views/admin/pictures/archive_overlay.html.erb DELETED
@@ -1,3 +0,0 @@
1
- <div id="alchemy_window_body">
2
- <%= render :partial => 'archive_overlay_images' %>
3
- </div>
data/app/views/admin/pictures/update.js.erb DELETED
@@ -1,11 +0,0 @@
1
- (function($) {
2
- $("picture_#{@picture.id}").html('<%= escape_javascript(render(
3
- :partial => "picture",
4
- :locals => {:picture => @picture}
5
- )) -%>');
6
- Alchemy.inPlaceEditor({
7
- save_label: "<%= _('save') -%>",
8
- cancel_label: "<%= _('cancel') -%>"
9
- });
10
- Alchemy.growl('<%= @message -%>');
11
- })(jQuery);