alchemy_cms 7.1.6 → 7.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 317caab1ef8a6019ed85b61349817e4ae3f04db4a886442aa66a08ef24ea21d3
-  data.tar.gz: 5aa12003198319cabf9cb4c7a2daa4a83bece9b59ce886bcc1082f5f57e709e1
+  metadata.gz: 10dd8a59519d7857b37a4452c589710baed67714eaa650618cfcc6d9deba4361
+  data.tar.gz: 7696cc960f7ea90f59fcca3e422e59eb57f54b5dba794212099d1cda0963659a
 SHA512:
-  metadata.gz: 67ed51a034f0ce690906cfaa8a7d4d06d24184ef7402342c166d9ebcc84e0a3183c9bcc58be7fa8d66671e7e89a3738780cddc0ee97a38c3b4e072ce9454b204
-  data.tar.gz: 4af3eb0ecde2863da57720bf1da7cb63cb298dfcc4647de80b8999feadfe6e0c84dae67c7151f602d52c8d7ca686b52b49b4b1714f1a84e210e32dd77efdc667
+  metadata.gz: cdc696a969e387cf3eef9175d61be4f5a606532698a347afddc6163fa04b3caa0ca4d5607e1d7b6377fc942e749ccae98ba38b05a89fcf4cde514f449feae5fd
+  data.tar.gz: 45bb6037a41654d6d16b8a3dde9fc894a3223b7274c76a9b0c7c0505594b51803a1b692a206bf1bd6f44a13776dc25f675b4059659ff4e56a245cb6faa650494

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 7.1.8 (2024-05-29)
+
+- [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))
+- [7.1-stable] Fix Preview Window width [#2881](https://github.com/AlchemyCMS/alchemy_cms/pull/2881) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.1-stable] Fix preview window resize transition [#2872](https://github.com/AlchemyCMS/alchemy_cms/pull/2872) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [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))
+
+## 7.1.7 (2024-04-12)
+
+- [7.1-stable] Fix Ingredient Boolean View [#2838](https://github.com/AlchemyCMS/alchemy_cms/pull/2838) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [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))
+- [7.1] Reload preview window (again) after element create [#2826](https://github.com/AlchemyCMS/alchemy_cms/pull/2826) ([tvdeyen](https://github.com/tvdeyen))
+- [7.1-stable] Fix module error [#2822](https://github.com/AlchemyCMS/alchemy_cms/pull/2822) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [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))
+
 ## 7.1.6 (2024-03-05)
 
 - [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

@@ -59,3 +59,5 @@ end
 gem "web-console", "~> 4.2", group: :development
 
 gem "rails_live_reload", "~> 0.3.5"
+
+gem "gem-release", "~> 2.2"

data/app/assets/stylesheets/alchemy/elements.scss

@@ -616,15 +616,13 @@ alchemy-publish-element-button {
   .picture_ingredient_css_class {
     position: absolute;
     z-index: 1;
-    bottom: 24px;
-    width: 99px;
-    background-color: white;
+    bottom: 34px;
     background-color: rgba(255, 254, 255, 0.7);
     padding: 4px 8px;
     font-size: $small-font-size;
-    text-align: right;
-    height: 12px;
     overflow: hidden;
+    max-width: 100%;
+    text-overflow: ellipsis;
   }
 }
 

data/app/assets/stylesheets/alchemy/preview_window.scss

@@ -7,7 +7,7 @@
   border: 0 none;
   background: #fff;
   border-right: $default-border;
-  transition: $transition-duration ease-in-out;
+  transition: width $transition-duration ease-in-out;
 
   .collapsed-menu & {
     left: $collapsed-main-menu-width;
@@ -15,10 +15,14 @@
   }
 
   .collapsed-menu.elements-window-visible & {
-    width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width});
+    width: calc(
+      100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width}
+    );
 
-    @media screen and (min-width: $large-screen-break-point) {
-      max-width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-min-width});
+    @media screen and (min-width: 1777px) {
+      width: calc(
+        100vw - #{$collapsed-main-menu-width - $default-border-width} - #{$elements-window-width}
+      );
     }
   }
 }

data/app/components/alchemy/ingredients/audio_view.rb

@@ -4,7 +4,7 @@ module Alchemy
       def call
         content_tag(:audio, **html_options) do
           tag(:source, src: src, type: type)
-        end
+        end.html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/base_view.rb

@@ -16,7 +16,7 @@ module Alchemy
       end
 
       def call
-        value
+        value.html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/boolean_view.rb

@@ -2,7 +2,7 @@ module Alchemy
   module Ingredients
     class BooleanView < BaseView
       def call
-        Alchemy.t(value, scope: "ingredient_values.boolean")
+        Alchemy.t(value.to_s, scope: "ingredient_values.boolean").html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/datetime_view.rb

@@ -15,7 +15,7 @@ module Alchemy
           ingredient.value.to_s(:rfc822)
         else
           ::I18n.l(ingredient.value, format: date_format)
-        end
+        end.html_safe
       end
     end
   end

data/app/components/alchemy/ingredients/file_view.rb

@@ -23,7 +23,7 @@ module Alchemy
             class: ingredient.css_class.presence,
             title: ingredient.title.presence
           }.merge(html_options)
-        )
+        ).html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/headline_view.rb

@@ -7,13 +7,22 @@ module Alchemy
       end
 
       def call
-        content_tag "h#{@level || ingredient.level}",
-          ingredient.value,
-          id: ingredient.dom_id.presence,
-          class: [
-            ingredient.size ? "h#{ingredient.size}" : nil,
-            html_options[:class]
-          ]
+        content_tag tag_name, id: dom_id, class: css_classes do
+          ingredient.value
+        end.html_safe
+      end
+
+      private
+
+      def tag_name = "h#{@level || ingredient.level}"
+
+      def dom_id = ingredient.dom_id.presence
+
+      def css_classes
+        [
+          ingredient.size ? "h#{ingredient.size}" : nil,
+          html_options[:class]
+        ]
       end
     end
   end

data/app/components/alchemy/ingredients/link_view.rb

@@ -12,7 +12,7 @@ module Alchemy
       end
 
       def call
-        link_to(link_text, value, {target: link_target}.merge(html_options))
+        link_to(link_text, value, {target: link_target}.merge(html_options)).html_safe
       end
 
       private

data/app/components/alchemy/ingredients/page_view.rb

@@ -4,7 +4,7 @@ module Alchemy
       delegate :page, to: :ingredient
 
       def call
-        link_to page.name, alchemy.show_page_path(urlname: page.urlname)
+        link_to(page.name, alchemy.show_page_path(urlname: page.urlname)).html_safe
       end
 
       def render?

data/app/components/alchemy/ingredients/picture_view.rb

@@ -57,7 +57,7 @@ module Alchemy
           content_tag(:figure, output, {class: ingredient.css_class.presence}.merge(html_options))
         else
           output
-        end
+        end.html_safe
       end
 
       private

data/app/components/alchemy/ingredients/richtext_view.rb

@@ -15,7 +15,7 @@ module Alchemy
           ingredient.stripped_body
         else
           value.to_s.html_safe
-        end
+        end.html_safe
       end
     end
   end

data/app/components/alchemy/ingredients/text_view.rb

@@ -24,7 +24,7 @@ module Alchemy
             target: ((link_target == "blank") ? "_blank" : nil),
             data: {link_target: link_target}
           }.merge(html_options))
-        end
+        end.html_safe
       end
 
       private

data/app/components/alchemy/ingredients/video_view.rb

@@ -6,7 +6,7 @@ module Alchemy
       def call
         content_tag(:video, html_options) do
           tag(:source, src: src, type: attachment.file_mime_type)
-        end
+        end.html_safe
       end
 
       def render?

data/app/models/alchemy/page.rb

@@ -121,6 +121,8 @@ module Alchemy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
     has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
+    has_many :page_ingredients, class_name: "Alchemy::Ingredients::Page", foreign_key: :related_object_id, dependent: :nullify
+
     before_validation :set_language,
       if: -> { language.nil? }
 

data/app/views/alchemy/admin/elements/create.js.erb

@@ -28,6 +28,7 @@
 
   Alchemy.growl('<%= Alchemy.t(:successfully_added_element) %>');
   Alchemy.closeCurrentDialog();
+  Alchemy.reloadPreview();
 
   el = document.querySelector('#element_<%= @element.id %>');
   el.focusElement();

data/lib/alchemy/modules.rb

@@ -35,7 +35,7 @@ module Alchemy
             defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map { |x| x["controller"] })
           end
 
-          validate_controllers_existence(defined_controllers)
+          validate_controllers_existence(defined_controllers, definition_hash)
         end
 
         @@alchemy_modules |= [definition_hash]
@@ -43,7 +43,7 @@ module Alchemy
 
       private
 
-      def validate_controllers_existence(controllers)
+      def validate_controllers_existence(controllers, definition_hash)
         controllers.each do |controller_val|
           next if controller_val.blank?
 

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.1.6"
+  VERSION = "7.1.8"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.1.6
+  version: 7.1.8
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1442,7 +1442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails