alchemy_cms 3.3.3 → 3.4.0.rc1

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

@@ -0,0 +1,62 @@
+ul.list {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+
+  &#layoutpages {
+    margin-top: 16px;
+
+    li {
+      margin-left: 8px;
+    }
+  }
+
+  &#sitemap {
+    padding: 0 0 104px 0;
+  }
+
+  li {
+    list-style-type: none;
+    display: block;
+    overflow: hidden;
+    margin-bottom: 0;
+
+    &.legend, &.list-header {
+      background-color: transparent;
+      font-weight: bold;
+      padding: $default-padding;
+
+      .list-secondary {
+        color: $text-color;
+      }
+    }
+
+    &.even {
+      background-color: #fff;
+    }
+
+    &.odd {
+      background-color: #eaf3f9;
+    }
+  }
+
+  .list-primary,
+  .list-secondary {
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+  }
+
+  .list-primary {
+    float: left;
+    max-width: 65%;
+  }
+
+  .list-secondary, .right {
+    float: right;
+    text-align: left;
+    width: 30%;
+    color: $dark-gray;
+  }
+}

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

@@ -214,9 +214,16 @@ select {
   margin: 0 3*$default-margin;
   @include inline-block(top);
 
-  label {
+  label, form {
     @include inline-block;
-    margin-right: 2*$default-margin;
+  }
+
+  select { margin: 0; }
+
+  label {
+    margin-right: $default-margin;
+
+    &:after { content: ':'; }
   }
 }
 

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

@@ -33,7 +33,7 @@
   background-color: #fff;
   color: black;
   display: block;
-  padding-left: 4px;
+  padding-left: $default-padding;
   text-decoration: none;
   @include transition(background-color, 400ms);
 
@@ -49,23 +49,23 @@
       width: 16px;
       height: 16px;
       float: left;
-      margin-right: 4px;
+      margin-right: $default-margin;
       background: image-url('alchemy/icons.png') -160px -168px;
-      margin-top: 4px;
+      margin-top: $default-margin;
     }
   }
 }
 
 .redirect_url {
   position: absolute;
-  top: 4px;
+  top: $default-padding;
   right: 199px;
   text-align: right;
   background-color: #fff0c4;
-  line-height: 22px;
-  padding-right: 4px;
+  line-height: $sitemap-line-height;
+  padding-right: $default-padding;
   font-size: 10px;
-  padding-left: 4px;
+  padding-left: $default-padding;
   max-width: 45%;
   white-space: nowrap;
   overflow: hidden;
@@ -85,14 +85,10 @@
   height: 28px;
 }
 
-#layoutpages li {
-  padding: 0;
-}
-
 .sitemap_page {
-  height: 22px;
-  padding-bottom: 4px;
-  padding-top: 4px;
+  height: $sitemap-line-height;
+  padding-bottom: $default-padding;
+  padding-top: $default-padding;
   position: relative;
 
   &.highlight .sitemap_pagename_link {
@@ -117,7 +113,7 @@ div.sitemap_left_images {
 }
 
 .sitemap_right_tools {
-  height: 22px;
+  height: $sitemap-line-height;
   background-color: $light-gray;
   padding-left: 8px;
   float: right;
@@ -188,43 +184,36 @@ ul#sitemap {
     }
 
     li {
-      padding-left: 22px;
+      padding-left: $sitemap-line-height;
       padding-right: 0;
     }
   }
 }
 
-ul#sitemap li,
-ul#layoutpages li {
-  list-style-type: none;
-  display: block;
-  margin-left: 0;
-  margin-bottom: 0;
-  line-height: 22px;
-}
-
 ul#sitemap li .sitemap_toolrow,
 ul.list li .sitemap_toolrow {
   margin: 0;
   overflow: auto;
-  padding: 4px 0;
+  padding: $default-padding 0;
 }
 
 ul#sitemap .sitemap_sitename,
 ul.list .sitemap_sitename {
-  height: 22px;
-  line-height: 22px;
+  height: $sitemap-line-height;
+  line-height: $sitemap-line-height;
   overflow: hidden;
 }
 
-div.page_infos {
+.page_infos {
   @extend .right-rounded-border;
   background-color: #fff;
   border-left: 1px solid $light-gray;
   float: right;
-  height: 20px;
-  padding: 1px;
-  width: 68px;
+  height: $sitemap-line-height;
+
+  .page_status {
+    margin: $default-margin;
+  }
 }
 
 #sub_navigation .page_status_and_name .page_status {
@@ -268,14 +257,6 @@ div.page_infos {
   }
 }
 
-#sitemap .page_status {
-  margin: 2px 2px 0 4px;
-}
-
-.alchemy-dialog .page_status {
-  margin: 2px 4px 0 0;
-}
-
 #sitemap {
 
   &.sorting {
@@ -295,7 +276,7 @@ div.page_infos {
 
 .sitemap_sitestatus {
   float: right;
-  margin-top: 4px;
+  margin-top: $default-margin;
 }
 
 a.folder_link {
@@ -313,18 +294,19 @@ a.folder_link {
   @extend %rounded-border;
 }
 
-h2#sitemap_heading {
+#sitemap_heading {
   padding: 0;
 
-  span.page_infos {
+  .page_infos {
     margin-right: 144px;
     width: 40px;
     text-align: center;
     float: right;
     line-height: 28px;
+    background: transparent;
   }
 
-  span.page_name {
+  .page_name {
     line-height: 28px;
     margin-left: 24px;
   }
@@ -352,7 +334,7 @@ h2#sitemap_heading {
 
   .close_elements_from_page_selector {
     position: absolute;
-    right: 4px;
+    right: $default-padding;
     top: 12px;
     font-size: 16px;
     width: 16px;
@@ -362,11 +344,6 @@ h2#sitemap_heading {
   }
 }
 
-.show_elements_to_link {
-  @extend .icon;
-  @extend .element_window;
-}
-
 .elements_from_page_selector {
   width: 100%;
 }
@@ -387,7 +364,7 @@ h2#sitemap_heading {
   .spinner {
     top: 17px !important;
     left: 50% !important;
-    margin-left: 4px;
+    margin-left: $default-margin;
   }
 
   .alchemy_selectbox {

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

@@ -13,8 +13,6 @@
       margin: 0;
       @include inline-block;
       line-height: 5px;
-
-      select { margin: 0 }
     }
   }
 

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

@@ -9,16 +9,14 @@ module Alchemy
         @query = Attachment.ransack(params[:q])
         @attachments = @query.result
 
-        if params[:only].present?
-          @attachments = @attachments.where("file_mime_type LIKE '%#{params[:only]}%'")
-        end
-        if params[:except].present?
-          @attachments = @attachments.where("file_mime_type NOT LIKE '%#{params[:except]}%'")
-        end
         if params[:tagged_with].present?
           @attachments = @attachments.tagged_with(params[:tagged_with])
         end
 
+        if params[:file_type].present?
+          @attachments = @attachments.with_file_type(params[:file_type])
+        end
+
         @attachments = @attachments
           .page(params[:page] || 1)
           .per(15)

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

@@ -165,10 +165,10 @@ module Alchemy
       end
 
       def load_locked_pages
-        @locked_pages = Page.from_current_site.locked_by(current_alchemy_user)
+        @locked_pages = Page.locked_by(current_alchemy_user).order(:locked_at)
       end
 
-      # Returns the current site.
+      # Returns the current site for admin controllers.
       #
       def current_alchemy_site
         @current_alchemy_site ||= begin

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

@@ -7,8 +7,8 @@ module Alchemy
       authorize_resource class: :alchemy_admin_dashboard
 
       def index
-        @last_edited_pages = Page.from_current_site.all_last_edited_from(current_alchemy_user)
-        @all_locked_pages = Page.from_current_site.locked
+        @last_edited_pages = Page.all_last_edited_from(current_alchemy_user)
+        @all_locked_pages = Page.locked
         if Alchemy.user_class.respond_to?(:logged_in)
           @online_users = Alchemy.user_class.logged_in.to_a - [current_alchemy_user]
         end

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

@@ -1,6 +1,11 @@
 module Alchemy
   module Admin
     class LanguagesController < ResourcesController
+      def index
+        @query = Language.on_current_site.ransack(params[:q])
+        @languages = @query.result.page(params[:page] || 1).per(per_page_value_for_screen_size)
+      end
+
       def new
         @language = Language.new
         @language.page_layout = configured_page_layout || @language.page_layout

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

@@ -24,10 +24,10 @@ module Alchemy
       def index
         authorize! :index, :alchemy_admin_pages
 
-        @languages = Language.all
+        @languages = Language.on_current_site
         if !@page_root
           @language = Language.current
-          @languages_with_page_tree = Language.with_root_page
+          @languages_with_page_tree = Language.on_current_site.with_root_page
           @page_layouts = PageLayout.layouts_for_select(@language.id)
         end
       end
@@ -75,12 +75,15 @@ module Alchemy
       end
 
       # Edit the content of the page and all its elements and contents.
+      #
+      # Locks the page to current user to prevent other users from editing it meanwhile.
+      #
       def edit
         # fetching page via before filter
         if page_is_locked?
           flash[:notice] = Alchemy.t('This page is locked', name: @page.locker_name)
           redirect_to admin_pages_path
-        else
+        elsif page_needs_lock?
           @page.lock_to!(current_alchemy_user)
         end
         @layoutpage = @page.layoutpage?
@@ -171,9 +174,10 @@ module Alchemy
 
       def visit
         @page.unlock!
-        redirect_to show_page_path(
+        redirect_to show_page_url(
           urlname: @page.urlname,
-          locale: prefix_locale? ? @page.language_code : nil
+          locale: prefix_locale? ? @page.language_code : nil,
+          host: @page.site.host == "*" ? request.host : @page.site.host
         )
       end
 
@@ -369,6 +373,11 @@ module Alchemy
         @page.locked? && @page.locker.id != current_alchemy_user.id
       end
 
+      def page_needs_lock?
+        return true unless @page.locker
+        @page.locker.try!(:id) != current_alchemy_user.try!(:id)
+      end
+
       def paste_from_clipboard
         if params[:paste_from_clipboard]
           source = Page.find(params[:paste_from_clipboard])

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

@@ -7,7 +7,7 @@ module Alchemy
     class ResourcesController < Alchemy::Admin::BaseController
       include Alchemy::ResourcesHelper
 
-      helper Alchemy::ResourcesHelper
+      helper Alchemy::ResourcesHelper, TagsHelper
       helper_method :resource_handler
 
       before_filter :load_resource,
@@ -20,9 +20,19 @@ module Alchemy
       def index
         @query = resource_handler.model.ransack(params[:q])
         items = @query.result
+
         if contains_relations?
           items = items.includes(*resource_relations_names)
         end
+
+        if params[:tagged_with].present?
+          items = items.tagged_with(params[:tagged_with])
+        end
+
+        if params[:filter].present?
+          items = items.public_send(sanitized_filter_params)
+        end
+
         respond_to do |format|
           format.html {
             items = items.page(params[:page] || 1).per(per_page_value_for_screen_size)
@@ -113,6 +123,12 @@ module Alchemy
       def resource_params
         params.require(resource_handler.namespaced_resource_name).permit!
       end
+
+      def sanitized_filter_params
+        resource_model.alchemy_resource_filters.detect do |filter|
+          filter == params[:filter]
+        end || :all
+      end
     end
   end
 end

data/app/controllers/alchemy/base_controller.rb

@@ -3,6 +3,7 @@
 module Alchemy
   class BaseController < ApplicationController
     include Alchemy::ConfigurationMethods
+    include Alchemy::AbilityHelper
     include Alchemy::ControllerActions
     include Alchemy::Modules
     include Alchemy::SSLProtection