alchemy_cms 3.5.0.rc1 → 3.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fe515cb79092ae441a7980d07d5da38e3023221
-  data.tar.gz: e5d16e9d4d83c30b7025cd69b14a9288e5c8ac23
+  metadata.gz: 0d26c504af85a3c863cb1f1474afde99b0999b0e
+  data.tar.gz: fa93bfde945a32bdec04ba01bbf9c3f594b1e61a
 SHA512:
-  metadata.gz: 079aab266840a0ae38173832d45bcceb9eb17a6294e53284cad2182933603b3839ab239bfb7ad601640590db4c4bfca87841f89b232b933e20f7a5a08d471c92
-  data.tar.gz: 48957ac1b40ed2f58e312e5924f427955605213a2760dfa9eda8f1d704e4ae8706ff750355999ff419aeddf4ea07ef7b32399e786ef34dd26acca557a0cd53df
+  metadata.gz: cfbfbaab2496508d73613a1799453e077d3ebe390273b71c1a80543889a5aa28826e56b2cfd7f65ef8da60a5a6f62a95d5c0b6a711777a0432344c3c6012e8fd
+  data.tar.gz: 64cb9dfe665da57d5461f17248023d1d485ee022c78e8b406c36aa3d8ccb75da6736d678d68a497ea7d150884922f4f2404e095348c57eb1012a6e7dd5aa79ab

data/CHANGELOG.md

@@ -14,6 +14,7 @@ __New Features__
 
 __Notable Changes__
 
+* The essence date input field is now 100% width (#1191)
 * The essence view partials don't get cached anymore (#1099)
 * The essence editor partials don't get cached anymore (#1171)
 * Removes update_essence_select_elements (#1103)
@@ -33,11 +34,14 @@ __Notable Changes__
 * Upgrade tasks can now be run separately (#1152)
 * Update to Tinymce 4.4.3
 * New sitemap UI (#1172)
+* Removed picture cache flushing (#1185)
+* Removed Mountpoint class (#1186)
 
 __Fixed Bugs__
 
 * Fix setting of locale when `current_alchemy_user.language` doesn't return a Symbol (#1097)
 * Presence validation of EssenceFile is not working (#1096)
+* Allow to define unique nestable elements (#852)
 
 ## 3.4.2 (unreleased)
 
@@ -45,6 +49,10 @@ __Notable Changes__
 
 * Allow users to manually publish changes on global pages
 
+__Fixed Bugs__
+
+* The `language_links` helper now only renders languages from the current site
+
 ## 3.4.1 (2016-08-31)
 
 __Fixed Bugs__

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

@@ -58,6 +58,9 @@ Alchemy.FileProgress::setCancelled = ->
   @$fileProgressCancel.hide()
   @$fileProgressWrapper.delay(1500).fadeOut ->
     $(this).remove()
+    if $('.upload-progress-container').is(':empty')
+      $('.overall-upload').removeClass('visible')
+    return
 
 Alchemy.FileProgress::setStatus = (status) ->
   @$fileProgressStatus.text Alchemy.t(status)

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

@@ -434,17 +434,6 @@
   }
 }
 
-.content_editor.essence_date {
-  float: none;
-  display: inline-block;
-  vertical-align: middle;
-  vertical-align: top;
-
-  input.date {
-    width: 154px;
-  }
-}
-
 .essence_picture_editor {
   position: relative;
 
@@ -745,17 +734,6 @@ select.long {
     }
   }
 
-  &.essence_date {
-    float: none;
-    display: inline-block;
-    vertical-align: middle;
-    vertical-align: top;
-
-    input.date {
-      width: 154px;
-    }
-  }
-
   &.essence_picture_editor {
     float: none;
     height: auto;
@@ -850,3 +828,9 @@ textarea.has_tinymce {
 .add-nestable-element-button {
   margin-top: 0;
 }
+
+.essence_date--label {
+  position: absolute;
+  right: 5px;
+  top: 31px;
+}

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

@@ -25,7 +25,7 @@ module Alchemy
       def new
         @page = Page.find(params[:page_id])
         @parent_element = Element.find_by(id: params[:parent_element_id])
-        @elements = @page.available_element_definitions(@parent_element.try(:name))
+        @elements = @page.available_elements_within_current_scope(@parent_element)
         @element = @page.elements.build
         @clipboard = get_clipboard('elements')
         @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)

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

@@ -106,11 +106,6 @@ module Alchemy
         redirect_to_index
       end
 
-      def flush
-        FileUtils.rm_rf Rails.root.join('public', Alchemy::MountPoint.get, 'pictures')
-        @notice = Alchemy.t('Picture cache flushed')
-      end
-
       private
 
       def pictures_per_page_for_size(size)

data/app/helpers/alchemy/pages_helper.rb

@@ -29,7 +29,7 @@ module Alchemy
         spacer: '',
         reverse: false
       }.merge(options)
-      languages = Language.published.with_root_page.order("name #{options[:reverse] ? 'DESC' : 'ASC'}")
+      languages = Language.on_current_site.published.with_root_page.order("name #{options[:reverse] ? 'DESC' : 'ASC'}")
       return nil if languages.count < 2
       render(
         partial: "alchemy/language_links/language",

data/app/models/alchemy/page/page_elements.rb

@@ -134,6 +134,19 @@ module Alchemy
       @_available_element_names ||= available_element_definitions.map { |e| e['name'] }
     end
 
+    # Available element definitions excluding nested unique elements.
+    #
+    def available_elements_within_current_scope(parent)
+      @_available_elements = if parent
+        parents_unique_nested_elements = parent.nested_elements.where(unique: true).pluck(:name)
+        available_element_definitions(parent.name).reject do |e|
+          parents_unique_nested_elements.include? e['name']
+        end
+      else
+        available_element_definitions
+      end
+    end
+
     # All element definitions defined for page's page layout
     #
     # Warning: Since elements can be unique or limited in number,

data/app/models/alchemy/picture.rb

@@ -24,7 +24,6 @@ module Alchemy
 
     include Alchemy::NameConversions
     include Alchemy::Touching
-    include Alchemy::Picture::Sweeping
     include Alchemy::Picture::Transformations
     include Alchemy::Picture::Url
 

data/app/views/alchemy/_menubar.html.erb

@@ -1,5 +1,5 @@
 <% if !@preview_mode && @page && can?(:edit_content, @page) %>
-  <div id="alchemy_menubar" style="display: none">
+  <div id="alchemy_menubar" style="display: none" data-turbolinks="false">
     <ul>
       <li><%= link_to Alchemy.t(:to_alchemy), alchemy.admin_dashboard_url %></li>
       <li><%= link_to Alchemy.t(:edit_page), alchemy.edit_admin_page_url(@page) %></li>

data/app/views/alchemy/admin/pages/_page_for_links.html.erb

@@ -20,9 +20,15 @@
       {{/unless}}
     </div>
     <div class="page_infos">
-      <span class="page_status {{#unless public}}not_{{/unless}}public" title="{{status_titles.public}}"></span>
-      <span class="page_status {{#unless visible}}not_{{/unless}}visible" title="{{status_titles.visible}}"></span>
-      <span class="page_status {{#unless restricted}}not_{{/unless}}restricted" title="{{status_titles.restricted}}"></span>
+      <span class="page_status">
+        <span class="icon {{#unless public}}not_{{/unless}}public"></span>
+      </span>
+      <span class="page_status">
+        <span class="icon {{#unless visible}}not_{{/unless}}visible"></span>
+      </span>
+      <span class="page_status">
+        <span class="icon {{#unless restricted}}not_{{/unless}}restricted"></span>
+      </span>
     </div>
     <div class="sitemap_sitename" id="sitemap_sitename_{{id}}" name="/<%= "#{Alchemy::Language.current.code}/" if multi_language? %>{{urlname}}">
       {{#if redirects_to_external}}

data/app/views/alchemy/admin/pictures/index.html.erb

@@ -38,22 +38,6 @@
       <label><%= Alchemy.t('Image size') %></label>
       <%= hidden_field_tag('size', @size, id: 'overlay_thumbnails_size') %>
     </div>
-    <% if can?(:flush, Alchemy::Picture) %>
-      <div class="toolbar_spacer"></div>
-      <%= toolbar_button(
-        icon: 'flush',
-        url: alchemy.flush_admin_pictures_path,
-        dialog: false,
-        link_options: {
-          remote: true,
-          method: :post
-        },
-        label: Alchemy.t('Flush picture cache'),
-        class: 'icon_button please_wait',
-        title: Alchemy.t('Flush picture cache'),
-        skip_permission_check: true
-      ) %>
-    <% end %>
     <div class="toolbar_spacer"></div>
     <div class="button_with_label">
       <%= link_to(

data/app/views/alchemy/base/500.html.erb

@@ -2,7 +2,7 @@
   buttons: [
     {
       icon: 'back',
-      url: request.referer || "#{Alchemy::MountPoint.get}/admin/dashboard",
+      url: request.referer || alchemy.admin_dashboard_path,
       label: Alchemy.t(:back),
       title: Alchemy.t(:back),
       hotkey: 'alt+z',

data/app/views/alchemy/essences/_essence_date_editor.html.erb

@@ -7,7 +7,7 @@
       value: content.settings_value(:default_value, local_assigns.fetch(:options, {}))
     }
   ) %>
-  <label for="<%= content.form_field_id %>" style="cursor: pointer; display: inline; display: inline-block; position: relative; top: 3px; margin: 0;">
+  <label for="<%= content.form_field_id %>" class="essence_date--label">
     <span class="ui-icon ui-icon-calendar"></span>
   </label>
 </div>

data/config/locales/alchemy.de.yml

@@ -238,7 +238,6 @@ de:
     "Picture renamed successfully": "Bild wurde erfolgreich von %{from} nach %{to} umbenannt"
     "Picture deleted successfully": "%{name} wurde gelöscht"
     "Pictures updated successfully": "Die Bilder wurden gespeichert"
-    "Picture cache flushed": "Bildercache wurde geleert"
     "Please Signup": "Um Ihre Homepage bearbeiten zu können, müssen Sie als erstes einen Admin Benutzer einrichten."
     "Please choose": "Bitte wählen"
     "Please enter a new password": "Bitte geben Sie Ihr neues Passwort ein."

data/config/locales/alchemy.en.yml

@@ -237,7 +237,6 @@ en:
     "Picture renamed successfully": "Picture renamed successfully from %{from} to %{to}"
     "Picture deleted successfully": "Picture %{name} successfully deleted"
     "Pictures updated successfully": "Pictures updated successfully"
-    "Picture cache flushed": "Picture cache flushed"
     "Please Signup": "Please signup to edit your Website."
     "Please choose": "Please choose"
     "Please enter a new password": "Please enter a new password."

data/config/locales/alchemy.es.yml

@@ -238,7 +238,6 @@ es:
     "Picture renamed successfully": "Imagen renombrada correctamente de %{from} a %{to}"
     "Picture deleted successfully": "Imagen %{name} eliminada correctamente"
     "Pictures updated successfully": "Imágenes actualizadas correctamente"
-    "Picture cache flushed": "Cache de imágenes vaciada"
     "Please Signup": "Por favor inicia sesión para editar tu web."
     "Please choose": "Por favor selecciona"
     "Please enter a new password": "Por favor introduce una nueva contraseña."

data/config/locales/alchemy.fr.yml

@@ -256,7 +256,6 @@ fr:
     "Picture deleted successfully": "%{name} A été effacé"
     "Pictures deleted successfully": "Les images %{names} ont été effacées"
     "Pictures updated successfully": "Les images ont été enregistrées"
-    "Picture cache flushed": "Le cache de l'image a été vidé"
     "Please Signup": "Pour être en mesure de modifier votre site Web, vous devez d'abord configurer un utilisateur Admin."
     "Please choose": "S'il vous plaît Choisir"
     "Please enter a new password": "S'il vous plaît, entrez votre nouveau mot de passe."

data/config/locales/alchemy.it.yml

@@ -238,7 +238,6 @@ it:
     "Picture renamed successfully": "Immagine rinominata con successo da %{from} a %{to}"
     "Picture deleted successfully": "Immagine %{name} eliminata con successo"
     "Pictures updated successfully": "Immagini caricate con successo"
-    "Picture cache flushed": "Cache delle immagini svuotata"
     "Please Signup": "Registrati per modificare il tuo sito web."
     "Please choose": "Scegli"
     "Please enter a new password": "Inserisci una nuova password."

data/config/locales/alchemy.nl.yml

@@ -236,7 +236,6 @@ nl:
     "Picture renamed successfully": "Afbeelding hernoemd van %{from} naar %{to}"
     "Picture deleted successfully": "Afbeelding %{name} verwijderd"
     "Pictures updated successfully": "De afbeelding is geüpdatet"
-    "Picture cache flushed": "Afbeeldingscache is geleegd"
     "Please Signup": "Om de homepagina te kunnen bewerken moet er eerst een Admin account gemaakt worden."
     "Please choose": "Maak een keuze"
     "Please enter a new password": "Geef een nieuw wachtwoord op"

data/config/locales/alchemy.ru.yml

@@ -237,7 +237,6 @@ ru:
     "Picture renamed successfully": "Изображение успешно переименовано из %{from} в %{to}"
     "Picture deleted successfully": "Изображение %{name} успешно удалено"
     "Pictures updated successfully": "Изображение  успешно обновлено"
-    "Picture cache flushed": "Кэш изображения очищен"
     "Please Signup": "Пожалуйста, войдите, чтобы редактировать Ваш сайт."
     "Please choose": "Пожалуйста, выберите"
     "Please enter a new password": "Пожалуйста, введите новый пароль."

data/config/routes.rb

@@ -61,7 +61,7 @@ Alchemy::Engine.routes.draw do
 
     resources :pictures, except: [:new] do
       collection do
-        post :flush, :update_multiple
+        post :update_multiple
         delete :delete_multiple
         get :edit_multiple
       end

data/lib/alchemy/engine.rb

@@ -35,7 +35,6 @@ require_relative './hints'
 require_relative './i18n'
 require_relative './logger'
 require_relative './modules'
-require_relative './mount_point'
 require_relative './name_conversions'
 require_relative './on_page_layout'
 require_relative './on_page_layout/callbacks_runner'

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.5.0.rc1"
+  VERSION = "3.5.0.rc2"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/module/module_generator.rb

@@ -20,7 +20,7 @@ module Alchemy
 
       def copy_templates
         template "controller.rb.tt", "app/controllers/admin/#{@controller_name}_controller.rb"
-        template "ability.rb.tt", 'app/models', "alchemy_#{@module_name}_ability.rb"
+        template "ability.rb.tt", "app/models/#{@module_name}_ability.rb"
         template "module_config.rb.tt", "config/initializers/alchemy_#{@module_name}.rb"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.5.0.rc1
+  version: 3.5.0.rc2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -531,7 +531,6 @@ files:
 - app/models/alchemy/page/page_scopes.rb
 - app/models/alchemy/page/page_users.rb
 - app/models/alchemy/picture.rb
-- app/models/alchemy/picture/sweeping.rb
 - app/models/alchemy/picture/transformations.rb
 - app/models/alchemy/picture/url.rb
 - app/models/alchemy/site.rb
@@ -818,7 +817,6 @@ files:
 - lib/alchemy/kaminari/scoped_pagination_url_helper.rb
 - lib/alchemy/logger.rb
 - lib/alchemy/modules.rb
-- lib/alchemy/mount_point.rb
 - lib/alchemy/name_conversions.rb
 - lib/alchemy/on_page_layout.rb
 - lib/alchemy/on_page_layout/callbacks_runner.rb

data/app/models/alchemy/picture/sweeping.rb

@@ -1,17 +0,0 @@
-module Alchemy
-  module Picture::Sweeping
-    extend ActiveSupport::Concern
-
-    included do
-      after_update  { expire_cache_for(self) }
-      after_destroy { expire_cache_for(self) }
-    end
-
-    private
-
-    # Removing all variants of the picture with FileUtils.
-    def expire_cache_for(picture)
-      FileUtils.rm_rf(Rails.root.join('public', Alchemy::MountPoint.get.gsub(/^\//, ''), 'pictures', picture.id.to_s))
-    end
-  end
-end

data/lib/alchemy/mount_point.rb

@@ -1,45 +0,0 @@
-require 'rails'
-
-module Alchemy
-  # Utilities for Alchemy's mount point in the host rails app.
-  #
-  class MountPoint
-    MOUNT_POINT_REGEXP = /mount\sAlchemy::Engine\s=>\s['|"](\/\w*)['|"]/
-
-    class << self
-      # Returns the path of Alchemy's mount point in current rails app.
-      #
-      # @param [Boolean] remove_leading_slash_if_blank
-      #   Pass false to not return a leading slash on empty mount point.
-      #
-      def get(remove_leading_slash_if_blank = true)
-        if path == "/" && remove_leading_slash_if_blank
-          path.gsub(/\A\/\z/, '')
-        else
-          path
-        end
-      end
-
-      # Returns the mount point path from the Rails app routes.
-      #
-      def path
-        match = File.read(routes_file_path).match(MOUNT_POINT_REGEXP)
-        if match.nil?
-          raise NotMountedError
-        else
-          match[1]
-        end
-      end
-
-      private
-
-      def routes_file_path
-        if Rails.root
-          Rails.root.join('config/routes.rb')
-        else
-          'config/routes.rb'
-        end
-      end
-    end
-  end
-end