alchemy_cms 5.0.9 → 5.1.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (97) 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 +50 -36
  7. data/CONTRIBUTING.md +2 -2
  8. data/Gemfile +2 -2
  9. data/README.md +2 -2
  10. data/alchemy_cms.gemspec +4 -4
  11. data/app/assets/images/alchemy/missing-image.svg +1 -0
  12. data/app/assets/stylesheets/alchemy/_variables.scss +1 -0
  13. data/app/assets/stylesheets/alchemy/archive.scss +23 -17
  14. data/app/assets/stylesheets/alchemy/errors.scss +1 -1
  15. data/app/assets/stylesheets/alchemy/navigation.scss +7 -10
  16. data/app/assets/stylesheets/alchemy/pagination.scss +1 -1
  17. data/app/assets/stylesheets/alchemy/search.scss +12 -2
  18. data/app/assets/stylesheets/alchemy/tags.scss +19 -31
  19. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +3 -3
  20. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +7 -7
  21. data/app/controllers/alchemy/admin/pictures_controller.rb +13 -6
  22. data/app/controllers/alchemy/admin/resources_controller.rb +3 -3
  23. data/app/controllers/alchemy/pages_controller.rb +49 -14
  24. data/app/helpers/alchemy/admin/base_helper.rb +0 -44
  25. data/app/helpers/alchemy/admin/navigation_helper.rb +2 -1
  26. data/app/helpers/alchemy/pages_helper.rb +1 -1
  27. data/app/models/alchemy/attachment/url.rb +40 -0
  28. data/app/models/alchemy/attachment.rb +21 -4
  29. data/app/models/alchemy/element.rb +1 -1
  30. data/app/models/alchemy/essence_picture.rb +3 -3
  31. data/app/models/alchemy/essence_picture_view.rb +5 -3
  32. data/app/models/alchemy/node.rb +1 -1
  33. data/app/models/alchemy/page/page_natures.rb +2 -0
  34. data/app/models/alchemy/page/url_path.rb +8 -6
  35. data/app/models/alchemy/page.rb +17 -2
  36. data/app/models/alchemy/picture/calculations.rb +55 -0
  37. data/app/models/alchemy/picture/transformations.rb +5 -49
  38. data/app/models/alchemy/picture/url.rb +28 -77
  39. data/app/models/alchemy/picture.rb +59 -3
  40. data/app/models/alchemy/picture_thumb/create.rb +39 -0
  41. data/app/models/alchemy/picture_thumb/signature.rb +23 -0
  42. data/app/models/alchemy/picture_thumb/uid.rb +22 -0
  43. data/app/models/alchemy/picture_thumb.rb +57 -0
  44. data/app/models/alchemy/picture_variant.rb +114 -0
  45. data/app/serializers/alchemy/page_tree_serializer.rb +4 -4
  46. data/app/views/alchemy/admin/attachments/show.html.erb +8 -8
  47. data/app/views/alchemy/admin/dashboard/index.html.erb +13 -16
  48. data/app/views/alchemy/admin/elements/_element_toolbar.html.erb +1 -1
  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/partials/_remote_search_form.html.erb +14 -13
  55. data/app/views/alchemy/admin/partials/_search_form.html.erb +8 -8
  56. data/app/views/alchemy/admin/pictures/_archive.html.erb +1 -1
  57. data/app/views/alchemy/admin/pictures/_form.html.erb +1 -1
  58. data/app/views/alchemy/admin/pictures/_picture.html.erb +3 -3
  59. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -1
  60. data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +1 -1
  61. data/app/views/alchemy/admin/pictures/index.html.erb +1 -1
  62. data/app/views/alchemy/admin/pictures/show.html.erb +3 -3
  63. data/app/views/alchemy/admin/resources/_per_page_select.html.erb +3 -3
  64. data/app/views/alchemy/admin/resources/index.html.erb +4 -1
  65. data/app/views/alchemy/admin/tags/index.html.erb +14 -15
  66. data/app/views/alchemy/base/500.html.erb +11 -13
  67. data/app/views/alchemy/essences/_essence_file_view.html.erb +3 -3
  68. data/app/views/alchemy/essences/_essence_picture_view.html.erb +3 -3
  69. data/config/alchemy/config.yml +15 -11
  70. data/config/alchemy/modules.yml +12 -12
  71. data/config/routes.rb +1 -1
  72. data/db/migrate/20200617110713_create_alchemy_picture_thumbs.rb +22 -0
  73. data/db/migrate/20200907111332_remove_tri_state_booleans.rb +33 -0
  74. data/lib/alchemy/auth_accessors.rb +12 -5
  75. data/lib/alchemy/config.rb +1 -3
  76. data/lib/alchemy/engine.rb +7 -2
  77. data/lib/alchemy/modules.rb +11 -1
  78. data/lib/alchemy/resource.rb +3 -5
  79. data/lib/alchemy/test_support/factories/picture_factory.rb +0 -1
  80. data/lib/alchemy/test_support/factories/picture_thumb_factory.rb +12 -0
  81. data/lib/alchemy/upgrader/five_point_zero.rb +0 -32
  82. data/lib/alchemy/version.rb +1 -1
  83. data/lib/generators/alchemy/install/files/alchemy.en.yml +2 -2
  84. data/lib/generators/alchemy/install/install_generator.rb +1 -2
  85. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +5 -5
  86. data/lib/tasks/alchemy/thumbnails.rake +37 -0
  87. data/lib/tasks/alchemy/upgrade.rake +0 -20
  88. data/package/admin.js +0 -2
  89. data/package/src/__tests__/i18n.spec.js +0 -23
  90. data/package/src/i18n.js +3 -1
  91. data/package.json +1 -1
  92. metadata +26 -24
  93. data/.github/workflows/ci.yml +0 -126
  94. data/.github/workflows/greetings.yml +0 -13
  95. data/app/controllers/concerns/alchemy/locale_redirects.rb +0 -40
  96. data/app/controllers/concerns/alchemy/page_redirects.rb +0 -68
  97. data/lib/alchemy/userstamp.rb +0 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b8b65ee04f3b4a173ef3c7d5fd49e4d488a548b0695994d5e6f572ee1f46d633
4
- data.tar.gz: 2ad0719e949bd1b48d979db6a0b2e5bfa70ee12648c0b79203ca8f87b82b4d65
3
+ metadata.gz: b10d39bfe40bc834b734a824c9fbce68e1acf178b5cbd3ecbf6613dd4ac33261
4
+ data.tar.gz: 909f0164f71e95ed26c0b7a194b3464fc8c5974f8b28161eb3da4cb8e6c0c473
5
5
  SHA512:
6
- metadata.gz: b3da1ab522043b9330c3a1d48c83f0b77b5ea8baa7ec290ad058c1f6ffe757890bc054cdcd798a8efb17ecf788fa57b374dbe2276675d5ffc7d7efcba60dd7b0
7
- data.tar.gz: d67fed46efb864c0910e922b2ad666e5d04058052a605560503c27429bbf0764dbd875dd5866bc5e19b2b9470ed59eb999c20df7dca317df807d46675f0a4ed8
6
+ metadata.gz: 58367dca12c34272d159b8346bddddd729df2d2670b9e159d617ab1958c40937f58a6deb557a2cec1951bfaa4bb4b29cb34071eb08df14583b4cfdf58985619e
7
+ data.tar.gz: f1f861bfbc18c988597189e5dd87db0e905a70d6d78ad8bde8f2f70bba012f564fa9cfe8febf6d53834eddfde425e231ea9549b12b1bf177a8ae337f21609661
@@ -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
data/.travis.yml ADDED
@@ -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=
data/CHANGELOG.md CHANGED
@@ -1,41 +1,55 @@
1
- ## 5.0.9 (2021-11-24)
2
-
3
- - Adjust tinymce skin assets urls again ([tvdeyen](https://github.com/tvdeyen))
4
-
5
- ## 5.0.8 (2021-11-17)
6
-
7
- - Set stampable user_class_name without root identifier ([tvdeyen](https://github.com/tvdeyen))
8
- - Use relative path for tinymce font-face ([tvdeyen](https://github.com/tvdeyen))
9
-
10
- ## 5.0.7 (2021-10-26)
11
-
12
- - Make sure to install correct npm package ([tvdeyen](https://github.com/tvdeyen))
13
-
14
- ## 5.0.6 (2021-09-17)
15
-
16
- - Use self_and_ancestors in page_active? helper [#2193](https://github.com/AlchemyCMS/alchemy_cms/pull/2193) ([mamhoff](https://github.com/mamhoff))
17
-
18
- ## 5.0.5 (2021-09-15)
19
-
20
- - Backport #2115 to v5.0 [#2126](https://github.com/AlchemyCMS/alchemy_cms/pull/2126) ([dbwinger](https://github.com/dbwinger))
21
- - Fixate Dragonfly to < 1.4 [#2122](https://github.com/AlchemyCMS/alchemy_cms/pull/2122) ([tvdeyen](https://github.com/tvdeyen))
22
- - Backport #2114 to v5.0 [#2118](https://github.com/AlchemyCMS/alchemy_cms/pull/2118) ([afdev82](https://github.com/afdev82))
23
-
24
- ## 5.0.4 (2021-05-06)
25
-
26
- - Use symbols in polymorphic routes for resources [#2087](https://github.com/AlchemyCMS/alchemy_cms/pull/2087) ([tvdeyen](https://github.com/tvdeyen))
27
-
28
- ## 5.0.3 (2021-01-12)
29
-
30
- - Fix copy element feature [#1996](https://github.com/AlchemyCMS/alchemy_cms/pull/1996) ([tvdeyen](https://github.com/tvdeyen))
31
-
32
- ## 5.0.2 (2020-12-18)
33
-
34
- - Fix page sorting [#1984](https://github.com/AlchemyCMS/alchemy_cms/pull/1984) ([tvdeyen](https://github.com/tvdeyen))
1
+ ## 5.1.0 (unreleased)
2
+
3
+ ### Features
4
+
5
+ - Persist rendered picture variants [#1882](https://github.com/AlchemyCMS/alchemy_cms/pull/1882) ([tvdeyen](https://github.com/tvdeyen))
6
+ - Store current pictures size in session [#1927](https://github.com/AlchemyCMS/alchemy_cms/pull/1927) ([tvdeyen](https://github.com/tvdeyen))
7
+ - Add support for custom mount points in Page::UrlPath [#1921](https://github.com/AlchemyCMS/alchemy_cms/pull/1921) ([tvdeyen](https://github.com/tvdeyen))
8
+ - Allow to set a custom Page::UrlPath class [#1919](https://github.com/AlchemyCMS/alchemy_cms/pull/1919) ([tvdeyen](https://github.com/tvdeyen))
9
+
10
+ ### Changes
11
+
12
+ - Do not abort if user class cannot be found [#1950](https://github.com/AlchemyCMS/alchemy_cms/pull/1950) ([tvdeyen](https://github.com/tvdeyen))
13
+ - Deprivatize useful picture view methods [#1936](https://github.com/AlchemyCMS/alchemy_cms/pull/1936) ([mickenorlen](https://github.com/mickenorlen))
14
+ - Unset render_size on layout default selection [#1935](https://github.com/AlchemyCMS/alchemy_cms/pull/1935) ([mickenorlen](https://github.com/mickenorlen))
15
+ - Dont show sizes selection if using srcset [#1934](https://github.com/AlchemyCMS/alchemy_cms/pull/1934) ([mickenorlen](https://github.com/mickenorlen))
16
+ - Change all Boolean columns to never be null [#1933](https://github.com/AlchemyCMS/alchemy_cms/pull/1933) ([mamhoff](https://github.com/mamhoff))
17
+ - Autoselect first if only one layout available [#1932](https://github.com/AlchemyCMS/alchemy_cms/pull/1932) ([mickenorlen](https://github.com/mickenorlen))
18
+ - Remove page from search form query [#1928](https://github.com/AlchemyCMS/alchemy_cms/pull/1928) ([tvdeyen](https://github.com/tvdeyen))
19
+ - Allow coffee-rails 5 [#1926](https://github.com/AlchemyCMS/alchemy_cms/pull/1926) ([sechix](https://github.com/sechix))
20
+ - Update documentation [#1917](https://github.com/AlchemyCMS/alchemy_cms/pull/1917) ([dhughesbc](https://github.com/dhughesbc))
21
+ - Remove deprecated Attachment#urlname [#1911](https://github.com/AlchemyCMS/alchemy_cms/pull/1911) ([tvdeyen](https://github.com/tvdeyen))
22
+ - Remove redirect_to_public_child flag and feature [#1910](https://github.com/AlchemyCMS/alchemy_cms/pull/1910) ([tvdeyen](https://github.com/tvdeyen))
23
+ - Remove toolbar helper [#1909](https://github.com/AlchemyCMS/alchemy_cms/pull/1909) ([tvdeyen](https://github.com/tvdeyen))
24
+ - Two minor CSS fixes [#1908](https://github.com/AlchemyCMS/alchemy_cms/pull/1908) ([tvdeyen](https://github.com/tvdeyen))
25
+ - Do not convert JPG images into JPEG [#1905](https://github.com/AlchemyCMS/alchemy_cms/pull/1905) ([tvdeyen](https://github.com/tvdeyen))
26
+ - Full text search respects filters [#1901](https://github.com/AlchemyCMS/alchemy_cms/pull/1901) ([tvdeyen](https://github.com/tvdeyen))
27
+ - 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))
28
+ - Do not freeze common_search_filter_includes [#1898](https://github.com/AlchemyCMS/alchemy_cms/pull/1898) ([tvdeyen](https://github.com/tvdeyen))
29
+ - Refactor sidebar CSS [#1897](https://github.com/AlchemyCMS/alchemy_cms/pull/1897) ([tvdeyen](https://github.com/tvdeyen))
30
+ - Fix tag-list height [#1896](https://github.com/AlchemyCMS/alchemy_cms/pull/1896) ([tvdeyen](https://github.com/tvdeyen))
31
+ - Fix vertical position of site name in page tab [#1895](https://github.com/AlchemyCMS/alchemy_cms/pull/1895) ([tvdeyen](https://github.com/tvdeyen))
32
+ - Support nested controllers in modules [#1894](https://github.com/AlchemyCMS/alchemy_cms/pull/1894) ([tvdeyen](https://github.com/tvdeyen))
33
+ - Always make pages taggable [#1893](https://github.com/AlchemyCMS/alchemy_cms/pull/1893) ([tvdeyen](https://github.com/tvdeyen))
34
+ - Fix editing sites [#1891](https://github.com/AlchemyCMS/alchemy_cms/pull/1891) ([mamhoff](https://github.com/mamhoff))
35
+ - Fix missing help_text_text translations [#1888](https://github.com/AlchemyCMS/alchemy_cms/pull/1888) ([gr8bit](https://github.com/gr8bit))
36
+
37
+ ### Misc
38
+
39
+ - Remove greetings action [#1956](https://github.com/AlchemyCMS/alchemy_cms/pull/1956) ([tvdeyen](https://github.com/tvdeyen))
40
+ - [ruby] Upgrade rubocop to version 1.0.0 [#1952](https://github.com/AlchemyCMS/alchemy_cms/pull/1952) ([depfu](https://github.com/apps/depfu))
41
+ - [ruby] Upgrade rubocop to version 0.93.1 [#1948](https://github.com/AlchemyCMS/alchemy_cms/pull/1948) ([depfu](https://github.com/apps/depfu))
42
+ - [ruby] Upgrade puma to version 5.0.2 [#1944](https://github.com/AlchemyCMS/alchemy_cms/pull/1944) ([depfu](https://github.com/apps/depfu))
43
+ - [ruby] Upgrade rubocop to version 0.92.0 [#1942](https://github.com/AlchemyCMS/alchemy_cms/pull/1942) ([depfu](https://github.com/apps/depfu))
44
+ - Use Node 12 on CI runs [#1925](https://github.com/AlchemyCMS/alchemy_cms/pull/1925) ([tvdeyen](https://github.com/tvdeyen))
45
+ - [ruby] Upgrade rubocop to version 0.89.0 [#1920](https://github.com/AlchemyCMS/alchemy_cms/pull/1920) ([depfu](https://github.com/apps/depfu))
46
+ - Move back to Travis CI [#1907](https://github.com/AlchemyCMS/alchemy_cms/pull/1907) ([tvdeyen](https://github.com/tvdeyen))
47
+ - [ruby] Upgrade rubocop to version 0.88.0 [#1892](https://github.com/AlchemyCMS/alchemy_cms/pull/1892) ([depfu](https://github.com/apps/depfu))
48
+ - [ruby] Upgrade rubocop to version 0.87.1 [#1889](https://github.com/AlchemyCMS/alchemy_cms/pull/1889) ([depfu](https://github.com/apps/depfu))
35
49
 
36
50
  ## 5.0.1 (2020-09-29)
37
51
 
38
- - Better image alt text support [#1940](https://github.com/AlchemyCMS/alchemy_cms/pull/1940) ([tvdeyen](https://github.com/tvdeyen))
52
+ - [a11y] Better image alt text support [#1940](https://github.com/AlchemyCMS/alchemy_cms/pull/1940) ([tvdeyen](https://github.com/tvdeyen))
39
53
 
40
54
  ## 5.0.0 (2020-07-17)
41
55
 
@@ -43,7 +57,7 @@
43
57
  - Do not enable image cropper if file is missing [#1903](https://github.com/AlchemyCMS/alchemy_cms/pull/1903) ([tvdeyen](https://github.com/tvdeyen))
44
58
  - Always show original image as zoomed image [#1902](https://github.com/AlchemyCMS/alchemy_cms/pull/1902) ([tvdeyen](https://github.com/tvdeyen))
45
59
  - Rename Attachment#urlname into slug [#1848](https://github.com/AlchemyCMS/alchemy_cms/pull/1848) ([tvdeyen](https://github.com/tvdeyen))
46
- - Deprecate toolbar helper ([tvdeyen](https://github.com/tvdeyen))
60
+ - Deprecate toolbar helper [#1900](https://github.com/AlchemyCMS/alchemy_cms/pull/1900) ([tvdeyen](https://github.com/tvdeyen))
47
61
  - Deprecate redirect_to_public_child ([tvdeyen](https://github.com/tvdeyen))
48
62
  - Add --auto-accept option to installer ([tvdeyen](https://github.com/tvdeyen))
49
63
  - Move all installer code into install generator ([tvdeyen](https://github.com/tvdeyen))
data/CONTRIBUTING.md CHANGED
@@ -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
@@ -13,7 +13,7 @@ gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql"
13
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.85.0", require: false
25
+ gem "rubocop", "~> 1.0.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=main)](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
data/alchemy_cms.gemspec CHANGED
@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
13
13
  gem.summary = 'A powerful, userfriendly and flexible CMS for Rails'
14
14
  gem.description = 'Alchemy is a powerful, userfriendly and flexible Rails CMS.'
15
15
  gem.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
16
- gem.required_ruby_version = '~> 2.3'
16
+ gem.required_ruby_version = '>= 2.3.0'
17
17
  gem.license = 'BSD New'
18
18
  gem.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
19
19
  gem.require_paths = ['lib']
@@ -22,8 +22,8 @@ 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']
26
- gem.add_runtime_dependency 'dragonfly', ['~> 1.0', '>= 1.0.7', '< 1.4.0']
25
+ gem.add_runtime_dependency 'coffee-rails', ['>= 4.0', '< 6.0']
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']
29
29
  gem.add_runtime_dependency 'handlebars_assets', ['~> 0.23']
@@ -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>
@@ -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;
@@ -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 {
@@ -40,7 +40,7 @@ div#errors, div.errors {
40
40
 
41
41
  body.error {
42
42
  .error.message {
43
- max-height: 95%;
43
+ max-height: 100%;
44
44
  overflow-y: scroll;
45
45
  }
46
46
  }
@@ -256,7 +256,7 @@
256
256
  > a {
257
257
  display: flex;
258
258
  cursor: pointer;
259
- padding: 0px 8px;
259
+ padding-left: 2 * $default-padding;
260
260
 
261
261
  &:focus {
262
262
  @include default-focus-style($box-shadow: inset 0 0 0 2px $focus-color);
@@ -273,19 +273,16 @@
273
273
  text-shadow: $text-shadow-light;
274
274
  }
275
275
 
276
- .page_language {
277
- display: inline-block;
278
- color: $muted-text-color;
279
- margin-right: 2px;
280
- font-size: $small-font-size;
281
- text-transform: uppercase;
282
- }
283
-
276
+ .page_language,
284
277
  .page_site {
285
278
  display: inline-block;
286
279
  color: $muted-text-color;
287
- margin-right: $default-margin;
288
280
  font-size: $small-font-size;
281
+ margin-right: $default-margin;
289
282
  line-height: 31px;
290
283
  }
284
+
285
+ .page_language {
286
+ text-transform: uppercase;
287
+ }
291
288
  }
@@ -7,7 +7,7 @@
7
7
  right: 0;
8
8
  width: 100%;
9
9
  left: 0px;
10
- height: 52px;
10
+ height: $pagination-height;
11
11
  padding: 2*$default-padding;
12
12
  padding-left: $main-menu-width + 10px;
13
13
  text-align: left;
@@ -11,9 +11,19 @@
11
11
  top: 9px;
12
12
  }
13
13
 
14
- label {
15
- display: block;
14
+ button {
15
+ position: absolute;
16
+ top: 0;
17
+ left: 0;
18
+ width: 30px;
16
19
  height: inherit;
20
+ appearance: none;
21
+ background-color: transparent;
22
+ border: 0 none;
23
+ border-radius: 0;
24
+ box-shadow: none;
25
+ margin: 0;
26
+ padding: 0;
17
27
  }
18
28
  }
19
29
 
@@ -1,26 +1,10 @@
1
1
  .tag-list {
2
+ display: flex;
3
+ flex-direction: column;
2
4
  height: 100%;
3
- padding-bottom: 138px;
4
-
5
- &.filtered {
6
- padding-bottom: 178px;
7
- }
8
-
9
- &.with_filter_bar {
10
- padding-bottom: 218px;
11
-
12
- &.filtered {
13
- padding-bottom: 256px;
14
- }
15
- }
16
5
 
17
6
  .js_filter_field_box {
18
- position: absolute;
19
- right: auto;
20
- top: auto;
21
- width: 200px;
22
- z-index: 1100;
23
- transition: background-color $transition-duration;
7
+ margin: 0;
24
8
 
25
9
  input {
26
10
  background-color: transparentize($white, 0.25);
@@ -29,23 +13,22 @@
29
13
  background-color: $white;
30
14
  }
31
15
  }
32
-
33
- label { display: none }
34
16
  }
35
17
 
36
18
  ul {
37
19
  list-style-type: none;
38
20
  padding: 0;
39
- margin: 44px 0 4px 0;
21
+ margin: 0;
40
22
  height: 100%;
41
- width: 200px;
42
23
  overflow-x: hidden;
43
24
  overflow-y: auto;
44
25
 
45
26
  li {
46
27
  display: block;
47
28
 
48
- &:first-child { margin-top: 0 }
29
+ &:first-child {
30
+ margin-top: 0;
31
+ }
49
32
 
50
33
  a {
51
34
  @include tag-base;
@@ -53,13 +36,14 @@
53
36
  display: block;
54
37
  }
55
38
 
56
- &:hover { background-color: $very-light-blue }
39
+ &:hover {
40
+ background-color: $very-light-blue;
41
+ }
57
42
 
58
43
  &.active {
59
-
60
44
  a {
61
45
  background-color: $dark-gray;
62
- color: $light-gray
46
+ color: $light-gray;
63
47
  }
64
48
  }
65
49
  }
@@ -69,7 +53,7 @@
69
53
  .tag {
70
54
  @include tag-base(
71
55
  $margin: $default-margin/2 0,
72
- $padding: $default-padding 2*$default-padding $default-padding
56
+ $padding: $default-padding 2 * $default-padding $default-padding
73
57
  );
74
58
  pointer-events: none;
75
59
  font-size: $small-font-size;
@@ -124,7 +108,9 @@
124
108
  position: relative;
125
109
  border-radius: $default-border-radius;
126
110
 
127
- &.odd { background-color: #eaf3f9 }
111
+ &.odd {
112
+ background-color: #eaf3f9;
113
+ }
128
114
 
129
115
  input {
130
116
  position: absolute;
@@ -141,14 +127,16 @@
141
127
  }
142
128
  }
143
129
 
144
- .tag_list, .autocomplete_tag_list {
130
+ .tag_list,
131
+ .autocomplete_tag_list {
145
132
  .select2-container.select2-container-multi {
146
133
  .select2-search-choice {
147
134
  padding: 0;
148
135
 
149
136
  div {
150
137
  @include tag-base(
151
- $padding: $default-padding 6*$default-padding $default-padding 3*$default-padding,
138
+ $padding: $default-padding 6 * $default-padding $default-padding 3 *
139
+ $default-padding,
152
140
  $margin: 0
153
141
  );
154
142
  }
@@ -30,7 +30,7 @@ td,th {
30
30
 
31
31
  .mce-object {
32
32
  border: 1px dotted #3a3a3a;
33
- background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/object.gif') no-repeat center;
33
+ background: #d5d5d5 url(img/object.gif) no-repeat center;
34
34
  }
35
35
 
36
36
  .mce-pagebreak {
@@ -55,7 +55,7 @@ td,th {
55
55
  width: 9px!important;
56
56
  height: 9px!important;
57
57
  border: 1px dotted #3a3a3a;
58
- background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/anchor.gif') no-repeat center;
58
+ background: #d5d5d5 url(img/anchor.gif) no-repeat center;
59
59
  }
60
60
 
61
61
  .mce-nbsp {
@@ -77,7 +77,7 @@ hr {
77
77
  }
78
78
 
79
79
  .mce-spellchecker-word {
80
- background: url('tinymce/skins/alchemy/fonts/img/wline.gif') repeat-x bottom left;
80
+ background: url(img/wline.gif) repeat-x bottom left;
81
81
  cursor: default;
82
82
  }
83
83