alchemy_cms 4.3.2 → 4.4.0

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

@@ -1,5 +1,3 @@
-#= require alchemy/alchemy.i18n
-
 window.Alchemy = Alchemy || {}
 
 Alchemy.initAlchemyPreviewMode = ->
@@ -30,12 +28,10 @@ Alchemy.initAlchemyPreviewMode = ->
         @elements = document.querySelectorAll("[data-alchemy-element]")
         @elements.forEach (element) =>
           element.addEventListener 'mouseover', =>
-            element.setAttribute('title', Alchemy.t('click_to_edit'))
             unless element.classList.contains('selected')
               Object.assign element.style, @getStyle('hover')
             return
           element.addEventListener 'mouseout', =>
-            element.removeAttribute('title')
             unless element.classList.contains('selected')
               Object.assign element.style, @getStyle('reset')
             return

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

@@ -55,7 +55,7 @@ Alchemy.Sitemap =
         self.options.ready()
 
     request.fail (jqXHR, status) ->
-      Alchemy.debug("Request failed: " + status)
+      console.warn("Request failed: " + status)
 
   # Filters the sitemap
   filter: (term) ->

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

@@ -51,7 +51,7 @@ $.extend Alchemy.Tinymce,
     # remove editor instance, if already initialized
     editor.remove() if editor
     if textarea.length == 0
-      Alchemy.log_error "Could not initialize TinyMCE for textarea#tinymce_#{id}!"
+      console.warn "Could not initialize TinyMCE for textarea#tinymce_#{id}!"
       return
     config = @getConfig(id, textarea[0].classList[1])
     if config
@@ -59,7 +59,7 @@ $.extend Alchemy.Tinymce,
       textarea.closest('.tinymce_container').prepend spinner.spin().el
       tinymce.init(config)
     else
-      Alchemy.debug('No tinymce configuration found for', id)
+      console.warn('No tinymce configuration found for', id)
 
   # Gets called after an editor instance gets intialized
   #

data/app/assets/javascripts/alchemy/page_select.js

@@ -0,0 +1,41 @@
+$.fn.alchemyPageSelect = function(options) {
+  var pageTemplate = HandlebarsTemplates.page
+
+  return this.select2({
+    placeholder: options.placeholder,
+    allowClear: true,
+    minimumInputLength: 3,
+    initSelection: function (_$el, callback) {
+      if (options.initialSelection) {
+        callback(options.initialSelection)
+      }
+    },
+    ajax: {
+      url: options.url,
+      datatype: 'json',
+      quietMillis: 300,
+      data: function (term, page) {
+        return {
+          q: $.extend({
+            name_cont: term
+          }, options.query_params),
+          page: page
+        }
+      },
+      results: function (data) {
+        var meta = data.meta
+
+        return {
+          results: data.pages,
+          more: meta.page * meta.per_page < meta.total_count
+        }
+      }
+    },
+    formatSelection: function (page) {
+      return page.text || page.name
+    },
+    formatResult: function(page) {
+      return pageTemplate({page: page})
+    }
+  })
+}

data/app/assets/javascripts/alchemy/templates/index.js

@@ -1 +1,2 @@
 //= require alchemy/templates/spinner
+//= require alchemy/templates/page

data/app/assets/javascripts/alchemy/templates/page.hbs

@@ -0,0 +1,9 @@
+<div class="page-select--page">
+  <i class="icon far fa-file fa-lg"></i>
+  <span class="page-select--page-name">
+    {{ page.name }}
+  </span>
+  <span class="page-select--page-urlname">
+    /{{ page.urlname }}
+  </span>
+</div>

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

@@ -136,13 +136,23 @@
   box-shadow: $shadow;
 }
 
-@mixin tag-base($margin: 2*$default-margin 0, $padding: $default-padding 3*$default-padding) {
+@mixin label-base($margin: 2*$default-margin 0, $padding: $default-padding 3*$default-padding) {
+  display: inline-block;
+  vertical-align: middle;
   padding: $padding;
   margin: $margin;
   background-color: $medium-gray;
   overflow: hidden;
   position: relative;
   border-radius: $default-border-radius;
+  color: $text-color;
+}
+
+@mixin tag-base($margin: 2*$default-margin 0, $padding: $default-padding 3*$default-padding) {
+  @include label-base(
+    $margin: $margin,
+    $padding: $padding
+  );
 
   &:before {
     content: fa-content($fa-var-tag);

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

@@ -29,7 +29,10 @@
 @import "alchemy/hints";
 @import "alchemy/icons";
 @import "alchemy/image_library";
+@import "alchemy/labels";
+@import "alchemy/nodes";
 @import "alchemy/notices";
+@import "alchemy/page-select";
 @import "alchemy/pagination";
 @import "alchemy/preview_window";
 @import "alchemy/resource_info";

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

@@ -266,6 +266,7 @@
   }
 
   .message {
+    width: 100%;
     margin: 2*$default-margin 0;
   }
 

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

@@ -38,6 +38,10 @@ form {
       float: right;
     }
 
+    .input > .select2-container {
+      width: 100%;
+    }
+
     > .autocomplete_tag_list {
 
       .select2-container, .select2-choices {
@@ -49,11 +53,8 @@ form {
       line-height: 16px;
     }
 
-    &.select, &.grouped_select {
-
-      .select2-container {
-        margin: 4px 0;
-      }
+    .select2-container {
+      margin: 4px 0;
     }
 
     &.boolean {

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

@@ -0,0 +1,6 @@
+.label {
+  @include label-base(
+    $margin: $default-margin/2 0,
+    $padding: $default-padding 2*$default-padding $default-padding
+  );
+}

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

@@ -0,0 +1,154 @@
+.nodes_tree.list {
+  margin: 2em 0;
+
+  &.sorting {
+    padding-top: 100px;
+
+    .page_icon {
+      cursor: move
+    }
+  }
+
+  .sitemap_node-level_0 {
+
+    > .node_name {
+      font-weight: bold;
+    }
+  }
+
+  .node_page,
+  .node_url {
+    width: 200px;
+    max-width: 45%;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+
+    > a {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      max-width: 100%;
+
+      .external & {
+        max-width: 90%;
+      }
+    }
+  }
+
+  .node_page {
+    padding: 0 8px;
+    margin-left: auto;
+  }
+
+  .node_url {
+    display: flex;
+    align-items: center;
+    padding: 0 2*$default-padding;
+    white-space: nowrap;
+    background-color: $sitemap-info-background-color;
+    line-height: $sitemap-line-height;
+    font-size: $small-font-size;
+    @include border-right-radius($default-border-radius);
+
+    > i {
+      margin-left: auto;
+      padding-left: $default-padding;
+    }
+  }
+
+  .node_folder {
+    cursor: pointer;
+  }
+
+  ul {
+    margin: 0;
+    padding: 0;
+  }
+
+  li {
+    line-height: $sitemap-line-height;
+    padding-left: $default-padding;
+
+    li {
+      padding-left: $sitemap-line-height;
+    }
+  }
+}
+
+#node_filter_result {
+  display: none;
+  margin-left: 2*$default-margin;
+}
+
+.sitemap_node {
+  margin: 3*$default-margin 0;
+  transition: background-color $transition-duration;
+
+  &.highlight {
+    background-color: $sitemap-highlight-color;
+  }
+
+  &.no-match .sitemap_pagename_link {
+    color: $medium-gray;
+  }
+
+  &:hover {
+    background-color: $sitemap-page-hover-color;
+    border-radius: $default-border-radius;
+  }
+
+  .node_name {
+    display: flex;
+    justify-content: space-between;
+    @include border-left-radius($default-border-radius);
+    padding: 0 0 0 10px;
+    margin: 2px;
+    text-decoration: none;
+    overflow: hidden;
+    background-color: $sitemap-page-background-color;
+
+    &.without-status {
+      @include border-right-radius($default-border-radius);
+    }
+
+    &.inactive {
+      color: #656565;
+    }
+  }
+}
+
+.nodes_tree-left_images {
+  position: relative;
+  width: 32px;
+  line-height: $sitemap-line-height;
+  float: left;
+  padding: 0 2*$default-padding;
+  text-align: center;
+}
+
+.nodes_tree-right_tools {
+  height: $sitemap-line-height;
+  padding: 0 2*$default-padding;
+  float: right;
+
+  > a {
+    float: left;
+    width: $sitemap-line-height;
+    height: $sitemap-line-height;
+    line-height: $sitemap-line-height;
+    text-align: center;
+    margin: 0;
+
+    &.disabled .icon {
+      opacity: 0.25;
+      filter: grayscale(100%);
+    }
+  }
+
+  .icon.blank {
+    margin-left: 2px;
+    float: left;
+    margin-top: 3px;
+    margin-right: 3px;
+  }
+}

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

@@ -0,0 +1,30 @@
+.page-select--page,
+.page-select--page-urlname {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.page-select--page {
+  display: flex;
+  align-items: center;
+
+  .icon {
+    margin: 0 8px 0 4px;
+
+    .select2-highlighted & {
+      color: $white
+    }
+  }
+}
+
+.page-select--page-urlname {
+  margin-left: auto;
+  padding: $default-padding 2*$default-padding;
+  color: $dark-gray;
+  font-size: $small-font-size;
+
+  .select2-highlighted & {
+    color: $white
+  }
+}

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

@@ -40,6 +40,10 @@ select {
       font-weight: normal;
       text-align: left;
 
+      .select2-chosen {
+        overflow: visible;
+      }
+
       .select2-arrow {
         top: 0;
         width: $form-field-height;
@@ -61,6 +65,11 @@ select {
           }
         }
       }
+
+      .select2-search-choice-close {
+        top: 9px;
+        right: 28px;
+      }
     }
 
     &.medium {
@@ -103,6 +112,30 @@ select {
     }
   }
 
+  &.select2-container-multi,
+  &.select2-allowclear {
+    .select2-search-choice-close {
+      @extend .fas;
+      @extend .fa-fw;
+      left: auto;
+      right: 5px;
+      top: 5px;
+      background: none;
+      font-size: $small-font-size;
+      text-decoration: none;
+
+      &:before {
+        @extend .fa-xs;
+        content: fa-content($fa-var-times);
+        opacity: $addon-icon-opacity;
+      }
+
+      &:hover {
+        color: $text-color;
+      }
+    }
+  }
+
   &.select2-container-multi {
     margin-top: 0 !important;
 
@@ -127,27 +160,6 @@ select {
         color: $text-color;
       }
 
-      .select2-search-choice-close {
-        @extend .fas;
-        @extend .fa-fw;
-        left: auto;
-        right: 5px;
-        top: 5px;
-        background: none;
-        font-size: $small-font-size;
-        text-decoration: none;
-
-        &:before {
-          @extend .fa-xs;
-          content: fa-content($fa-var-times);
-          opacity: $addon-icon-opacity;
-        }
-
-        &:hover {
-          color: $text-color;
-        }
-      }
-
       .select2-search-field {
         height: 29px;
 
@@ -162,7 +174,6 @@ select {
 }
 
 .select2-drop {
-
   .select2-search {
     margin: $default-margin 0;
 
@@ -219,6 +230,12 @@ select {
     border-radius: $default-border-radius;
     border: $default-border;
   }
+
+  .select2-more-results,
+  .select2-ajax-error {
+    padding: 2*$default-padding;
+    margin-bottom: 0;
+  }
 }
 
 .window_form, #filter_bar {