alchemy_cms 6.1.2 → 7.0.0.pre.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f303fbee5eb7ba00c41042f4a2c435e345621eae81768d8c66f86dad04d23d
-  data.tar.gz: e2ad0dfb05e0412676eb203c0ac7829d4945c8e8db879c8393748bb40089ce19
+  metadata.gz: 6b458227c38affbfe51743916b5d726410371bc82d1aecdaec6f587df2fef882
+  data.tar.gz: 14626367bd1b8cb8f891518514915273ebb95f320e9a91e5815108a2109854f3
 SHA512:
-  metadata.gz: 1ec82e1628873bcfb3f1e16826087289ab1dcefe4bb98598ad320bce329c3f1481dc0df28fdbd0570a3fb79f6325de4a9eee510dd4dc6a981f3cc82565bd908b
-  data.tar.gz: 10c17180fbff27a83a2c6f052c200a9723858dea973f547206c9ca094e46b18bdc7130f5914e006acd058296b6783b4adafa47bc2bad87fca29ca6774673a973
+  metadata.gz: '068c0aac56cf25bc3bb88a2c1114db7028f5a1177e71e8763d2f7cd0124cfecbf984aa3b62c75267077af051f5032c18ec779d354a61a6c082b6b96d4d0bc706'
+  data.tar.gz: 6cd013283061060f7d97c0222c474d67e1748b8865c03872cdd00f2c6583d6f3c3c6918d69dff069bd60392e2c0814c0cf1a00cb79ad75f7be49ec6f1032be41

data/.github/workflows/ci.yml

@@ -82,9 +82,6 @@ jobs:
           sudo apt update -qq
           sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
       - name: Restore node modules cache
         id: yarn-cache
         uses: actions/cache@v2.1.3

data/.gitignore

@@ -9,14 +9,9 @@ pkg
 tmp
 log
 .sass-cache
-spec/dummy/.browserslistrc
+spec/dummy/app/assets/builds/*.js*
 spec/dummy/app/javascript/
-spec/dummy/babel.config.js
-spec/dummy/bin/webpack
-spec/dummy/bin/webpack-dev-server
 spec/dummy/config/alchemy/config.yml
-spec/dummy/config/webpack/
-spec/dummy/config/webpacker.yml
 spec/dummy/db/*.sqlite3*
 spec/dummy/package.json
 spec/dummy/postcss.config.js

data/CHANGELOG.md

@@ -1,13 +1,27 @@
 # Changelog
 
-## 6.1.2 (2023-02-27)
-
-- [6.1] Fix thumbnail writing for multi-concurrent and multi-db setups [#2434](https://github.com/AlchemyCMS/alchemy_cms/pull/2434) ([tvdeyen](https://github.com/tvdeyen))
-
-## 6.1.1 (2023-01-23)
-
-- Re-introduce deleted methods [#2422](https://github.com/AlchemyCMS/alchemy_cms/pull/2422) ([tvdeyen](https://github.com/tvdeyen))
-- Add searchable field to page (Alchemy 6.1) [#2420](https://github.com/AlchemyCMS/alchemy_cms/pull/2420) ([kulturbande](https://github.com/kulturbande))
+## 7.0.0 (unreleased)
+
+- Remove deprecations [#2450](https://github.com/AlchemyCMS/alchemy_cms/pull/2450) ([tvdeyen](https://github.com/tvdeyen))
+- Fix respond_to? overwrite in ElementEditor [#2449](https://github.com/AlchemyCMS/alchemy_cms/pull/2449) ([tvdeyen](https://github.com/tvdeyen))
+- Fix installer: Add seeds file if not exists [#2446](https://github.com/AlchemyCMS/alchemy_cms/pull/2446) ([tvdeyen](https://github.com/tvdeyen))
+- Make CapybaraHelpers requireable [#2445](https://github.com/AlchemyCMS/alchemy_cms/pull/2445) ([tvdeyen](https://github.com/tvdeyen))
+- Do not install webpacker tag for fresh apps [#2444](https://github.com/AlchemyCMS/alchemy_cms/pull/2444) ([tvdeyen](https://github.com/tvdeyen))
+- Re-add Webpacker support. [#2443](https://github.com/AlchemyCMS/alchemy_cms/pull/2443) ([tvdeyen](https://github.com/tvdeyen))
+- Add support for more link tabs [#2442](https://github.com/AlchemyCMS/alchemy_cms/pull/2442) ([tvdeyen](https://github.com/tvdeyen))
+- Add support for Ransack 4 [#2438](https://github.com/AlchemyCMS/alchemy_cms/pull/2438) ([tvdeyen](https://github.com/tvdeyen))
+- Fix non_stupid_digest_assets [#2436](https://github.com/AlchemyCMS/alchemy_cms/pull/2436) ([tvdeyen](https://github.com/tvdeyen))
+- Add PictureThumb.storage_class [#2435](https://github.com/AlchemyCMS/alchemy_cms/pull/2435) ([tvdeyen](https://github.com/tvdeyen))
+- Fix thumbnail writing for multi-concurrent and multi-db setups [#2433](https://github.com/AlchemyCMS/alchemy_cms/pull/2433) ([tvdeyen](https://github.com/tvdeyen))
+- Integrate non_stupid_digest_assets gem [#2430](https://github.com/AlchemyCMS/alchemy_cms/pull/2430) ([afdev82](https://github.com/afdev82))
+- Define allowed settings in ingredients [#2425](https://github.com/AlchemyCMS/alchemy_cms/pull/2425) ([tvdeyen](https://github.com/tvdeyen))
+- Remove webpacker [#2424](https://github.com/AlchemyCMS/alchemy_cms/pull/2424) ([tvdeyen](https://github.com/tvdeyen))
+- Remove deprecated methods [#2421](https://github.com/AlchemyCMS/alchemy_cms/pull/2421) ([tvdeyen](https://github.com/tvdeyen))
+- Remove 6.0 upgrade tasks [#2418](https://github.com/AlchemyCMS/alchemy_cms/pull/2418) ([tvdeyen](https://github.com/tvdeyen))
+- Compress 6.1 migrations [#2417](https://github.com/AlchemyCMS/alchemy_cms/pull/2417) ([tvdeyen](https://github.com/tvdeyen))
+- Remove all content/essence related code [#2416](https://github.com/AlchemyCMS/alchemy_cms/pull/2416) ([tvdeyen](https://github.com/tvdeyen))
+- Remove RSS Feed feature [#2415](https://github.com/AlchemyCMS/alchemy_cms/pull/2415) ([tvdeyen](https://github.com/tvdeyen))
+- Add searchable field to page [#2414](https://github.com/AlchemyCMS/alchemy_cms/pull/2414) ([kulturbande](https://github.com/kulturbande))
 
 ## 6.1.0 (2023-01-19)
 

data/Gemfile

@@ -19,6 +19,7 @@ group :development, :test do
   # in our case the culprit is `handlebars-assets`. The changes between 2.7.0 and 2.8.0 are
   # minimal, but breaking.
   gem "execjs", "= 2.8.1"
+  gem "jsbundling-rails", "~> 1.1"
 
   if ENV["GITHUB_ACTIONS"]
     # Necessary because GH Actions gem cache does not have this "Bundled with Ruby" gem installed

data/Rakefile

@@ -44,13 +44,14 @@ namespace :alchemy do
           yarn install && \
           yarn link && \
           cd spec/dummy && \
+          yarn link @alchemy_cms/admin && \
           export RAILS_ENV=test && \
           bin/rake db:create && \
           bin/rake db:environment:set && \
           bin/rake db:migrate:reset && \
+          bin/rails javascript:install:esbuild && \
           bin/rails g alchemy:install --skip --skip-demo-files --auto-accept --skip-db-create && \
-          yarn link @alchemy_cms/admin && \
-          RAILS_ENV=test bin/webpack && \
+          bin/rails javascript:build && \
           cd -
         BASH
       ) || fail
@@ -63,13 +64,17 @@ namespace :alchemy do
       original_file = "./CHANGELOG.md"
       new_file = original_file + ".new"
       backup = original_file + ".old"
-      changes = `git rev-list v#{ENV["PREVIOUS_VERSION"]}..HEAD | bundle exec github_fast_changelog AlchemyCMS/alchemy_cms`
-      File.open(new_file, "w") do |fo|
-        fo.puts changes
-        File.foreach(original_file) do |li|
-          fo.puts li
+      changes = `git rev-list v#{ENV["PREVIOUS_VERSION"]}..HEAD | bundle exec github_fast_changelog AlchemyCMS/alchemy_cms`.split("\n")
+      changelog = File.read(original_file)
+      File.open(new_file, "w") do |file|
+        changes.each do |change|
+          next if changelog.include?(change)
+          file.puts change
+        end
+        File.foreach(original_file) do |line|
+          file.puts line
         end
-        fo.puts ""
+        file.puts ""
       end
       File.rename(original_file, backup)
       File.rename(new_file, original_file)

data/alchemy_cms.gemspec

@@ -45,15 +45,13 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "jquery-ui-rails", ["~> 6.0"]
   gem.add_runtime_dependency "kaminari", ["~> 1.1"]
   gem.add_runtime_dependency "originator", ["~> 3.1"]
-  gem.add_runtime_dependency "non-stupid-digest-assets", ["~> 1.0.8"]
-  gem.add_runtime_dependency "ransack", [">= 1.8", "< 4.0"]
+  gem.add_runtime_dependency "ransack", [">= 1.8", "< 5.0"]
   gem.add_runtime_dependency "request_store", ["~> 1.2"]
   gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]
   gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]
   gem.add_runtime_dependency "simple_form", [">= 4.0", "< 6"]
   gem.add_runtime_dependency "sprockets", [">= 3.0", "< 5"]
   gem.add_runtime_dependency "turbolinks", [">= 2.5"]
-  gem.add_runtime_dependency "webpacker", [">= 4.0", "< 6"]
 
   gem.add_development_dependency "capybara", ["~> 3.0"]
   gem.add_development_dependency "capybara-screenshot", ["~> 1.0"]

data/app/assets/javascripts/alchemy/alchemy.dirty.js.coffee

@@ -20,7 +20,7 @@ $.extend Alchemy,
   setElementClean: (element) ->
     $element = $(element)
     $element.removeClass('dirty')
-    $element.find('> .element-content .dirty').removeClass('dirty')
+    $element.find('> .element-body .dirty').removeClass('dirty')
     window.onbeforeunload = undefined
 
   isPageDirty: ->

data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee

@@ -15,7 +15,7 @@ Alchemy.ElementEditors =
   init: ->
     @element_area = $("#element_area")
     @bindEvents()
-    @expandContentGroups()
+    @expandIngredientGroups()
     return
 
   # Binds click events on several DOM elements from element editors
@@ -29,27 +29,25 @@ Alchemy.ElementEditors =
       @onDoubleClickElement(e)
     @element_area.on "click", "[data-element-toggle]", (e) =>
       @onClickToggle(e)
-    @element_area.on "click", '[data-create-missing-content]', (e) =>
-      @onClickMissingContent(e)
     # Binds the custom FocusElementEditor event
     @element_area.on "FocusElementEditor.Alchemy", '.element-editor', (e) =>
       @onFocusElement(e)
     # Binds the custom SaveElement event
     @element_area.on "SaveElement.Alchemy", '.element-editor', (e, data) =>
       @onSaveElement(e, data)
-    @element_area.on "click", '[data-toggle-content-group]', (e) =>
-      @onToggleContentGroup(e)
+    @element_area.on "click", '[data-toggle-ingredient-group]', (e) =>
+      @onToggleIngredientGroup(e)
     # Listen to postMessage messages from the preview frame
     window.addEventListener 'message', (e) =>
       @onMessage(e.data)
       true
     return
 
-  # Expands content groups that are stored in sessionStorage as expanded
-  expandContentGroups: ->
-    if $expanded_content_groups = sessionStorage.getItem('Alchemy.expanded_content_groups')
-      for header_id in JSON.parse($expanded_content_groups) then do (header_id) =>
-        $('#' + header_id).closest('.content-group').addClass('expanded');
+  # Expands ingredient groups that are stored in sessionStorage as expanded
+  expandIngredientGroups: ->
+    if $expanded_ingredient_groups = sessionStorage.getItem('Alchemy.expanded_ingredient_groups')
+      for header_id in JSON.parse($expanded_ingredient_groups) then do (header_id) =>
+        $('#' + header_id).closest('.ingredient-group').addClass('expanded');
 
   # Selects and scrolls to element with given id in the preview window.
   #
@@ -179,21 +177,21 @@ Alchemy.ElementEditors =
       Alchemy.Buttons.enable($element)
     true
 
-  # Toggle visibility of the content fields in the group
-  onToggleContentGroup: (event) ->
-    $group_div = $(event.currentTarget).closest('.content-group');
+  # Toggle visibility of the ingredient fields in the group
+  onToggleIngredientGroup: (event) ->
+    $group_div = $(event.currentTarget).closest('.ingredient-group');
     $group_div.toggleClass('expanded');
 
-    $expanded_content_groups = JSON.parse(sessionStorage.getItem('Alchemy.expanded_content_groups') || '[]');
-    # Add or remove depending on whether this content group is expanded
+    $expanded_ingredient_groups = JSON.parse(sessionStorage.getItem('Alchemy.expanded_ingredient_groups') || '[]');
+    # Add or remove depending on whether this ingredient group is expanded
     if $group_div.hasClass('expanded')
-      if $expanded_content_groups.indexOf(event.currentTarget.id) == -1
-        $expanded_content_groups.push(event.currentTarget.id);
+      if $expanded_ingredient_groups.indexOf(event.currentTarget.id) == -1
+        $expanded_ingredient_groups.push(event.currentTarget.id);
     else
-      $expanded_content_groups = $expanded_content_groups.filter (value) ->
+      $expanded_ingredient_groups = $expanded_ingredient_groups.filter (value) ->
         value != event.currentTarget.id
 
-    sessionStorage.setItem('Alchemy.expanded_content_groups', JSON.stringify($expanded_content_groups))
+    sessionStorage.setItem('Alchemy.expanded_ingredient_groups', JSON.stringify($expanded_ingredient_groups))
     false
 
   # Event handlers
@@ -248,22 +246,10 @@ Alchemy.ElementEditors =
     e.stopPropagation()
     false
 
-  # Handles the missing content button click events.
-  #
-  # Ensures that the links query string is converted into post body and send
-  # the request via a real ajax post to server, to allow long query strings.
-  #
-  onClickMissingContent: (e) ->
-    link = e.target
-    url = link.pathname
-    querystring = link.search.replace(/\?/, '')
-    $.post(url, querystring)
-    false
-
   # private
 
   _shouldUpdateTitle: (element, event) ->
-    editors = element.find('> .element-content .element-content-editors, > .element-content .element-ingredient-editors').children()
+    editors = element.find('> .element-body .element-ingredient-editors').children()
     if @_hasParents(element)
       editors.length != 0
     else if @_isParent(element) && @_isFirstChild $(event.target)

data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee

@@ -50,8 +50,8 @@ Alchemy.ElementsWindow =
     $.get @url, (data) =>
       @element_area.html data
       Alchemy.GUI.init(@element_area)
-      Alchemy.fileEditors(@element_area.find(".essence_file, .essence_video, .essence_audio, .ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
-      Alchemy.pictureEditors(@element_area.find(".essence_picture, .ingredient-editor.picture").selector)
+      Alchemy.fileEditors(@element_area.find(".ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
+      Alchemy.pictureEditors(@element_area.find(".ingredient-editor.picture").selector)
       if @callback
         @callback.call()
     .fail (xhr, status, error) =>

data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee

@@ -23,5 +23,5 @@ Alchemy.GUI =
     Alchemy.ElementDirtyObserver($el)
     Alchemy.GUI.init($el && $el.selector)
     Alchemy.ImageLoader($el[0])
-    Alchemy.fileEditors($el.find(".essence_file, .essence_video, .essence_audio, .ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
-    Alchemy.pictureEditors($el.find(".essence_picture, .ingredient-editor.picture").selector)
+    Alchemy.fileEditors($el.find(".ingredient-editor.file, .ingredient-editor.audio, .ingredient-editor.video").selector)
+    Alchemy.pictureEditors($el.find(".ingredient-editor.picture").selector)

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -1,5 +1,5 @@
 # Represents the link Dialog that appears, if a user clicks the link buttons
-# in TinyMCE or on an Essence that has links enabled (e.g. EssencePicture)
+# in TinyMCE or on an Ingredient that has links enabled (e.g. Picture)
 #
 class window.Alchemy.LinkDialog extends Alchemy.Dialog
 
@@ -25,37 +25,29 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     # attach events we handle
     @attachEvents()
     # Store some jQuery objects for further reference
-    @$page_urlname = $('#page_urlname', @dialog_body)
+    @$internal_link = $('#internal_link', @dialog_body)
     @$element_anchor = $('#element_anchor', @dialog_body)
     @$anchor_link = $('#anchor_link', @dialog_body)
-    @$external_url = $('#external_url', @dialog_body)
-    @$public_filename = $('#public_filename', @dialog_body)
+    @$external_link = $('#external_link', @dialog_body)
+    @$file_link = $('#file_link', @dialog_body)
     @$overlay_tabs = $('#overlay_tabs', @dialog_body)
     @$page_container = $('#page_selector_container')
+    @initAnchorLinks()
     # if we edit an existing link
     if @link_object
       # we select the correct tab
       @selectTab()
     @initPageSelect()
-    @initAnchorLinks()
+    return
 
   # Attaches click events to several buttons in the link dialog.
   attachEvents: ->
     # The ok buttons
     $('.create-link.button', @dialog_body).click (e) =>
       @link_type = $(e.target).data('link-type')
-      switch @link_type
-        # get stored url for link type
-        when 'external'
-          url = @$external_url.val()
-        when 'file'
-          url = @$public_filename.val()
-        when 'anchor'
-          url = @$anchor_link.val()
-        else
-          url = @$page_urlname.val()
-          if @$element_anchor.val() != ''
-            url += "##{@$element_anchor.val()}"
+      url = $("##{@link_type}_link").val()
+      if @link_type == 'internal' && @$element_anchor.val() != ''
+        url += "##{@$element_anchor.val()}"
       # Create the link
       @createLink
         url: url
@@ -67,7 +59,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
   initPageSelect: ->
     pageTemplate = HandlebarsTemplates.page
     element_anchor_placeholder = @$element_anchor.attr('placeholder')
-    @$page_urlname.select2
+    @$internal_link.select2
       placeholder: Alchemy.t('Search page')
       allowClear: true
       minimumInputLength: 3
@@ -142,7 +134,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
       @setLink(options.url, options.title, options.target)
     @close()
 
-  # Sets the link either in TinyMCE or on an Essence.
+  # Sets the link either in TinyMCE or on an Ingredient.
   setLink: (url, title, target) ->
     Alchemy.setElementDirty(@$link_object.closest('.element-editor'))
     if @link_object.editor
@@ -162,7 +154,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     editor.selection.collapse()
     true
 
-  # Sets a link on an Essence (e.g. EssencePicture).
+  # Sets a link on an Ingredient (e.g. Picture).
   setLinkFields: (url, title, target) ->
     @link_value_field.value = url
     @link_value_field.dispatchEvent(new Event("change"))
@@ -176,10 +168,10 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
 
   # Selects the correct tab for link type and fills all fields.
   selectTab: ->
-    # Creating an temporary anchor node if we are linking an EssencePicture or EssenceText.
+    # Creating an temporary anchor node if we are linking an Picture Ingredient.
     if (@link_object.nodeType)
       @$link = @createTempLink()
-    # Restoring the bookmarked selection inside the TinyMCE of an EssenceRichtext.
+    # Restoring the bookmarked selection inside the TinyMCE of an Richtext.
     else if (@link_object.node.nodeName == 'A')
       @$link = $(@link_object.node)
       @link_object.selection.moveToBookmark(@link_object.bookmark)
@@ -192,27 +184,33 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     if @$link.hasClass('external')
       # Handles an external link.
       tab = $('#overlay_tab_external_link')
-      @$external_url.val(@$link.attr('href'))
+      @$external_link.val(@$link.attr('href'))
     else if @$link.hasClass('file')
       # Handles a file link.
       tab = $('#overlay_tab_file_link')
-      @$public_filename.select2('val', @$link[0].pathname + @$link[0].search)
+      @$file_link.select2('val', @$link[0].pathname + @$link[0].search)
     else if @$link.attr('href').match(/^#/)
       # Handles an anchor link.
       tab = $('#overlay_tab_anchor_link')
       @$anchor_link.select2('val', @$link.attr('href'))
-    else
+    else if @$link.hasClass('internal')
       # Handles an internal link.
       tab = $('#overlay_tab_internal_link')
       @initInternalLinkTab()
-    # activate the tab jquery ui 1.10 style o.O
-    @$overlay_tabs.tabs('option', 'active', $('#overlay_tabs > div').index(tab))
+    else
+      # Emit an event to allow extensions hook into the link overlay.
+      @$overlay_tabs.trigger 'SelectLinkTab.Alchemy',
+        link: @$link
+    if tab
+      # activate the tab jquery ui 1.10 style o.O
+      @$overlay_tabs.tabs('option', 'active', $('#overlay_tabs > div').index(tab))
+    return
 
   # Handles actions for internal link tab.
   initInternalLinkTab: ->
     url = @$link.attr('href').split('#')
     # update the url field
-    @$page_urlname.val(url[0])
+    @$internal_link.val(url[0])
     # store the anchor
     @$element_anchor.val(url[1])
 
@@ -251,7 +249,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
 
   # Public class methods
 
-  # Removes link from Essence.
+  # Removes link from Ingredient.
   @removeLink = (link, parent_selector) ->
     parent = document.querySelector(parent_selector)
     link_value_field = parent.querySelector("[data-link-value]")

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

@@ -275,11 +275,10 @@
       }
     }
 
-    .element-content {
+    .element-body {
       margin: 4px 8px;
     }
 
-    .content_editor,
     .ingredient-editor,
     .picture_thumbnail {
       width: 100%;
@@ -303,7 +302,7 @@
     }
   }
 
-  .element-content {
+  .element-body {
     margin: 2 * $default-padding;
   }
 
@@ -414,7 +413,7 @@
   }
 }
 
-.content-group {
+.ingredient-group {
   width: 100%;
   padding: $default-padding 0;
   position: relative;
@@ -425,7 +424,7 @@
     padding-bottom: 0;
   }
 
-  .content-group-header {
+  .ingredient-group-header {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -434,22 +433,21 @@
     padding: $default-padding 1px;
   }
 
-  .content-group-contents {
+  .ingredient-group-ingredients {
     display: none;
   }
 
   &.expanded {
-    .content-group-contents {
+    .ingredient-group-ingredients {
       display: block;
     }
 
-    .content-group-expand {
+    .ingredient-group-expand {
       @extend .fa-angle-up;
     }
   }
 }
 
-.element-content-editors,
 .element-ingredient-editors {
   display: flex;
   flex-wrap: wrap;
@@ -467,7 +465,7 @@
   min-height: 100px;
 }
 
-.linkable_essence_tools {
+.ingredient_link_buttons {
   display: flex;
   position: absolute;
   bottom: 2 * $default-margin;
@@ -495,7 +493,7 @@
       background-color: $form-field-disabled-bg-color;
     }
 
-    &.linked.link-essence {
+    &.linked.link-ingredient {
       @include linked-button(
         $border-radius: 0,
         $line-height: 30px,
@@ -507,7 +505,7 @@
       }
     }
 
-    &.linked.unlink-essence {
+    &.linked.unlink-ingredient {
       @include linked-button(
         $border-radius: 0 $default-border-radius $default-border-radius 0,
         $line-height: 30px,
@@ -519,7 +517,7 @@
       }
     }
 
-    &.unlink-essence {
+    &.unlink-ingredient {
       border-left-width: 0;
       @extend .right-rounded-border;
     }
@@ -561,7 +559,6 @@
   }
 }
 
-.essence_picture,
 .ingredient-editor.picture {
   position: relative;
 
@@ -586,7 +583,7 @@
     }
   }
 
-  .essence_picture_css_class {
+  .picture_ingredient_css_class {
     position: absolute;
     z-index: 1;
     bottom: 24px;
@@ -639,9 +636,6 @@
   }
 }
 
-.content_editor.essence_audio,
-.content_editor.essence_file,
-.content_editor.essence_video,
 .ingredient-editor.audio,
 .ingredient-editor.file,
 .ingredient-editor.video {
@@ -681,8 +675,7 @@
   }
 }
 
-.file_tools,
-.essence_file_tools {
+.file_tools {
   display: flex;
   align-items: center;
   margin-left: auto;
@@ -717,7 +710,6 @@ select.long {
   padding: 0;
 }
 
-.content_editor,
 .ingredient-editor {
   width: 100%;
   padding: $default-padding 0;
@@ -828,7 +820,6 @@ select.long {
     }
   }
 
-  &.essence_select,
   &.select {
     label {
       margin-bottom: 2 * $default-margin;
@@ -843,8 +834,7 @@ select.long {
     }
   }
 
-  select.ingredient-editor-select,
-  select.essence_editor_select {
+  select.ingredient-editor-select {
     border-radius: $default-border-radius;
     background: white;
     border: 1px solid $button-border-color;
@@ -871,13 +861,11 @@ select.long {
     }
   }
 
-  &.essence_picture,
   &.picture {
     width: 50%;
     padding-left: 1px; // Compensate the box shadow
     padding-right: $default-padding;
 
-    + .essence_picture,
     + .picture {
       padding-left: $default-padding;
       padding-right: 1px; // Compensate the box shadow
@@ -885,10 +873,6 @@ select.long {
   }
 }
 
-.content_rtf_text_area {
-  display: none;
-}
-
 div.pictures_for_element {
   overflow: auto;
   margin-top: 4px;
@@ -898,7 +882,7 @@ textarea.has_tinymce {
   visibility: hidden;
 }
 
-.essence_html textarea {
+.ingredient-editor.html textarea {
   font-family: $mono-font-family;
   resize: vertical;
   font-size: $form-field-font-size;
@@ -928,8 +912,6 @@ textarea.has_tinymce {
   }
 }
 
-.content_editor .hint-with-icon,
-.content_editor .with-hint,
 .ingredient-editor .hint-with-icon,
 .ingredient-editor .with-hint,
 .element-handle .hint-with-icon {
@@ -946,7 +928,7 @@ textarea.has_tinymce {
 }
 
 .is-fixed {
-  &.with-contents {
+  &.with-ingredients {
     > .element-footer {
       border-top: 0;
       border-bottom: 1px solid $medium-gray;
@@ -992,7 +974,6 @@ textarea.has_tinymce {
 }
 
 .ingredient-date--label,
-.essence_date--label,
 .edit-ingredient-anchor-link {
   position: absolute;
   right: 2 * $default-padding;

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

@@ -249,10 +249,6 @@ form {
   }
 }
 
-textarea#essence_picture_caption {
-  height: 61px;
-}
-
 // styles for link overlay selects
 .window_form {
   td.checkbox {

data/app/assets/stylesheets/alchemy/node-select.scss

@@ -35,9 +35,9 @@
 }
 
 // The container of the rendered node is slightly larger than other a line of
-// text, as it would be for the Alchemy::EssencePage. Reducing the padding here from 0.6em
+// text, as it would be for the Alchemy::Ingredients::Page. Reducing the padding here from 0.6em
 // to 0.4em centers the content nicely.
-.essence_node {
+.ingredient-editor.node {
   .select2-container.alchemy_selectbox .select2-choice {
     padding: 0.4em 0.75em;
   }