alchemy_cms 3.1.0.beta1 → 3.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8ff921fd176dd5ee1ffbbb6c23b73d3a03f6f05
-  data.tar.gz: 09825c9d513e598cab488839e88f80ef301f2c67
+  metadata.gz: d3f9fd30a6baa86b0499dff4647278d18e65596e
+  data.tar.gz: 2391c52bfedb51e86cd9221e30af4a262734e524
 SHA512:
-  metadata.gz: 5baf66ef54d6670f7f8f05d5a55bdfef93d7725c9084d12dd84cd430851ff261190473837555fb767fd9822326582474c71b15e088a53dbf4e96e44473a3d85d
-  data.tar.gz: e3cfe5a46b73571a77da7296df1b1d8c978b7ab6004e6f7ce9e8b9c42e1910cd0e24cac3ab81f1edc5238e7d7a492889d9e266b3cfa47f975de6daa1a5b11e1a
+  metadata.gz: 9f2c4f1c5e7da9afab852f2d8a73cd1e9832e4e98ceb52b2fce51f8a67dc324499f6733b1c35749d6c386040eb36b29d7816a9156ac6f55dde55bb4cfcbb63f8
+  data.tar.gz: 716c636e3c9770bdc2eddc5c5f25beec76e2dd2bbbb44020997dca8a5f661b250494e29e175fd158d29d595204726d3c556778829656a28c09020a6b97aa3a50

data/.gitignore

@@ -24,3 +24,4 @@ spec/dummy/config/locales/**/*
 /.ruby-version
 /index/
 /.bundle/
+.rbenv-version

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
@@ -6,8 +8,8 @@ rvm:
 branches:
   only:
     - master
-before_script: 'rake alchemy:spec:prepare'
-script: rspec
+before_script: 'bundle exec rake alchemy:spec:prepare'
+script: 'bundle exec rspec'
 env:
   - DB=mysql
   - DB=postgresql

data/README.md

@@ -80,6 +80,14 @@ gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: 'master'
 
 **NOTE:** You normally want to use a stable branch, like `3.0-stable`.
 
+If you want to use Russian translation and have better i18n support, you should put:
+
+```ruby
+gem 'russian', '~> 0.6.0'
+```
+
+or gem with similar functionality into your Gemfile.
+
 #### 2. Update your bundle:
 
 ```shell
@@ -275,7 +283,7 @@ $ bundle exec rake
 
 **A note about RSpec version:**
 
-Alchemy specs are written **in RSpec 3**. Please **do not use depricated RSpec 2.x syntax**. Thanks
+Alchemy specs are written **in RSpec 3**. Please **do not use deprecated RSpec 2.x syntax**. Thanks
 
 
 Getting Help

data/alchemy_cms.gemspec

@@ -31,18 +31,17 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'simple_form',                      '~> 3.0'
   gem.add_runtime_dependency 'jquery-rails',                     '~> 3.1.0'
   gem.add_runtime_dependency 'jquery-ui-rails',                  '~> 5.0.0'
-  gem.add_runtime_dependency 'sass-rails',                       '>= 4.0.4'
-  gem.add_runtime_dependency 'sass',                             '>= 3.2.19'
+  gem.add_runtime_dependency 'sass-rails',                       '~> 4.0.5'
   gem.add_runtime_dependency 'uglifier',                         '>= 1.3.0'
   gem.add_runtime_dependency 'coffee-rails',                     '~> 4.0.0'
   gem.add_runtime_dependency 'compass-rails',                    '>= 1.1.2'
   gem.add_runtime_dependency 'sassy-buttons',                    '~> 0.2.6'
-  gem.add_runtime_dependency 'select2-rails',                    '~> 3.4'
+  gem.add_runtime_dependency 'select2-rails',                    '>= 3.5.9.1', '< 4.0'
   gem.add_runtime_dependency 'tvdeyen-handles_sortable_columns', '~> 0.1.5'
   gem.add_runtime_dependency 'spinner.rb'
-  gem.add_runtime_dependency 'turbolinks',                       '~> 2.0'
+  gem.add_runtime_dependency 'turbolinks',                       '~> 2.5'
   gem.add_runtime_dependency 'non-stupid-digest-assets',         '~> 1.0.3'
-  gem.add_runtime_dependency 'active_model_serializers',         '>= 0.8.1', '< 0.10.0'
+  gem.add_runtime_dependency 'active_model_serializers',         '>= 0.8.1', '< 0.9.1'
   gem.add_runtime_dependency 'request_store',                    '~> 1.1.0'
 
   gem.add_development_dependency 'rspec-rails', '~> 3.0'
@@ -50,18 +49,30 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'factory_girl_rails'
 
   gem.post_install_message =<<-MSG
-To complete the installation of Alchemy please run:
+-------------------------------------------------------------
+            Thank you for installing Alchemy CMS
+-------------------------------------------------------------
 
-$ bin/rake alchemy:install
+- Create a new standalone Alchemy project:
 
-To upgrade former Alchemy intallations please run:
+  $ alchemy new my_project_name
 
-$ bin/rake alchemy:upgrade
+- Complete the installation in an existing Rails application:
 
-Thanks for installing Alchemy!
+  $ bin/rake alchemy:install
+
+- Complete the upgrade of an existing Alchemy installation:
+
+  $ bin/rake alchemy:upgrade
+
+and follow the onscreen instructions.
+
+Need help? Try:
+
+* http://stackoverflow.com/questions/tagged/alchemy-cms
+* http://groups.google.com/group/alchemy-cms
+* irc://irc.freenode.net#alchemy_cms
+-------------------------------------------------------------
 
-Need help?
-Try https://groups.google.com/forum/#!forum/alchemy-cms
-or #alchemy_cms on irc.freenode.net
 MSG
 end

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

@@ -26,5 +26,5 @@ Alchemy.Autocomplete =
   _initializeSelection: (element, callback) ->
     data = []
     $(element.val().split(",")).each ->
-      data.push id: this, text: this
+      data.push id: $.trim(this), text: this
     callback(data)

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

@@ -47,7 +47,7 @@ Alchemy.ElementEditors =
     self.scrollToElement this
     self.selectElementInPreview id
 
-  # Selcts and scrolls to element with given id in the preview window.
+  # Selects and scrolls to element with given id in the preview window.
   #
   selectElementInPreview: (id) ->
     $frame_elements = document.getElementById("alchemy_preview_window").contentWindow.jQuery("[data-alchemy-element]")

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

@@ -43,6 +43,15 @@ Alchemy.Initializer = ->
     tagName = (event.target || event.srcElement).tagName
     key.isPressed('esc') || !(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA')
 
+  # Sticky table headers
+  $('table.list').floatThead
+    useAbsolutePositioning: false,
+    scrollingTop: 122,
+    zIndex: 1
+
+# Enabling the Turbolinks Progress Bar
+Turbolinks.enableProgressBar()
+
 # Turbolinks DOM Ready
 $(document).on 'page:change', ->
   Alchemy.Initializer()

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

@@ -16,6 +16,10 @@
 //= require requestAnimationFrame
 //= require select2
 //= require select2_locale_de
+//= require select2_locale_es
+//= require select2_locale_fr
+//= require select2_locale_nl
+//= require select2_locale_ru
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.autocomplete
 //= require alchemy/alchemy.browser

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

@@ -63,12 +63,13 @@ Alchemy.initAlchemyPreviewMode = ($) ->
         $el = $(e.delegateTarget)
         $elements = @$previewElements
         offset = @scrollOffset
+        el_offset = $el.offset()
         e.preventDefault()
         $elements.removeClass("selected").css(@getStyle("reset"))
         $el.addClass("selected").css(@getStyle("selected"))
         $("html, body").animate
-          scrollTop: $el.offset().top - offset
-          scrollLeft: $el.offset().left - offset
+          scrollTop: el_offset.top - offset
+          scrollLeft: el_offset.left - offset
         , 400
         return
 

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

@@ -29,6 +29,8 @@ Alchemy.PreviewWindow =
   refresh: (callback) ->
     $iframe = $('#alchemy_preview_window')
     @_showSpinner()
+    # We need to be sure that no load event is binded on the preview frame.
+    $iframe.off('load')
     $iframe.load (e) =>
       @_hideSpinner()
       if callback

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

@@ -87,4 +87,46 @@ Alchemy.translations =
     'File is too small': 'Le fichier est trop petit.'
     '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.'
+    'Uploaded bytes exceed file size': 'Taille de fichier maximale autorisée atteint.'
+
+  # Russian
+  ru:
+    allowed_chars: '%{count} знаков'
+    cancel: 'Отмена'
+    cancelled: 'Отменено'
+    click_to_edit: 'нажмите, чтобы редактировать'
+    complete: 'Завершено'
+    element_dirty_notice: 'Для этого элемента есть несохраненные изменения. Вы действительно хотите их сбросить?'
+    help: 'Помощь'
+    ok: 'Ок'
+    page_dirty_notice: 'На странице есть несохраненные изменения. Если вы продолжите, то они пропадут.'
+    page_found: 'Страница найдена'
+    pages_found: 'Страницы найдены'
+    url_validation_failed: 'Адрес (URL) имеет неверный формат.'
+    warning: 'Внимание!'
+    'File is too large': 'Файл слишком большой'
+    'File is too small': 'Файл слишком маленький'
+    'File type not allowed': 'Этот тип файла не разрешен'
+    'Maximum number of files exceeded': 'Исчерпано максимальное количество файлов.'
+    'Uploaded bytes exceed file size': 'Превышен максимальный размер файла'
+      
+  # Spanish
+  es:
+    allowed_chars: 'de %{count} caracteres'
+    cancel: 'Cancelar'
+    cancelled: 'Cancelado'
+    click_to_edit: 'Pulsar para editar'
+    complete: 'Completado'
+    element_dirty_notice: 'Este elemento tiene cambios sin guardar. ¿Realmente quieres plegarlo?'
+    help: 'Ayuda'
+    ok: 'Aceptar'
+    page_dirty_notice: 'Tienes cambios sin guardar en esta página. Si continúas se perderán.'
+    page_found: 'Página encontrada'
+    pages_found: 'Páginas encontradas'
+    url_validation_failed: 'La url no tiene un formato válido.'
+    warning: '¡Atención!'
+    'File is too large': 'El archivo es demasiado grande'
+    'File is too small': 'El archivo es demasiado pequeño'
+    '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'

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

@@ -1,8 +1,7 @@
 @mixin default-focus-style {
   border-color: $blue;
-  @include box-shadow(0 0 2px 2px $blue);
+  @include box-shadow(0 0 1px 2px $blue);
   outline: none;
-  @include transition(all 0.25s ease-in-out);
 
   &::-moz-focus-inner {
     border: none !important;

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

@@ -216,7 +216,7 @@ div#library_sidebar {
   padding-top: 96px;
   padding: 84px 4*$default-padding 0 4*$default-padding;
   height: 100%;
-  z-index: 0;
+  z-index: 3;
   background-color: $light-gray;
 
   h2 {

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

@@ -1,5 +1,11 @@
 html {
   height: 100%;
+
+  &.turbolinks-progress-bar::before {
+    background-color: $blue !important;
+    height: 3px !important;
+    z-index: 400001;
+  }
 }
 
 noscript {
@@ -37,10 +43,21 @@ body {
 }
 
 h1 {
-  margin: 8px;
   padding: 0;
+  margin: 8px;
   font-weight: bold;
   font-size: $default-font-size;
+
+  &.resources-header {
+    position: fixed;
+    width: 100%;
+    top: 75px;
+    left: 74px;
+    z-index: 2;
+    margin: 0 -8px;
+    padding: 16px;
+    background-color: $light-gray;
+  }
 }
 
 h2 {

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

@@ -196,6 +196,11 @@ button.icon_button {
     border: $default-border;
     padding: 2px;
     @extend %rounded-border;
+
+    &:focus {
+      border: 0;
+      padding: 3px;
+    }
   }
 
   .select2-container {

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

@@ -48,7 +48,6 @@
 .alchemy-dialog {
   position: relative;
   max-width: 100%;
-  max-height: 100%;
   display: inline-block;
   vertical-align: middle;
   text-align: left;

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

@@ -122,12 +122,12 @@ div#overlay_text_box {
   left: 0;
   text-align: center;
   width: 65px;
-  padding-top: 4px;
-  padding-bottom: 8px;
   background: $light-blue;
 
   a {
     display: block;
+    padding-top: 4px;
+    padding-bottom: 8px;
 
     &:hover {
       text-decoration: none;
@@ -142,7 +142,7 @@ div#overlay_text_box {
 #main_content {
   @include box-sizing(border-box);
   background-color: $light-gray;
-  padding: 73px 8px 8px 74px;
+  padding: 75px 8px 8px 74px;
   z-index: 0;
   width: 100%;
   height: 100%;
@@ -154,6 +154,10 @@ div#overlay_text_box {
   &.with_tag_filter {
     padding-right: 230px;
   }
+
+  &.resources-table-wrapper {
+    padding-top: 47px;
+  }
 }
 
 div#user_info {
@@ -197,20 +201,22 @@ div#user_info {
     text-shadow: 0px 1px 1px #FFFFFF;
     @extend .disable-user-select;
     cursor: default;
-    line-height: 22px;
+    line-height: 27px;
     float: left;
     @extend .top-rounded-border;
     border: $default-border;
     border-bottom-style: none;
     height: 24px;
     margin-right: 1px;
+
+    .page_name {
+      position: relative;
+      bottom: 2px;
+    }
   }
 
   .page_name {
-    position: relative;
     margin-right: $default-margin;
-    line-height: 27px;
-    bottom: 2px;
   }
 
   .page_language {
@@ -228,7 +234,6 @@ div#user_info {
 
   .subnavi_tab {
     float: left;
-    padding: 0px 8px;
     line-height: 21px;
     height: 23px;
     text-shadow: #fff 0 0px 4px;
@@ -257,9 +262,7 @@ div#user_info {
     }
 
     &.active {
-      float: left;
       position: relative;
-      padding: 0px 8px;
       height: 24px;
       color: $text-color;
       background-color: $medium-gray;
@@ -268,6 +271,10 @@ div#user_info {
       cursor: default;
       z-index: 10;
     }
+
+    > a {
+      padding: 0px 8px;
+    }
   }
 }
 

data/app/assets/stylesheets/alchemy/menubar.css.scss

@@ -70,8 +70,11 @@
         line-height: 14px;
         font-weight: normal;
         text-decoration: none !important;
+        text-transform: none;
         color: $text-color !important;
         font-family: $default-font-face;
+
+        &:after { display: none }
       }
     }
   }

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

@@ -21,36 +21,58 @@ table {
   border-left: 1px solid $medium-gray
 }
 
+.list th {
+  position: relative;
+
+  &.icon {
+    border-bottom: 1px solid $medium-gray;
+  }
+}
+
+.floatThead-container {
+  background: $light-gray;
+  overflow: visible !important; // the javascript author thought that, but ....
+
+  &:after {
+    position: absolute;
+    bottom: -4px;
+    left: 0;
+    width: 100%;
+    height: 4px;
+    @include background(linear-gradient(top, $light-gray 0%, rgba($light-gray, .0) 100%));
+    content: '';
+  }
+}
+
 th {
   white-space: nowrap;
   text-align: left;
   vertical-align: top;
-  @include background(linear-gradient(top, lighten($light-gray, 10) 0%, $light-gray 30%, $light-gray 90%, darken($light-gray, 10) 100%));
-  border-top: 1px solid $medium-gray;
-  color: #666;
+  background: $light-gray;
+  border-bottom: 1px solid $medium-gray;
   font-weight: normal;
+  text-transform: uppercase;
 
   i {
     font-style: normal;
     position: absolute;
     right: 2px;
     top: 4px;
-    color: #999;
-    @include text-shadow(1px 1px 0px #fff);
+    @include text-shadow(1px 1px 1px #fff);
   }
 
   a {
-    @include text-shadow(1px 1px 0px #fff);
 
     &.sortable {
       display: block;
       margin: -4px -8px;
       padding: 4px 18px 4px 8px;
+      @include text-shadow(1px 1px 1px #fff);
     }
 
     &.sorted {
       position: relative;
-      @include background(linear-gradient(top, lighten($light-gray, 10) 0%, $very-light-blue 50%, $light-gray 90%, darken($light-gray, 10) 100%));
+      background: $medium-gray;
     }
   }
 }
@@ -91,7 +113,7 @@ td.heading {
 .list td.icon, .list th.icon {
   background-color: $light-gray;
   background-image: none;
-  border: 0 none;
+  border-left: 0 none;
   padding: 0;
   border-right: 1px solid $medium-gray;
   text-align: center;