alchemy_cms 2.2.4 → 2.3.rc5

data/.gitignore

@@ -18,4 +18,4 @@ spec/dummy/uploads/
 spec/dummy/db/test.sqlite3-journal
 spec/dummy/db/seeds.rb
 .rvmrc
-/coverage/
+spec/dummy/config/locales/**/*

data/.travis.yml

@@ -5,12 +5,11 @@ rvm:
   - 1.9.3
 branches:
   only:
-    - 2.2-stable
+    - master
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - "phantomjs -v"
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load --trace'"
-script: "bundle exec rspec spec --format=doc"
+script: "bundle exec rspec spec"
 env:
   - DB=mysql
   - DB=postgresql

data/Gemfile

@@ -24,6 +24,7 @@ end
 
 group :development do
   unless ENV['CI']
+    #gem 'localeapp'
     gem 'guard-spork'
     gem 'debugger', :platform => :ruby_19
     gem 'ruby-debug', :platform => :ruby_18

data/README.md

@@ -1,12 +1,16 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.2-stable)](http://travis-ci.org/magiclabs/alchemy_cms)
-![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
+[![Maintenance Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)](http://stillmaintained.com/magiclabs/alchemy_cms)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/magiclabs/alchemy_cms)
+[![Dependency Status](https://gemnasium.com/magiclabs/alchemy_cms.png)](https://gemnasium.com/magiclabs/alchemy_cms)
 
 About
 -----
 
+**This branch is a beta development branch. For productive environments use the current rubygems version, or the [latest stable branch (2.2-stable)](https://github.com/magiclabs/alchemy_cms/tree/2.2-stable).**
+
 Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 
 Read more on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
@@ -33,9 +37,9 @@ Features
 Rails Version
 -------------
 
-This version of Alchemy runs with Rails 3.2 only.
+This version of Alchemy runs with Rails 3.2.6+.
 
-If you are looking for a Rails 3.1 compatible version check the 2.1-stable branch.
+If you are looking for a Rails 3.1 compatible version check the 2.2-stable branch.
 
 If you are looking for a Rails 3.0 compatible version check the 2.0-stable branch.
 
@@ -51,7 +55,7 @@ Installation
 
 Use the installer (recommended):
 
-    gem install alchemy_cms
+    gem install alchemy_cms --pre
     alchemy new my_magicpage
 
 Start the local server:
@@ -79,7 +83,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', :git => 'git://github.com/magiclabs/alchemy_cms.git'
+    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms'
 
 Run in terminal:
 

data/alchemy_cms.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<rails>, ["~> 3.2.11"])
+  s.add_runtime_dependency(%q<rails>, ["~> 3.2.5"])
   s.add_runtime_dependency(%q<authlogic>)
   s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
+  s.add_runtime_dependency(%q<acts-as-taggable-on>, ["~> 2.1"])
   s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
   s.add_runtime_dependency(%q<tvdeyen-fleximage>, ["~> 1.2.0"])
   s.add_runtime_dependency(%q<kaminari>, ["~> 0.13.0"])
@@ -34,11 +35,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
   s.add_runtime_dependency(%q<sass-rails>, ['~> 3.2.3'])
   s.add_runtime_dependency(%q<coffee-rails>, ['~> 3.2.1'])
+  s.add_runtime_dependency(%q<compass-rails>, ['~> 1.0.3'])
+  s.add_runtime_dependency(%q<sassy-buttons>, ['~> 0.1.3'])
 
   s.add_development_dependency(%q<bumpy>)
   s.add_development_dependency(%q<capybara>)
   s.add_development_dependency(%q<factory_girl_rails>, ['~> 1.7.0'])
-  s.add_development_dependency(%q<rspec-rails>,        ['2.12.0'])
+  s.add_development_dependency(%q<rspec-rails>)
   s.add_development_dependency(%q<sqlite3>)
   s.add_development_dependency(%q<yard>)
 

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

@@ -10,53 +10,38 @@ if (typeof(Alchemy) === 'undefined') {
   // The Alchemy JavaScript Object contains all Functions
   $.extend(Alchemy, {
 
-    inPlaceEditor: function(options) {
-      var defaults = {
-        save_label: 'save',
-        cancel_label: 'cancel'
-      };
-      var settings = jQuery.extend({}, defaults, options);
-      var cancel_handler = function(element) {
-          jQuery(element).css({
-            overflow: 'hidden'
-          });
-          return true;
-        };
-      var submit_handler = function(element, id, value) {
-          $(element).css({
-            overflow: 'hidden'
-          });
-          id = id.match(/\d+/)[0];
-          $.ajax({
-            url: Alchemy.routes.admin_picture_path(id),
-            type: 'PUT',
-            data: {
-              name: value,
-              size: Alchemy.getUrlParam('size')
-            }
-          });
-          return false;
-        };
-
-      $('#alchemy .rename').click(function() {
-        $(this).css({
-          overflow: 'visible'
-        });
+    pictureSelector: function() {
+      var
+        $selected_item_tools = $('.selected_item_tools'),
+        $picture_selects = $('.picture_tool.select input');
+      $picture_selects.on('change', function() {
+        if ($picture_selects.filter(':checked').size() > 0) {
+          $selected_item_tools.show();
+        } else {
+          $selected_item_tools.hide();
+        }
+        if (this.checked) {
+          $(this).parent().addClass('visible').removeClass('hidden');
+        } else {
+          $(this).parent().removeClass('visible').addClass('hidden');
+        }
       });
-
-      $('#alchemy .rename').inPlaceEdit({
-        submit: submit_handler,
-        cancel: cancel_handler,
-        html: ' \
-                <div class="inplace-edit"> \
-                  <input type="text" value="" class="thin_border field" /> \
-                  <div class="buttons"> \
-                    <input type="button" value="' + settings.save_label + '" class="save-button button" /> \
-                    <input type="button" value="' + settings.cancel_label + '" class="cancel-button button" /> \
-                  </div> \
-                </div>'
+      $('a#edit_multiple_pictures').on('click', function(e) {
+        var
+          $this = $(this),
+          picture_ids = $("input:checkbox", '#picture_archive').serialize();
+        e.preventDefault();
+        Alchemy.openWindow(
+          $this.attr('href') + '?' + picture_ids,
+          $this.attr('title'),
+          400,
+          230,
+          false,
+          true,
+          false
+        );
+        return false;
       });
-
     },
 
     pleaseWaitOverlay: function(show) {
@@ -180,26 +165,14 @@ if (typeof(Alchemy) === 'undefined') {
       });
     },
 
-    SelectBox: function(selector) {
-      $(selector).sb({
-        animDuration: 0,
-        fixedWidth: true
-      });
+    SelectBox: function(scope) {
+      $('select', scope).selectBoxIt();
     },
 
     Buttons: function(options) {
       $("button, input:submit, a.button").button(options);
     },
 
-    handleEssenceCheckbox: function(checkbox) {
-      var $checkbox = $(checkbox);
-      if (checkbox.checked) {
-        $('#' + checkbox.id + '_hidden').remove();
-      } else {
-        $checkbox.after('<input type="hidden" value="0" name="' + checkbox.name + '" id="' + checkbox.id + '_hidden">');
-      }
-    },
-
     selectOrCreateCellTab: function(cell_name, label) {
       if ($('#cell_' + cell_name).size() === 0) {
         $('#cells').tabs('add', '#cell_' + cell_name, label);
@@ -220,8 +193,26 @@ if (typeof(Alchemy) === 'undefined') {
       if (results) return results[1] || 0;
     },
 
+    isiPhone: navigator.userAgent.match(/iPhone/i) !== null,
+    isiPad: navigator.userAgent.match(/iPad/i) !== null,
+    isiPod: navigator.userAgent.match(/iPod/i) !== null,
+    isiOS: navigator.userAgent.match(/iPad|iPhone|iPod/i) !== null,
+    isFirefox: navigator.userAgent.match(/Firefox/i) !== null,
+    isChrome: navigator.userAgent.match(/Chrome/i) !== null,
+    isSafari: navigator.userAgent.match(/Safari/i) !== null,
+    isIE: navigator.userAgent.match(/MSIE/i) !== null,
+
     locale: 'en'
 
   });
 
+  Alchemy.getBrowserVersion = function(browser) {
+    return Alchemy['is' + browser] ? parseInt(navigator.userAgent.match(new RegExp(browser + ".[0-9]+", 'i'))[0].replace(new RegExp(browser + '.'), ''), 10) : null;
+  }
+
+  Alchemy.ChromeVersion = Alchemy.getBrowserVersion('Chrome');
+  Alchemy.FirefoxVersion = Alchemy.getBrowserVersion('Firefox');
+  Alchemy.SafariVersion = Alchemy.getBrowserVersion('Safari');
+  Alchemy.IEVersion = Alchemy.getBrowserVersion('MSIE');
+
 })(jQuery);

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

@@ -15,16 +15,18 @@ if (typeof(Alchemy) === 'undefined') {
     disableButton: function(button) {
       var $button = $(button),
         $clone = $button.clone(),
-        width = $button.outerWidth(),
-        text = $button.text();
+        width = Alchemy.getButtonWidth($button),
+        height = Alchemy.getButtonHeight($button),
+        spinner = '<img src="/assets/alchemy/ajax_loader.gif" style="width: 16px; height: 16px">';
       $button.hide().addClass('disabled');
       $button.parent().append($clone);
       $clone.attr({
         disabled: true,
         href: 'javascript:void(0)'
       }).addClass('cloned-button').css({
-        width: width
-      }).html('<img src="/assets/alchemy/ajax_loader.gif" style="width: 16px; height: 16px">').show();
+        width: width,
+        'line-height': height + 'px'
+      }).html(spinner).show();
       return true;
     },
 
@@ -33,6 +35,14 @@ if (typeof(Alchemy) === 'undefined') {
       $button.show().removeClass('disabled');
       $button.parent().find('.cloned-button').remove();
       return true;
+    },
+
+    getButtonWidth: function($button) {
+      return $button.outerWidth() - (parseInt($button.css('border-left-width'), 10) + parseInt($button.css('border-right-width'), 10));
+    },
+
+    getButtonHeight: function($button) {
+      return $button.outerHeight() - (parseInt($button.css('border-top-width'), 10) + parseInt($button.css('border-bottom-width'), 10));
     }
 
   });

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

@@ -7,13 +7,17 @@ if (typeof(Alchemy) === 'undefined') {
   $.extend(Alchemy, {
 
     Datepicker: function(selector) {
+      var browserHasDatepicker = Alchemy.isiOS || (Alchemy.isChrome && Alchemy.ChromeVersion >= 20);
       var datepicker_options = {
         dateFormat: 'yy-mm-dd',
         changeMonth: true,
         changeYear: true,
         showWeek: true,
         showButtonPanel: true,
-        showOtherMonths: true
+        showOtherMonths: true,
+        onSelect: function() {
+          Alchemy.setElementDirty($(this).parents('div.element_editor'));
+        }
       };
       if (typeof(selector) === 'undefined') {
         var selector = 'input[type="date"], input.date'
@@ -32,7 +36,9 @@ if (typeof(Alchemy) === 'undefined') {
           prevText: 'vorheriger'
         });
       }
-      $(selector).datepicker(datepicker_options);
+      if (!browserHasDatepicker) {
+        $(selector).datepicker(datepicker_options);
+      }
     }
 
   });

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

@@ -71,13 +71,21 @@ if (typeof(Alchemy) === 'undefined') {
 
     button: {
       enable: function() {
-        $('div#show_element_window').removeClass('disabled');
+        $('div#show_element_window').
+          removeClass('disabled').
+          find('a').removeAttr('tabindex');
       },
       disable: function() {
-        $('div#show_element_window').addClass('disabled');
+        $('div#show_element_window').
+          addClass('disabled').
+          find('a').attr('tabindex', '-1');
       },
       toggle: function() {
-        $('div#show_element_window').toggleClass('disabled');
+        if ($('div#show_element_window').hasClass('disabled')) {
+          Alchemy.ElementsWindow.button.enable();
+        } else {
+          Alchemy.ElementsWindow.button.disable();
+        }
       }
     },
 

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

@@ -5,7 +5,7 @@ Alchemy.GUI =
 
   initElement: ($el) ->
     Alchemy.ElementDirtyObserver($el)
-    Alchemy.SelectBox('select', $el)
+    Alchemy.SelectBox($el)
     Alchemy.ButtonObserver('button.button', $el)
     Alchemy.Datepicker('input[type="date"]', $el)
     Alchemy.overlayObserver($el)

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

@@ -27,7 +27,10 @@
             url: Alchemy.routes.link_admin_pages_path,
             success: (data, textStatus, XMLHttpRequest) ->
               $dialog.html(data)
-              Alchemy.SelectBox('#alchemyLinkOverlay select.alchemy_selectbox')
+              Alchemy.SelectBox('#alchemyLinkOverlay')
+              $dialog.css overflow: 'visible'
+              $dialog.dialog('widget').css overflow: 'visible'
+              Alchemy.LinkOverlay.attachEvents();
             error: (XMLHttpRequest, textStatus, errorThrown) ->
               Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown)
           })
@@ -36,6 +39,16 @@
       })
       Alchemy.LinkOverlay.current.linked_element = linked_element
 
+    attachEvents: ->
+      self = Alchemy.LinkOverlay
+      $('a.sitemap_pagename_link, a.show_elements_to_link', '#alchemyLinkOverlay').on 'click', (e) ->
+        e.preventDefault()
+        $this = $(this)
+        page_id = $this.data('page-id')
+        url = $this.data('url')
+        self.selectPage(page_id, url)
+        self.showElementsSelect(page_id) if $this.hasClass('show_elements_to_link')
+
     close : ->
       Alchemy.LinkOverlay.current.dialog('close')
       return true

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

@@ -72,7 +72,7 @@ Alchemy.initAlchemyPreviewMode = function() {
       clickElement: function(e) {
         var $this = $(this);
         var parent$ = window.parent.jQuery;
-        var target_id = $this.data('alchemy-element');
+        var target_id = $this.attr('data-alchemy-element');
         var $element_editor = parent$('#element_area .element_editor').closest('[id="element_' + target_id + '"]');
         var $elementsWindow = parent$('#alchemyElementWindow');
         e.preventDefault();

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

@@ -87,15 +87,23 @@ if (typeof(Alchemy) === 'undefined') {
 
     button: {
       enable: function() {
-        $('div#show_preview_window').removeClass('disabled');
+        $('div#show_preview_window').
+          removeClass('disabled').
+          find('a').removeAttr('tabindex');
       },
       disable: function() {
-        $('div#show_preview_window').addClass('disabled');
+        $('div#show_preview_window').
+          addClass('disabled').
+          find('a').attr('tabindex', '-1');
       },
       toggle: function() {
-        $('div#show_preview_window').toggleClass('disabled');
+        if ($('div#show_preview_window').hasClass('disabled')) {
+          Alchemy.PreviewWindow.button.enable();
+        } else {
+          Alchemy.PreviewWindow.button.disable();
+        }
       }
-    }
+    },
 
   };
 

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

@@ -68,7 +68,10 @@ Alchemy.Uploader = {
           if (status === 200) {
             window.setTimeout(function() {
               Alchemy.closeCurrentWindow();
-            }, 3500);
+              if (typeof(settings.onQueueComplete) !== 'undefined') {
+                settings.onQueueComplete.call();
+              }
+            }, 2000);
           }
         },
         onClientLoadStart: function(event, file) {

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

@@ -50,7 +50,7 @@ if (typeof(Alchemy) === 'undefined') {
       if (options.buttonId) $btn.attr({
         'id': options.buttonId
       });
-      $lnk = $('<a title="' + options.buttonTitle + '" class="icon_button"></a>');
+      $lnk = $('<a title="' + options.buttonTitle + '" class="icon_button" href="#"></a>');
       $lnk.click(options.onClick);
       $lnk.append('<span class="icon ' + options.iconClass + '"></span>');
       $btn.append($lnk);
@@ -110,7 +110,7 @@ if (typeof(Alchemy) === 'undefined') {
     },
 
     openWindow: function(action_url, title, size_x, size_y, resizable, modal, overflow) {
-      overflow == undefined ? overflow = false : overflow = overflow;
+      overflow == undefined ? overflow = true : overflow = overflow;
       if (size_x === 'fullscreen') {
         size_x = $(window).width() - 50;
         size_y = $(window).height() - 50;
@@ -151,7 +151,7 @@ if (typeof(Alchemy) === 'undefined') {
                   top: ($(window).height() - $dialog.dialog('widget').height()) / 2
                 });
               }
-              Alchemy.SelectBox('#alchemyOverlay select.alchemy_selectbox');
+              Alchemy.SelectBox('#alchemyOverlay');
               Alchemy.Datepicker('#alchemyOverlay input.date, #alchemyOverlay input[type="date"]');
               Alchemy.ButtonObserver('#alchemyOverlay .button');
               Alchemy.overlayObserver('#alchemyOverlay');
@@ -164,9 +164,6 @@ if (typeof(Alchemy) === 'undefined') {
             }
           });
         },
-        beforeClose: function() {
-          $(".sb.open").triggerAll("close");
-        },
         close: function() {
           $dialog.remove();
         }
@@ -294,13 +291,26 @@ if (typeof(Alchemy) === 'undefined') {
         return false;
       });
 
-      $('a[data-alchemy-confirm]', scope).on('click', function(event) {
+      $('a[data-alchemy-confirm-delete]', scope).on('click', function(event) {
         var $this = $(this);
-        var options = $this.data('alchemy-confirm');
+        var options = $this.data('alchemy-confirm-delete');
         event.preventDefault();
         Alchemy.confirmToDeleteWindow($this.attr('href'), options.title, options.message, options.ok_label, options.cancel_label);
         return false;
       });
+
+      $('input[data-alchemy-confirm], button[data-alchemy-confirm]', scope).on('click', function(event) {
+        var $this = $(this), self = this;
+        var options = $this.data('alchemy-confirm');
+        event.preventDefault();
+        Alchemy.openConfirmWindow($.extend(options, {
+          okCallback: function() {
+            Alchemy.pleaseWaitOverlay();
+            self.form.submit();
+          }
+        }));
+        return false;
+      });
     }
 
   });