alchemy_cms 5.3.4 → 6.0.0.b1

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

@@ -45,13 +45,13 @@
   }
 
   > .message {
-    margin: 2*$default-margin
+    margin: 2 * $default-margin;
   }
 }
 
 #main-content-elements,
 .element-editor.is-fixed .nestable-elements {
-  padding: 2*$default-padding $default-padding 2px;
+  padding: 2 * $default-padding $default-padding 2px;
 }
 
 .element-title {
@@ -124,7 +124,7 @@
   border: 1px solid $default-border-color;
   border-radius: $default-border-radius;
   background-color: $light-gray;
-  margin-bottom: 2*$default-margin;
+  margin-bottom: 2 * $default-margin;
   transition: box-shadow $transition-duration;
 
   &.hidden {
@@ -165,7 +165,7 @@
   &.dirty {
     border-color: #d0c83d;
 
-    >.element-header {
+    > .element-header {
       background-color: #fff8df;
     }
   }
@@ -189,7 +189,8 @@
     }
   }
 
-  &.selected:not(.is-fixed), &:hover {
+  &.selected:not(.is-fixed),
+  &:hover {
     &:not(.hidden) {
       box-shadow: 0 2px 8px rgba(#9b9b9b, 0.75);
     }
@@ -203,7 +204,6 @@
   }
 
   &.folded {
-
     .nested-elements {
       display: none;
     }
@@ -248,7 +248,7 @@
       transition: all $transition-duration;
     }
 
-    .element-header:hover+.element-toolbar,
+    .element-header:hover + .element-toolbar,
     .element-toolbar:hover {
       visibility: visible;
       opacity: 1;
@@ -280,6 +280,7 @@
     }
 
     .content_editor,
+    .ingredient-editor,
     .picture_thumbnail {
       width: 100%;
     }
@@ -303,7 +304,7 @@
   }
 
   .element-content {
-    margin: 2*$default-padding;
+    margin: 2 * $default-padding;
   }
 
   .validation_notice {
@@ -315,7 +316,7 @@
   }
 
   .message {
-    margin: 2*$default-margin;
+    margin: 2 * $default-margin;
   }
 
   .foot_note {
@@ -343,7 +344,7 @@
   hr {
     height: 0;
     width: 100%;
-    margin: 0 0 4*$default-margin 0;
+    margin: 0 0 4 * $default-margin 0;
     border: 0 none;
     border-top: 1px solid $medium-gray;
     opacity: 1;
@@ -352,7 +353,7 @@
 
 .element-header {
   position: relative;
-  padding: 2*$default-padding;
+  padding: 2 * $default-padding;
   background-color: $element-header-bg-color;
   @extend .disable-user-select;
   cursor: pointer;
@@ -369,7 +370,7 @@
     transition: color $transition-duration;
   }
 
-  >.hint-with-icon {
+  > .hint-with-icon {
     position: absolute;
     right: 32px;
     top: 10px;
@@ -405,7 +406,7 @@
 
 .element-footer {
   border-top: 1px solid $medium-gray;
-  padding: 2*$default-padding;
+  padding: 2 * $default-padding;
   text-align: right;
 
   .button {
@@ -413,7 +414,8 @@
   }
 }
 
-.element-content-editors {
+.element-content-editors,
+.element-ingredient-editors {
   display: flex;
   flex-wrap: wrap;
 }
@@ -437,7 +439,8 @@
   right: 0;
 
   .icon_button {
-    @include button-defaults($background-color: $medium-gray,
+    @include button-defaults(
+      $background-color: $medium-gray,
       $hover-color: darken($medium-gray, 5%),
       $border: 1px solid #c0c0c0,
       $box-shadow: none,
@@ -447,7 +450,8 @@
       $margin: 0,
       $border-radius: 0,
       $focus-border-color: $focus-color,
-      $focus-box-shadow: 0 0 0 2px $focus-color);
+      $focus-box-shadow: 0 0 0 2px $focus-color
+    );
     width: 29px;
     height: $form-field-height;
 
@@ -457,9 +461,11 @@
     }
 
     &.linked.link-essence {
-      @include linked-button($border-radius: 0,
+      @include linked-button(
+        $border-radius: 0,
         $line-height: 30px,
-        $padding: 0);
+        $padding: 0
+      );
 
       &:focus {
         border-radius: 0;
@@ -467,9 +473,11 @@
     }
 
     &.linked.unlink-essence {
-      @include linked-button($border-radius: 0 $default-border-radius $default-border-radius 0,
+      @include linked-button(
+        $border-radius: 0 $default-border-radius $default-border-radius 0,
         $line-height: 30px,
-        $padding: 0);
+        $padding: 0
+      );
 
       &:focus {
         border-radius: 0 $default-border-radius $default-border-radius 0;
@@ -487,7 +495,7 @@
   height: 36px;
   border: 1px dotted $button-border-color;
   background-color: $medium-gray;
-  margin-bottom: 2*$default-margin;
+  margin-bottom: 2 * $default-margin;
   border-radius: $default-border-radius;
 }
 
@@ -518,21 +526,10 @@
   }
 }
 
-.essence_picture {
+.essence_picture,
+.ingredient-editor.picture {
   position: relative;
 
-  .picture_tool_delete {
-    position: absolute;
-    right: $default-margin;
-    top: $default-margin;
-    padding: 2px 2px 0;
-    z-index: 2;
-  }
-
-  .picture_thumbnail:hover .picture_tool_delete {
-    display: block;
-  }
-
   .picture_thumbnail {
     display: inline-block;
     width: 160px;
@@ -541,7 +538,7 @@
   }
 
   &.validation_failed .picture_thumbnail {
-    border-color: $error_border_color
+    border-color: $error_border_color;
   }
 
   .thumbnail_background .icon {
@@ -565,9 +562,15 @@
   }
 }
 
-.content_editor.essence_file {
-
+.content_editor.essence_audio,
+.content_editor.essence_file,
+.content_editor.essence_video,
+.ingredient-editor.audio,
+.ingredient-editor.file,
+.ingredient-editor.video {
   .file {
+    display: flex;
+    align-items: center;
     margin: 6px 0 $default-margin;
     border: $default-border;
     background-color: $white;
@@ -581,35 +584,39 @@
   }
 
   .file_icon {
-    display: inline-block;
     text-align: center;
-    float: left;
     width: 24px;
-    padding: 6px 4px;
+    padding: $default-padding;
   }
 
   .file_name {
     white-space: nowrap;
     overflow: hidden;
-    float: left;
     max-width: 80%;
-    line-height: 28px;
     font-size: $small-font-size;
     text-overflow: ellipsis;
+    padding: $default-padding;
+  }
+
+  .remove_file_link {
+    width: 24px;
+    padding: $default-padding;
   }
 }
 
+.file_tools,
 .essence_file_tools {
-  height: 27px;
-  float: right;
+  display: flex;
+  align-items: center;
+  margin-left: auto;
   background-color: white;
   width: 48px;
   border-radius: 0 $default-border-radius $default-border-radius 0;
 
   a {
+    text-align: center;
     text-decoration: none;
-    padding: 6px $default-margin;
-    float: left;
+    padding: $default-padding;
   }
 }
 
@@ -633,7 +640,8 @@ select.long {
   padding: 0;
 }
 
-.content_editor {
+.content_editor,
+.ingredient-editor {
   width: 100%;
   padding: $default-padding 0;
   position: relative;
@@ -644,7 +652,6 @@ select.long {
   }
 
   &.missing {
-
     .message {
       margin: 0;
       @include clearfix;
@@ -675,13 +682,12 @@ select.long {
   }
 
   &.validation_failed {
-
-    label {
-      color: $error_text_color
+    > label {
+      color: $error_text_color;
     }
 
     input {
-      @extend %field-with-error
+      @extend %field-with-error;
     }
 
     .tinymce_container {
@@ -727,10 +733,10 @@ select.long {
     }
   }
 
-  &.essence_select {
-
+  &.essence_select,
+  &.select {
     label {
-      margin-bottom: 2*$default-margin
+      margin-bottom: 2 * $default-margin;
     }
 
     .select2-container {
@@ -742,6 +748,7 @@ select.long {
     }
   }
 
+  select.ingredient-editor-select,
   select.essence_editor_select {
     border-radius: $default-border-radius;
     background: white;
@@ -769,12 +776,14 @@ select.long {
     }
   }
 
-  &.essence_picture {
+  &.essence_picture,
+  &.picture {
     width: 50%;
     padding-left: 1px; // Compensate the box shadow
     padding-right: $default-padding;
 
-    +.essence_picture {
+    + .essence_picture,
+    + .picture {
       padding-left: $default-padding;
       padding-right: 1px; // Compensate the box shadow
     }
@@ -812,7 +821,7 @@ textarea.has_tinymce {
   margin-top: 8px;
   margin-bottom: 8px;
   background-color: $error_background_color;
-  padding: 2*$default-padding;
+  padding: 2 * $default-padding;
   list-style-type: none;
   border-radius: $default-border-radius;
   color: $error_text_color;
@@ -826,10 +835,12 @@ 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 {
   margin: 0;
 
-  >.hint-bubble {
+  > .hint-bubble {
     left: -7px;
     transform: none;
 
@@ -841,13 +852,13 @@ textarea.has_tinymce {
 
 .is-fixed {
   &.with-contents {
-    >.element-footer {
+    > .element-footer {
       border-top: 0;
       border-bottom: 1px solid $medium-gray;
     }
   }
 
-  >.nestable-elements .add-nestable-element-button {
+  > .nestable-elements .add-nestable-element-button {
     width: 100%;
     text-align: center;
   }
@@ -885,6 +896,7 @@ textarea.has_tinymce {
   }
 }
 
+.ingredient-date--label,
 .essence_date--label {
   position: absolute;
   right: 7px;

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

@@ -0,0 +1,8 @@
+img {
+  opacity: 1;
+  transition: opacity $transition-duration;
+
+  &.loading {
+    opacity: 0;
+  }
+}

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

@@ -8,12 +8,13 @@
 .node-select--node {
   display: flex;
   align-items: center;
+  height: 21px;
 
   .icon {
     margin: 0 8px 0 4px;
 
     .select2-highlighted & {
-      color: $white
+      color: $white;
     }
   }
 }
@@ -24,12 +25,12 @@
 
 .node-select--node-url {
   margin-left: auto;
-  padding: $default-padding 2*$default-padding;
+  padding: $default-padding 2 * $default-padding;
   color: $dark-gray;
   font-size: $small-font-size;
 
   .select2-highlighted & {
-    color: $white
+    color: $white;
   }
 }
 

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

@@ -1,4 +1,5 @@
 .page-select--page,
+.page-select--page-name,
 .page-select--page-urlname {
   text-overflow: ellipsis;
   overflow: hidden;
@@ -7,49 +8,24 @@
 
 .page-select--page {
   display: flex;
-  flex-direction: column;
+  align-items: center;
 
   .icon {
     margin: 0 8px 0 4px;
 
     .select2-highlighted & {
-      color: $white;
+      color: $white
     }
   }
 }
 
-.page-select--top,
-.page-select--bottom {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-
-.page-select--bottom {
-  font-size: $small-font-size;
-  padding-left: 6 * $default-padding;
-}
-
-.page-select--language-code {
-  display: inline-block;
-  background-color: $medium-gray;
-  margin-left: auto;
-  border-radius: $default-border-radius;
-  padding: $default-padding / 2 $default-padding;
-
-  .select2-highlighted & {
-    color: $select-hover-bg-color;
-    background-color: white;
-  }
-}
-
 .page-select--page-urlname {
   margin-left: auto;
-  padding: $default-padding 2 * $default-padding;
+  padding: $default-padding 2*$default-padding;
   color: $dark-gray;
   font-size: $small-font-size;
 
   .select2-highlighted & {
-    color: $white;
+    color: $white
   }
 }

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

@@ -23,7 +23,7 @@ $sitemap-url-xlarge-width: 350px;
 
 #sitemap-wrapper {
   position: relative;
-  min-height: calc(100vh - 148px);
+  min-height: calc(100vh - 96px);
 }
 
 .sitemap_pagename_link {
@@ -142,16 +142,18 @@ $sitemap-url-xlarge-width: 350px;
 #sitemap {
   padding: 0 0 104px 0;
 
-  .handle {
-    cursor: move;
+  &.sorting {
+    padding-top: 100px;
+
+    .page_icon {
+      cursor: move;
+    }
   }
 
   .page_folder {
     position: absolute;
     left: -23px;
     top: 0;
-    width: 16px;
-    height: $sitemap-line-height;
   }
 
   .placeholder {
@@ -256,7 +258,3 @@ $sitemap-url-xlarge-width: 350px;
     }
   }
 }
-
-#search_field_clear {
-  cursor: pointer;
-}

data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss

@@ -30,7 +30,7 @@ td,th {
 
 .mce-object {
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/object.gif') no-repeat center;
+  background: #d5d5d5 url(img/object.gif) no-repeat center;
 }
 
 .mce-pagebreak {
@@ -55,7 +55,7 @@ td,th {
   width: 9px!important;
   height: 9px!important;
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/anchor.gif') no-repeat center;
+  background: #d5d5d5 url(img/anchor.gif) no-repeat center;
 }
 
 .mce-nbsp {
@@ -77,7 +77,7 @@ hr {
 }
 
 .mce-spellchecker-word {
-  background: url('tinymce/skins/alchemy/fonts/img/wline.gif') repeat-x bottom left;
+  background: url(img/wline.gif) repeat-x bottom left;
   cursor: default;
 }
 

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -1561,23 +1561,23 @@ i.mce-i-resize {
   opacity: 0.6;
   filter: alpha(opacity=60);
   zoom: 1;
-  background: #fff url('tinymce/skins/alchemy/fonts/img/loader.gif') no-repeat center center;
+  background: #fff url('img/loader.gif') no-repeat center center;
 }
 
 @font-face {
   font-family: 'tinymce';
-  src: url('tinymce/skins/alchemy/fonts/tinymce.woff') format('woff'),
-       url('tinymce/skins/alchemy/fonts/tinymce.ttf') format('truetype'),
-       url('tinymce/skins/alchemy/fonts/tinymce.svg#tinymce') format('svg');
+  src: url('fonts/tinymce.woff') format('woff'),
+       url('fonts/tinymce.ttf') format('truetype'),
+       url('fonts/tinymce.svg#tinymce') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'tinymce-small';
-  src: url('tinymce/skins/alchemy/fonts/tinymce-small.woff') format('woff'),
-       url('tinymce/skins/alchemy/fonts/tinymce-small.ttf') format('truetype'),
-       url('tinymce/skins/alchemy/fonts/tinymce-small.svg#tinymce') format('svg');
+  src: url('fonts/tinymce-small.woff') format('woff'),
+       url('fonts/tinymce-small.ttf') format('truetype'),
+       url('fonts/tinymce-small.svg#tinymce') format('svg');
   font-weight: normal;
   font-style: normal;
 }

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -8,6 +8,10 @@ module Alchemy
 
       helper "alchemy/admin/tags"
 
+      before_action(only: :assign) do
+        @attachment = Attachment.find(params[:id])
+      end
+
       def index
         @query = Attachment.ransack(search_filter_params[:q])
         @query.sorts = "name asc" if @query.sorts.empty?
@@ -74,8 +78,8 @@ module Alchemy
         @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
           *common_search_filter_includes + [
             :file_type,
-            :content_id,
-          ],
+            :form_field_id,
+          ]
         )
       end
 

data/app/controllers/alchemy/admin/base_controller.rb

@@ -8,7 +8,7 @@ module Alchemy
 
       before_action :load_locked_pages
 
-      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
+      helper_method :clipboard_empty?, :get_clipboard, :is_admin?
 
       check_authorization
 
@@ -40,7 +40,9 @@ module Alchemy
       def exception_handler(error)
         exception_logger(error)
         show_error_notice(error)
-        notify_error_tracker(error)
+        if defined?(Airbrake)
+          notify_airbrake(error) unless Rails.env.development? || Rails.env.test?
+        end
       end
 
       # Displays an error notice in the Alchemy backend.
@@ -52,7 +54,10 @@ module Alchemy
         if request.xhr?
           render action: "error_notice"
         else
-          render "500", status: 500
+          respond_to do |format|
+            format.html { render "500", status: 500 }
+            format.json { render json: { message: @notice }, status: 500 }
+          end
         end
       end
 
@@ -67,11 +72,6 @@ module Alchemy
         get_clipboard(category).blank?
       end
 
-      def trash_empty?(category)
-        "alchemy/#{category.singularize}".classify.constantize.trashed.blank?
-      end
-      deprecate :trash_empty?, deprecator: Alchemy::Deprecation
-
       def set_stamper
         if Alchemy.user_class < ActiveRecord::Base
           Alchemy.user_class.stamper = current_alchemy_user
@@ -146,14 +146,6 @@ module Alchemy
             site
           end
       end
-
-      def notify_error_tracker(exception)
-        if ::Alchemy::ErrorTracking.notification_handler.respond_to?(:call)
-          ::Alchemy::ErrorTracking.notification_handler.call(exception)
-        else
-          Rails.logger.warn("To use the Alchemy::ErrorTracking.notification_handler, it must respond to #call.")
-        end
-      end
     end
   end
 end