alchemy_cms 4.4.4 → 5.0.0.beta2

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

@@ -0,0 +1,43 @@
+.node-select--node,
+.node-select--node-url {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.node-select--node {
+  display: flex;
+  align-items: center;
+
+  .icon {
+    margin: 0 8px 0 4px;
+
+    .select2-highlighted & {
+      color: $white
+    }
+  }
+}
+
+.node-select--node-name {
+  font-weight: bold;
+}
+
+.node-select--node-url {
+  margin-left: auto;
+  padding: $default-padding 2*$default-padding;
+  color: $dark-gray;
+  font-size: $small-font-size;
+
+  .select2-highlighted & {
+    color: $white
+  }
+}
+
+// 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
+// to 0.4em centers the content nicely.
+.essence_node {
+  .select2-container.alchemy_selectbox .select2-choice {
+    padding: 0.4em 0.75em;
+  }
+}

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

@@ -18,7 +18,7 @@
 
   .node_page,
   .node_url {
-    width: 200px;
+    width: 250px;
     max-width: 45%;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -63,6 +63,10 @@
   ul {
     margin: 0;
     padding: 0;
+
+    &.folded > li {
+      display: none;
+    }
   }
 
   li {
@@ -106,6 +110,7 @@
     text-decoration: none;
     overflow: hidden;
     background-color: $sitemap-page-background-color;
+    cursor: move;
 
     &.without-status {
       @include border-right-radius($default-border-radius);

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

@@ -1,3 +1,6 @@
+$sitemap-url-large-width: 250px;
+$sitemap-url-xlarge-width: 350px;
+
 #sort_panel {
   background: $light-gray;
   padding: 47px 0 8px 0;
@@ -20,7 +23,7 @@
 
 #sitemap-wrapper {
   position: relative;
-  min-height: 100%;
+  min-height: calc(100vh - 96px);
 }
 
 .sitemap_pagename_link {
@@ -28,23 +31,35 @@
   padding: 0 10px;
   margin: 2px;
   text-decoration: none;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
 
   &.inactive {
     color: #656565;
   }
 }
 
-.redirect_url {
+.sitemap_url {
+  display: none;
   float: right;
-  text-align: right;
   background-color: $sitemap-info-background-color;
-  line-height: $sitemap-line-height;
+  line-height: $sitemap-line-height - 2px;
   font-size: $small-font-size;
-  padding: 0 2*$default-padding;
-  max-width: 45%;
+  padding: 0 2 * $default-padding;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  border: 1px solid $sitemap-page-background-color;
+
+  @media screen and (min-width: $large-screen-break-point) {
+    display: block;
+    width: $sitemap-url-large-width;
+  }
+
+  @media screen and (min-width: 1440px) {
+    width: $sitemap-url-xlarge-width;
+  }
 }
 
 .sitemap_line_spacer {
@@ -55,7 +70,7 @@
 
 .sitemap_page {
   height: $sitemap-line-height;
-  margin: 3*$default-margin 0;
+  margin: 3 * $default-margin 0;
   position: relative;
   transition: background-color $transition-duration;
 
@@ -89,13 +104,13 @@
   width: 32px;
   line-height: $sitemap-line-height;
   float: left;
-  padding: 0 2*$default-padding;
+  padding: 0 2 * $default-padding;
   text-align: center;
 }
 
 .sitemap_right_tools {
   height: $sitemap-line-height;
-  padding: 0 2*$default-padding;
+  padding: 0 2 * $default-padding;
   float: right;
 
   .sitemap_tool {
@@ -130,7 +145,9 @@
   &.sorting {
     padding-top: 100px;
 
-    .page_icon { cursor: move }
+    .page_icon {
+      cursor: move;
+    }
   }
 
   .page_folder {
@@ -180,28 +197,51 @@
 
 .page_status {
   display: inline-block;
+
+  .alchemy-dialog & {
+    display: block;
+  }
 }
 
 #sitemap_heading {
+  display: flex;
   padding: 0;
-
-  .page_infos {
-    margin-right: 210px;
-    text-align: left;
-    float: right;
-    line-height: 28px;
-    background: transparent;
-  }
+  line-height: 28px;
 
   .page_name {
-    line-height: 28px;
     margin-left: 43px;
   }
+
+  .page_urlname {
+    display: none;
+    margin-left: auto;
+    padding-left: 2 * $default-padding;
+    padding-right: 2 * $default-padding;
+
+    @media screen and (min-width: $large-screen-break-point) {
+      display: block;
+      width: $sitemap-url-large-width;
+    }
+
+    @media screen and (min-width: 1440px) {
+      width: $sitemap-url-xlarge-width;
+    }
+  }
+
+  .page_status {
+    padding-left: 2 * $default-padding;
+    margin-right: 188px;
+    margin-left: auto;
+
+    @media screen and (min-width: $large-screen-break-point) {
+      margin-left: initial;
+    }
+  }
 }
 
 #page_filter_result {
   display: none;
-  margin-left: 2*$default-margin;
+  margin-left: 2 * $default-margin;
 }
 
 .alchemy-dialog {
@@ -213,6 +253,8 @@
     margin: 0;
     padding: 0 24px 8px 8px;
 
-    .page_icon { cursor: default }
+    .page_icon {
+      cursor: default;
+    }
   }
 }

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

@@ -57,29 +57,6 @@ th {
   vertical-align: top;
   border-bottom: 1px solid $medium-gray;
   font-weight: bold;
-
-  i {
-    font-style: normal;
-    position: absolute;
-    right: 2px;
-    top: 4px;
-    text-shadow: 1px 1px 1px #fff;
-  }
-
-  a {
-
-    &.sortable {
-      display: block;
-      margin: -4px -8px;
-      padding: 4px 18px 4px 8px;
-      text-shadow: 1px 1px 1px #fff;
-    }
-
-    &.sorted {
-      position: relative;
-      background: $medium-gray;
-    }
-  }
 }
 
 tr.even td {
@@ -141,7 +118,7 @@ td {
     width: 80px;
   }
 
-  &.date {
+  &.date, &.datetime {
     width: 150px;
   }
 

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

@@ -6,10 +6,11 @@ module Alchemy
       include UploaderResponses
       include ArchiveOverlay
 
-      helper 'alchemy/admin/tags'
+      helper "alchemy/admin/tags"
 
       def index
         @query = Attachment.ransack(search_filter_params[:q])
+        @query.sorts = "name asc" if @query.sorts.empty?
         @attachments = @query.result
 
         if search_filter_params[:tagged_with].present?
@@ -41,13 +42,13 @@ module Alchemy
 
       def update
         @attachment.update(attachment_attributes)
-        if attachment_attributes['file'].present?
+        if attachment_attributes["file"].present?
           handle_uploader_response(status: :accepted)
         else
           render_errors_or_redirect(
             @attachment,
             admin_attachments_path(search_filter_params),
-            Alchemy.t("File successfully updated")
+            Alchemy.t("File successfully updated"),
           )
         end
       end
@@ -56,14 +57,14 @@ module Alchemy
         name = @attachment.name
         @attachment.destroy
         @url = admin_attachments_url(search_filter_params)
-        flash[:notice] = Alchemy.t('File deleted successfully', name: name)
+        flash[:notice] = Alchemy.t("File deleted successfully", name: name)
       end
 
       def download
         @attachment = Attachment.find(params[:id])
         send_file @attachment.file.path, {
           filename: @attachment.file_name,
-          type: @attachment.file_mime_type
+          type: @attachment.file_mime_type,
         }
       end
 
@@ -73,8 +74,8 @@ module Alchemy
         @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
           *common_search_filter_includes + [
             :file_type,
-            :content_id
-          ]
+            :content_id,
+          ],
         )
       end
 

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

@@ -6,11 +6,9 @@ module Alchemy
       include Userstamp
       include Locale
 
-      before_action { enforce_ssl if ssl_required? && !request.ssl? }
       before_action :load_locked_pages
 
-      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?,
-        :options_from_params
+      helper_method :clipboard_empty?, :trash_empty?, :get_clipboard, :is_admin?
 
       check_authorization
 
@@ -28,14 +26,14 @@ module Alchemy
 
       def leave
         authorize! :leave, :alchemy_admin
-        render template: '/alchemy/admin/leave', layout: !request.xhr?
+        render template: "/alchemy/admin/leave", layout: !request.xhr?
       end
 
       private
 
       # Disable layout rendering for xhr requests.
       def set_layout
-        request.xhr? ? false : 'alchemy/admin'
+        request.xhr? ? false : "alchemy/admin"
       end
 
       # Handles exceptions
@@ -56,7 +54,7 @@ module Alchemy
         if request.xhr?
           render action: "error_notice"
         else
-          render '500', status: 500
+          render "500", status: 500
         end
       end
 
@@ -90,6 +88,7 @@ module Alchemy
       # Returns true if the current_alchemy_user (The logged-in Alchemy User) has the admin role.
       def is_admin?
         return false if !current_alchemy_user
+
         current_alchemy_user.admin?
       end
 
@@ -105,22 +104,15 @@ module Alchemy
           flash[:notice] = Alchemy.t(flash_notice)
           do_redirect_to redirect_url
         else
-          render action: (params[:action] == 'update' ? 'edit' : 'new')
+          render action: (params[:action] == "update" ? "edit" : "new")
         end
       end
 
-      def per_page_value_for_screen_size
-        Alchemy::Deprecation.warn("#per_page_value_for_screen_size is deprecated, please use #items_per_page instead")
-        return items_per_page if session[:screen_size].blank?
-        screen_height = session[:screen_size].split('x').last.to_i
-        (screen_height / 50) - 12
-      end
-
       # Does redirects for html and js requests
       #
       def do_redirect_to(url_or_path)
         respond_to do |format|
-          format.js   {
+          format.js {
             @redirect_url = url_or_path
             render :redirect
           }
@@ -128,18 +120,6 @@ module Alchemy
         end
       end
 
-      # Extracts options from params and permits all keys
-      #
-      # If no options are present it returns an empty parameters hash.
-      #
-      # @returns [ActionController::Parameters]
-      def options_from_params
-        @_options_from_params ||= begin
-          (params[:options] || ActionController::Parameters.new).permit!
-        end
-      end
-      deprecate :options_from_params, deprecator: Alchemy::Deprecation
-
       # This method decides if we want to raise an exception or not.
       #
       # I.e. in test environment.
@@ -150,7 +130,7 @@ module Alchemy
 
       # Are we currently in the page edit mode page preview.
       def is_page_preview?
-        controller_path == 'alchemy/admin/pages' && action_name == 'show'
+        controller_path == "alchemy/admin/pages" && action_name == "show"
       end
 
       def load_locked_pages
@@ -161,11 +141,11 @@ module Alchemy
       #
       def current_alchemy_site
         @current_alchemy_site ||= begin
-          site_id = params[:site_id] || session[:alchemy_site_id]
-          site = Site.find_by(id: site_id) || super
-          session[:alchemy_site_id] = site.id
-          site
-        end
+            site_id = params[:site_id] || session[:alchemy_site_id]
+            site = Site.find_by(id: site_id) || super
+            session[:alchemy_site_id] = site&.id
+            site
+          end
       end
     end
   end

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

@@ -17,10 +17,10 @@ module Alchemy
 
       def insert
         @item = model_class.find(remarkable_params[:remarkable_id])
-        unless @clipboard.detect { |item| item['id'] == remarkable_params[:remarkable_id] }
+        unless @clipboard.detect { |item| item["id"] == remarkable_params[:remarkable_id] }
           @clipboard << {
-            'id' => remarkable_params[:remarkable_id],
-            'action' => params[:remove] ? 'cut' : 'copy'
+            "id" => remarkable_params[:remarkable_id],
+            "action" => params[:remove] ? "cut" : "copy",
           }
         end
         respond_to do |format|
@@ -30,7 +30,7 @@ module Alchemy
 
       def remove
         @item = model_class.find(remarkable_params[:remarkable_id])
-        @clipboard.delete_if { |item| item['id'] == remarkable_params[:remarkable_id] }
+        @clipboard.delete_if { |item| item["id"] == remarkable_params[:remarkable_id] }
         respond_to do |format|
           format.js
         end
@@ -48,6 +48,7 @@ module Alchemy
 
       def model_class
         raise ActionController::BadRequest unless remarkable_type
+
         "alchemy/#{remarkable_type}".classify.constantize
       end