alchemy_cms 7.1.6 → 7.1.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 317caab1ef8a6019ed85b61349817e4ae3f04db4a886442aa66a08ef24ea21d3
4
- data.tar.gz: 5aa12003198319cabf9cb4c7a2daa4a83bece9b59ce886bcc1082f5f57e709e1
3
+ metadata.gz: 10dd8a59519d7857b37a4452c589710baed67714eaa650618cfcc6d9deba4361
4
+ data.tar.gz: 7696cc960f7ea90f59fcca3e422e59eb57f54b5dba794212099d1cda0963659a
5
5
  SHA512:
6
- metadata.gz: 67ed51a034f0ce690906cfaa8a7d4d06d24184ef7402342c166d9ebcc84e0a3183c9bcc58be7fa8d66671e7e89a3738780cddc0ee97a38c3b4e072ce9454b204
7
- data.tar.gz: 4af3eb0ecde2863da57720bf1da7cb63cb298dfcc4647de80b8999feadfe6e0c84dae67c7151f602d52c8d7ca686b52b49b4b1714f1a84e210e32dd77efdc667
6
+ metadata.gz: cdc696a969e387cf3eef9175d61be4f5a606532698a347afddc6163fa04b3caa0ca4d5607e1d7b6377fc942e749ccae98ba38b05a89fcf4cde514f449feae5fd
7
+ data.tar.gz: 45bb6037a41654d6d16b8a3dde9fc894a3223b7274c76a9b0c7c0505594b51803a1b692a206bf1bd6f44a13776dc25f675b4059659ff4e56a245cb6faa650494
data/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # Changelog
2
2
 
3
+ ## 7.1.8 (2024-05-29)
4
+
5
+ - [7.1-stable] Fix preview window width for smaller viewports [#2890](https://github.com/AlchemyCMS/alchemy_cms/pull/2890) ([alchemycms-bot](https://github.com/alchemycms-bot))
6
+ - [7.1-stable] Fix Preview Window width [#2881](https://github.com/AlchemyCMS/alchemy_cms/pull/2881) ([alchemycms-bot](https://github.com/alchemycms-bot))
7
+ - [7.1-stable] Fix preview window resize transition [#2872](https://github.com/AlchemyCMS/alchemy_cms/pull/2872) ([alchemycms-bot](https://github.com/alchemycms-bot))
8
+ - [7.1-stable] UI fixes for picture css class display [#2846](https://github.com/AlchemyCMS/alchemy_cms/pull/2846) ([alchemycms-bot](https://github.com/alchemycms-bot))
9
+
10
+ ## 7.1.7 (2024-04-12)
11
+
12
+ - [7.1-stable] Fix Ingredient Boolean View [#2838](https://github.com/AlchemyCMS/alchemy_cms/pull/2838) ([alchemycms-bot](https://github.com/alchemycms-bot))
13
+ - [7.1-stable] Nullify Ingredients::Page on Page destroy [#2831](https://github.com/AlchemyCMS/alchemy_cms/pull/2831) ([alchemycms-bot](https://github.com/alchemycms-bot))
14
+ - [7.1] Reload preview window (again) after element create [#2826](https://github.com/AlchemyCMS/alchemy_cms/pull/2826) ([tvdeyen](https://github.com/tvdeyen))
15
+ - [7.1-stable] Fix module error [#2822](https://github.com/AlchemyCMS/alchemy_cms/pull/2822) ([alchemycms-bot](https://github.com/alchemycms-bot))
16
+ - [7.1-stable] Mark ingredient output as html_safe [#2782](https://github.com/AlchemyCMS/alchemy_cms/pull/2782) ([alchemycms-bot](https://github.com/alchemycms-bot))
17
+
3
18
  ## 7.1.6 (2024-03-05)
4
19
 
5
20
  - [7.1-stable] Do not include timezone in datepickers only displaying date [#2768](https://github.com/AlchemyCMS/alchemy_cms/pull/2768) ([alchemycms-bot](https://github.com/alchemycms-bot))
data/Gemfile CHANGED
@@ -59,3 +59,5 @@ end
59
59
  gem "web-console", "~> 4.2", group: :development
60
60
 
61
61
  gem "rails_live_reload", "~> 0.3.5"
62
+
63
+ gem "gem-release", "~> 2.2"
@@ -616,15 +616,13 @@ alchemy-publish-element-button {
616
616
  .picture_ingredient_css_class {
617
617
  position: absolute;
618
618
  z-index: 1;
619
- bottom: 24px;
620
- width: 99px;
621
- background-color: white;
619
+ bottom: 34px;
622
620
  background-color: rgba(255, 254, 255, 0.7);
623
621
  padding: 4px 8px;
624
622
  font-size: $small-font-size;
625
- text-align: right;
626
- height: 12px;
627
623
  overflow: hidden;
624
+ max-width: 100%;
625
+ text-overflow: ellipsis;
628
626
  }
629
627
  }
630
628
 
@@ -7,7 +7,7 @@
7
7
  border: 0 none;
8
8
  background: #fff;
9
9
  border-right: $default-border;
10
- transition: $transition-duration ease-in-out;
10
+ transition: width $transition-duration ease-in-out;
11
11
 
12
12
  .collapsed-menu & {
13
13
  left: $collapsed-main-menu-width;
@@ -15,10 +15,14 @@
15
15
  }
16
16
 
17
17
  .collapsed-menu.elements-window-visible & {
18
- width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width});
18
+ width: calc(
19
+ 100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width}
20
+ );
19
21
 
20
- @media screen and (min-width: $large-screen-break-point) {
21
- max-width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width});
22
+ @media screen and (min-width: 1777px) {
23
+ width: calc(
24
+ 100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width}
25
+ );
22
26
  }
23
27
  }
24
28
  }
@@ -4,7 +4,7 @@ module Alchemy
4
4
  def call
5
5
  content_tag(:audio, **html_options) do
6
6
  tag(:source, src: src, type: type)
7
- end
7
+ end.html_safe
8
8
  end
9
9
 
10
10
  def render?
@@ -16,7 +16,7 @@ module Alchemy
16
16
  end
17
17
 
18
18
  def call
19
- value
19
+ value.html_safe
20
20
  end
21
21
 
22
22
  def render?
@@ -2,7 +2,7 @@ module Alchemy
2
2
  module Ingredients
3
3
  class BooleanView < BaseView
4
4
  def call
5
- Alchemy.t(value, scope: "ingredient_values.boolean")
5
+ Alchemy.t(value.to_s, scope: "ingredient_values.boolean").html_safe
6
6
  end
7
7
 
8
8
  def render?
@@ -15,7 +15,7 @@ module Alchemy
15
15
  ingredient.value.to_s(:rfc822)
16
16
  else
17
17
  ::I18n.l(ingredient.value, format: date_format)
18
- end
18
+ end.html_safe
19
19
  end
20
20
  end
21
21
  end
@@ -23,7 +23,7 @@ module Alchemy
23
23
  class: ingredient.css_class.presence,
24
24
  title: ingredient.title.presence
25
25
  }.merge(html_options)
26
- )
26
+ ).html_safe
27
27
  end
28
28
 
29
29
  def render?
@@ -7,13 +7,22 @@ module Alchemy
7
7
  end
8
8
 
9
9
  def call
10
- content_tag "h#{@level || ingredient.level}",
11
- ingredient.value,
12
- id: ingredient.dom_id.presence,
13
- class: [
14
- ingredient.size ? "h#{ingredient.size}" : nil,
15
- html_options[:class]
16
- ]
10
+ content_tag tag_name, id: dom_id, class: css_classes do
11
+ ingredient.value
12
+ end.html_safe
13
+ end
14
+
15
+ private
16
+
17
+ def tag_name = "h#{@level || ingredient.level}"
18
+
19
+ def dom_id = ingredient.dom_id.presence
20
+
21
+ def css_classes
22
+ [
23
+ ingredient.size ? "h#{ingredient.size}" : nil,
24
+ html_options[:class]
25
+ ]
17
26
  end
18
27
  end
19
28
  end
@@ -12,7 +12,7 @@ module Alchemy
12
12
  end
13
13
 
14
14
  def call
15
- link_to(link_text, value, {target: link_target}.merge(html_options))
15
+ link_to(link_text, value, {target: link_target}.merge(html_options)).html_safe
16
16
  end
17
17
 
18
18
  private
@@ -4,7 +4,7 @@ module Alchemy
4
4
  delegate :page, to: :ingredient
5
5
 
6
6
  def call
7
- link_to page.name, alchemy.show_page_path(urlname: page.urlname)
7
+ link_to(page.name, alchemy.show_page_path(urlname: page.urlname)).html_safe
8
8
  end
9
9
 
10
10
  def render?
@@ -57,7 +57,7 @@ module Alchemy
57
57
  content_tag(:figure, output, {class: ingredient.css_class.presence}.merge(html_options))
58
58
  else
59
59
  output
60
- end
60
+ end.html_safe
61
61
  end
62
62
 
63
63
  private
@@ -15,7 +15,7 @@ module Alchemy
15
15
  ingredient.stripped_body
16
16
  else
17
17
  value.to_s.html_safe
18
- end
18
+ end.html_safe
19
19
  end
20
20
  end
21
21
  end
@@ -24,7 +24,7 @@ module Alchemy
24
24
  target: ((link_target == "blank") ? "_blank" : nil),
25
25
  data: {link_target: link_target}
26
26
  }.merge(html_options))
27
- end
27
+ end.html_safe
28
28
  end
29
29
 
30
30
  private
@@ -6,7 +6,7 @@ module Alchemy
6
6
  def call
7
7
  content_tag(:video, html_options) do
8
8
  tag(:source, src: src, type: attachment.file_mime_type)
9
- end
9
+ end.html_safe
10
10
  end
11
11
 
12
12
  def render?
@@ -121,6 +121,8 @@ module Alchemy
121
121
  has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
122
122
  has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
123
123
 
124
+ has_many :page_ingredients, class_name: "Alchemy::Ingredients::Page", foreign_key: :related_object_id, dependent: :nullify
125
+
124
126
  before_validation :set_language,
125
127
  if: -> { language.nil? }
126
128
 
@@ -28,6 +28,7 @@
28
28
 
29
29
  Alchemy.growl('<%= Alchemy.t(:successfully_added_element) %>');
30
30
  Alchemy.closeCurrentDialog();
31
+ Alchemy.reloadPreview();
31
32
 
32
33
  el = document.querySelector('#element_<%= @element.id %>');
33
34
  el.focusElement();
@@ -35,7 +35,7 @@ module Alchemy
35
35
  defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map { |x| x["controller"] })
36
36
  end
37
37
 
38
- validate_controllers_existence(defined_controllers)
38
+ validate_controllers_existence(defined_controllers, definition_hash)
39
39
  end
40
40
 
41
41
  @@alchemy_modules |= [definition_hash]
@@ -43,7 +43,7 @@ module Alchemy
43
43
 
44
44
  private
45
45
 
46
- def validate_controllers_existence(controllers)
46
+ def validate_controllers_existence(controllers, definition_hash)
47
47
  controllers.each do |controller_val|
48
48
  next if controller_val.blank?
49
49
 
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Alchemy
4
- VERSION = "7.1.6"
4
+ VERSION = "7.1.8"
5
5
 
6
6
  def self.version
7
7
  VERSION
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.1.6
4
+ version: 7.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2024-03-05 00:00:00.000000000 Z
16
+ date: 2024-05-29 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: actionmailer
@@ -1442,7 +1442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1442
1442
  version: '0'
1443
1443
  requirements:
1444
1444
  - ImageMagick (libmagick), v6.6 or greater.
1445
- rubygems_version: 3.4.19
1445
+ rubygems_version: 3.5.9
1446
1446
  signing_key:
1447
1447
  specification_version: 4
1448
1448
  summary: A powerful, userfriendly and flexible CMS for Rails