alchemy_cms 3.3.3 → 3.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e46cc1ad834f7414c9aa12266eb68ee85ce0040
-  data.tar.gz: 4ab3d7090f5c97ac01ee7c0e263950abbb645c48
+  metadata.gz: ccd7ef2204aab33386942efc46784bab6a2e40f4
+  data.tar.gz: b91fa94caa3ebffb1d9de950850fa12de33f019b
 SHA512:
-  metadata.gz: 40701894774db2496b239cae14fbdcf8ff1e76f801f417e96711e1f218f7696877fc52fa642b9fadfc72e2ba617c125c156cd0214326e74e66b35a9615c5b3be
-  data.tar.gz: d3543e573450058ce283b23e222488e70f58ab5c53433f8dd329f5a489949a3ce956c65cfc98421d15cd6699bdcf6d7612a2620fbdc1c9e7da9f768a6e5c4c37
+  metadata.gz: 55f8b83db6a43248ce5ed8a54173fdca726896affd34c55440ed0c06fa7bfc1a4eccd58fb4876ae96742575fb1f0d77f917d0b874ace52eff5829c98f75d45e9
+  data.tar.gz: 2805a1bee4575223459af51e7de6fcdb8c0e3bb7c9c6b8fb8e60c1952a8967d4290d0436d8beabcfd74741f8e705c16ce299825315193e4e3e209e80ec647f20

data/.travis.yml

@@ -7,7 +7,7 @@ rvm:
 - 2.3.0
 branches:
   only:
-    - 3.3-stable
+    - 3.4-stable
 before_install:
   - gem install bundler
 before_script: bundle exec rake alchemy:spec:prepare

data/CHANGELOG.md

@@ -1,11 +1,49 @@
 # Change Log
 
-## 3.3.3 (2016-08-31)
+## 3.4.0 (unreleased)
 
-* Fix bug that rendered duplicate nested elements within a cell (#1100)
-* Merge `html_options` in EssenceFile view (#1115)
+__New Features__
+
+* `MessagesMailer` (formerly known as `Messages`) now inherits from `ApplicationMailer`
+when it is defined.
+* Adds time based published pages: The public status of a page is now made of two time stamps:
+  `public_on` and `public_until`
+* Send page expiration cache headers
+* Adds an +EssencePictureView+ class responsible for rendering the `essence_picture_view` partial
+* Adds a file type filter to file archive
+* Allow setting the type of EssenceText input fields in the elements.yml via `settings[:input_type]`
+* Adds support for defining custom searchable attributes in resources
+* Automatically add tag management to admin module views, when the resource model
+  has been set to `acts_as_taggable`.
+* Automatically add scope filters to admin module views, when the resource model
+  has the class method `alchemy_resource_filters` defined.
+
+__Notable Changes__
+
+* `Messages` mailer class has been renamed to `MessagesMailer`
+* Removed the auto-magically merge of Ability classes (#1022)
+* Replace jQueryUI datepicker with $.datetimepicker
+* Thumbnails now render in original file format, but GIFs will always be flattened
+* Pictures will be rendered in original file format by default
+* Allow SVG files to be rendered as EssencePicture
+* When using Alchemy content outside of Alchemy, `current_ability` is no longer
+  included with `Alchemy::ControllerActions` to prevent method clashes. If you
+  need access to `current_ability` you also need to include `Alchemy::AbilityHelper`
+* Asset manifests are now installed into `vendor/assets` folder in order to provide easy customization
+  Please don't use alchemy/custom files any more. Instead require your customizations in the manifests.
+* Removes the default_scope from Language on_site current while ensuring to load languages by code
+  from current site only.
+* Removes the `Language.get_default` method alias for `Language.default`
+* Move site select into pages and languages module to avoid confusion about curent site (#1067)
+* List pages from all sites in currently locked pages tabs and Dashboard widget (#1067)
+* The locked value on page is now a timestamp (`locked_at`), so we can order locked pages by (#1070)
+* Persist user in dummy app
+
+__Fixed Bugs__
+
+* Generators don't delete directories any more (#850)
 
-## 3.3.2 (2016-08-02)
+## 3.3.2 (unreleased)
 
 * Use relative url for page preview frame in order to prevent cross origin errors (#1076)
 

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=3.3-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
+[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=3.4-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
 [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy_cms.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
 [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
 [![Slack Status](http://slack.alchemy-cms.com/badge.svg)](http://slack.alchemy-cms.com)
@@ -75,9 +75,11 @@ $ alchemy --help
 Put this into your `Gemfile`:
 
 ```ruby
-gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '3.3-stable'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '3.4-stable'
 ```
 
+**NOTE:** You normally want to use a stable branch, like `3.3-stable`.
+
 If you want to use Russian translation and have better i18n support, you should put:
 
 ```ruby
@@ -102,9 +104,11 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
 If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
 
 ```ruby
-gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '3.3-stable'
+gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '3.4-stable'
 ```
 
+**NOTE:** You normally want to use a stable branch, like `3.3-stable`.
+
 Then run:
 
 ```shell

data/alchemy_cms.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']
   gem.add_runtime_dependency 'compass-rails',                    ['>= 2.0.4', '< 4.0']
   gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0.1']
+  gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
   gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0']
   gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 5.0.0']
   gem.add_runtime_dependency 'kaminari',                         ['~> 0.15']

data/app/assets/javascripts/alchemy/{alchemy.js → admin.js}

@@ -3,7 +3,6 @@
 //= require jquery2
 //= require jquery_ujs
 //= require turbolinks
-//= require jquery-ui/datepicker
 //= require jquery-ui/draggable
 //= require jquery-ui/effect-drop
 //= require jquery-ui/effect-fade
@@ -20,6 +19,7 @@
 //= require select2_locale_fr
 //= require select2_locale_nl
 //= require select2_locale_ru
+//= require select2_locale_it
 //= require handlebars
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.autocomplete
@@ -51,4 +51,3 @@
 //= require alchemy/alchemy.tinymce
 //= require alchemy/alchemy.translations
 //= require alchemy/alchemy.trash_window
-//= require alchemy/alchemy.custom

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

@@ -3,30 +3,33 @@ window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
 $.extend Alchemy,
 
   Datepicker: (scope) ->
-    browserHasDatepicker = Alchemy.isiOS
-    datepicker_options =
-      dateFormat: "yy-mm-dd"
-      changeMonth: true
-      changeYear: true
-      showWeek: true
-      showButtonPanel: true
-      showOtherMonths: true
-      onSelect: ->
+    options =
+      format: Alchemy.t('formats.datetime')
+      formatDate: Alchemy.t('formats.date')
+      formatTime: Alchemy.t('formats.time')
+      dayOfWeekStart: Alchemy.t('formats.start_of_week')
+      onSelectDate: ->
         Alchemy.setElementDirty $(this).closest(".element-editor")
 
-    if Alchemy.locale is "de"
-      $.extend datepicker_options,
-        dateFormat: "dd.mm.yy"
-        firstDay: 1
-        dayNames: ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"]
-        dayNamesMin: ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"]
-        monthNames: ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"]
-        monthNamesShort: ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"]
-        closeText: "Ok"
-        currentText: "Heute"
-        weekHeader: "KW"
-        nextText: "nächster"
-        prevText: "vorheriger"
-
-    # Initializes the jQueryUI datepicker and disables the browsers default Datepicker unless the browser is iOS.
-    $('input[type="date"], input.date', scope).datepicker(datepicker_options).prop "type", "text" unless browserHasDatepicker
+    datepicker_options = $.extend {}, options,
+      format: options.formatDate
+      timepicker: false
+
+    timepicker_options = $.extend {}, options,
+      format: options.formatTime
+      datepicker: false
+
+    $.datetimepicker.setLocale(Alchemy.locale);
+
+    # Initializes the datepickers and disables the browsers default Datepicker
+    # unless the browser is iOS.
+    $('input[type="date"], input.date', scope)
+      .datetimepicker(datepicker_options).prop "type", "text" unless Alchemy.isiOS
+
+    $('input[type="time"], input.time', scope)
+      .datetimepicker(timepicker_options).prop "type", "text" unless Alchemy.isiOS
+
+    $('input[type="datetime"], input.datetime', scope)
+      .datetimepicker(options).prop "type", "text" unless Alchemy.isiOS
+
+    return

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

@@ -81,6 +81,7 @@ class window.Alchemy.Dialog
     @dialog_body.hide()
     @dialog_body.html(data)
     @init()
+    @dialog.trigger('DialogReady.Alchemy', @dialog_body)
     if @options.ready?
       @options.ready(@dialog_body)
     @dialog_body.show('fade', 200)

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

@@ -4,6 +4,8 @@ window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
 
 Alchemy.I18n =
 
+  KEY_SEPARATOR: /\./
+
   # Translates given string
   #
   translate: (key, replacement) ->
@@ -11,7 +13,11 @@ Alchemy.I18n =
       throw 'Alchemy.locale is not set! Please set Alchemy.locale to a locale string in order to translate something.'
     translations = Alchemy.translations[Alchemy.locale]
     if translations
-      translation = translations[key] || key
+      if @KEY_SEPARATOR.test(key)
+        keys = key.split(@KEY_SEPARATOR)
+        translation = translations[keys[0]][keys[1]] || key
+      else
+        translation = translations[key] || key
       if replacement
         translation.replace(/%\{.+\}/, replacement)
       else

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

@@ -56,7 +56,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
   attachTreeEvents: ->
     # The select page and show elements links.
     $('a.sitemap_pagename_link, a.show_elements_to_link', @dialog_body).click (e) =>
-      $this = $(e.target)
+      $this = $(e.currentTarget)
       page_id = $this.data('page-id')
       url = $this.data('url')
       # Select page in page tree

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

@@ -1,3 +1,5 @@
+#= require date-formatter
+
 window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
 
 # The admin sitemap Alchemy module
@@ -15,6 +17,8 @@ Alchemy.Sitemap =
     @list_template = Handlebars.compile(list_template_html)
     @items = null
     @options = options
+    @watchPagePublicationState()
+    true
 
     Handlebars.registerPartial('list', list_template_html)
 
@@ -92,3 +96,25 @@ Alchemy.Sitemap =
     @filter_field_clear.click =>
       @search_field.val('')
       filter('')
+
+  # Handles the page publication date fields
+  watchPagePublicationState: ->
+    $(document).on 'DialogReady.Alchemy', (e, $dialog) ->
+      $public_on_field = $('#page_public_on', $dialog)
+      $public_until_field = $('#page_public_until', $dialog)
+      $publication_date_fields = $('.page-publication-date-fields', $dialog)
+
+      $('#page_public', $dialog).click ->
+        $checkbox = $(this)
+        format = $checkbox.data('date-format')
+        now = new Date()
+        if $checkbox.is(':checked')
+          $publication_date_fields.removeClass('hidden')
+          $public_on_field.val Date.format(now, format)
+        else
+          $publication_date_fields.addClass('hidden')
+          $public_on_field.val('')
+        $public_until_field.val('')
+        true
+
+    return

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

@@ -24,6 +24,11 @@ Alchemy.translations =
     'File type not allowed': 'Dateityp nicht erlaubt.'
     'Maximum number of files exceeded': 'Maximale Anzahl gleichzeitig erlaubter Datei-Uploads erreicht.'
     'Uploaded bytes exceed file size': 'Maximale Größe der erlaubten Dateigröße erreicht.'
+    formats:
+      datetime: "d.m.Y H:i"
+      date: "d.m.Y"
+      time: "H:i"
+      start_of_week: 1
 
   # English
   en:
@@ -45,6 +50,11 @@ Alchemy.translations =
     'File type not allowed': 'File type not allowed'
     'Maximum number of files exceeded': 'Maximum number of files exceeded.'
     'Uploaded bytes exceed file size': 'Uploaded bytes exceed file size'
+    formats:
+      datetime: "Y-m-d H:i"
+      date: "Y-m-d"
+      time: "H:i"
+      start_of_week: 0
 
   # Dutch
   nl:
@@ -66,7 +76,11 @@ Alchemy.translations =
     'File type not allowed': 'File type not allowed'
     'Maximum number of files exceeded': 'Uploadlimiet bereikt.'
     'Uploaded bytes exceed file size': 'Uploaded bytes exceed file size'
-
+    formats:
+      datetime: "Y-m-d H:i"
+      date: "Y-m-d"
+      time: "H:i"
+      start_of_week: 1
 
   # French
   fr:
@@ -88,6 +102,11 @@ Alchemy.translations =
     'File type not allowed': 'Type de document non autorisé.'
     'Maximum number of files exceeded': 'Le nombre maximum de fichiers est atteint.'
     'Uploaded bytes exceed file size': 'Taille de fichier maximale autorisée atteint.'
+    formats:
+      datetime: "d.m.Y H:i"
+      date: "d.m.Y"
+      time: "H:i"
+      start_of_week: 1
 
   # Russian
   ru:
@@ -109,6 +128,11 @@ Alchemy.translations =
     'File type not allowed': 'Этот тип файла не разрешен'
     'Maximum number of files exceeded': 'Исчерпано максимальное количество файлов.'
     'Uploaded bytes exceed file size': 'Превышен максимальный размер файла'
+    formats:
+      datetime: "d.m.Y H:i"
+      date: "d.m.Y"
+      time: "H:i"
+      start_of_week: 1
 
   # Spanish
   es:
@@ -130,3 +154,34 @@ Alchemy.translations =
     'File type not allowed': 'El tipo de archivo no está permitido'
     'Maximum number of files exceeded': 'Número máximo de archivos excedido.'
     'Uploaded bytes exceed file size': 'Los bytes subidos exceden el tamaño del archivo'
+    formats:
+      datetime: "d/m/Y H:i"
+      date: "d/m/Y"
+      time: "H:i"
+      start_of_week: 1
+
+  # Italian
+  it:
+    allowed_chars: 'di %{count} caratteri'
+    cancel: 'Annulla'
+    cancelled: 'Annullato'
+    click_to_edit: 'clicca per modificare'
+    complete: 'Completato'
+    element_dirty_notice: 'Questo elemento contiene delle modifiche non salvate. Vuoi veramenter chiuderlo?'
+    help: 'Aiuto'
+    ok: 'Ok'
+    page_dirty_notice: 'Su questa pagina hai delle modifiche non salvate. Verranno perse se decidi di continuare.'
+    page_found: 'Pagina trovata'
+    pages_found: 'Pagine trovate'
+    url_validation_failed: 'Formato URL non valido.'
+    warning: 'Attenzione!'
+    'File is too large': 'Il file è troppo grande'
+    'File is too small': 'Il file è troppo piccolo'
+    'File type not allowed': 'Tipo di file non consentito'
+    'Maximum number of files exceeded': 'Numero massimo di file raggiunto.'
+    'Uploaded bytes exceed file size': 'Il numero di byte caricati eccede la dimensione del file'
+    formats:
+      datetime: "Y-m-d H:i"
+      date: "Y-m-d"
+      time: "H:i"
+      start_of_week: 1

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

@@ -60,3 +60,4 @@ $error_background_color: #efd3d3;
 
 $form-left-width: 35%;
 $form-right-width: 65%;
+$sitemap-line-height: 24px;

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

@@ -26,7 +26,8 @@
 @import "alchemy/selects";
 @import "alchemy/sitemap";
 @import "alchemy/tables";
+@import "alchemy/lists";
 @import "alchemy/upload";
 @import "alchemy/jquery-ui";
 @import "jquery.Jcrop.min";
-@import "alchemy/custom";
+@import "jquery.datetimepicker";

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

@@ -25,6 +25,13 @@ div#image_assign_filter_and_image_sizing {
   position: relative;
   @extend %rounded-border;
 
+  img {
+    width: auto;
+    height: auto;
+    max-width: 100%;
+    max-height: 100%;
+  }
+
   .thumbnail_background {
     @extend %thumbnail-background;
     width: 160px;

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

@@ -256,48 +256,6 @@ div#page_editing_menu {
   margin-top: 1em;
 }
 
-li.even {
-  background-color: #fff;
-}
-
-li.odd {
-  background-color: #eaf3f9;
-}
-
-ul.list {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-ul#layoutpages.list {
-  margin-top: 16px;
-}
-
-ul#layoutpages.list li {
-  margin-left: 8px;
-}
-
-ul#sitemap.list {
-  padding: 0 0 104px 0;
-}
-
-ul.list li {
-  list-style-type: none;
-  border-width: 0;
-  border-style: none;
-  display: block;
-}
-
-ul.list li.legend {
-  background-color: transparent;
-  font-weight: bold;
-}
-
-ul.list span.right {
-  float: right;
-}
-
 .handle {
   cursor: move;
 }