alchemy_cms 5.0.0.rc2 → 5.1.0.rc1

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

@@ -1,4 +1,7 @@
-button, input[type="submit"], a.button, input.button {
+button,
+input[type="submit"],
+a.button,
+input.button {
   @include button-defaults;
   position: relative;
 
@@ -14,7 +17,8 @@ button, input[type="submit"], a.button, input.button {
       );
     }
 
-    &:active, &:active:focus {
+    &:active,
+    &:active:focus {
       border-color: $button-hover-border-color;
       box-shadow: none;
     }
@@ -23,7 +27,7 @@ button, input[type="submit"], a.button, input.button {
   &.small {
     padding: $small-button-padding;
     vertical-align: inherit;
-    line-height: 4*$default-padding;
+    line-height: 4 * $default-padding;
     font-size: inherit;
   }
 
@@ -83,13 +87,14 @@ button, input[type="submit"], a.button, input.button {
       border: $default-border-width $default-border-style $icon-color;
       color: $icon-color;
 
-      .icon { color: inherit }
+      .icon {
+        color: inherit;
+      }
     }
   }
 
   &.disabled,
   &[disabled] {
-
     span {
       opacity: 0.3;
       cursor: not-allowed;
@@ -118,7 +123,8 @@ button.icon_button {
   border: 0 none;
   box-shadow: none;
 
-  &:disabled, &.disabled {
+  &:disabled,
+  &.disabled {
     background: transparent;
   }
 }
@@ -131,10 +137,15 @@ button.icon_button {
   position: relative;
   display: inline-block;
   text-align: center;
-  margin: 0 2*$default-margin;
 
-  &.active, &:active, &:hover {
-   .icon_button:not([disabled]) {
+  .toolbar_buttons & {
+    margin: 0 2 * $default-margin;
+  }
+
+  &.active,
+  &:active,
+  &:hover {
+    .icon_button:not([disabled]) {
       background-color: $default-border-color;
       cursor: pointer;
     }
@@ -161,8 +172,8 @@ button.icon_button {
   }
 }
 
-.button_with_label, .button_group {
-
+.button_with_label,
+.button_group {
   .icon_button {
     width: 29px;
     height: 29px;
@@ -179,16 +190,16 @@ button.icon_button {
     z-index: 30;
     background-color: $tooltip-background-color;
     color: $white;
-    padding: $default-padding 2*$default-padding 1.5*$default-padding;
+    padding: $default-padding 2 * $default-padding 1.5 * $default-padding;
     line-height: 1;
     box-shadow: 0 0 4px $default-border-color;
     white-space: nowrap;
     pointer-events: none;
     opacity: 0;
-    transition: .3s;
+    transition: 0.3s;
 
     &:before {
-      content: '';
+      content: "";
       position: absolute;
       bottom: -10px;
       left: 8px;
@@ -238,6 +249,6 @@ button.icon_button {
     visibility: visible;
     opacity: 1;
     top: -25px;
-    transition-delay: .2s;
+    transition-delay: 0.2s;
   }
 }

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

@@ -40,7 +40,7 @@ div#errors, div.errors {
 
 body.error {
   .error.message {
-    max-height: 95%;
+    max-height: 100%;
     overflow-y: scroll;
   }
 }

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

@@ -256,7 +256,7 @@
   > a {
     display: flex;
     cursor: pointer;
-    padding: 0px 8px;
+    padding-left: 2 * $default-padding;
 
     &:focus {
       @include default-focus-style($box-shadow: inset 0 0 0 2px $focus-color);
@@ -273,19 +273,16 @@
     text-shadow: $text-shadow-light;
   }
 
-  .page_language {
-    display: inline-block;
-    color: $muted-text-color;
-    margin-right: 2px;
-    font-size: $small-font-size;
-    text-transform: uppercase;
-  }
-
+  .page_language,
   .page_site {
     display: inline-block;
     color: $muted-text-color;
-    margin-right: $default-margin;
     font-size: $small-font-size;
+    margin-right: $default-margin;
     line-height: 31px;
   }
+
+  .page_language {
+    text-transform: uppercase;
+  }
 }

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

@@ -7,7 +7,7 @@
   right: 0;
   width: 100%;
   left: 0px;
-  height: 52px;
+  height: $pagination-height;
   padding: 2*$default-padding;
   padding-left: $main-menu-width + 10px;
   text-align: left;

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

@@ -11,9 +11,19 @@
     top: 9px;
   }
 
-  label {
-    display: block;
+  button {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 30px;
     height: inherit;
+    appearance: none;
+    background-color: transparent;
+    border: 0 none;
+    border-radius: 0;
+    box-shadow: none;
+    margin: 0;
+    padding: 0;
   }
 }
 

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

@@ -1,5 +1,3 @@
-$medium-select-box-width: 90px;
-
 select {
   @include button-defaults(
     $background-color: $form-field-background-color,
@@ -76,6 +74,10 @@ select {
       width: $medium-select-box-width;
     }
 
+    &.large {
+      width: $large-select-box-width;
+    }
+
     &.select2-container-active {
 
       .select2-choice, .select2-choices {

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/assets/stylesheets/alchemy/tags.scss

@@ -1,26 +1,10 @@
 .tag-list {
+  display: flex;
+  flex-direction: column;
   height: 100%;
-  padding-bottom: 138px;
-
-  &.filtered {
-    padding-bottom: 178px;
-  }
-
-  &.with_filter_bar {
-    padding-bottom: 218px;
-
-    &.filtered {
-      padding-bottom: 256px;
-    }
-  }
 
   .js_filter_field_box {
-    position: absolute;
-    right: auto;
-    top: auto;
-    width: 200px;
-    z-index: 1100;
-    transition: background-color $transition-duration;
+    margin: 0;
 
     input {
       background-color: transparentize($white, 0.25);
@@ -29,23 +13,22 @@
         background-color: $white;
       }
     }
-
-    label { display: none }
   }
 
   ul {
     list-style-type: none;
     padding: 0;
-    margin: 44px 0 4px 0;
+    margin: 0;
     height: 100%;
-    width: 200px;
     overflow-x: hidden;
     overflow-y: auto;
 
     li {
       display: block;
 
-      &:first-child { margin-top: 0 }
+      &:first-child {
+        margin-top: 0;
+      }
 
       a {
         @include tag-base;
@@ -53,13 +36,14 @@
         display: block;
       }
 
-      &:hover { background-color: $very-light-blue }
+      &:hover {
+        background-color: $very-light-blue;
+      }
 
       &.active {
-
         a {
           background-color: $dark-gray;
-          color: $light-gray
+          color: $light-gray;
         }
       }
     }
@@ -69,7 +53,7 @@
 .tag {
   @include tag-base(
     $margin: $default-margin/2 0,
-    $padding: $default-padding 2*$default-padding $default-padding
+    $padding: $default-padding 2 * $default-padding $default-padding
   );
   pointer-events: none;
   font-size: $small-font-size;
@@ -124,7 +108,9 @@
       position: relative;
       border-radius: $default-border-radius;
 
-      &.odd { background-color: #eaf3f9 }
+      &.odd {
+        background-color: #eaf3f9;
+      }
 
       input {
         position: absolute;
@@ -141,14 +127,16 @@
   }
 }
 
-.tag_list, .autocomplete_tag_list {
+.tag_list,
+.autocomplete_tag_list {
   .select2-container.select2-container-multi {
     .select2-search-choice {
       padding: 0;
 
       div {
         @include tag-base(
-          $padding: $default-padding 6*$default-padding $default-padding 3*$default-padding,
+          $padding: $default-padding 6 * $default-padding $default-padding 3 *
+            $default-padding,
           $margin: 0
         );
       }

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
 
@@ -138,7 +165,7 @@ module Alchemy
 
       def link
         @attachments = Attachment.all.collect { |f|
-          [f.name, download_attachment_path(id: f.id, name: f.urlname)]
+          [f.name, download_attachment_path(id: f.id, name: f.slug)]
         }
       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