alchemy_cms 2.4.1 → 2.5.0.b2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (163) hide show
  1. data/.travis.yml +1 -1
  2. data/README.md +18 -17
  3. data/alchemy_cms.gemspec +5 -10
  4. data/app/assets/images/alchemy/icons.png +0 -0
  5. data/app/assets/stylesheets/alchemy/archive.scss +27 -0
  6. data/app/assets/stylesheets/alchemy/base.scss +0 -51
  7. data/app/assets/stylesheets/alchemy/elements.scss +37 -2
  8. data/app/assets/stylesheets/alchemy/icons.scss +4 -0
  9. data/app/assets/stylesheets/alchemy/modules.scss +4 -0
  10. data/app/assets/stylesheets/alchemy/sitemap.scss +1 -1
  11. data/app/assets/stylesheets/alchemy/tables.scss +1 -1
  12. data/app/assets/stylesheets/alchemy/variables.scss +1 -0
  13. data/app/controllers/alchemy/admin/pages_controller.rb +1 -0
  14. data/app/controllers/alchemy/admin/pictures_controller.rb +22 -8
  15. data/app/controllers/alchemy/admin/resources_controller.rb +1 -1
  16. data/app/controllers/alchemy/admin/sites_controller.rb +6 -0
  17. data/app/controllers/alchemy/base_controller.rb +8 -0
  18. data/app/controllers/alchemy/elements_controller.rb +33 -3
  19. data/app/controllers/alchemy/messages_controller.rb +47 -40
  20. data/app/controllers/alchemy/pages_controller.rb +8 -31
  21. data/app/controllers/alchemy/pictures_controller.rb +64 -30
  22. data/app/helpers/alchemy/admin/base_helper.rb +7 -0
  23. data/app/helpers/alchemy/admin/pages_helper.rb +12 -0
  24. data/app/helpers/alchemy/elements_helper.rb +2 -0
  25. data/app/helpers/alchemy/pages_helper.rb +30 -10
  26. data/app/helpers/alchemy/url_helper.rb +1 -0
  27. data/app/models/alchemy/content.rb +1 -2
  28. data/app/models/alchemy/element.rb +47 -2
  29. data/app/models/alchemy/language.rb +27 -14
  30. data/app/models/alchemy/page.rb +1 -1
  31. data/app/models/alchemy/picture.rb +46 -41
  32. data/app/models/alchemy/site.rb +44 -0
  33. data/app/views/alchemy/admin/elements/_element_head.html.erb +1 -0
  34. data/app/views/alchemy/admin/languages/index.html.erb +23 -0
  35. data/app/views/alchemy/admin/pages/edit.html.erb +27 -1
  36. data/app/views/alchemy/admin/pages/fold.js.erb +1 -0
  37. data/app/views/alchemy/admin/partials/_upload_form.html.erb +2 -0
  38. data/app/views/alchemy/admin/pictures/_picture.html.erb +24 -2
  39. data/app/views/alchemy/admin/pictures/_tag_list.html.erb +5 -4
  40. data/app/views/alchemy/admin/pictures/create.js.erb +1 -9
  41. data/app/views/alchemy/admin/pictures/info.html.erb +42 -0
  42. data/app/views/alchemy/admin/resources/_form.html.erb +0 -2
  43. data/app/views/alchemy/admin/resources/_resource.html.erb +2 -1
  44. data/app/views/alchemy/admin/resources/index.html.erb +2 -1
  45. data/app/views/alchemy/elements/show.html.erb +1 -6
  46. data/app/views/alchemy/elements/show.js.erb +4 -10
  47. data/app/views/alchemy/essences/_essence_link_view.html.erb +1 -0
  48. data/app/views/alchemy/search/_form.html.erb +9 -6
  49. data/app/views/alchemy/search/_result.html.erb +1 -1
  50. data/bin/alchemy +13 -120
  51. data/config/alchemy/config.yml +7 -11
  52. data/config/alchemy/modules.yml +24 -12
  53. data/config/authorization_rules.rb +6 -2
  54. data/config/initializers/dragonfly.rb +20 -0
  55. data/config/locales/alchemy.de.yml +57 -28
  56. data/config/locales/alchemy.en.yml +18 -4
  57. data/config/routes.rb +4 -2
  58. data/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb +21 -0
  59. data/db/migrate/20121205155004_create_alchemy_sites.rb +14 -0
  60. data/db/migrate/20121211163003_add_public_to_alchemy_sites.rb +6 -0
  61. data/lib/alchemy/capistrano.rb +7 -2
  62. data/lib/alchemy/ferret_search.rb +84 -0
  63. data/lib/alchemy/picture_attributes.rb +29 -0
  64. data/lib/alchemy/seeder.rb +10 -16
  65. data/lib/alchemy/upgrader.rb +59 -8
  66. data/lib/alchemy/version.rb +1 -1
  67. data/lib/alchemy_cms.rb +7 -4
  68. data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +3 -0
  69. data/lib/rails/generators/alchemy/elements/elements_generator.rb +5 -1
  70. data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb +1 -0
  71. data/lib/rails/generators/alchemy/scaffold/files/{pages.html.erb → application.html.erb} +0 -0
  72. data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb +11 -20
  73. data/lib/rails/templates/alchemy.rb +1 -7
  74. data/lib/tasks/{database.rake → alchemy/db.rake} +1 -1
  75. data/lib/tasks/{install.rake → alchemy/install.rake} +9 -14
  76. data/lib/tasks/{upgrade.rake → alchemy/upgrade.rake} +1 -1
  77. data/spec/controllers/elements_controller_spec.rb +24 -9
  78. data/spec/controllers/pictures_controller_spec.rb +11 -8
  79. data/{app → spec/dummy/app}/views/alchemy/elements/_article_editor.html.erb +0 -0
  80. data/{app → spec/dummy/app}/views/alchemy/elements/_article_view.html.erb +0 -0
  81. data/{app → spec/dummy/app}/views/alchemy/elements/_headline_view.html.erb +0 -0
  82. data/{app → spec/dummy/app}/views/alchemy/elements/_news_view.html.erb +0 -0
  83. data/{app → spec/dummy/app}/views/alchemy/elements/_searchresult_view.html.erb +0 -0
  84. data/{app → spec/dummy/app}/views/alchemy/page_layouts/_standard.html.erb +0 -0
  85. data/spec/dummy/config/alchemy/elements.yml +86 -0
  86. data/spec/dummy/config/alchemy/page_layouts.yml +26 -0
  87. data/spec/dummy/config/application.rb +1 -1
  88. data/spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb +21 -0
  89. data/spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb +14 -0
  90. data/spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb +6 -0
  91. data/spec/dummy/db/schema.rb +21 -6
  92. data/spec/factories.rb +6 -2
  93. data/spec/integration/translation_integration_spec.rb +4 -18
  94. data/spec/models/element_spec.rb +4 -4
  95. data/spec/models/picture_spec.rb +37 -20
  96. data/spec/models/site_spec.rb +69 -0
  97. data/spec/routing_spec.rb +115 -115
  98. data/spec/spec_helper.rb +1 -3
  99. data/spec/support/alchemy/specs_helpers.rb +4 -4
  100. data/vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js +1 -1
  101. metadata +72 -96
  102. data/app/assets/stylesheets/alchemy/standard_set.css +0 -440
  103. data/app/views/alchemy/elements/_bild_editor.html.erb +0 -1
  104. data/app/views/alchemy/elements/_bild_text_editor.html.erb +0 -7
  105. data/app/views/alchemy/elements/_bild_text_view.html.erb +0 -9
  106. data/app/views/alchemy/elements/_bild_view.html.erb +0 -9
  107. data/app/views/alchemy/elements/_claim_editor.html.erb +0 -1
  108. data/app/views/alchemy/elements/_claim_view.html.erb +0 -1
  109. data/app/views/alchemy/elements/_contactform_editor.html.erb +0 -4
  110. data/app/views/alchemy/elements/_contactform_view.html.erb +0 -78
  111. data/app/views/alchemy/elements/_download_editor.html.erb +0 -4
  112. data/app/views/alchemy/elements/_download_view.html.erb +0 -7
  113. data/app/views/alchemy/elements/_footnote_editor.html.erb +0 -1
  114. data/app/views/alchemy/elements/_footnote_view.html.erb +0 -5
  115. data/app/views/alchemy/elements/_header_editor.html.erb +0 -1
  116. data/app/views/alchemy/elements/_header_view.html.erb +0 -1
  117. data/app/views/alchemy/elements/_headline_editor.html.erb +0 -1
  118. data/app/views/alchemy/elements/_image_mosaic_editor.html.erb +0 -3
  119. data/app/views/alchemy/elements/_image_mosaic_view.html.erb +0 -14
  120. data/app/views/alchemy/elements/_intro_editor.html.erb +0 -1
  121. data/app/views/alchemy/elements/_intro_image_text_editor.html.erb +0 -3
  122. data/app/views/alchemy/elements/_intro_image_text_view.html.erb +0 -16
  123. data/app/views/alchemy/elements/_intro_view.html.erb +0 -3
  124. data/app/views/alchemy/elements/_news_editor.html.erb +0 -3
  125. data/app/views/alchemy/elements/_searchresult_editor.html.erb +0 -4
  126. data/app/views/alchemy/elements/_sitemap_editor.html.erb +0 -3
  127. data/app/views/alchemy/elements/_sitemap_view.html.erb +0 -38
  128. data/app/views/alchemy/elements/_sitename_editor.html.erb +0 -1
  129. data/app/views/alchemy/elements/_sitename_view.html.erb +0 -1
  130. data/app/views/alchemy/elements/_subheadline_editor.html.erb +0 -1
  131. data/app/views/alchemy/elements/_subheadline_view.html.erb +0 -5
  132. data/app/views/alchemy/elements/_text_editor.html.erb +0 -1
  133. data/app/views/alchemy/elements/_text_view.html.erb +0 -3
  134. data/app/views/alchemy/page_layouts/_contact.html.erb +0 -14
  135. data/app/views/alchemy/page_layouts/_external.html.erb +0 -0
  136. data/app/views/alchemy/page_layouts/_intro.html.erb +0 -14
  137. data/app/views/alchemy/page_layouts/_layout_footer.html.erb +0 -14
  138. data/app/views/alchemy/page_layouts/_layout_header.html.erb +0 -14
  139. data/app/views/alchemy/page_layouts/_news.html.erb +0 -14
  140. data/app/views/alchemy/page_layouts/_newsletter_layout.html.erb +0 -1
  141. data/app/views/alchemy/page_layouts/_search.html.erb +0 -14
  142. data/app/views/alchemy/pictures/show.gif.flexi +0 -19
  143. data/app/views/alchemy/pictures/show.jpg.flexi +0 -19
  144. data/app/views/alchemy/pictures/show.png.flexi +0 -19
  145. data/app/views/alchemy/pictures/thumbnail.png.flexi +0 -13
  146. data/app/views/alchemy/pictures/zoom.jpg.flexi +0 -3
  147. data/app/views/alchemy/pictures/zoom.png.flexi +0 -3
  148. data/app/views/layouts/alchemy/pages.html.erb +0 -51
  149. data/config/alchemy/elements.yml +0 -274
  150. data/config/alchemy/page_layouts.yml +0 -75
  151. data/config/asset_packages.yml +0 -30
  152. data/config/initializers/localeapp.rb +0 -9
  153. data/lib/rails/generators/alchemy/plugin/files/translation.pot +0 -3
  154. data/lib/rails/generators/alchemy/plugin/files/translation_de.po +0 -3
  155. data/lib/rails/generators/alchemy/plugin/files/translation_en.po +0 -3
  156. data/lib/rails/generators/alchemy/plugin/plugin_generator.rb +0 -37
  157. data/lib/rails/generators/alchemy/plugin/templates/authorization_rules.rb +0 -34
  158. data/lib/rails/generators/alchemy/plugin/templates/config.yml +0 -30
  159. data/lib/rails/generators/alchemy/plugin/templates/init.rb +0 -1
  160. data/lib/rails/generators/alchemy/plugin/templates/plugin.rb +0 -0
  161. data/lib/rails/generators/alchemy/plugin/templates/routes.rb +0 -10
  162. data/lib/tasks/fleximage.rake +0 -154
  163. data/spec/dummy/app/views/layouts/.gitkeep +0 -0
@@ -39,9 +39,6 @@ def configure
39
39
  Capybara.default_driver = :rack_test
40
40
  Capybara.default_selector = :css
41
41
  Capybara.javascript_driver = :poltergeist
42
- Capybara.register_driver(:rack_test_translated_header) do |app|
43
- Capybara::RackTest::Driver.new(app, :headers => { 'HTTP_ACCEPT_LANGUAGE' => 'de' })
44
- end
45
42
 
46
43
  # Load support files
47
44
  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
@@ -59,6 +56,7 @@ def configure
59
56
  end
60
57
  # Ensuring that the locale is always resetted to :en before running any tests
61
58
  config.before(:each) do
59
+ Alchemy::Site.current = nil
62
60
  ::I18n.locale = :en
63
61
  end
64
62
  end
@@ -15,9 +15,9 @@ module Alchemy
15
15
  # * create_admin_user
16
16
  # * login_into_alchemy
17
17
  #
18
- def authorize_as_admin(locale = 'en')
18
+ def authorize_as_admin
19
19
  create_admin_user
20
- login_into_alchemy(locale)
20
+ login_into_alchemy
21
21
  end
22
22
 
23
23
  # Capybara actions to login into Alchemy Backend
@@ -26,8 +26,8 @@ module Alchemy
26
26
  #
27
27
  # See: create_admin_user method
28
28
  #
29
- def login_into_alchemy(locale = 'en')
30
- visit "/alchemy/admin/login?locale=#{locale}"
29
+ def login_into_alchemy
30
+ visit '/alchemy/admin/login'
31
31
  fill_in('alchemy_user_session_login', :with => 'jdoe')
32
32
  fill_in('alchemy_user_session_password', :with => 's3cr3t')
33
33
  click_on('Login')
@@ -182,7 +182,7 @@
182
182
  settings.onServerError(e, file, xmlHttpRequest.statusText);
183
183
  }
184
184
  }
185
- if (queuedFiles[Math.abs(queuedFiles.length) - 1] === file) {
185
+ if (successfullyUploadedFiles === queuedFiles.length) {
186
186
  completeQueue(xmlHttpRequest.status);
187
187
  }
188
188
  }
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.4.1
5
- prerelease:
4
+ version: 2.5.0.b2
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2013-01-10 00:00:00.000000000 Z
16
+ date: 2012-12-14 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: rails
@@ -22,7 +22,7 @@ dependencies:
22
22
  requirements:
23
23
  - - ~>
24
24
  - !ruby/object:Gem::Version
25
- version: 3.2.11
25
+ version: 3.2.8
26
26
  type: :runtime
27
27
  prerelease: false
28
28
  version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 3.2.11
33
+ version: 3.2.8
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: authlogic
36
36
  requirement: !ruby/object:Gem::Requirement
@@ -96,13 +96,13 @@ dependencies:
96
96
  - !ruby/object:Gem::Version
97
97
  version: 0.5.5
98
98
  - !ruby/object:Gem::Dependency
99
- name: tvdeyen-fleximage
99
+ name: dragonfly
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  none: false
102
102
  requirements:
103
103
  - - ~>
104
104
  - !ruby/object:Gem::Version
105
- version: 1.2.0
105
+ version: 0.9.12
106
106
  type: :runtime
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
110
110
  requirements:
111
111
  - - ~>
112
112
  - !ruby/object:Gem::Version
113
- version: 1.2.0
113
+ version: 0.9.12
114
114
  - !ruby/object:Gem::Dependency
115
115
  name: kaminari
116
116
  requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
150
150
  requirements:
151
151
  - - ~>
152
152
  - !ruby/object:Gem::Version
153
- version: '0.1'
153
+ version: 0.1.9
154
154
  type: :runtime
155
155
  prerelease: false
156
156
  version_requirements: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ dependencies:
158
158
  requirements:
159
159
  - - ~>
160
160
  - !ruby/object:Gem::Version
161
- version: '0.1'
161
+ version: 0.1.9
162
162
  - !ruby/object:Gem::Dependency
163
163
  name: magiclabs-userstamp
164
164
  requirement: !ruby/object:Gem::Requirement
@@ -356,17 +356,17 @@ dependencies:
356
356
  requirement: !ruby/object:Gem::Requirement
357
357
  none: false
358
358
  requirements:
359
- - - '='
359
+ - - ! '>='
360
360
  - !ruby/object:Gem::Version
361
- version: 2.12.0
361
+ version: '0'
362
362
  type: :development
363
363
  prerelease: false
364
364
  version_requirements: !ruby/object:Gem::Requirement
365
365
  none: false
366
366
  requirements:
367
- - - '='
367
+ - - ! '>='
368
368
  - !ruby/object:Gem::Version
369
- version: 2.12.0
369
+ version: '0'
370
370
  - !ruby/object:Gem::Dependency
371
371
  name: sqlite3
372
372
  requirement: !ruby/object:Gem::Requirement
@@ -399,6 +399,22 @@ dependencies:
399
399
  - - ! '>='
400
400
  - !ruby/object:Gem::Version
401
401
  version: '0'
402
+ - !ruby/object:Gem::Dependency
403
+ name: redcarpet
404
+ requirement: !ruby/object:Gem::Requirement
405
+ none: false
406
+ requirements:
407
+ - - ! '>='
408
+ - !ruby/object:Gem::Version
409
+ version: '0'
410
+ type: :development
411
+ prerelease: false
412
+ version_requirements: !ruby/object:Gem::Requirement
413
+ none: false
414
+ requirements:
415
+ - - ! '>='
416
+ - !ruby/object:Gem::Version
417
+ version: '0'
402
418
  description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
403
419
  email:
404
420
  - alchemy@magiclabs.de
@@ -483,7 +499,6 @@ files:
483
499
  - app/assets/stylesheets/alchemy/print.css.scss
484
500
  - app/assets/stylesheets/alchemy/search.scss
485
501
  - app/assets/stylesheets/alchemy/sitemap.scss
486
- - app/assets/stylesheets/alchemy/standard_set.css
487
502
  - app/assets/stylesheets/alchemy/tables.scss
488
503
  - app/assets/stylesheets/alchemy/tinymce_content.css.scss
489
504
  - app/assets/stylesheets/alchemy/tinymce_dialog.css.scss
@@ -503,6 +518,7 @@ files:
503
518
  - app/controllers/alchemy/admin/pages_controller.rb
504
519
  - app/controllers/alchemy/admin/pictures_controller.rb
505
520
  - app/controllers/alchemy/admin/resources_controller.rb
521
+ - app/controllers/alchemy/admin/sites_controller.rb
506
522
  - app/controllers/alchemy/admin/tags_controller.rb
507
523
  - app/controllers/alchemy/admin/trash_controller.rb
508
524
  - app/controllers/alchemy/admin/users_controller.rb
@@ -550,6 +566,7 @@ files:
550
566
  - app/models/alchemy/message.rb
551
567
  - app/models/alchemy/page.rb
552
568
  - app/models/alchemy/picture.rb
569
+ - app/models/alchemy/site.rb
553
570
  - app/models/alchemy/tag.rb
554
571
  - app/models/alchemy/user.rb
555
572
  - app/models/alchemy/user_session.rb
@@ -601,6 +618,7 @@ files:
601
618
  - app/views/alchemy/admin/languages/_form.html.erb
602
619
  - app/views/alchemy/admin/languages/_language.html.erb
603
620
  - app/views/alchemy/admin/languages/_table.html.erb
621
+ - app/views/alchemy/admin/languages/index.html.erb
604
622
  - app/views/alchemy/admin/layoutpages/_layoutpage.html.erb
605
623
  - app/views/alchemy/admin/layoutpages/index.html.erb
606
624
  - app/views/alchemy/admin/pages/_contactform_links.html.erb
@@ -654,6 +672,7 @@ files:
654
672
  - app/views/alchemy/admin/pictures/flush.js.erb
655
673
  - app/views/alchemy/admin/pictures/index.html.erb
656
674
  - app/views/alchemy/admin/pictures/index.js.erb
675
+ - app/views/alchemy/admin/pictures/info.html.erb
657
676
  - app/views/alchemy/admin/pictures/new.html.erb
658
677
  - app/views/alchemy/admin/pictures/show_in_window.html.erb
659
678
  - app/views/alchemy/admin/resources/_form.html.erb
@@ -683,43 +702,7 @@ files:
683
702
  - app/views/alchemy/base/redirect.js.erb
684
703
  - app/views/alchemy/base/remote_errors.js.erb
685
704
  - app/views/alchemy/base/update.js.erb
686
- - app/views/alchemy/elements/_article_editor.html.erb
687
- - app/views/alchemy/elements/_article_view.html.erb
688
- - app/views/alchemy/elements/_bild_editor.html.erb
689
- - app/views/alchemy/elements/_bild_text_editor.html.erb
690
- - app/views/alchemy/elements/_bild_text_view.html.erb
691
- - app/views/alchemy/elements/_bild_view.html.erb
692
- - app/views/alchemy/elements/_claim_editor.html.erb
693
- - app/views/alchemy/elements/_claim_view.html.erb
694
- - app/views/alchemy/elements/_contactform_editor.html.erb
695
- - app/views/alchemy/elements/_contactform_view.html.erb
696
- - app/views/alchemy/elements/_download_editor.html.erb
697
- - app/views/alchemy/elements/_download_view.html.erb
698
705
  - app/views/alchemy/elements/_editor_not_found.html.erb
699
- - app/views/alchemy/elements/_footnote_editor.html.erb
700
- - app/views/alchemy/elements/_footnote_view.html.erb
701
- - app/views/alchemy/elements/_header_editor.html.erb
702
- - app/views/alchemy/elements/_header_view.html.erb
703
- - app/views/alchemy/elements/_headline_editor.html.erb
704
- - app/views/alchemy/elements/_headline_view.html.erb
705
- - app/views/alchemy/elements/_image_mosaic_editor.html.erb
706
- - app/views/alchemy/elements/_image_mosaic_view.html.erb
707
- - app/views/alchemy/elements/_intro_editor.html.erb
708
- - app/views/alchemy/elements/_intro_image_text_editor.html.erb
709
- - app/views/alchemy/elements/_intro_image_text_view.html.erb
710
- - app/views/alchemy/elements/_intro_view.html.erb
711
- - app/views/alchemy/elements/_news_editor.html.erb
712
- - app/views/alchemy/elements/_news_view.html.erb
713
- - app/views/alchemy/elements/_searchresult_editor.html.erb
714
- - app/views/alchemy/elements/_searchresult_view.html.erb
715
- - app/views/alchemy/elements/_sitemap_editor.html.erb
716
- - app/views/alchemy/elements/_sitemap_view.html.erb
717
- - app/views/alchemy/elements/_sitename_editor.html.erb
718
- - app/views/alchemy/elements/_sitename_view.html.erb
719
- - app/views/alchemy/elements/_subheadline_editor.html.erb
720
- - app/views/alchemy/elements/_subheadline_view.html.erb
721
- - app/views/alchemy/elements/_text_editor.html.erb
722
- - app/views/alchemy/elements/_text_view.html.erb
723
706
  - app/views/alchemy/elements/_view_not_found.html.erb
724
707
  - app/views/alchemy/elements/show.html.erb
725
708
  - app/views/alchemy/elements/show.js.erb
@@ -750,24 +733,9 @@ files:
750
733
  - app/views/alchemy/navigation/_renderer.html.erb
751
734
  - app/views/alchemy/notifications/admin_user_created.text.erb
752
735
  - app/views/alchemy/notifications/registered_user_created.text.erb
753
- - app/views/alchemy/page_layouts/_contact.html.erb
754
- - app/views/alchemy/page_layouts/_external.html.erb
755
- - app/views/alchemy/page_layouts/_intro.html.erb
756
- - app/views/alchemy/page_layouts/_layout_footer.html.erb
757
- - app/views/alchemy/page_layouts/_layout_header.html.erb
758
- - app/views/alchemy/page_layouts/_news.html.erb
759
- - app/views/alchemy/page_layouts/_newsletter_layout.html.erb
760
- - app/views/alchemy/page_layouts/_search.html.erb
761
- - app/views/alchemy/page_layouts/_standard.html.erb
762
736
  - app/views/alchemy/pages/show.html.erb
763
737
  - app/views/alchemy/pages/show.rss.builder
764
738
  - app/views/alchemy/pages/sitemap.xml.erb
765
- - app/views/alchemy/pictures/show.gif.flexi
766
- - app/views/alchemy/pictures/show.jpg.flexi
767
- - app/views/alchemy/pictures/show.png.flexi
768
- - app/views/alchemy/pictures/thumbnail.png.flexi
769
- - app/views/alchemy/pictures/zoom.jpg.flexi
770
- - app/views/alchemy/pictures/zoom.png.flexi
771
739
  - app/views/alchemy/search/_form.html.erb
772
740
  - app/views/alchemy/search/_result.html.erb
773
741
  - app/views/alchemy/search/_results.html.erb
@@ -782,18 +750,14 @@ files:
782
750
  - app/views/kaminari/_prev_page.html.erb
783
751
  - app/views/layouts/alchemy/admin.html.erb
784
752
  - app/views/layouts/alchemy/login.html.erb
785
- - app/views/layouts/alchemy/pages.html.erb
786
753
  - app/views/layouts/alchemy/sitemap.xml.erb
787
754
  - bin/alchemy
788
755
  - config/alchemy/config.yml
789
- - config/alchemy/elements.yml
790
756
  - config/alchemy/modules.yml
791
- - config/alchemy/page_layouts.yml
792
- - config/asset_packages.yml
793
757
  - config/authorization_rules.rb
794
758
  - config/initializers/cache_storage.rb
759
+ - config/initializers/dragonfly.rb
795
760
  - config/initializers/kaminari_config.rb
796
- - config/initializers/localeapp.rb
797
761
  - config/locales/alchemy.de.yml
798
762
  - config/locales/alchemy.en.yml
799
763
  - config/routes.rb
@@ -802,16 +766,21 @@ files:
802
766
  - db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb
803
767
  - db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb
804
768
  - db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb
769
+ - db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
770
+ - db/migrate/20121205155004_create_alchemy_sites.rb
771
+ - db/migrate/20121211163003_add_public_to_alchemy_sites.rb
805
772
  - lib/alchemy/auth_engine.rb
806
773
  - lib/alchemy/authentication_helpers.rb
807
774
  - lib/alchemy/capistrano.rb
808
775
  - lib/alchemy/config.rb
809
776
  - lib/alchemy/engine.rb
810
777
  - lib/alchemy/essence.rb
778
+ - lib/alchemy/ferret_search.rb
811
779
  - lib/alchemy/i18n.rb
812
780
  - lib/alchemy/modules.rb
813
781
  - lib/alchemy/mount_point.rb
814
782
  - lib/alchemy/page_layout.rb
783
+ - lib/alchemy/picture_attributes.rb
815
784
  - lib/alchemy/resource.rb
816
785
  - lib/alchemy/resources_helper.rb
817
786
  - lib/alchemy/scoped_pagination_url_helper.rb
@@ -841,25 +810,15 @@ files:
841
810
  - lib/rails/generators/alchemy/page_layouts/templates/layout.html.erb
842
811
  - lib/rails/generators/alchemy/page_layouts/templates/layout.html.haml
843
812
  - lib/rails/generators/alchemy/page_layouts/templates/layout.html.slim
844
- - lib/rails/generators/alchemy/plugin/files/translation.pot
845
- - lib/rails/generators/alchemy/plugin/files/translation_de.po
846
- - lib/rails/generators/alchemy/plugin/files/translation_en.po
847
- - lib/rails/generators/alchemy/plugin/plugin_generator.rb
848
- - lib/rails/generators/alchemy/plugin/templates/authorization_rules.rb
849
- - lib/rails/generators/alchemy/plugin/templates/config.yml
850
- - lib/rails/generators/alchemy/plugin/templates/init.rb
851
- - lib/rails/generators/alchemy/plugin/templates/plugin.rb
852
- - lib/rails/generators/alchemy/plugin/templates/routes.rb
813
+ - lib/rails/generators/alchemy/scaffold/files/application.html.erb
853
814
  - lib/rails/generators/alchemy/scaffold/files/elements.yml
854
- - lib/rails/generators/alchemy/scaffold/files/pages.html.erb
855
815
  - lib/rails/generators/alchemy/scaffold/scaffold_generator.rb
856
816
  - lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml.tt
857
817
  - lib/rails/templates/alchemy.rb
858
- - lib/tasks/database.rake
818
+ - lib/tasks/alchemy/db.rake
819
+ - lib/tasks/alchemy/install.rake
820
+ - lib/tasks/alchemy/upgrade.rake
859
821
  - lib/tasks/ferret.rake
860
- - lib/tasks/fleximage.rake
861
- - lib/tasks/install.rake
862
- - lib/tasks/upgrade.rake
863
822
  - script/rails
864
823
  - spec/alchemy_spec.rb
865
824
  - spec/config_spec.rb
@@ -885,9 +844,16 @@ files:
885
844
  - spec/dummy/app/helpers/application_helper.rb
886
845
  - spec/dummy/app/mailers/.gitkeep
887
846
  - spec/dummy/app/models/event.rb
888
- - spec/dummy/app/views/layouts/.gitkeep
847
+ - spec/dummy/app/views/alchemy/elements/_article_editor.html.erb
848
+ - spec/dummy/app/views/alchemy/elements/_article_view.html.erb
849
+ - spec/dummy/app/views/alchemy/elements/_headline_view.html.erb
850
+ - spec/dummy/app/views/alchemy/elements/_news_view.html.erb
851
+ - spec/dummy/app/views/alchemy/elements/_searchresult_view.html.erb
852
+ - spec/dummy/app/views/alchemy/page_layouts/_standard.html.erb
889
853
  - spec/dummy/app/views/layouts/application.html.erb
890
854
  - spec/dummy/config.ru
855
+ - spec/dummy/config/alchemy/elements.yml
856
+ - spec/dummy/config/alchemy/page_layouts.yml
891
857
  - spec/dummy/config/application.rb
892
858
  - spec/dummy/config/authorization_rules.rb
893
859
  - spec/dummy/config/boot.rb
@@ -909,6 +875,9 @@ files:
909
875
  - spec/dummy/db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb
910
876
  - spec/dummy/db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb
911
877
  - spec/dummy/db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb
878
+ - spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
879
+ - spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb
880
+ - spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb
912
881
  - spec/dummy/db/schema.rb
913
882
  - spec/dummy/lib/assets/.gitkeep
914
883
  - spec/dummy/public/404.html
@@ -962,6 +931,7 @@ files:
962
931
  - spec/models/page_spec.rb
963
932
  - spec/models/picture_spec.rb
964
933
  - spec/models/resource_spec.rb
934
+ - spec/models/site_spec.rb
965
935
  - spec/models/user_spec.rb
966
936
  - spec/routing_spec.rb
967
937
  - spec/spec_helper.rb
@@ -1077,12 +1047,10 @@ files:
1077
1047
  homepage: http://alchemy-cms.com
1078
1048
  licenses:
1079
1049
  - BSD New
1080
- post_install_message: ! "\n_______.-=` Alchemy CMS Post Install Message ´=-._______\n\n\n
1081
- If you are installing Alchemy the first time\n ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n
1050
+ post_install_message: ! "\n If you are installing Alchemy the first time\n ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n
1082
1051
  \ $ bundle exec rake alchemy:install\n\n\n If you are upgrading an existing Alchemy
1083
1052
  installation\n ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n $ bundle
1084
- exec rake alchemy:upgrade\n\n\n♥ ♥ ♥ ♥ ♥ ♥ ♥ Thanks for using Alchemy CMS ♥ ♥ ♥
1085
- ♥ ♥ ♥ ♥\n\n"
1053
+ exec rake alchemy:upgrade\n\n"
1086
1054
  rdoc_options: []
1087
1055
  require_paths:
1088
1056
  - lib
@@ -1095,12 +1063,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
1095
1063
  required_rubygems_version: !ruby/object:Gem::Requirement
1096
1064
  none: false
1097
1065
  requirements:
1098
- - - ! '>='
1066
+ - - ! '>'
1099
1067
  - !ruby/object:Gem::Version
1100
- version: '0'
1101
- segments:
1102
- - 0
1103
- hash: 1834932849568995813
1068
+ version: 1.3.1
1104
1069
  requirements:
1105
1070
  - ImageMagick (libmagick), v6.6 or greater.
1106
1071
  rubyforge_project:
@@ -1133,9 +1098,16 @@ test_files:
1133
1098
  - spec/dummy/app/helpers/application_helper.rb
1134
1099
  - spec/dummy/app/mailers/.gitkeep
1135
1100
  - spec/dummy/app/models/event.rb
1136
- - spec/dummy/app/views/layouts/.gitkeep
1101
+ - spec/dummy/app/views/alchemy/elements/_article_editor.html.erb
1102
+ - spec/dummy/app/views/alchemy/elements/_article_view.html.erb
1103
+ - spec/dummy/app/views/alchemy/elements/_headline_view.html.erb
1104
+ - spec/dummy/app/views/alchemy/elements/_news_view.html.erb
1105
+ - spec/dummy/app/views/alchemy/elements/_searchresult_view.html.erb
1106
+ - spec/dummy/app/views/alchemy/page_layouts/_standard.html.erb
1137
1107
  - spec/dummy/app/views/layouts/application.html.erb
1138
1108
  - spec/dummy/config.ru
1109
+ - spec/dummy/config/alchemy/elements.yml
1110
+ - spec/dummy/config/alchemy/page_layouts.yml
1139
1111
  - spec/dummy/config/application.rb
1140
1112
  - spec/dummy/config/authorization_rules.rb
1141
1113
  - spec/dummy/config/boot.rb
@@ -1157,6 +1129,9 @@ test_files:
1157
1129
  - spec/dummy/db/migrate/20121115100736_add_cached_tag_list_to_elements_pages_and_users.rb
1158
1130
  - spec/dummy/db/migrate/20121116140636_add_cached_tag_list_to_alchemy_attachments.rb
1159
1131
  - spec/dummy/db/migrate/20121116141016_change_alchemy_pictures_tag_list_column.rb
1132
+ - spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
1133
+ - spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb
1134
+ - spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb
1160
1135
  - spec/dummy/db/schema.rb
1161
1136
  - spec/dummy/lib/assets/.gitkeep
1162
1137
  - spec/dummy/public/404.html
@@ -1210,6 +1185,7 @@ test_files:
1210
1185
  - spec/models/page_spec.rb
1211
1186
  - spec/models/picture_spec.rb
1212
1187
  - spec/models/resource_spec.rb
1188
+ - spec/models/site_spec.rb
1213
1189
  - spec/models/user_spec.rb
1214
1190
  - spec/routing_spec.rb
1215
1191
  - spec/spec_helper.rb
@@ -1,440 +0,0 @@
1
- body {
2
- margin: 0;
3
- padding: 0;
4
- font: 12px "Lucida Grande", Lucida, Verdana, sans-serif;
5
- color: #3e3e3e;
6
- }
7
-
8
- .image_with_link a {
9
- position: absolute;
10
- z-index: 1;
11
- height: 100%;
12
- width: 600px;
13
- display: block;
14
- }
15
-
16
- div.image_with_link {
17
- position: relative;
18
- }
19
-
20
- .image_with_link a:hover {
21
- border-width: 4px;
22
- border-style: solid;
23
- border-color: #ffa300;
24
- background: transparent;
25
- border-bottom-style: none;
26
- border-top-style: none;
27
- width: 592px;
28
- }
29
-
30
- a {
31
- background-color: #ffa300;
32
- color: #fff;
33
- text-decoration: none;
34
- }
35
-
36
- a:hover {
37
- background-color: transparent;
38
- color: #333;
39
- text-decoration: none;
40
- }
41
-
42
- a img {
43
- border: none;
44
- }
45
-
46
- #breadcrump {
47
- height: 22px;
48
- text-align: right;
49
- font: 10px "Lucida Grande", Lucida, Verdana, sans-serif;
50
- margin-bottom: 12px;
51
- float: right;
52
- }
53
-
54
- div#language_select {
55
- height: 22px;
56
- text-align: right;
57
- font: 10px "Lucida Grande", Lucida, Verdana, sans-serif;
58
- margin-bottom: 12px;
59
- float: left;
60
- }
61
-
62
- #language_select a {
63
- text-decoration: none;
64
- float: left;
65
- text-transform: uppercase;
66
- padding-left: 4px;
67
- padding-right: 4px;
68
- padding-top: 12px;
69
- }
70
-
71
- #language_select span {
72
- float: left;
73
- padding-top: 12px;
74
- }
75
-
76
- #language_select a.active {
77
- background-color: #c0c0c0;
78
- }
79
-
80
- #page {
81
- width: 900px;
82
- margin: 0 auto;
83
- }
84
-
85
- #breadcrump a {
86
- text-decoration: none;
87
- float: right;
88
- padding-left: 4px;
89
- padding-right: 4px;
90
- padding-top: 12px;
91
- }
92
-
93
- #breadcrump a.active {
94
- background-color: #c0c0c0;
95
- }
96
-
97
- #breadcrump span {
98
- float: right;
99
- padding-top: 12px;
100
- }
101
-
102
- #header {
103
- width: 900px;
104
- height: 300px;
105
- margin-bottom: 50px;
106
- clear: both;
107
- }
108
-
109
- div#header_image {
110
- position: absolute;
111
- z-index: 0;
112
- }
113
-
114
- #claim {
115
- font: 24px "Lucida Grande", Lucida, Verdana, sans-serif;
116
- color: #252525;
117
- position: relative;
118
- top: 30%;
119
- text-transform: uppercase;
120
- padding-top: 3px;
121
- padding-bottom: 3px;
122
- padding-left: 12px;
123
- padding-right: 12px;
124
- background: #fff none no-repeat;
125
- float: left;
126
- }
127
-
128
- #navigation {
129
- font-family: "Lucida Grande", Lucida, Verdana, sans-serif;
130
- color: #fdfdfd;
131
- text-transform: uppercase;
132
- position: absolute;
133
- top: 215px;
134
- z-index: 100;
135
- }
136
-
137
- #navigation ul {
138
- margin: 0;
139
- padding: 0;
140
- background-color: white;
141
- list-style-type: none;
142
- float: left;
143
- }
144
-
145
- #navigation ul li:hover {
146
- background-color: #ffa300;
147
- }
148
-
149
- #navigation ul.navigation.level_1 li {
150
- display: inline;
151
- float: left;
152
- }
153
-
154
- #navigation ul.navigation.level_2 li {
155
- display: block;
156
- float: none;
157
- }
158
-
159
- #navigation ul.navigation.level_3 li {
160
-
161
- }
162
-
163
- #navigation a.active {
164
- background-color: #c0c0c0;
165
- }
166
-
167
- #navigation ul.navigation.level_2 > li.last {
168
-
169
- }
170
-
171
- #navigation ul li a {
172
- padding: 6px;
173
- display: block;
174
- text-decoration: none;
175
- color: #252525;
176
- background-color: transparent;
177
- }
178
-
179
- #navigation ul li a:hover {
180
- color: #fff;
181
- }
182
-
183
- #navigation ul.navigation.level_2 {
184
- display: none;
185
- position: absolute;
186
- z-index: 10;
187
- background-color: white;
188
- -webkit-box-shadow: black -1px 4px 6px;
189
- float: left;
190
- clear: both;
191
- }
192
-
193
- #navigation ul.navigation.level_3 {
194
- display: none;
195
- z-index: 20;
196
- background-color: white;
197
- float: none;
198
- }
199
-
200
- #navigation ul.navigation.level_3 li {
201
- padding-left: 20px;
202
- }
203
-
204
- #navigation ul.navigation.level_1 li:hover ul.navigation.level_2 {
205
- display: block;
206
- }
207
-
208
- #navigation ul.navigation.level_2 li:hover ul.navigation.level_3 {
209
- display: block;
210
- }
211
-
212
- #content {
213
- width: 900px;
214
- }
215
-
216
- .article, .bild_text {
217
- width: 900px;
218
- overflow: hidden;
219
- margin-bottom: 24px;
220
- clear: both;
221
- }
222
-
223
- .intro {
224
- color: #fff;
225
- font: 24px "Lucida Grande", Lucida, Verdana, sans-serif;
226
- background-color: #383838;
227
- padding: 4px 12px;
228
- float: left;
229
- clear: both;
230
- }
231
-
232
- .intro p {
233
- margin: 0;
234
- padding: 0;
235
- }
236
-
237
- h1,
238
- .headline {
239
- color: #fff;
240
- font: 26px "Lucida Grande", Lucida, Verdana, sans-serif;
241
- text-transform: uppercase;
242
- background: #383838;
243
- float: left;
244
- clear: both;
245
- padding: 4px 12px;
246
- margin-bottom: 0;
247
- }
248
-
249
- .text_bild_container {
250
- clear: both;
251
- }
252
-
253
- .text_bild_container .image_caption {
254
- width: 426px;
255
- }
256
-
257
- .image.left {
258
- margin-right: 12px;
259
- float: left;
260
- }
261
-
262
- .image.right {
263
- margin-left: 12px;
264
- float: right;
265
- }
266
-
267
- .image_caption,
268
- .caption {
269
- color: #fff;
270
- font: 12px "Lucida Grande", Lucida, Verdana, sans-serif;
271
- background-color: #383838;
272
- clear: both;
273
- padding: 2px 12px;
274
- }
275
-
276
- img {
277
- display: block;
278
- }
279
-
280
- .article .text, .bild_text .text {
281
- clear: none;
282
- float: none;
283
- }
284
-
285
- .text {
286
- width: 888px;
287
- margin: 0 0 12px;
288
- padding: 2px 0 0 12px;
289
- margin: 0 0 12px;
290
- clear: both;
291
- }
292
-
293
- .footer {
294
- width: 900px;
295
- height: 200px;
296
- padding-top: 100px;
297
- text-align: right;
298
- font-size: 10px;
299
- clear: both;
300
- float: left;
301
- }
302
-
303
- #spacer {
304
- height: 100px;
305
- width: 900px;
306
- }
307
-
308
- .image_mosaic_image,
309
- .bilder_gallery_image {
310
- float: left;
311
- position: relative;
312
- }
313
-
314
- .image_mosaic_image .image_caption {
315
- width: 276px;
316
- position: absolute;
317
- left: 0;
318
- top: 0;
319
- z-index: 1;
320
- overflow: hidden;
321
- }
322
-
323
- .bild {
324
- margin-bottom: 24px;
325
- clear: both;
326
- }
327
-
328
- input.field {
329
- padding: 4px;
330
- margin: 0;
331
- font: 12px "Lucida Grande", Lucida, Verdana, sans-serif;
332
- border: 1px solid silver;
333
- width: 310px;
334
- }
335
-
336
- td.field {
337
- white-space: nowrap;
338
- }
339
-
340
- input.field.short {
341
- width: 97px;
342
- }
343
-
344
- input.field.medium {
345
- width: 200px;
346
- }
347
-
348
- td.label {
349
- width: 130px;
350
- }
351
-
352
- textarea {
353
- width: 314px;
354
- padding: 2px;
355
- font: 12px "Lucida Grande", Lucida, Verdana, sans-serif;
356
- border: 1px solid silver;
357
- margin-left: 126px;
358
- height: 10em;
359
- margin-top: 2em;
360
- margin-bottom: 1em;
361
- }
362
-
363
- div.field_with_errors {
364
- color: #fe1b15;
365
- }
366
-
367
- div.field_with_errors input.field {
368
- border-color: #fe1b15;
369
- }
370
-
371
- p.foot_notice {
372
- font-size: 0.8em;
373
- }
374
-
375
- form#contact {
376
- padding: 0 0 0 12px;
377
- width: 450px;
378
- }
379
-
380
- #errorExplanation {
381
- color: #fe1d16;
382
- margin-bottom: 20px;
383
- margin-top: 20px;
384
- }
385
-
386
- #errorExplanation ul {
387
- list-style-type: disc;
388
- padding: 0 0 0 1.5em;
389
- }
390
-
391
- label {
392
- font: 12px "Lucida Grande", Lucida, Verdana, sans-serif;
393
- }
394
-
395
- p.right {
396
- text-align: right;
397
- }
398
-
399
- .searchresult {
400
- margin-top: 1em;
401
- margin-bottom: 1em;
402
- }
403
-
404
- .searchresult form {
405
- padding-left: 12px;
406
- }
407
-
408
- .searchresult h2 {
409
- padding-left: 12px;
410
- margin-bottom: 2em;
411
- margin-top: 1em;
412
- }
413
-
414
- .search_results ul {
415
- list-style-type: none;
416
- padding: 0 0 0 12px;
417
- }
418
-
419
- .search_results ul li {
420
- margin-bottom: 2em;
421
- }
422
-
423
- .search_results ul li p {
424
- margin-top: 0.5em;
425
- margin-bottom: 0.5em;
426
- }
427
-
428
- .search_results ul li h3 {
429
- margin-bottom: 0.5em;
430
- margin-top: 0.5em;
431
- }
432
-
433
- .search_results ul li h4 {
434
- margin-top: 0.5em;
435
- margin-bottom: 0.5em;
436
- }
437
-
438
- .search_results em {
439
- font-weight: bold;
440
- }