alchemy_cms 5.1.0.beta1 → 5.1.2

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

@@ -60,6 +60,7 @@
   max-width: 85%;
   margin-left: $default-margin;
   text-overflow: ellipsis;
+  transition: color $transition-duration;
 
   .has-hint & {
     max-width: 80%;
@@ -73,7 +74,6 @@
 
 .preview_text_element_name {
   font-size: $small-font-size;
-  text-shadow: #efefef 1px 1px 1px;
   font-weight: bold;
   line-height: 15px;
 }
@@ -106,6 +106,7 @@
   height: 16px;
   right: 8px;
   top: 10px;
+  transition: none;
 
   .error_icon {
     float: left;
@@ -126,6 +127,32 @@
   margin-bottom: 2*$default-margin;
   transition: box-shadow $transition-duration;
 
+  &.hidden {
+    display: block;
+    border-style: dashed;
+    opacity: 0.5;
+    transition: opacity $transition-duration;
+
+    > .element-header {
+      background-color: transparent;
+      background-image: linear-gradient(
+        45deg,
+        $light-gray 25%,
+        $medium-gray 25%,
+        $medium-gray 50%,
+        $light-gray 50%,
+        $light-gray 75%,
+        $medium-gray 75%,
+        $medium-gray 100%
+      );
+      background-size: 28.28px 28.28px;
+    }
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
   &.is-fixed {
     border-width: 0;
     border-radius: 0;
@@ -143,9 +170,17 @@
     }
   }
 
-  &.selected:not(.is-fixed) {
-    border-color: #c3c3c3;
-    box-shadow: 0 2px 8px rgba(#9b9b9b, 0.75);
+  &.selected:not(.is-fixed), &:hover {
+    &:not(.hidden) {
+      box-shadow: 0 2px 8px rgba(#9b9b9b, 0.75);
+    }
+  }
+
+  &.selected:not(.is-fixed):not(.folded):not(.dirty):not(.hidden) {
+    > .element-header {
+      background-color: $element-header-active-bg-color;
+      color: $element-header-active-color;
+    }
   }
 
   &.folded {
@@ -221,21 +256,10 @@
       }
     }
 
-    .element_tools {
-      display: flex;
-      width: 100%;
-      justify-content: space-between;
-      margin-left: 0;
-    }
-
     .element-content {
       margin: 4px 8px;
     }
 
-    .button_with_label {
-      margin: 0 4px;
-    }
-
     .content_editor,
     .picture_thumbnail {
       width: 100%;
@@ -313,7 +337,18 @@
   background-color: $element-header-bg-color;
   @extend .disable-user-select;
   cursor: pointer;
-  @include border-top-radius($default-border-radius);
+  border-radius: $default-border-radius;
+  transition: background-color $transition-duration;
+
+  .expanded & {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+
+  .icon {
+    color: inherit;
+    transition: color $transition-duration;
+  }
 
   >.hint-with-icon {
     position: absolute;
@@ -338,10 +373,14 @@
   padding: $default-padding 0;
   height: $element-toolbar-height;
   border-bottom: 1px solid $medium-gray;
+}
 
-  .element_tools {
-    float: left;
-    margin-left: -$default-margin;
+.element_tools {
+  display: flex;
+  width: 100%;
+
+  .button_with_label {
+    margin: 0 2px;
   }
 }
 

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

@@ -74,7 +74,6 @@ div#overlay_text_box {
 
   .page_name {
     display: inline-block;
-    max-width: 100px;
     margin-right: $default-margin;
     line-height: $header-height;
     white-space: nowrap;

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

@@ -27,7 +27,8 @@
 
   > .hint-bubble {
     visibility: hidden;
-    background: $light_yellow;
+    background-color: $hint-background-color;
+    color: $hint-text-color;
     border-radius: $default-border-radius;
     box-shadow: 0px 4px 8px rgba(0, 0, 0, .3);
     position: absolute;

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

@@ -54,7 +54,7 @@
 
   .search_input_field {
     width: 0;
-    height: inherit;
+    height: 100%;
     border: none;
     background-color: transparentize($form-field-background-color, 0.25);
     transition:

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

@@ -1,15 +1,16 @@
-$medium-select-box-width: 90px;
+@import "alchemy_admin/select2";
 
 select {
   @include button-defaults(
     $background-color: $form-field-background-color,
     $hover-color: $form-field-background-color,
     $hover-border-color: darken($default-border-color, 10%),
-    $padding: 0 2*$default-padding,
+    $padding: 0 2 * $default-padding,
     $border: 1px solid $default-border-color,
     $box-shadow: none,
     $color: $text-color,
-    $margin: 0);
+    $margin: 0
+  );
   height: $form-field-height;
   padding: 0.4em 0.6em;
   max-width: 100%;
@@ -34,7 +35,8 @@ select {
         $border: 1px solid $default-border-color,
         $box-shadow: none,
         $color: $text-color,
-        $margin: 0);
+        $margin: 0
+      );
       background-image: none;
       display: block;
       font-weight: normal;
@@ -76,15 +78,18 @@ select {
       width: $medium-select-box-width;
     }
 
-    &.select2-container-active {
+    &.large {
+      width: $large-select-box-width;
+    }
 
-      .select2-choice, .select2-choices {
+    &.select2-container-active {
+      .select2-choice,
+      .select2-choices {
         @include default-focus-style($box-shadow: 0 0 0 1px $focus-color);
       }
     }
 
     &.select2-container-disabled {
-
       &:hover {
         + .with-hint > .hint-bubble {
           @include hint-hover-style;
@@ -96,7 +101,8 @@ select {
         top: 0;
       }
 
-      .select2-choice, .select2-choice:hover {
+      .select2-choice,
+      .select2-choice:hover {
         background-image: none;
         background-color: $light-gray;
         box-shadow: none;
@@ -106,7 +112,9 @@ select {
         .select2-arrow {
           border-color: $border-inset-color;
 
-          b { color: $border-inset-color; }
+          b {
+            color: $border-inset-color;
+          }
         }
       }
     }
@@ -140,7 +148,6 @@ select {
     margin-top: 0 !important;
 
     &.select2-container-active {
-
       .select2-choices {
         @include default-focus-style($box-shadow: 0 0 0 1px $focus-color);
       }
@@ -212,7 +219,8 @@ select {
       }
     }
 
-    .select2-no-results, .select2-searching {
+    .select2-no-results,
+    .select2-searching {
       padding: 8px;
       margin: 0;
     }
@@ -233,41 +241,39 @@ select {
 
   .select2-more-results,
   .select2-ajax-error {
-    padding: 2*$default-padding;
+    padding: 2 * $default-padding;
     margin-bottom: 0;
   }
 }
 
-.window_form, #filter_bar {
-
+.window_form,
+#filter_bar {
   .select2-container {
     width: 100%;
   }
 }
 
 .select_with_label {
-  margin: 0 3*$default-margin;
+  margin: 0 3 * $default-margin;
   display: inline-block;
   vertical-align: middle;
 
   label {
     display: inline-block;
     vertical-align: middle;
-    margin-right: 2*$default-margin;
+    margin-right: 2 * $default-margin;
   }
 }
 
 // overriding important of select2 default style for retina screens
 @media only screen and (-webkit-min-device-pixel-ratio: 1.5),
-       only screen and (min-resolution: 2dppx) {
-
+  only screen and (min-resolution: 2dppx) {
   #alchemy {
-
     .select2-search input,
     .select2-search-choice-close,
     .select2-container .select2-choice abbr,
     .select2-container .select2-choice .select2-arrow b {
-       background-image: none !important;
+      background-image: none !important;
     }
   }
 }

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

@@ -6,7 +6,8 @@ table {
   width: 100%;
 
   &.list .tools {
-    button, a {
+    button,
+    a {
       display: inline-block;
       width: 18px;
       height: 18px;
@@ -22,8 +23,9 @@ table {
   }
 }
 
-.list td, .list th {
-  padding: 2*$default-padding;
+.list td,
+.list th {
+  padding: 2 * $default-padding;
   vertical-align: top;
   line-height: 18px;
   border-right: 1px solid $medium-gray;
@@ -93,9 +95,10 @@ td.heading {
   background-color: $table-row-hover-color;
 }
 
-td, th {
-
-  &.center, &.boolean {
+td,
+th {
+  &.center,
+  &.boolean {
     text-align: center;
   }
 
@@ -105,7 +108,6 @@ td, th {
 }
 
 td {
-
   &.file_name {
     word-break: break-all;
   }
@@ -118,7 +120,8 @@ td {
     width: 80px;
   }
 
-  &.date, &.datetime {
+  &.date,
+  &.datetime {
     width: 150px;
   }
 
@@ -137,9 +140,35 @@ td {
   &.rights {
     width: 60px;
   }
+
+  &.page_layout {
+    width: 160px;
+  }
+
+  &.status {
+    width: 80px;
+
+    .page_status {
+      margin: 0 $default-margin;
+    }
+  }
+
+  &.tags {
+    width: 180px;
+
+    .tag {
+      margin: 0;
+      padding: 0 2 + $default-padding;
+
+      &:before {
+        padding-right: $default-padding;
+      }
+    }
+  }
 }
 
-th.count, td.count {
+th.count,
+td.count {
   width: 120px;
   text-align: right;
   padding-right: 16px;

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

@@ -2,12 +2,12 @@
 
 module Alchemy
   module Admin
-    class PagesController < Alchemy::Admin::BaseController
+    class PagesController < ResourcesController
       include OnPageLayout::CallbacksRunner
 
       helper "alchemy/pages"
 
-      before_action :load_page, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
+      before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
 
       authorize_resource class: Alchemy::Page, except: [:index, :tree]
 
@@ -27,11 +27,33 @@ module Alchemy
         if: :run_on_page_layout_callbacks?,
         only: [:show]
 
+      before_action :load_languages_and_layouts,
+        unless: -> { @page_root },
+        only: [:index]
+
+      before_action :set_view, only: [:index]
+
       def index
-        if !@page_root
-          @language = @current_language
-          @languages_with_page_tree = Language.on_current_site.with_root_page
-          @page_layouts = PageLayout.layouts_for_select(@language.id)
+        @query = @current_language.pages.contentpages.ransack(search_filter_params[:q])
+
+        if @view == "list"
+          @query.sorts = default_sort_order if @query.sorts.empty?
+          items = @query.result
+
+          if search_filter_params[:tagged_with].present?
+            items = items.tagged_with(search_filter_params[:tagged_with])
+          end
+
+          if search_filter_params[:filter].present?
+            items = items.public_send(sanitized_filter_params)
+          end
+
+          if search_filter_params[:page_layout].present?
+            items = items.where(page_layout: search_filter_params[:page_layout])
+          end
+
+          items = items.page(params[:page] || 1).per(items_per_page)
+          @pages = items
         end
       end
 
@@ -85,7 +107,12 @@ module Alchemy
         elsif page_needs_lock?
           @page.lock_to!(current_alchemy_user)
         end
-        @preview_url = Alchemy::Admin::PREVIEW_URL.url_for(@page)
+        @preview_urls = Alchemy.preview_sources.map do |klass|
+          [
+            klass.model_name.human,
+            klass.new(routes: Alchemy::Engine.routes).url_for(@page),
+          ]
+        end
         @layoutpage = @page.layoutpage?
       end
 
@@ -178,6 +205,10 @@ module Alchemy
       def publish
         # fetching page via before filter
         @page.publish!
+
+        # Send publish notification to all registered publish targets
+        Alchemy.publish_targets.each { |p| p.perform_later(@page) }
+
         flash[:notice] = Alchemy.t(:page_published, name: @page.name)
         redirect_back(fallback_location: admin_pages_path)
       end
@@ -220,6 +251,19 @@ module Alchemy
 
       private
 
+      def resource_handler
+        @_resource_handler ||= Alchemy::Resource.new(controller_path, alchemy_module, Alchemy::Page)
+      end
+
+      def common_search_filter_includes
+        super.push(:page_layout, :view)
+      end
+
+      def set_view
+        @view = params[:view] || session[:alchemy_pages_view] || "tree"
+        session[:alchemy_pages_view] = @view
+      end
+
       def copy_of_language_root
         Page.copy(
           language_root_to_copy_from,
@@ -301,7 +345,7 @@ module Alchemy
         { my_urlname: default_urlname, children_path: default_urlname }
       end
 
-      def load_page
+      def load_resource
         @page = Page.find(params[:id])
       end
 
@@ -364,6 +408,12 @@ module Alchemy
                                       user: current_alchemy_user,
                                       full: params[:full] == "true")
       end
+
+      def load_languages_and_layouts
+        @language = @current_language
+        @languages_with_page_tree = Language.on_current_site.with_root_page
+        @page_layouts = PageLayout.layouts_for_select(@language.id)
+      end
     end
   end
 end