alchemy_cms 5.0.0.rc1 → 5.1.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. checksums.yaml +4 -4
  2. data/.github/PULL_REQUEST_TEMPLATE.md +1 -1
  3. data/.github/workflows/stale.yml +1 -1
  4. data/.gitignore +1 -0
  5. data/.travis.yml +48 -0
  6. data/CHANGELOG.md +63 -2
  7. data/CONTRIBUTING.md +2 -2
  8. data/Gemfile +3 -3
  9. data/README.md +2 -2
  10. data/alchemy_cms.gemspec +2 -2
  11. data/app/assets/images/alchemy/missing-image.svg +1 -0
  12. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +1 -4
  13. data/app/assets/javascripts/alchemy/alchemy.preview.js.coffee +0 -3
  14. data/app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee +29 -4
  15. data/app/assets/stylesheets/alchemy/_variables.scss +3 -0
  16. data/app/assets/stylesheets/alchemy/archive.scss +23 -17
  17. data/app/assets/stylesheets/alchemy/errors.scss +1 -1
  18. data/app/assets/stylesheets/alchemy/navigation.scss +7 -9
  19. data/app/assets/stylesheets/alchemy/pagination.scss +1 -1
  20. data/app/assets/stylesheets/alchemy/search.scss +12 -2
  21. data/app/assets/stylesheets/alchemy/selects.scss +4 -2
  22. data/app/assets/stylesheets/alchemy/tags.scss +19 -31
  23. data/app/controllers/alchemy/admin/pages_controller.rb +11 -2
  24. data/app/controllers/alchemy/admin/pictures_controller.rb +13 -6
  25. data/app/controllers/alchemy/admin/resources_controller.rb +3 -3
  26. data/app/controllers/alchemy/pages_controller.rb +49 -14
  27. data/app/helpers/alchemy/admin/base_helper.rb +0 -42
  28. data/app/helpers/alchemy/admin/navigation_helper.rb +2 -1
  29. data/app/helpers/alchemy/url_helper.rb +2 -2
  30. data/app/models/alchemy/attachment.rb +21 -1
  31. data/app/models/alchemy/attachment/url.rb +40 -0
  32. data/app/models/alchemy/essence_file.rb +1 -1
  33. data/app/models/alchemy/essence_picture.rb +4 -4
  34. data/app/models/alchemy/essence_picture_view.rb +10 -4
  35. data/app/models/alchemy/page.rb +16 -1
  36. data/app/models/alchemy/page/page_natures.rb +2 -0
  37. data/app/models/alchemy/page/url_path.rb +8 -6
  38. data/app/models/alchemy/picture.rb +58 -2
  39. data/app/models/alchemy/picture/calculations.rb +55 -0
  40. data/app/models/alchemy/picture/transformations.rb +5 -49
  41. data/app/models/alchemy/picture/url.rb +28 -75
  42. data/app/models/alchemy/picture_thumb.rb +57 -0
  43. data/app/models/alchemy/picture_thumb/create.rb +39 -0
  44. data/app/models/alchemy/picture_thumb/signature.rb +23 -0
  45. data/app/models/alchemy/picture_thumb/uid.rb +22 -0
  46. data/app/models/alchemy/picture_variant.rb +114 -0
  47. data/app/views/alchemy/admin/attachments/show.html.erb +8 -8
  48. data/app/views/alchemy/admin/dashboard/index.html.erb +13 -16
  49. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +1 -1
  50. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +2 -2
  51. data/app/views/alchemy/admin/layoutpages/edit.html.erb +4 -6
  52. data/app/views/alchemy/admin/pages/_form.html.erb +4 -6
  53. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +2 -1
  54. data/app/views/alchemy/admin/pages/edit.html.erb +9 -1
  55. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +14 -13
  56. data/app/views/alchemy/admin/partials/_search_form.html.erb +8 -8
  57. data/app/views/alchemy/admin/pictures/_archive.html.erb +1 -1
  58. data/app/views/alchemy/admin/pictures/_form.html.erb +1 -1
  59. data/app/views/alchemy/admin/pictures/_picture.html.erb +3 -3
  60. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -1
  61. data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +1 -1
  62. data/app/views/alchemy/admin/pictures/index.html.erb +1 -1
  63. data/app/views/alchemy/admin/pictures/show.html.erb +3 -3
  64. data/app/views/alchemy/admin/resources/_per_page_select.html.erb +3 -3
  65. data/app/views/alchemy/admin/resources/index.html.erb +24 -22
  66. data/app/views/alchemy/admin/sites/_form.html.erb +2 -2
  67. data/app/views/alchemy/admin/tags/index.html.erb +14 -15
  68. data/app/views/alchemy/base/500.html.erb +11 -13
  69. data/app/views/alchemy/essences/_essence_file_view.html.erb +4 -4
  70. data/config/alchemy/config.yml +15 -11
  71. data/config/alchemy/modules.yml +12 -12
  72. data/config/locales/alchemy.en.yml +2 -0
  73. data/config/routes.rb +1 -1
  74. data/db/migrate/20200617110713_create_alchemy_picture_thumbs.rb +22 -0
  75. data/db/migrate/20200907111332_remove_tri_state_booleans.rb +33 -0
  76. data/lib/alchemy.rb +66 -0
  77. data/lib/alchemy/admin/preview_url.rb +2 -0
  78. data/lib/alchemy/auth_accessors.rb +12 -5
  79. data/lib/alchemy/config.rb +1 -3
  80. data/lib/alchemy/engine.rb +7 -6
  81. data/lib/alchemy/modules.rb +11 -1
  82. data/lib/alchemy/resource.rb +2 -2
  83. data/lib/alchemy/test_support/factories/picture_factory.rb +0 -1
  84. data/lib/alchemy/test_support/factories/picture_thumb_factory.rb +12 -0
  85. data/lib/alchemy/version.rb +1 -1
  86. data/lib/alchemy_cms.rb +2 -3
  87. data/lib/generators/alchemy/install/files/alchemy.en.yml +2 -2
  88. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +5 -5
  89. data/lib/tasks/alchemy/thumbnails.rake +37 -0
  90. metadata +24 -15
  91. data/.github/workflows/ci.yml +0 -134
  92. data/.github/workflows/greetings.yml +0 -13
  93. data/app/controllers/concerns/alchemy/locale_redirects.rb +0 -40
  94. data/app/controllers/concerns/alchemy/page_redirects.rb +0 -68
  95. data/lib/alchemy/userstamp.rb +0 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9b719983afdc90cf645552079d8de65a7632372c37b3c3acc98e81c726fe3ddd
4
- data.tar.gz: 45f07d11d8cce7598ba56a9e6801eb93e3ef31873d24a5e894d8e5208628f99c
3
+ metadata.gz: 9e12f510dae37d181a93e110634f158c8f3fac7231c489579d61118528c1174a
4
+ data.tar.gz: 467204837b948c660077c45e0dab282d23fff3c79a1fea854658d05098a3b8b7
5
5
  SHA512:
6
- metadata.gz: de9831e1555fa6ecff7dfe9e28d762ae6bfb9507566aae096ca6ade3087e976a0ec840b1e5a87167fe198154d34cca498fed9d693775f4ba0960d8a062847e24
7
- data.tar.gz: 179690bed4cb7feadeb9bff852a8de948c397c8c65d06643bc8dc8863538f951499307a42c883a188454c916d945abe3788ee0eba3f97839e70a881eba2ae21b
6
+ metadata.gz: 3037cd0a408e63b6edde1c58bc398ec4d377d6a9452caf0e6d8b418b438eb8e7176ca8336f5987089caf355c90e68fbca04ab7df3ac67fca76654efcf00d2cab
7
+ data.tar.gz: d5a363910f6e4bfb221094c15f33c550dc3650c5eae35a375ea187e92bdac102e31c155168f336c1fa8f11a22235ff1558cc5433ad34fadc79cf59d28e0d883e
@@ -13,6 +13,6 @@ Explain any changes (maybe breaking?) that have been made.
13
13
  Remove if no visual changes have been made.
14
14
 
15
15
  ## Checklist
16
- - [ ] I have followed [Pull Request guidelines](https://github.com/AlchemyCMS/alchemy_cms/blob/master/CONTRIBUTING.md)
16
+ - [ ] I have followed [Pull Request guidelines](https://github.com/AlchemyCMS/alchemy_cms/blob/main/CONTRIBUTING.md)
17
17
  - [ ] I have added a detailed description into each commit message
18
18
  - [ ] I have added tests to cover this change
@@ -14,4 +14,4 @@ jobs:
14
14
  with:
15
15
  repo-token: ${{ secrets.GITHUB_TOKEN }}
16
16
  stale-issue-message: 'This issue has not seen any activity in a long time. If the issue described still exists in recent versions of Alchemy, please open a new issue or preferably open a PR with a fix. Thanks for reporting.'
17
- stale-pr-message: 'This pull request has not seen any activiy in a long time. Probably because of missing tests or a necessary rebase. Please open a new PR to latest master if you want to continue working on this. Thanks for the contribution.'
17
+ stale-pr-message: 'This pull request has not seen any activiy in a long time. Probably because of missing tests or a necessary rebase. Please open a new PR to latest main if you want to continue working on this. Thanks for the contribution.'
data/.gitignore CHANGED
@@ -40,3 +40,4 @@ yarn-error.log
40
40
  yarn-debug.log*
41
41
  .yarn-integrity
42
42
  yarn.lock
43
+ /spec/dummy/public/pictures
@@ -0,0 +1,48 @@
1
+ language: ruby
2
+ os: linux
3
+ dist: bionic
4
+ services:
5
+ - mysql
6
+ addons:
7
+ postgresql: "10"
8
+ cache:
9
+ bundler: true
10
+ yarn: true
11
+ directories:
12
+ - /home/travis/.webdrivers/
13
+ rvm:
14
+ - 2.6.6
15
+ - 2.7.1
16
+
17
+ before_script:
18
+ - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
19
+ - chmod +x ./cc-test-reporter
20
+ - ./cc-test-reporter before-build
21
+ - nvm use 12
22
+
23
+ script: bundle exec rake
24
+
25
+ after_script:
26
+ - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
27
+
28
+ jobs:
29
+ include:
30
+ - language: node_js
31
+ node_js: 12
32
+ install: yarn install
33
+ script: yarn jest --coverage
34
+ env: NODE_ENV=test
35
+ before_script: skip
36
+ after_script: skip
37
+
38
+ env:
39
+ global:
40
+ CC_TEST_REPORTER_ID=bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
41
+ jobs:
42
+ - DB=mysql RAILS_VERSION=5.2
43
+ - DB=mysql RAILS_VERSION=6.0
44
+ - DB=postgresql RAILS_VERSION=5.2
45
+ - DB=postgresql RAILS_VERSION=6.0
46
+ notifications:
47
+ slack:
48
+ secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=
@@ -1,5 +1,66 @@
1
- ## 5.0.0 (unreleased)
2
-
1
+ ## 5.1.0 (unreleased)
2
+
3
+ ### Features
4
+
5
+ - Allow multiple preview sources [#1959](https://github.com/AlchemyCMS/alchemy_cms/pull/1959) ([tvdeyen](https://github.com/tvdeyen))
6
+ - Add Publish Targets [#1957](https://github.com/AlchemyCMS/alchemy_cms/pull/1957) ([tvdeyen](https://github.com/tvdeyen))
7
+ - Persist rendered picture variants [#1882](https://github.com/AlchemyCMS/alchemy_cms/pull/1882) ([tvdeyen](https://github.com/tvdeyen))
8
+ - Store current pictures size in session [#1927](https://github.com/AlchemyCMS/alchemy_cms/pull/1927) ([tvdeyen](https://github.com/tvdeyen))
9
+ - Add support for custom mount points in Page::UrlPath [#1921](https://github.com/AlchemyCMS/alchemy_cms/pull/1921) ([tvdeyen](https://github.com/tvdeyen))
10
+ - Allow to set a custom Page::UrlPath class [#1919](https://github.com/AlchemyCMS/alchemy_cms/pull/1919) ([tvdeyen](https://github.com/tvdeyen))
11
+
12
+ ### Changes
13
+
14
+ - Do not abort if user class cannot be found [#1950](https://github.com/AlchemyCMS/alchemy_cms/pull/1950) ([tvdeyen](https://github.com/tvdeyen))
15
+ - Deprivatize useful picture view methods [#1936](https://github.com/AlchemyCMS/alchemy_cms/pull/1936) ([mickenorlen](https://github.com/mickenorlen))
16
+ - Unset render_size on layout default selection [#1935](https://github.com/AlchemyCMS/alchemy_cms/pull/1935) ([mickenorlen](https://github.com/mickenorlen))
17
+ - Dont show sizes selection if using srcset [#1934](https://github.com/AlchemyCMS/alchemy_cms/pull/1934) ([mickenorlen](https://github.com/mickenorlen))
18
+ - Change all Boolean columns to never be null [#1933](https://github.com/AlchemyCMS/alchemy_cms/pull/1933) ([mamhoff](https://github.com/mamhoff))
19
+ - Autoselect first if only one layout available [#1932](https://github.com/AlchemyCMS/alchemy_cms/pull/1932) ([mickenorlen](https://github.com/mickenorlen))
20
+ - Remove page from search form query [#1928](https://github.com/AlchemyCMS/alchemy_cms/pull/1928) ([tvdeyen](https://github.com/tvdeyen))
21
+ - Allow coffee-rails 5 [#1926](https://github.com/AlchemyCMS/alchemy_cms/pull/1926) ([sechix](https://github.com/sechix))
22
+ - Update documentation [#1917](https://github.com/AlchemyCMS/alchemy_cms/pull/1917) ([dhughesbc](https://github.com/dhughesbc))
23
+ - Remove deprecated Attachment#urlname [#1911](https://github.com/AlchemyCMS/alchemy_cms/pull/1911) ([tvdeyen](https://github.com/tvdeyen))
24
+ - Remove redirect_to_public_child flag and feature [#1910](https://github.com/AlchemyCMS/alchemy_cms/pull/1910) ([tvdeyen](https://github.com/tvdeyen))
25
+ - Remove toolbar helper [#1909](https://github.com/AlchemyCMS/alchemy_cms/pull/1909) ([tvdeyen](https://github.com/tvdeyen))
26
+ - Two minor CSS fixes [#1908](https://github.com/AlchemyCMS/alchemy_cms/pull/1908) ([tvdeyen](https://github.com/tvdeyen))
27
+ - Do not convert JPG images into JPEG [#1905](https://github.com/AlchemyCMS/alchemy_cms/pull/1905) ([tvdeyen](https://github.com/tvdeyen))
28
+ - Full text search respects filters [#1901](https://github.com/AlchemyCMS/alchemy_cms/pull/1901) ([tvdeyen](https://github.com/tvdeyen))
29
+ - Do not add id attributes to hidden fields in search and filters [#1899](https://github.com/AlchemyCMS/alchemy_cms/pull/1899) ([tvdeyen](https://github.com/tvdeyen))
30
+ - Do not freeze common_search_filter_includes [#1898](https://github.com/AlchemyCMS/alchemy_cms/pull/1898) ([tvdeyen](https://github.com/tvdeyen))
31
+ - Refactor sidebar CSS [#1897](https://github.com/AlchemyCMS/alchemy_cms/pull/1897) ([tvdeyen](https://github.com/tvdeyen))
32
+ - Fix tag-list height [#1896](https://github.com/AlchemyCMS/alchemy_cms/pull/1896) ([tvdeyen](https://github.com/tvdeyen))
33
+ - Fix vertical position of site name in page tab [#1895](https://github.com/AlchemyCMS/alchemy_cms/pull/1895) ([tvdeyen](https://github.com/tvdeyen))
34
+ - Support nested controllers in modules [#1894](https://github.com/AlchemyCMS/alchemy_cms/pull/1894) ([tvdeyen](https://github.com/tvdeyen))
35
+ - Always make pages taggable [#1893](https://github.com/AlchemyCMS/alchemy_cms/pull/1893) ([tvdeyen](https://github.com/tvdeyen))
36
+ - Fix editing sites [#1891](https://github.com/AlchemyCMS/alchemy_cms/pull/1891) ([mamhoff](https://github.com/mamhoff))
37
+ - Fix missing help_text_text translations [#1888](https://github.com/AlchemyCMS/alchemy_cms/pull/1888) ([gr8bit](https://github.com/gr8bit))
38
+
39
+ ### Misc
40
+
41
+ - [ruby - main] Upgrade rubocop to version 1.1.0 [#1958](https://github.com/AlchemyCMS/alchemy_cms/pull/1958) ([depfu](https://github.com/apps/depfu))
42
+ - Remove greetings action [#1956](https://github.com/AlchemyCMS/alchemy_cms/pull/1956) ([tvdeyen](https://github.com/tvdeyen))
43
+ - [ruby] Upgrade rubocop to version 1.0.0 [#1952](https://github.com/AlchemyCMS/alchemy_cms/pull/1952) ([depfu](https://github.com/apps/depfu))
44
+ - [ruby] Upgrade rubocop to version 0.93.1 [#1948](https://github.com/AlchemyCMS/alchemy_cms/pull/1948) ([depfu](https://github.com/apps/depfu))
45
+ - [ruby] Upgrade puma to version 5.0.2 [#1944](https://github.com/AlchemyCMS/alchemy_cms/pull/1944) ([depfu](https://github.com/apps/depfu))
46
+ - [ruby] Upgrade rubocop to version 0.92.0 [#1942](https://github.com/AlchemyCMS/alchemy_cms/pull/1942) ([depfu](https://github.com/apps/depfu))
47
+ - Use Node 12 on CI runs [#1925](https://github.com/AlchemyCMS/alchemy_cms/pull/1925) ([tvdeyen](https://github.com/tvdeyen))
48
+ - [ruby] Upgrade rubocop to version 0.89.0 [#1920](https://github.com/AlchemyCMS/alchemy_cms/pull/1920) ([depfu](https://github.com/apps/depfu))
49
+ - Move back to Travis CI [#1907](https://github.com/AlchemyCMS/alchemy_cms/pull/1907) ([tvdeyen](https://github.com/tvdeyen))
50
+ - [ruby] Upgrade rubocop to version 0.88.0 [#1892](https://github.com/AlchemyCMS/alchemy_cms/pull/1892) ([depfu](https://github.com/apps/depfu))
51
+ - [ruby] Upgrade rubocop to version 0.87.1 [#1889](https://github.com/AlchemyCMS/alchemy_cms/pull/1889) ([depfu](https://github.com/apps/depfu))
52
+
53
+ ## 5.0.1 (2020-09-29)
54
+
55
+ - [a11y] Better image alt text support [#1940](https://github.com/AlchemyCMS/alchemy_cms/pull/1940) ([tvdeyen](https://github.com/tvdeyen))
56
+
57
+ ## 5.0.0 (2020-07-17)
58
+
59
+ - Do not convert JPEG images into JPG [#1904](https://github.com/AlchemyCMS/alchemy_cms/pull/1904) ([tvdeyen](https://github.com/tvdeyen))
60
+ - Do not enable image cropper if file is missing [#1903](https://github.com/AlchemyCMS/alchemy_cms/pull/1903) ([tvdeyen](https://github.com/tvdeyen))
61
+ - Always show original image as zoomed image [#1902](https://github.com/AlchemyCMS/alchemy_cms/pull/1902) ([tvdeyen](https://github.com/tvdeyen))
62
+ - Rename Attachment#urlname into slug [#1848](https://github.com/AlchemyCMS/alchemy_cms/pull/1848) ([tvdeyen](https://github.com/tvdeyen))
63
+ - Deprecate toolbar helper [#1900](https://github.com/AlchemyCMS/alchemy_cms/pull/1900) ([tvdeyen](https://github.com/tvdeyen))
3
64
  - Deprecate redirect_to_public_child ([tvdeyen](https://github.com/tvdeyen))
4
65
  - Add --auto-accept option to installer ([tvdeyen](https://github.com/tvdeyen))
5
66
  - Move all installer code into install generator ([tvdeyen](https://github.com/tvdeyen))
@@ -39,11 +39,11 @@ refactoring and documentation changes require no new tests. If you are adding
39
39
  functionality or fixing a bug, we need tests!
40
40
 
41
41
  4. Push to your fork and submit a pull request. If the changes will apply cleanly
42
- to the latest stable branches and master branch, you will only need to submit one
42
+ to the latest stable branches and main branch, you will only need to submit one
43
43
  pull request.
44
44
 
45
45
  5. If a PR does not apply cleanly to one of its targeted branches, then a separate
46
- PR should be created that does. For instance, if a PR applied to master & 2.7-stable but not 2.8-stable, then there should be one PR for master & 2.7-stable and another, separate PR for 2.8-stable.
46
+ PR should be created that does. For instance, if a PR applied to main & 2.7-stable but not 2.8-stable, then there should be one PR for main & 2.7-stable and another, separate PR for 2.8-stable.
47
47
 
48
48
  At this point you're waiting on us. We like to at least comment on, if not
49
49
  accept pull requests. We may suggest some changes or improvements or alternatives.
data/Gemfile CHANGED
@@ -10,10 +10,10 @@ if ENV["DB"].nil? || ENV["DB"] == "sqlite"
10
10
  gem "sqlite3", "~> 1.4.1"
11
11
  end
12
12
  gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql"
13
- gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
13
+ gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
14
14
 
15
15
  group :development, :test do
16
- if ENV["GITHUB_ACTIONS"]
16
+ if ENV["TRAVIS"]
17
17
  gem "sassc", "~> 2.4.0" # https://github.com/sass/sassc-ruby/issues/146
18
18
  else
19
19
  gem "launchy"
@@ -22,7 +22,7 @@ group :development, :test do
22
22
  gem "yard"
23
23
  gem "redcarpet"
24
24
  gem "pry-byebug"
25
- gem "rubocop", "~> 0.87.1", require: false
25
+ gem "rubocop", "~> 1.1.0", require: false
26
26
  gem "listen"
27
27
  gem "localeapp", "~> 3.0", require: false
28
28
  gem "dotenv", "~> 2.2"
data/README.md CHANGED
@@ -1,7 +1,7 @@
1
1
  # AlchemyCMS
2
2
 
3
3
  [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
4
- [![Build Status](https://github.com/AlchemyCMS/alchemy_cms/workflows/CI/badge.svg?branch=master)](https://github.com/AlchemyCMS/alchemy_cms/actions)
4
+ [![Build Status](https://travis-ci.com/AlchemyCMS/alchemy_cms.svg?branch=main)](https://travis-ci.com/AlchemyCMS/alchemy_cms)
5
5
  [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
6
6
  [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
7
7
  [![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
@@ -18,7 +18,7 @@ Alchemy is an open source CMS engine written in Ruby on Rails.
18
18
 
19
19
  Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [guidelines](https://guides.alchemy-cms.com).
20
20
 
21
- **CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (4.5-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.5-stable).**
21
+ **CAUTION: This main branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (5.0-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/5.0-stable).**
22
22
 
23
23
 
24
24
  ## ✅ Features
@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
22
22
  gem.add_runtime_dependency 'acts_as_list', ['>= 0.3', '< 2']
23
23
  gem.add_runtime_dependency 'awesome_nested_set', ['~> 3.1']
24
24
  gem.add_runtime_dependency 'cancancan', ['>= 2.1', '< 4.0']
25
- gem.add_runtime_dependency 'coffee-rails', ['~> 4.0', '< 5.0']
25
+ gem.add_runtime_dependency 'coffee-rails', ['>= 4.0', '< 6.0']
26
26
  gem.add_runtime_dependency 'dragonfly', ['~> 1.0', '>= 1.0.7']
27
27
  gem.add_runtime_dependency 'dragonfly_svg', ['~> 0.0.4']
28
28
  gem.add_runtime_dependency 'gutentag', ['~> 2.2', '>= 2.2.1']
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
46
46
  gem.add_development_dependency 'capybara', ['~> 3.0']
47
47
  gem.add_development_dependency 'capybara-screenshot', ['~> 1.0']
48
48
  gem.add_development_dependency 'factory_bot_rails', ['~> 6.0']
49
- gem.add_development_dependency 'puma', ['~> 4.0']
49
+ gem.add_development_dependency 'puma', ['~> 5.0']
50
50
  gem.add_development_dependency 'rails-controller-testing', ['~> 1.0']
51
51
  gem.add_development_dependency 'rspec-activemodel-mocks', ['~> 1.0']
52
52
  gem.add_development_dependency 'rspec-rails', ['>= 4.0.0.beta2']
@@ -0,0 +1 @@
1
+ <svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" width="16" height="16"><path fill="#f7f7f7" d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z" class=""></path></svg>
@@ -38,10 +38,7 @@ Alchemy.ElementEditors =
38
38
  @onSaveElement(e, data)
39
39
  # Listen to postMessage messages from the preview frame
40
40
  window.addEventListener 'message', (e) =>
41
- if e.origin == window.location.origin
42
- @onMessage(e.data)
43
- else
44
- console.warn 'Unsafe message origin!', e.origin
41
+ @onMessage(e.data)
45
42
  true
46
43
  return
47
44
 
@@ -22,9 +22,6 @@ Alchemy.initAlchemyPreviewMode = ->
22
22
 
23
23
  init: ->
24
24
  window.addEventListener "message", (event) =>
25
- if event.origin != window.location.origin
26
- console.warn 'Unsafe message origin!', event.origin
27
- return
28
25
  switch event.data.message
29
26
  when "Alchemy.blurElements" then @blurElements()
30
27
  when "Alchemy.focusElement" then @focusElement(event.data)
@@ -4,8 +4,10 @@ Alchemy.PreviewWindow =
4
4
  MIN_WIDTH: 240
5
5
  HEIGHT: 75 # Top menu height
6
6
 
7
- init: (url) ->
8
- $iframe = $("<iframe name=\"alchemy_preview_window\" src=\"#{url}\" id=\"alchemy_preview_window\" frameborder=\"0\"/>")
7
+ init: (previewUrl) ->
8
+ @select = document.querySelector('#preview_url')
9
+ @previewUrl = @_getCurrentPreviewUrl() || previewUrl[1]
10
+ $iframe = $("<iframe name=\"alchemy_preview_window\" src=\"#{@previewUrl}\" id=\"alchemy_preview_window\" frameborder=\"0\"/>")
9
11
  $reload = $('#reload_preview_button')
10
12
  @_showSpinner()
11
13
  $iframe.load =>
@@ -13,6 +15,10 @@ Alchemy.PreviewWindow =
13
15
  $('body').append($iframe)
14
16
  @currentWindow = $iframe
15
17
  @_bindReloadButton()
18
+ if @select
19
+ @select.value = @previewUrl
20
+ @_bindSelect()
21
+ return
16
22
 
17
23
  resize: (width) ->
18
24
  width = @MIN_WIDTH if width < @MIN_WIDTH
@@ -29,12 +35,12 @@ Alchemy.PreviewWindow =
29
35
  @_hideSpinner()
30
36
  if callback
31
37
  callback.call(e, $iframe)
32
- $iframe.attr 'src', $iframe.attr('src')
38
+ $iframe.attr('src', @previewUrl)
33
39
  true
34
40
 
35
41
  postMessage: (data) ->
36
42
  frameWindow = @currentWindow[0].contentWindow
37
- frameWindow.postMessage(data, window.location.origin)
43
+ frameWindow.postMessage(data, "*")
38
44
 
39
45
  _showSpinner: ->
40
46
  @reload = $('#reload_preview_button')
@@ -53,5 +59,24 @@ Alchemy.PreviewWindow =
53
59
  e.preventDefault()
54
60
  @refresh()
55
61
 
62
+ _getCurrentPreviewUrl: ->
63
+ if @select
64
+ option = Array.from(@select.options).find (o) =>
65
+ o.text == window.localStorage.getItem("alchemyPreview")
66
+ if option
67
+ option.value
68
+ else
69
+ null
70
+ else
71
+ null
72
+
73
+ _bindSelect: ->
74
+ $(@select).change (e) =>
75
+ @previewUrl = e.target.value
76
+ option = e.target.querySelector("option[value='#{@previewUrl}']")
77
+ window.localStorage.setItem("alchemyPreview", option.text)
78
+ @refresh()
79
+ return
80
+
56
81
  Alchemy.reloadPreview = ->
57
82
  Alchemy.PreviewWindow.refresh()
@@ -143,6 +143,7 @@ $element-header-bg-color: $medium-gray !default;
143
143
  $top-menu-height: 75px !default;
144
144
 
145
145
  $tabs-height: 31px !default;
146
+ $pagination-height: 52px !default;
146
147
 
147
148
  $datepicker_current_bg: $blue !default;
148
149
  $datepicker_current_color: $white !default;
@@ -158,6 +159,8 @@ $datepicker_day_color: $text-color !default;
158
159
 
159
160
  $select-hover-bg-color: $dark-blue !default;
160
161
  $select-hover-text-color: $white !default;
162
+ $medium-select-box-width: 90px;
163
+ $large-select-box-width: 120px;
161
164
 
162
165
  $thumbnail-background-color: opacify($default-border-color, 1) !default;
163
166
  $medium-screen-break-point: 700px;
@@ -1,5 +1,5 @@
1
1
  .resources-header {
2
- padding: 2*$default-padding;
2
+ padding: 2 * $default-padding;
3
3
  }
4
4
 
5
5
  .resources-table-wrapper {
@@ -16,12 +16,11 @@ div#image_assign_filter_and_image_sizing {
16
16
  }
17
17
 
18
18
  #picture_archive {
19
-
20
19
  .selected_item_tools {
21
- margin: -2*$default-padding;
20
+ margin: -2 * $default-padding;
22
21
  border-bottom: 1px solid $default-border-color;
23
- margin-bottom: 4*$default-padding;
24
- padding: 4*$default-padding;
22
+ margin-bottom: 4 * $default-padding;
23
+ padding: 4 * $default-padding;
25
24
  display: none;
26
25
  }
27
26
  }
@@ -37,7 +36,7 @@ div#image_assign_filter_and_image_sizing {
37
36
  }
38
37
 
39
38
  .picture_thumbnail {
40
- margin: 2*$default-margin;
39
+ margin: 2 * $default-margin;
41
40
  background-color: #fff;
42
41
  position: relative;
43
42
  box-shadow: 0 0 0 1px $default-border-color;
@@ -80,8 +79,8 @@ div#image_assign_filter_and_image_sizing {
80
79
  }
81
80
 
82
81
  &:hover {
83
-
84
- .picture_tool, .picture_tags {
82
+ .picture_tool,
83
+ .picture_tags {
85
84
  visibility: visible;
86
85
  opacity: 1;
87
86
  }
@@ -95,7 +94,6 @@ div#image_assign_filter_and_image_sizing {
95
94
  }
96
95
 
97
96
  #pictures {
98
-
99
97
  .thumbnail_background {
100
98
  @include zoom-in;
101
99
  }
@@ -165,25 +163,34 @@ div.assign_image_list_image {
165
163
  pointer-events: none;
166
164
  }
167
165
 
168
- .picture_tags, .picture_tool {
166
+ .picture_tags,
167
+ .picture_tool {
169
168
  visibility: hidden;
170
169
  opacity: 0;
171
170
  transition: opacity $transition-duration;
172
171
  }
173
172
 
174
173
  div#library_sidebar {
174
+ display: flex;
175
+ flex-direction: column;
175
176
  position: fixed;
176
177
  border-left: 1px solid $default-border-color;
177
178
  top: 0;
178
179
  right: 0;
179
180
  width: 232px;
180
- padding: 86px 4*$default-padding 0 4*$default-padding;
181
+
182
+ padding: $top-menu-height + 2 * $default-padding 4 * $default-padding
183
+ $pagination-height + 2 * $default-padding 4 * $default-padding;
181
184
  height: 100%;
182
185
  z-index: 3;
183
186
  background-color: $light-gray;
184
187
 
185
188
  h2 {
186
- margin-top: 4*$default-margin;
189
+ margin-top: 4 * $default-margin;
190
+ }
191
+
192
+ h3 {
193
+ margin: 2em 0 1em;
187
194
  }
188
195
  }
189
196
 
@@ -192,20 +199,19 @@ div#library_sidebar {
192
199
  }
193
200
 
194
201
  div#filter_bar {
195
-
196
202
  .selectboxit {
197
203
  width: 194px;
198
204
  }
199
205
  }
200
206
 
201
207
  .alchemy-dialog-body {
202
-
203
208
  #library_sidebar {
204
- padding: 0 4*$default-padding;
209
+ padding: 0 4 * $default-padding;
205
210
  }
206
211
  }
207
212
 
208
- #assign_image_list, #assign_file_list {
213
+ #assign_image_list,
214
+ #assign_file_list {
209
215
  position: relative;
210
216
  height: 548px;
211
217
  }
@@ -234,7 +240,7 @@ div#filter_bar {
234
240
  display: block;
235
241
  line-height: 25px;
236
242
  text-decoration: none;
237
- padding: $default-padding 2*$default-padding;
243
+ padding: $default-padding 2 * $default-padding;
238
244
  }
239
245
 
240
246
  .icon {