alchemy_cms 2.4.beta2 → 2.4.rc1

data/.gitignore

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

data/.travis.yml

@@ -6,7 +6,9 @@ branches:
   only:
     - master
 before_script:
-  - "phantomjs -v"
+  - sudo spec/support/ci/install_phantomjs
+  - "export PATH=phantomjs/bin:$PATH"
+  - phantomjs --version
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load --trace'"
 script: "bundle exec rspec spec"
 env:

data/.yardopts

@@ -1,5 +1,5 @@
 --title "Alchemy CMS"
 app/**/*.rb
 config/**/*.yml
-lib/**/*
+lib/**/*.rb
 README.md

data/Gemfile

@@ -10,9 +10,10 @@ group :test do
   gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
   gem 'mysql2'                if ENV['DB'] == 'mysql'
   gem 'pg'                    if ENV['DB'] == 'postgresql'
-  gem 'poltergeist', '0.7.0'
+  gem 'poltergeist', '1.0.2'
   unless ENV['CI']
     gem 'launchy'
+    gem 'simplecov', :require => false
   end
 end
 

data/alchemy_cms.gemspec

@@ -20,23 +20,24 @@ 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.8"]
-  s.add_runtime_dependency %q<authlogic>,                 ["~> 3.1.3"]
-  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.5"]
-  s.add_runtime_dependency %q<tvdeyen-fleximage>,         ["~> 1.2.0"]
-  s.add_runtime_dependency %q<kaminari>,                  ["~> 0.13.0"]
-  s.add_runtime_dependency %q<acts_as_ferret>,            ["~> 0.5"]
-  s.add_runtime_dependency %q<acts_as_list>,              ["~> 0.1"]
-  s.add_runtime_dependency %q<magiclabs-userstamp>,       ["~> 2.0.2"]
-  s.add_runtime_dependency %q<dynamic_form>,              ["~> 1.1"]
-  s.add_runtime_dependency %q<jquery-rails>,              ["~> 2.1.3"]
-  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_runtime_dependency %q<rails>,                      ["~> 3.2.8"]
+  s.add_runtime_dependency %q<authlogic>,                  ["~> 3.1.3"]
+  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.5"]
+  s.add_runtime_dependency %q<tvdeyen-fleximage>,          ["~> 1.2.0"]
+  s.add_runtime_dependency %q<kaminari>,                   ["~> 0.13.0"]
+  s.add_runtime_dependency %q<acts_as_ferret>,             ["~> 0.5"]
+  s.add_runtime_dependency %q<acts_as_list>,               ["~> 0.1"]
+  s.add_runtime_dependency %q<magiclabs-userstamp>,        ["~> 2.0.2"]
+  s.add_runtime_dependency %q<dynamic_form>,               ["~> 1.1"]
+  s.add_runtime_dependency %q<jquery-rails>,               ["~> 2.1.3"]
+  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_runtime_dependency %q<rails3-jquery-autocomplete>, ['~> 1.0.10']
 
   s.add_development_dependency %q<bumpy>
   s.add_development_dependency %q<capybara>

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

@@ -200,9 +200,7 @@ if (typeof(Alchemy) === 'undefined') {
     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'
+    isIE: navigator.userAgent.match(/MSIE/i) !== null
 
   });
 

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

@@ -0,0 +1,28 @@
+window.Alchemy = {} if typeof (Alchemy) is "undefined"
+run = ($) ->
+  Alchemy.Browser =
+    isiPhone: navigator.userAgent.match(/iPhone/i) isnt null
+    isiPad: navigator.userAgent.match(/iPad/i) isnt null
+    isiPod: navigator.userAgent.match(/iPod/i) isnt null
+    isiOS: navigator.userAgent.match(/iPad|iPhone|iPod/i) isnt null
+    isFirefox: navigator.userAgent.match(/Firefox/i) isnt null
+    isChrome: navigator.userAgent.match(/Chrome/i) isnt null
+    isSafari: navigator.userAgent.match(/AppleWebKit/) and not navigator.userAgent.match(/Chrome/)
+    isIE: navigator.userAgent.match(/MSIE/i) isnt null
+    getVersion: (browser) ->
+      if Alchemy.Browser["is" + browser]
+        parseInt(navigator.userAgent.match(new RegExp(browser + ".[0-9]+", "i"))[0].replace(new RegExp(browser + "."), ""), 10)
+      else
+        null
+
+  Alchemy.Browser.ChromeVersion = Alchemy.Browser.getVersion("Chrome")
+  Alchemy.Browser.FirefoxVersion = Alchemy.Browser.getVersion("Firefox")
+  Alchemy.Browser.SafariVersion = Alchemy.Browser.getVersion("Safari")
+  Alchemy.Browser.IEVersion = Alchemy.Browser.getVersion("MSIE")
+  Alchemy.Browser.isWebKit = Alchemy.Browser.isChrome || Alchemy.Browser.isSafari
+  return
+
+if typeof (jQuery) is "undefined"
+  Alchemy.loadjQuery(run)
+else
+  run(jQuery)

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

@@ -30,12 +30,12 @@ Alchemy.loadjQuery = function(callback) {
     head.appendChild(script);
   }
 
-  getScript('//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js', function() {
+  getScript('//code.jquery.com/jquery.min.js', function() {
     if (typeof(jQuery) !== 'undefined') {
       if (thisPageUsingOtherJSLibrary) {
         jQuery.noConflict();
       }
-      callback();
+      callback(jQuery);
     }
   });
 

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

@@ -3,11 +3,13 @@
 //= require jquery
 //= require jquery-ui
 //= require jquery_ujs
+//= require autocomplete-rails
 //= require tiny_mce/tiny_mce
 //= require_tree ../../../../vendor/assets/javascripts/jquery_plugins/
 //= require_tree ../../../../vendor/assets/javascripts/swfupload/
 //= require alchemy/alchemy.routes
 //= require alchemy/alchemy.base
+//= require alchemy/alchemy.browser
 //= require alchemy/alchemy.buttons
 //= require alchemy/alchemy.datepicker
 //= require alchemy/alchemy.dirty

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

@@ -1,5 +1,4 @@
-''
-(($, window, document) ->
+(($, window) ->
 
   if (typeof(Alchemy) is 'undefined')
     window.Alchemy = {}
@@ -9,12 +8,13 @@
 
   Alchemy.LinkOverlay = {
 
-    open:  (linked_element, width) ->
+    open: (linked_element, width) ->
+      self = Alchemy.LinkOverlay
       $dialog = $('<div style="display:none" id="alchemyLinkOverlay"></div>')
 
       $dialog.html(Alchemy.getOverlaySpinner({x: width}))
 
-      Alchemy.LinkOverlay.current = $dialog.dialog({
+      self.current = $dialog.dialog({
         modal: true,
         minWidth: if parseInt(width) < 600 then 600 else parseInt(width),
         minHeight: 450,
@@ -30,14 +30,14 @@
               Alchemy.SelectBox('#alchemyLinkOverlay')
               $dialog.css overflow: 'visible'
               $dialog.dialog('widget').css overflow: 'visible'
-              Alchemy.LinkOverlay.attachEvents();
+              self.attachEvents()
             error: (XMLHttpRequest, textStatus, errorThrown) ->
               Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown)
           })
         close: ->
           $dialog.remove()
       })
-      Alchemy.LinkOverlay.current.linked_element = linked_element
+      self.current.linked_element = linked_element
 
     attachEvents: ->
       self = Alchemy.LinkOverlay
@@ -62,43 +62,33 @@
       $('#sitemap_sitename_' + selected_element).addClass('selected_page').attr('name', urlname)
 
     createLink : (link_type, url, title, target) ->
+      self = Alchemy.LinkOverlay
+      if link_type == 'external'
+        if self.validateURLFormat(url)
+          self.setLink(url, link_type, title, target)
+        else
+          return self.showValidationError()
+      else
+        self.setLink(url, link_type, title, target)
+      self.close()
+
+    setLink: (url, link_type, title, target) ->
+      self = Alchemy.LinkOverlay
       element = Alchemy.LinkOverlay.current.linked_element
       Alchemy.setElementDirty($(element).parents('.element_editor'))
       if (element.editor)
         # aka we are linking text inside of TinyMCE
-        editor = element.editor
-        editor.execCommand('mceInsertLink', false, {
-          href: url,
-          'class': link_type,
-          title: title,
-          'data-link-target': target,
-          target: if target == 'blank' then '_blank' else null
-        })
-        editor.selection.collapse()
+        self.executeTinyMCEcommand(url, title, link_type, target)
       else
         # aka: we are linking an essence
-        essence_type = element.name.replace('essence_', '').split('_')[0]
-        content_id = null
-        switch (essence_type)
-          when "picture" then content_id = element.name.replace('essence_picture_', '')
-          when "text" then content_id = element.name.replace('essence_text_', '')
-
-        $('#contents_content_' + content_id + '_link').val(url).change()
-        $('#contents_content_' + content_id + '_link_title').val(title)
-        $('#contents_content_' + content_id + '_link_class_name').val(link_type)
-        $('#contents_content_' + content_id + '_link_target').val(target)
-        $(element).addClass('linked')
-        $(element).next().addClass('linked').removeClass('disabled')
+        self.linkEssence(url, title, link_type, target)
 
     # Selects the tab for kind of link and fills all fields.
     selectTab : ->
       linked_element = Alchemy.LinkOverlay.current.linked_element
-      link = '' # initialization really needed?
-
       # Creating an temporary anchor node if we are linking an EssencePicture or EssenceText.
       if (linked_element.nodeType)
         link = Alchemy.LinkOverlay.createTempLink(linked_element)
-
       # Restoring the bookmarked selection inside the TinyMCE of an EssenceRichtext.
       else
         if (linked_element.node.nodeName == 'A')
@@ -146,16 +136,16 @@
 
         # Handling a contactform link.
         if (link.className == 'contact')
-          link_url = link.pathname;
-          link_params = link.search;
-          link_subject = link_params.split('&')[0];
-          link_mailto = link_params.split('&')[1];
-          link_body = link_params.split('&')[2];
-          $('#overlay_tabs').tabs("select", '#overlay_tab_contactform_link');
-          $('#contactform_url').val(link_url);
-          $('#contactform_subject').val(unescape(link_subject.replace(/subject=/, '')).replace(/\?/, ''));
-          $('#contactform_body').val(unescape(link_body.replace(/body=/, '')).replace(/\?/, ''));
-          $('#contactform_mailto').val(link_mailto.replace(/mail_to=/, '').replace(/\?/, ''));
+          link_url = link.pathname
+          link_params = link.search
+          link_subject = link_params.split('&')[0]
+          link_mailto = link_params.split('&')[1]
+          link_body = link_params.split('&')[2]
+          $('#overlay_tabs').tabs("select", '#overlay_tab_contactform_link')
+          $('#contactform_url').val(link_url)
+          $('#contactform_subject').val(unescape(link_subject.replace(/subject=/, '')).replace(/\?/, ''))
+          $('#contactform_body').val(unescape(link_body.replace(/body=/, '')).replace(/\?/, ''))
+          $('#contactform_mailto').val(link_mailto.replace(/mail_to=/, '').replace(/\?/, ''))
 
     showElementsSelect: (id) ->
       $('#elements_for_page_' + id).show()
@@ -169,12 +159,7 @@
 
     createTempLink: (linked_element) ->
       $tmp_link = $("<a></a>")
-      essence_type = $(linked_element).attr('name').replace('essence_', '').split('_')[0]
-      content_id
-      switch (essence_type)
-        when "picture" then content_id = $(linked_element).attr('name').replace('essence_picture_', '')
-        when "text" then content_id = $(linked_element).attr('name').replace('essence_text_', '')
-
+      content_id = $(linked_element).data('contentId')
       $tmp_link.attr('href', $('#contents_content_' + content_id + '_link').val())
       $tmp_link.attr('title', $('#contents_content_' + content_id + '_link_title').val())
       $tmp_link.attr('data-link-target', $('#contents_content_' + content_id + '_link_target').val())
@@ -190,5 +175,52 @@
       $('#contents_content_' + content_id + '_link_target').val('')
       $(link).removeClass('linked').addClass('disabled')
       $('#edit_link_' + content_id).removeClass('linked')
+
+    executeTinyMCEcommand: (url, title, link_type, target) ->
+      element = Alchemy.LinkOverlay.current.linked_element
+      editor = element.editor
+      editor.execCommand('mceInsertLink', false, {
+        href: url,
+        'class': link_type,
+        title: title,
+        'data-link-target': target,
+        target: if target == 'blank' then '_blank' else null
+      })
+      editor.selection.collapse()
+
+    linkEssence: (url, title, link_type, target) ->
+      element = Alchemy.LinkOverlay.current.linked_element
+      content_id = $(element).data('contentId')
+      $('#contents_content_' + content_id + '_link').val(url).change()
+      $('#contents_content_' + content_id + '_link_title').val(title)
+      $('#contents_content_' + content_id + '_link_class_name').val(link_type)
+      $('#contents_content_' + content_id + '_link_target').val(target)
+      $(element).addClass('linked')
+      $(element).next().addClass('linked').removeClass('disabled')
+
+    validateURLFormat: (url) ->
+      if url.match(/^(\/|[a-z]+:\/\/)/)
+        return true
+      else
+        return false
+
+    showValidationError: ->
+      self = Alchemy.LinkOverlay
+      $('#errors ul').html("<li>#{self.t('url_validation_failed')}</li>")
+      $('#errors').show()
+
+    t: (id) ->
+      self = Alchemy.LinkOverlay
+      translation = self.translations[id]
+      if translation
+        return translation[Alchemy.locale]
+      else
+        return id
+
+    translations:
+      'url_validation_failed':
+        'de': 'Die URL hat kein gültiges Format.'
+        'en': 'The url has no valid format.'
+
   }
-)(jQuery, window, document)
+)(jQuery, window)

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

@@ -6,12 +6,20 @@ Alchemy.loadAlchemyMenuBar = function(options) {
 
   Alchemy.Menubar = {
 
+    init: function ($) {
+      var self = Alchemy.Menubar;
+      self._$ = $;
+      self.show();
+    },
+
     show: function() {
-      $('body').prepend(Alchemy.Menubar.build());
+      var self = Alchemy.Menubar;
+      self._$('body').prepend(Alchemy.Menubar.build());
     },
 
     build: function() {
-      var bar = $('<div id="alchemy_menubar"/>').append('<ul/>');
+      var self = Alchemy.Menubar;
+      var bar = self._$('<div id="alchemy_menubar"/>').append('<ul/>');
       bar.find('ul').append('<li><a href="' + options.route + '/admin">' + Alchemy.Menubar.t("to_alchemy") + '</a></li>').append('<li><a href="' + options.route + '/admin/pages/' + options.page_id + '/edit">' + Alchemy.Menubar.t("edit_page") + '</a></li>').append('<li><a href="' + options.route + '/admin/logout">' + Alchemy.Menubar.t("logout") + '</a></li>');
       return bar;
     },
@@ -43,9 +51,9 @@ Alchemy.loadAlchemyMenuBar = function(options) {
   };
 
   if (typeof(jQuery) === 'undefined') {
-    Alchemy.loadjQuery(Alchemy.Menubar.show);
+    Alchemy.loadjQuery(Alchemy.Menubar.init);
   } else {
-    Alchemy.Menubar.show();
+    Alchemy.Menubar.init(jQuery);
   }
 
 };

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

@@ -24,7 +24,7 @@ $ ->
   # Locale select handler
   $('select#change_locale').on 'change', (e) ->
     url = Alchemy.current_url
-    delimiter = url.match(/\?/) ? '&' : '?'
+    delimiter = if url.match(/\?/) then '&' else '?'
     window.location = url + delimiter + 'locale=' + $(this).val()
 
 # Resize the Alchemy frame on every browser resize.

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

@@ -0,0 +1,103 @@
+window.Alchemy = {}  if typeof (Alchemy) is "undefined"
+Alchemy.initAlchemyPreviewMode = ($) ->
+
+  # Setting jQueryUIs global animation duration
+  $.fx.speeds._default = 400
+
+  # The Alchemy JavaScript Object contains all Functions
+  $.extend Alchemy,
+    ElementSelector:
+
+      # defaults
+      scrollOffset: 20
+
+      styles:
+        reset:
+          outline: ""
+          "outline-offset": ""
+          "-moz-outline-radius": ""
+
+        default_hover:
+          outline: "3px solid #F0B437"
+          "outline-offset": "4px"
+
+        webkit_hover:
+          outline: "4px auto #F0B437"
+
+        moz_hover:
+          "-moz-outline-radius": "3px"
+
+        default_selected:
+          outline: "3px solid #90B9D0"
+          "outline-offset": "4px"
+
+        webkit_selected:
+          outline: "4px auto #90B9D0"
+
+        moz_selected:
+          "-moz-outline-radius": "3px"
+
+      init: ->
+        self = Alchemy.ElementSelector
+        $elements = $("[data-alchemy-element]")
+        $elements.bind "mouseover", (e) ->
+          $(this).attr("title", "Klicken zum bearbeiten")
+          $(this).css(self.getStyle("hover")) unless $(this).hasClass("selected")
+
+        $elements.bind "mouseout", ->
+          $(this).removeAttr("title")
+          $(this).css(self.getStyle("reset")) unless $(this).hasClass("selected")
+
+        $elements.bind("Alchemy.SelectElement", self.selectElement)
+        $elements.bind("click", self.clickElement)
+        self.$previewElements = $elements
+
+      selectElement: (e) ->
+        $this = $(this)
+        self = Alchemy.ElementSelector
+        $elements = self.$previewElements
+        offset = self.scrollOffset
+        e.preventDefault()
+        $elements.removeClass("selected").css(self.getStyle("reset"))
+        $this.addClass("selected").css(self.getStyle("selected"))
+        $("html, body").animate
+          scrollTop: $this.offset().top - offset
+          scrollLeft: $this.offset().left - offset
+        , 400
+        return
+
+      clickElement: (e) ->
+        $this = $(this)
+        parent$ = window.parent.jQuery
+        target_id = $this.data("alchemy-element")
+        $element_editor = parent$("#element_area .element_editor").closest("[id=\"element_" + target_id + "\"]")
+        $elementsWindow = parent$("#alchemyElementWindow")
+        e.preventDefault()
+        $element_editor.trigger("Alchemy.SelectElementEditor", target_id)
+        if $elementsWindow.dialog
+          if $elementsWindow.dialog("isOpen")
+            $elementsWindow.dialog("moveToTop")
+          else
+            $elementsWindow.dialog "open"
+        $this.trigger("Alchemy.SelectElement")
+        return
+
+      getStyle: (state) ->
+        self = Alchemy.ElementSelector
+        if state == "reset"
+          self.styles["reset"]
+        else
+          default_state_style = self.styles["default_#{state}"]
+          browser = "webkit" if Alchemy.Browser.isWebKit
+          browser = "moz" if Alchemy.Browser.isFirefox
+          if browser
+            $.extend(default_state_style, self.styles["#{browser}_#{state}"])
+          else
+            default_state_style
+
+  Alchemy.ElementSelector.init()
+
+if typeof (jQuery) is "undefined"
+  Alchemy.loadjQuery(Alchemy.initAlchemyPreviewMode)
+else
+  Alchemy.initAlchemyPreviewMode(jQuery)