alchemy_cms 3.0.0.rc5 → 3.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c765b8cbf60627a8a7127e4c911ac5f784a0d5
-  data.tar.gz: 64f8f25adcd982278ee427c0d8bbf2646c03ce88
+  metadata.gz: 46aef856d1de74f7fdd263bd44290ab72970a408
+  data.tar.gz: c8db252636d2e4af9b8172f89b27fc7d7ba209e9
 SHA512:
-  metadata.gz: 7cd17ed412cce80d4929376215336d28424615c3a0897592cb14094825abf730cc22678cf4d6b8e34fa225c5e7f95d2f3683cfd62a2978439f3bff1dfeb0732b
-  data.tar.gz: 31ceaae54f98da0e6a97106a46a317b58c0a3a93e0a6081726368fa628e08bab3682b1f809a4a9d34f085a53c3939421a34f36bab79bd15a615e2079a8a53e52
+  metadata.gz: 316bf6685dc74ea7a82a54a9f6f2c1f3efff0abf0ff24952fca2bb5de42315ae027cc154016dac6fc5075006f90104eaed1680b4bfba10d28e0ff10518366572
+  data.tar.gz: b86f3962f5e93226710495596dc5dc9ec7dd16ffbac5972b80fecd3e085b2feb812d4b11b51f260dad7c370ab03f61aa9939b1f229f4cd9af669a31f9617fc44

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
 branches:
   only:
     - master
@@ -10,7 +10,7 @@ script: rake
 env:
   - DB=mysql
   - DB=postgresql
-  - RAILS_VERSION=4.1.0.rc2
+  - RAILS_VERSION=4.1.1
 notifications:
   irc:
     on_success: change
@@ -18,6 +18,3 @@ notifications:
     use_notice: true
     channels:
       - "irc.freenode.org#alchemy_cms"
-matrix:
-  allow_failures:
-    - env: RAILS_VERSION=4.1.0.rc2

data/README.md

@@ -10,8 +10,8 @@ Alchemy is the most powerful, userfriendly and flexible Rails CMS.
 
 Read more on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
 
-**This master branch is a development branch that can contain bugs. For productive environments you should use the [current Ruby gem version](http://rubygems.org/gems/alchemy_cms/versions/2.7.2),
-or the [latest stable branch (2.7-stable)](https://github.com/magiclabs/alchemy_cms/tree/2.7-stable).**
+**This master branch is a development branch that can contain bugs. For productive environments you should use the [current Ruby gem version](http://rubygems.org/gems/alchemy_cms/versions/2.8.1),
+or the [latest stable branch (2.8-stable)](https://github.com/magiclabs/alchemy_cms/tree/2.8-stable).**
 
 Features
 --------
@@ -37,7 +37,7 @@ Rails Version
 
 **This version of Alchemy CMS runs with Rails 4 (including 4.1)**
 
-If you are looking for a Rails 3.2 compatible version check the [2.7-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.7-stable).
+If you are looking for a Rails 3.2 compatible version check the [2.8-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.8-stable).
 
 If you are looking for a Rails 3.1 compatible version check the [2.1-stable branch](https://github.com/magiclabs/alchemy_cms/tree/2.1-stable).
 
@@ -130,6 +130,33 @@ Example:
       end
     end
 
+**Optionally** you can add a `alchemy_display_name` method that returns a name representing the currently logged in user. This is used in the admin views.
+
+Example:
+
+    def alchemy_display_name
+      "#{first_name} #{last_name}".strip
+    end
+
+Testing
+-------
+
+Before running tests (which refer to Alchemy), please make sure to run the rake task
+
+    bundle exec rake alchemy:spec:prepare
+
+to set up the database for testing.
+
+Now you can run your tests, e. g. with RSpec:
+
+    bundle exec rspec spec/...
+
+**Alternatively** you can just run:
+
+    bundle exec rake
+
+This default task executes the database preparations and runs all defined test cases.
+
 Deployment
 ----------
 
@@ -179,7 +206,7 @@ Resources
 ---------
 
 * Homepage: <http://alchemy-cms.com>
-* Live-Demo: <http://edge-demo.alchemy-cms.com> (user: demo, password: demo123)
+* Live-Demo: <http://demo.alchemy-cms.com> (user: demo, password: demo123)
 * API Documentation: <http://rubydoc.info/github/magiclabs/alchemy_cms>
 * Issue-Tracker: <https://github.com/magiclabs/alchemy_cms/issues>
 * Sourcecode: <https://github.com/magiclabs/alchemy_cms>
@@ -199,4 +226,4 @@ Authors
 License
 -------
 
-* BSD: <https://raw.github.com/magiclabs/alchemy_cms/2.7-stable/LICENSE>
+* BSD: <https://raw.github.com/magiclabs/alchemy_cms/master/LICENSE>

data/alchemy_cms.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'non-stupid-digest-assets',         '~> 1.0.3'
   gem.add_runtime_dependency 'active_model_serializers',         '~> 0.8.1'
 
-  gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency 'rspec-rails', '~> 2.0'
   gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'factory_girl_rails'
 

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

@@ -15,12 +15,12 @@ Alchemy.Buttons =
   disable: (button) ->
     $button = $(button)
     spinner = Alchemy.Spinner.small()
-    $button.data('label', $button.text())
+    $button.data('content', $button.html())
     $button.attr('disabled', true)
     $button.addClass('disabled')
     $button.css
       width: $button.outerWidth()
-    $button.text('')
+    $button.empty()
     spinner.spin($button[0])
     return true
 
@@ -28,5 +28,5 @@ Alchemy.Buttons =
     $button = $('form :submit:disabled', scope)
     $button.removeClass('disabled')
     $button.removeAttr('disabled')
-    $button.text($button.data('label'))
+    $button.html($button.data('content'))
     return true

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

@@ -0,0 +1,19 @@
+class window.Alchemy.CharCounter
+
+  constructor: (field) ->
+    @$field = $(field)
+    @max_chars = @$field.data('alchemy-char-counter')
+    @text = Alchemy._t('allowed_chars', @max_chars)
+    @$display = $('<small class="alchemy-char-counter"/>')
+    @$field.after(@$display)
+    countChars.call(this)
+    @$field.keyup =>
+      countChars.call(this)
+      true
+
+  countChars = ->
+    char_length = @$field.val().length
+    @$display.removeClass('too-long')
+    @$display.text("#{char_length} #{@text}")
+    if char_length > @max_chars
+      @$display.addClass('too-long')

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

@@ -76,5 +76,10 @@ window.Alchemy.confirmToDeleteDialog = (url, opts) ->
       $.ajax
         url: url
         type: "DELETE"
+        error: (xhr, status, error) ->
+          type = if xhr.status == 403 then 'warning' else 'error'
+          Alchemy.pleaseWaitOverlay(false)
+          Alchemy.growl(xhr.responseText || error, type)
+
   $.extend(options, opts)
   Alchemy.openConfirmDialog options.message, options

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

@@ -99,9 +99,10 @@ class window.Alchemy.Dialog
     form = $('[data-remote="true"]', @dialog_body)
     form.bind "ajax:complete", (e, xhr, status) =>
       content_type = xhr.getResponseHeader('Content-Type')
+      Alchemy.Buttons.enable(@dialog_body)
       if status == 'success'
         if content_type.match(/javascript/)
-          @close()
+          return
         else
           @dialog_body.html(xhr.responseText)
           @init()
@@ -127,7 +128,7 @@ class window.Alchemy.Dialog
           error_header = "#{xhr.statusText} (#{xhr.status})"
         error_body = "Please check log and try again."
     $errorDiv = $("<div class=\"message #{error_type}\" />")
-    $errorDiv.append '<span class="icon warning"></span>'
+    $errorDiv.append "<span class=\"icon #{error_type}\" />"
     $errorDiv.append "<h1>#{error_header}</h1>"
     $errorDiv.append "<p>#{error_body}</p>"
     @dialog_body.html $errorDiv

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

@@ -47,9 +47,11 @@ $.extend Alchemy,
             Alchemy.TrashWindow.refresh page_id
 
       start: (event, ui) ->
+        ui.helper.find('.insert-element-button').hide()
         Alchemy.Tinymce.remove getTinymceIDs(ui)
 
       stop: (event, ui) ->
+        ui.item.find('.insert-element-button').show()
         Alchemy.Tinymce.init getTinymceIDs(ui)
 
   SortableContents: (selector, token) ->

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

@@ -39,7 +39,7 @@ Alchemy.ElementEditors =
   #
   onClickElement: (e) ->
     self = Alchemy.ElementEditors
-    $element = $(this).parent(".element_editor")
+    $element = $(this).parents(".element_editor")
     id = $element.attr("id").replace(/\D/g, "")
     e.preventDefault()
     $("#element_area .element_editor").removeClass "selected"

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

@@ -1,22 +1,5 @@
 window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
 
-# Adds buttons into a toolbar inside of overlay windows
-Alchemy.ToolbarButton = (options) ->
-  $btn = $('<div class="button_with_label" />')
-  if options.buttonId
-    $btn.attr(id: options.buttonId)
-  $lnk = $("<a title='#{options.title}' class='icon_button' href='#' />")
-  if options.hotkey
-    $lnk.attr('data-alchemy-hotkey', options.hotkey)
-  $lnk.click (e) ->
-    e.preventDefault()
-    options.onClick(e)
-    false
-  $lnk.append "<span class='icon #{options.iconClass}' />"
-  $btn.append $lnk
-  $btn.append "<br><label>#{options.label}</label>"
-  $btn
-
 Alchemy.ElementsWindow =
 
   init: (url, options, callback) ->
@@ -26,7 +9,6 @@ Alchemy.ElementsWindow =
     @url = url
     @options = options
     @callback = callback
-    @element_window.append @createToolbar(options.toolbarButtons)
     @element_window.append @element_area
     @button = $('#element_window_button')
     @button.click =>
@@ -39,18 +21,12 @@ Alchemy.ElementsWindow =
     $('#main_content').append(@element_window)
     @reload()
 
-  createToolbar: (buttons) ->
-    @toolbar = $('<div id="overlay_toolbar"/>')
-    for btn in buttons
-      @toolbar.append Alchemy.ToolbarButton(btn)
-    @toolbar
-
   resize: ->
-    height = $(window).height() - 80
+    height = $(window).height() - 75
     @element_window.css
       height: height
     @element_area.css
-      height: height - 54
+      height: height
     height
 
   reload: ->

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

@@ -60,4 +60,4 @@ Alchemy.FileProgress::setCancelled = ->
     $(this).remove()
 
 Alchemy.FileProgress::setStatus = (status) ->
-  @$fileProgressStatus.text status
+  @$fileProgressStatus.text Alchemy._t(status)

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

@@ -13,6 +13,8 @@ Alchemy.GUI =
     Alchemy.ListFilter(scope)
     Alchemy.Spinner.watch(scope)
     Alchemy.Autocomplete.tags(scope)
+    $('[data-alchemy-char-counter]', scope).each ->
+      new Alchemy.CharCounter(this)
 
   initElement: ($el) ->
     Alchemy.ElementDirtyObserver($el)

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

@@ -6,16 +6,21 @@ Alchemy.I18n =
 
   # Translates given string
   #
-  translate: (id) ->
+  translate: (key, replacement) ->
     if !Alchemy.locale?
       throw 'Alchemy.locale is not set! Please set Alchemy.locale to a locale string in order to translate something.'
-    translation = Alchemy.translations[id]
-    if (translation)
-      translation[Alchemy.locale]
+    translations = Alchemy.translations[Alchemy.locale]
+    if translations
+      translation = translations[key] || key
+      if replacement
+        translation.replace(/%\{.+\}/, replacement)
+      else
+        translation
     else
-      id
+      Alchemy.debug "Translations for locale #{Alchemy.locale} not found!"
+      key
 
 # Global utility method for translating a given string
 #
-Alchemy._t = (id) ->
-  Alchemy.I18n.translate(id)
+Alchemy._t = (key, replacement) ->
+  Alchemy.I18n.translate(key, replacement)

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

@@ -16,12 +16,12 @@
 //= require requestAnimationFrame
 //= require select2
 //= require select2_locale_de
-//= require alchemy/alchemy.routes
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.autocomplete
 //= require alchemy/alchemy.browser
 //= require alchemy/alchemy.buttons
 //= require alchemy/alchemy.dialog
+//= require alchemy/alchemy.char_counter
 //= require alchemy/alchemy.confirm_dialog
 //= require alchemy/alchemy.datepicker
 //= require alchemy/alchemy.dirty

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

@@ -7,23 +7,25 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     @url = Alchemy.routes.link_admin_pages_path
     @$link_object = $(@link_object)
     @options =
-      size: '600x540'
+      size: '600x320'
       title: 'Link'
     super(@url, @options)
 
   # Called from Dialog class after the url was loaded
   replace: (data) ->
-    # let Dailog class handle the content replacement
+    # let Dialog class handle the content replacement
     super(data)
     # attach events we handle
     @attachEvents()
     # Store some jQuery objects for further reference
     @$page_anchor = $('#page_anchor', @dialog_body)
     @$internal_urlname = $('#internal_urlname', @dialog_body)
+    @$internal_anchor = $('#internal_anchor', @dialog_body)
     @$external_url = $('#external_url', @dialog_body)
     @$public_filename = $('#public_filename', @dialog_body)
     @$overlay_tabs = $('#overlay_tabs', @dialog_body)
     @$page_container = $('#page_selector_container')
+    @initInternalAnchors()
     # if we edit an existing link
     if @link_object
       # we select the correct tab
@@ -66,10 +68,16 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
 
   # Sets the page selected and scrolls it in the viewport.
   selectPage: (page_id) ->
-    $('#sitemap .selected_page', @dialog_body).removeClass('selected_page')
+    # deselect any selected page from page tree
+    @deselectPage()
+    # reset the internal anchor select
+    @$internal_anchor.select2('val', '')
     $('#sitemap_sitename_' + page_id).addClass('selected_page')
     @$page_container.scrollTo("#sitemap_sitename_#{page_id}", {duration: 400, offset: -10})
 
+  deselectPage: ->
+    $('#sitemap .selected_page', @dialog_body).removeClass('selected_page')
+
   # Creates a link if no validation errors are present.
   # Otherwise shows an error notice.
   createLink: (options) ->
@@ -152,6 +160,11 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
       @$page_anchor.val("##{anchor}")
       # and update the url field
       @$internal_urlname.val("#{urlname}##{anchor}")
+      # if we linked an internal anchor
+      if @$internal_urlname.val().match(/^#/)
+        # we select the correct value from anchors select
+        value = @$internal_urlname.val()
+        @$internal_anchor.select2 'val', value.replace(/^#/, '')
     else
       @$internal_urlname.val(urlname)
     $sitemap_line = $('.sitemap_sitename').closest('[name="'+urlname+'"]')
@@ -195,7 +208,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
 
   # Validates url for beginning with an protocol.
   validateURLFormat: (url) ->
-    if url.match(/^(mailto:|\/|[a-z]+:\/\/)/)
+    if url.match(Alchemy.link_url_regexp)
       true
     else
       false
@@ -205,6 +218,22 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
     $('#errors ul', @dialog_body).html("<li>#{Alchemy._t('url_validation_failed')}</li>")
     $('#errors', @dialog_body).show()
 
+  # Populates the internal anchors select
+  initInternalAnchors: ->
+    frame = document.getElementById('alchemy_preview_window')
+    elements = frame.contentDocument.getElementsByTagName('*')
+    if elements.length > 0
+      for element in elements
+        if element.id
+          @$internal_anchor.append("<option value='#{element.id}'>##{element.id}</option>")
+    else
+      @$internal_anchor.html("<option>#{Alchemy._t('No anchors found')}</option>")
+    @$internal_anchor.change (e) =>
+      # deselect any selected page from page tree
+      @deselectPage()
+      # store the internal anchor as urlname
+      $("#internal_urlname").val("##{e.target.value}")
+
   # Public class methods
 
   # Removes link from Essence.

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

@@ -19,7 +19,7 @@ Alchemy.PreviewWindow =
       width = $window.width() - 64
     else
       width = $window.width() - 466
-    height = $window.height() - 80
+    height = $window.height() - 75
     width = 240 if width < 240
     @currentWidth = width
     @currentWindow.css

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

@@ -27,10 +27,10 @@ Alchemy.Sitemap =
     self.filter_field_clear.show()
     length = results.length
     if length == 1
-      self.display.show().text("1 #{self._t('page_found')}")
+      self.display.show().text("1 #{Alchemy._t('page_found')}")
       $.scrollTo(results[0], {duration: 400, offset: -80})
     else if length > 1
-      self.display.show().text("#{length} #{self._t('pages_found')}")
+      self.display.show().text("#{length} #{Alchemy._t('pages_found')}")
     else
       self.items.removeClass('no-match highlight')
       self.display.hide()
@@ -48,14 +48,3 @@ Alchemy.Sitemap =
     @filter_field_clear.click =>
       @search_field.val('')
       filter('')
-
-  # Translations
-  _t: (id) ->
-    i18n =
-      page_found:
-        de: 'Seite gefunden'
-        en: 'Page found'
-      pages_found:
-        de: 'Seiten gefunden'
-        en: 'Pages found'
-    i18n[id][Alchemy.locale]