alchemy_cms 2.6.3 → 2.7.0

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

@@ -11,8 +11,10 @@ Alchemy.GUI =
     Alchemy.overlayObserver(scope)
     Alchemy.Hotkeys(scope)
     Alchemy.ListFilter(scope)
+    Alchemy.Spinner.watch(scope)
 
   initElement: ($el) ->
     Alchemy.ElementDirtyObserver($el)
     Alchemy.GUI.init($el)
-    Alchemy.ImageLoader($el);
+    Alchemy.ImageLoader($el)
+    Alchemy.Spinner.watch($el)

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

@@ -24,6 +24,7 @@
 //= require alchemy/alchemy.dirty
 //= require alchemy/alchemy.dragndrop
 //= require alchemy/alchemy.element_editors
+//= require alchemy/alchemy.elements_window
 //= require alchemy/alchemy.growler
 //= require alchemy/alchemy.gui
 //= require alchemy/alchemy.hotkeys
@@ -35,10 +36,11 @@
 //= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.file_progress
+//= require alchemy/alchemy.preview_window
 //= require alchemy/alchemy.sitemap
 //= require alchemy/alchemy.spinner
 //= require alchemy/alchemy.swf_upload
+//= require alchemy/alchemy.tinymce
+//= require alchemy/alchemy.translations
 //= require alchemy/alchemy.windows
-//= require alchemy/alchemy.preview_window
-//= require alchemy/alchemy.elements_window
 //= require alchemy/alchemy.custom

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

@@ -25,7 +25,7 @@ $ ->
   $('select#change_locale').on 'change', (e) ->
     url = Alchemy.current_url
     delimiter = if url.match(/\?/) then '&' else '?'
-    window.location = url + delimiter + 'locale=' + $(this).val()
+    window.location.href = "#{url}#{delimiter}locale=#{$(this).val()}"
 
   # Attaches the image loader on all images
   Alchemy.ImageLoader('#main_content')

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

@@ -10,6 +10,14 @@ Alchemy.Spinner =
     speed: 1.25
     hwaccel: true
 
+  tiny: (opts) ->
+    defaults = $.extend({}, Alchemy.Spinner.DEFAULTS,
+      length: 2
+      width: 1
+      radius: 1
+    )
+    new Spinner($.extend(defaults, opts))
+
   small: (opts) ->
     defaults = $.extend({}, Alchemy.Spinner.DEFAULTS,
       length: 2
@@ -33,3 +41,9 @@ Alchemy.Spinner =
       radius: 8
     )
     new Spinner($.extend(defaults, opts))
+
+  watch: (scope) ->
+    $('a.spinner', scope).click ->
+      spinner = Alchemy.Spinner.tiny()
+      spinner.spin(this)
+      $(this).css('background': 'none').off('click')

data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee.erb

@@ -0,0 +1,96 @@
+# Alchemy Tinymce wrapper
+#
+window.Alchemy.Tinymce =
+
+  # Holds the default Alchemy TinyMCE configuration
+  #
+  defaults:
+    plugins: "<%= Alchemy::Tinymce.plugins.join(',') %>"
+    <% Alchemy::Tinymce.init.each do |k, v| %>
+    <%= k %>: <%= v.to_json %>
+    <% end %>
+    <% if Alchemy::Tinymce.setup %>
+    setup: <%= Alchemy::Tinymce.setup %>
+    <% end %>
+
+  # Holds custom tinymce configurations
+  #
+  # The key has to be a unique selector in the format of: "element_name_content_name"
+  #
+  # The value has to be a valid tinymce configuration object.
+  #
+  customConfigs: {}
+
+  # Returns default config for tinymce editors.
+  #
+  getDefaultConfig: ->
+    config = @defaults
+    config.language = Alchemy.locale
+    config.mode = "specific_textareas"
+    config.editor_selector = "default_tinymce"
+    config.init_instance_callback = (inst) ->
+      $this = $("##{inst.editorId}")
+      parent = $this.parents('.element_editor')
+      parent.find('.spinner').remove()
+      inst.onChange.add ->
+        Alchemy.setElementDirty(parent)
+    return config
+
+  # Returns configuration for given custom tinymce editor selector.
+  #
+  # It uses the +.getDefaultConfig+ and merges the custom parts.
+  #
+  getCustomConfig: (editor) ->
+    if editor_config = @customConfigs[editor]
+      config = $.extend({}, @getDefaultConfig(), editor_config)
+      config.mode = 'specific_textareas'
+      config.editor_selector = new RegExp("custom_tinymce #{editor}")
+      return config
+
+  # Initializes all default TinyMCE instances
+  #
+  init: ->
+    spinner = Alchemy.Spinner.small()
+    $('.tinymce_container').prepend spinner.spin().el
+    tinymce.init @getDefaultConfig()
+
+  # Initializes all tinymce editors with custom configuration.
+  #
+  # @param editors [Array]
+  #   - Editor selectors that should be initialized. The selector has to be in format of:
+  #     "element_name_content_name"
+  #
+  initCustomEditors: (editors) ->
+    return if not editors
+    for editor in editors
+      if custom_editor_config = @getCustomConfig(editor)
+        tinymce.init custom_editor_config
+
+  # Adds a TinyMCE editor to given dom elements.
+  #
+  # Checks if element has custom tinymce config and uses this to init editor.
+  # Otherwise it uses the default config.
+  #
+  addEditor: (elements) ->
+    self = Alchemy.Tinymce
+    $(elements).each ->
+      if custom_editor = this.classList[1]
+        config = self.getCustomConfig(custom_editor)
+      else
+        config = self.getDefaultConfig()
+      tinymce.init(config)
+      tinymce.execCommand('mceAddControl', true, this.id)
+
+  # Removes the TinyMCE editor from given dom elements.
+  #
+  removeEditor: (elements) ->
+    $(elements).each ->
+      tinymce.get(this.id).remove()
+
+# Populate custom tinymce configurations
+<% Alchemy::Tinymce.custom_config_contents.each do |content| %>
+Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] %>"] =
+  <% content.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
+  <%= k %>: <%= v.to_json %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,22 @@
+window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
+
+$.extend Alchemy,
+
+  # Holds translations
+  #
+  translations:
+    page_dirty_notice:
+      en: "You have unsaved changes on this page. They will be lost if you continue."
+      de: "Sie haben ungesicherte Änderungen auf der Seite. Diese gehen verloren, wenn Sie fortfahren."
+    element_dirty_notice:
+      en: "This element has unsaved changes. Do you really want to fold it?"
+      de: "Dieses Element hat nicht gespeicherte Änderungen. Möchten Sie es wirklich einklappen?"
+    warning:
+      en: 'Warning!'
+      de: 'Achtung!'
+    ok:
+      en: 'Ok'
+      de: 'Ok'
+    cancel:
+      en: 'Cancel'
+      de: 'Abbrechen'

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

@@ -28,16 +28,24 @@ $.extend Alchemy,
   # Display a error message for dialogs
   # Used by Alchemy.openWindow if errors happen
   AjaxErrorHandler: ($dialog, status, textStatus, errorThrown) ->
+    error_type = "warning"
     $div = $('<div class="with_padding" />')
-    $errorDiv = $("<div id=\"errorExplanation\" class=\"ajax_status_code_#{status}\" />")
     $dialog.html $div
+    switch status
+      when 0
+        error_header = "The server does not respond."
+        error_body = "Please check server and try again."
+      when 403
+        error_header = "You are not authorized!"
+        error_body = "Please close this window."
+      else
+        error_header = "#{errorThrown} (#{status})"
+        error_body = "Please check log and try again."
+        error_type = "error"
+    $errorDiv = $("<div id=\"errorExplanation\" class=\"ajax_status_code #{error_type}\" />")
+    $errorDiv.append "<h2>#{error_header}</h2>"
+    $errorDiv.append "<p>#{error_body}</p>"
     $div.append $errorDiv
-    if status is 0
-      $errorDiv.append "<h2>The server does not respond.</h2>"
-      $errorDiv.append "<p>Please check server and try again.</p>"
-    else
-      $errorDiv.append "<h2>" + errorThrown + " (" + status + ")</h2>"
-      $errorDiv.append "<p>Please check log and try again.</p>"
 
   # Opens a confirm window
   #
@@ -167,16 +175,19 @@ $.extend Alchemy,
           url: url
           success: (data, textStatus, XMLHttpRequest) ->
             widget = $dialog.dialog("widget")
-            $dialog.html(data)
-            $dialog.css(overflow: (if options.overflow then "visible" else "auto"))
-            widget.css(overflow: (if options.overflow then "visible" else "hidden"))
-            if options.width is "auto"
-              widget.css left: (($(window).width() / 2) - ($dialog.width() / 2))
-            if options.height is "auto"
-              widget.css top: ($(window).height() - $dialog.dialog("widget").height()) / 2
-            Alchemy.GUI.init Alchemy.CurrentWindow
-            if options.image_loader
-              Alchemy.ImageLoader Alchemy.CurrentWindow, {color: options.image_loader_color}
+            if XMLHttpRequest.getResponseHeader('Content-Type').match(/javascript/)
+              $dialog.empty()
+            else
+              $dialog.html(data)
+              $dialog.css(overflow: (if options.overflow then "visible" else "auto"))
+              widget.css(overflow: (if options.overflow then "visible" else "hidden"))
+              if options.width is "auto"
+                widget.css left: (($(window).width() / 2) - ($dialog.width() / 2))
+              if options.height is "auto"
+                widget.css top: ($(window).height() - $dialog.dialog("widget").height()) / 2
+              Alchemy.GUI.init Alchemy.CurrentWindow
+              if options.image_loader
+                Alchemy.ImageLoader Alchemy.CurrentWindow, {color: options.image_loader_color}
           error: (XMLHttpRequest, textStatus, errorThrown) ->
             Alchemy.AjaxErrorHandler $dialog, XMLHttpRequest.status, textStatus, errorThrown
           complete: (jqXHR, textStatus) ->

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

@@ -91,6 +91,12 @@ ul {
   }
 }
 
+hr {
+  border: 0 none;
+  border-bottom: 1px solid;
+  @include opacity(0.5);
+}
+
 .float_right {
   float: right;
 }

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

@@ -534,19 +534,6 @@ div.essence_file_tools a.edit_file {
   background: image-url('alchemy/icons.png') -160px -167px;
 }
 
-td.content_editor_essence_type {
-  width: 90px;
-  height: 20px;
-}
-
-table.content_editor_table {
-  margin-bottom: 8px;
-}
-
-.content_editor_table .thin_border {
-  width: 210px;
-}
-
 a.new_content_link {
   float: none;
   margin-bottom: 12px !important;
@@ -563,12 +550,6 @@ div.tinymce_container {
   }
 }
 
-div.content_text_editor.text_short {
-  margin-top: 0;
-  margin-bottom: 0;
-  display: inline;
-}
-
 input.long,
 input.text_long {
   width: 363px;
@@ -580,13 +561,6 @@ select.long {
   padding: 0;
 }
 
-div.content_text_editor input.text_short {
-  border-width: 1px;
-  width: 50px;
-  margin-right: 4px;
-  padding: 2px;
-}
-
 #alchemy .ui-dialog-content div.content_editor input.auto_resize {
   width: 100%;
 }
@@ -595,7 +569,7 @@ div.content_editor {
   margin-bottom: 8px;
   position: relative;
 
-  input.thin_border {
+  .thin_border, input[type="text"] {
     width: 100%;
   }
 
@@ -619,7 +593,7 @@ div.content_editor {
     margin-right: 4px;
     vertical-align: top;
 
-    .thin_border {
+    .thin_border, input[type="text"] {
       width: 170px;
     }
   }

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

@@ -7,7 +7,7 @@
   color: #690001;
   @extend .rounded-border;
 
-  &.ajax_status_code_0 {
+  &.ajax_status_code.warning {
     border-color: #c4c19c;
     color: #726d23;
     background-color: #f3f0c1;

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

@@ -65,6 +65,8 @@
 
   * {
     @include box-sizing;
+    margin: 0;
+    padding: 0;
   }
 
   &:hover {

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

@@ -48,7 +48,7 @@ div#sort_panel {
 .redirect_url {
   position: absolute;
   top: 4px;
-  right: 184px;
+  right: 199px;
   text-align: right;
   background-color: #fff0c4;
   line-height: 22px;
@@ -108,13 +108,13 @@ div.sitemap_left_images {
 div.sitemap_right_tools {
   height: 22px;
   background-color: $light-gray;
-  padding-left: 16px;
+  padding-left: 8px;
   float: right;
-  width: 100px;
+  width: 120px;
 
   a {
     float: left;
-    width: 21px;
+    width: 24px;
     height: 21px;
     text-align: center;
 
@@ -134,8 +134,7 @@ div.sitemap_right_tools {
 .sitemap_sitetools {
   padding: 0;
   float: left;
-  width: 70px;
-  margin-left: 8px;
+  width: 72px;
 }
 
 div#page_selector_container div.sitemap_right_tools {
@@ -217,7 +216,7 @@ div.page_infos {
   float: right;
   height: 20px;
   padding: 1px;
-  width: 66px;
+  width: 68px;
 }
 
 #sub_navigation span.page_status_and_name span.page_status {
@@ -234,14 +233,13 @@ span.page_status {
   background-image: image-url('alchemy/icons.png');
   background-repeat: no-repeat;
   float: left;
-  margin: 2px 2px 0 4px;
 
   &.restricted {
     background-position: -258px -39px;
   }
 
   &.not_restricted {
-    background-position: -290px -39px;
+    background-position: -288px -39px;
     @include opacity(0.3);
   }
 
@@ -264,47 +262,36 @@ span.page_status {
   }
 }
 
+#sitemap .page_status {
+  margin: 2px 2px 0 4px;
+}
+
+.alchemy_overlay .page_status {
+  margin: 4px 4px 0 0;
+}
+
 .site_status {
   float: left;
   width: 16px;
   height: 16px;
   background: image-url('alchemy/icons.png') no-repeat 0 -40px;
   position: relative;
-  cursor: help;
+
+  a {
+    display: block;
+    height: 100%;
+    cursor: help;
+  }
 }
 
 .locked .site_status {
   background-position: -32px -40px;
 }
 
-.tooltip {
-  @extend %tooltip;
-  right: auto;
-  left: -12px;
-  top: 24px;
-  min-width: 240px;
-
-  &:before {
-    right: auto;
-    left: 12px;
-  }
-
-  p, h3 {
-    font-size: 11px;
-    margin: 0;
-    padding: 0;
-  }
-
-  h3 { margin-top: 0.5em }
-}
-
 #sitemap.sorting {
   .site_status { cursor: move }
-  .tooltip { display: none }
 }
 
-.site_status:hover .tooltip { display: block }
-
 #sub_navigation span.page_status_and_name span.site_status {
   float: none;
   @include inline-block;