alchemy_cms 3.0.0.rc5 → 3.0.0.rc6

data/app/assets/javascripts/alchemy/{alchemy.tinymce.js.coffee.erb → alchemy.tinymce.js.coffee}

@@ -1,22 +1,6 @@
 # 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 %>
-
-  # 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: {}
+$.extend Alchemy.Tinymce,
 
   # Returns default config for a tinymce editor.
   #
@@ -80,11 +64,3 @@ window.Alchemy.Tinymce =
       editor = tinymce.get("tinymce_#{id}")
       if editor
         editor.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

@@ -1,110 +1,68 @@
 window.Alchemy = {} if typeof(window.Alchemy) is 'undefined'
 
-# Holds translations
+# Holds translations for javascripts
 #
 Alchemy.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."
-    nl: "Er zijn wijzigingen op deze pagina aangebracht. Deze gaan verloren als u doorgaat."
-  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?"
-    nl: "Dit element bevat niet opgeslagen wijzigingen. Wilt u dit echt inklappen?"
-  warning:
-    en: 'Warning!'
-    de: 'Achtung!'
-    nl: 'Waarschuwing!'
-  ok:
-    en: 'Ok'
-    de: 'Ok'
-    nl: 'Ok'
-  cancel:
-    en: 'Cancel'
-    de: 'Abbrechen'
-    nl: 'Annuleren'
-  browse:
-    de: "durchsuchen"
-    en: "browse"
-    nl: "bladeren"
-  pending:
-    de: "Wartend..."
-    en: "Pending..."
-    nl: "Bezig..."
-  uploading:
-    de: "Ladend..."
-    en: "Uploading..."
-    nl: "Uploaden..."
-  remaining:
-    de: " verbleibend."
-    en: " remaining."
-    nl: " over."
-  complete:
-    de: "Abgeschlossen"
-    en: "Complete"
-    nl: "Klaar"
-  cancelled:
-    de: "Abgebrochen"
-    en: "Cancelled"
-    nl: "Afgebroken"
-  stopped:
-    de: "Gestoppt"
-    en: "Stopped"
-    nl: "Gestopt"
-  upload_failed:
-    de: "Fehlgeschlagen!"
-    en: "Upload Failed!"
-    nl: "Upload gestopt!"
-  file_too_big:
-    de: "Datei ist zu groß!"
-    en: "File is too big!"
-    nl: "Bestand is te groot!"
-  upload_limit_exceeded:
-    de: "Maximales Dateilimit erreicht."
-    en: "Upload limit exceeded."
-    nl: "Uploadlimiet bereikt."
-  validation_failed:
-    de: "Validierung fehlgeschlagen. Ladevorgang angehalten."
-    en: "Failed Validation. Upload skipped."
-    nl: "Validatiefout. Upload is stopgezet."
-  zero_byte_file:
-    de: "Datei hat keinen Inhalt!"
-    en: "Cannot upload Zero Byte files!"
-    nl: "Bestand is leeg!"
-  invalid_file:
-    de: "Ungültiger Dateityp!"
-    en: "Invalid File Type!"
-    nl: "Ongeldig bestandstype!"
-  unknown_error:
-    de: "Unbekannter Fehler!"
-    en: "Unhandled Error!"
-    nl: "Onbekende fout!"
-  drag_files_notice:
-    de: "Oder ziehen Sie die Dateien hier rauf"
-    en: "Or drag files over here"
-    nl: "Of sleep bestanden hier naartoe"
-  drop_files_notice:
-    de: "Lassen Sie die Dateien nun los"
-    en: "Now drop the files"
-    nl: "Laat nu de bestanden los"
-  queued_files_notice:
-    de: "x Dateien in der Warteschlange."
-    en: "Queued x files."
-    nl: "x bestanden in de wachtrij gezet."
-  success_notice:
-    de: "x Dateien hochgeladen."
-    en: "Uploaded x files."
-    nl: "x bestanden geupload."
-  url_validation_failed:
-    de: 'Die URL hat kein gültiges Format.'
-    en: 'The url has no valid format.'
-    nl: 'De url heeft geen geldig formaat.'
-  click_to_edit:
-    de: 'Klicken zum Bearbeiten'
-    en: 'click to edit'
-    nl: 'klik om aan te passen'
-  help:
-    de: 'Hilfe'
-    en: 'Help'
-    en: 'Hulp'
+  # German
+  de:
+    allowed_chars: 'von %{count} Zeichen'
+    cancel: 'Abbrechen'
+    cancelled: 'Abgebrochen'
+    click_to_edit: 'Klicken zum Bearbeiten'
+    complete: 'Abgeschlossen'
+    element_dirty_notice: 'Dieses Element hat nicht gespeicherte Änderungen. Möchten Sie es wirklich einklappen?'
+    help: 'Hilfe'
+    ok: 'Ok'
+    page_dirty_notice: 'Sie haben ungesicherte Änderungen auf der Seite. Diese gehen verloren, wenn Sie fortfahren.'
+    page_found: 'Seite gefunden'
+    pages_found: 'Seiten gefunden'
+    url_validation_failed: 'Die URL hat kein gültiges Format.'
+    warning: 'Achtung!'
+    'File is too large': 'Datei ist zu groß.'
+    'File is too small': 'Datei ist zu klein.'
+    'File type not allowed': 'Dateityp nicht erlaubt.'
+    'Maximum number of files exceeded': 'Maximale Anzahl an Dateien erreicht.'
+    'Uploaded bytes exceed file size': 'Maximal erlaubte Dateigröße erreicht.'
+
+  # English
+  en:
+    allowed_chars: 'of %{count} chars'
+    cancel: 'Cancel'
+    cancelled: 'Cancelled'
+    click_to_edit: 'click to edit'
+    complete: 'Complete'
+    element_dirty_notice: 'This element has unsaved changes. Do you really want to fold it?'
+    help: 'Help'
+    ok: 'Ok'
+    page_dirty_notice: 'You have unsaved changes on this page. They will be lost if you continue.'
+    page_found: 'Page found'
+    pages_found: 'Pages found'
+    url_validation_failed: 'The url has no valid format.'
+    warning: 'Warning!'
+    'File is too large': 'File is too large'
+    'File is too small': 'File is too small'
+    'File type not allowed': 'File type not allowed'
+    'Maximum number of files exceeded': 'Maximum number of files exceeded.'
+    'Uploaded bytes exceed file size': 'Uploaded bytes exceed file size'
+
+  # Dutch
+  nl:
+    allowed_chars: 'of %{count} chars'
+    cancel: 'Annuleren'
+    cancelled: 'Afgebroken'
+    click_to_edit: 'klik om aan te passen'
+    complete: 'Klaar'
+    element_dirty_notice: 'Dit element bevat niet opgeslagen wijzigingen. Wilt u dit echt inklappen?'
+    help: 'Hulp'
+    ok: 'Ok'
+    page_found: 'Page found'
+    pages_found: 'Pages found'
+    page_dirty_notice: 'Er zijn wijzigingen op deze pagina aangebracht. Deze gaan verloren als u doorgaat.'
+    url_validation_failed: 'De url heeft geen geldig formaat.'
+    warning: 'Waarschuwing!'
+    'File is too large': 'File is too large'
+    'File is too small': 'File is too small'
+    'File type not allowed': 'File type not allowed'
+    'Maximum number of files exceeded': 'Uploadlimiet bereikt.'
+    'Uploaded bytes exceed file size': 'Uploaded bytes exceed file size'

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

@@ -46,7 +46,7 @@ Alchemy.Uploader = (settings) ->
         data.context.$fileProgressCancel.click (e) ->
           e.preventDefault()
           data.context.setCancelled()
-          data.context.setStatus('Upload cancelled')
+          data.context.setStatus('cancelled')
           false
         false
       else
@@ -55,7 +55,7 @@ Alchemy.Uploader = (settings) ->
           e.preventDefault()
           xhr.abort()
           data.context.setCancelled()
-          data.context.setStatus('Upload cancelled')
+          data.context.setStatus('cancelled')
           false
         xhr
     progress: (e, data) ->
@@ -70,7 +70,7 @@ Alchemy.Uploader = (settings) ->
       completedUploads += 1
       $('.uploaded-files-count').text(completedUploads)
       data.context.setComplete()
-      data.context.setStatus('Completed')
+      data.context.setStatus('complete')
       response_data = data.xhr().response
       if completedUploads == totalFilesCount
         completedUploads = 0

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

@@ -60,18 +60,10 @@
   @include box-shadow(inset 1px 1px 4px rgba($error_border_color, 0.5));
 }
 
-%border-radius-reset {
-  @include border-radius(0);
-}
-
 %blue-focus-style {
   @include default-focus-style;
 }
 
-%white-focus-style {
-  @include default-focus-style(rgba(white, 0.5), none);
-}
-
 %default-input-style {
   @include box-sizing(border-box);
   $border-inset-color: lighten($default-border-color, 20%);
@@ -102,4 +94,6 @@
 
 %gradiated-toolbar {
   background: $medium-gray;
+  padding: 8px 4px;
+  height: 29px;
 }

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

@@ -1,13 +1,8 @@
-@mixin default-focus-style($bg-color: $very-light-blue, $border: 1px solid $blue) {
-  background-color: $bg-color;
-  border: $border;
-  @include box-shadow(0 0 6px $blue, inset 0 0 4px $light-blue);
+@mixin default-focus-style {
+  border-color: $blue;
+  @include box-shadow(0 0 2px 2px $blue);
   outline: none;
-  @include transition(
-    box-shadow 0.25s ease-in-out,
-    background-color 0.25s ease-in-out,
-    border 0.25s ease-in-out
-  );
+  @include transition(all 0.25s ease-in-out);
 
   &::-moz-focus-inner {
     border: none !important;

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

@@ -68,7 +68,7 @@ a {
   }
 
   &:focus {
-    @extend %white-focus-style;
+    @extend %blue-focus-style;
     color: black;
   }
 
@@ -235,10 +235,6 @@ div#page_editing_menu {
   margin-top: 1em;
 }
 
-div.table_right span.tools a.icon_button img {
-  left: -1px;
-}
-
 li.even {
   background-color: #fff;
 }
@@ -546,6 +542,10 @@ select#url_protocol.medium {
   overflow-x: hidden;
   overflow-y: auto;
   margin-bottom: 1em;
+
+  .insert-element-button {
+    display: none;
+  }
 }
 
 .mceEditor table {
@@ -560,7 +560,7 @@ div.browse {
   @include box-sizing(border-box);
   position: absolute;
   left: 66px;
-  top: 80px;
+  top: 75px;
   width: auto;
   height: auto;
   border: 0 none;

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

@@ -49,10 +49,9 @@ button, input[type="submit"], a.button, input.button {
 }
 
 .icon_button {
-  @extend %button-defaults;
   width: 21px;
   height: 21px;
-  line-height: 19px;
+  line-height: 21px;
   margin: 0;
   padding: 3px;
   overflow: hidden;
@@ -65,7 +64,7 @@ button, input[type="submit"], a.button, input.button {
 
   .icon {
     @include inline-block;
-    vertical-align: middle;
+    margin-top: -2px;
   }
 
   .old_icon {
@@ -100,9 +99,10 @@ button, input[type="submit"], a.button, input.button {
       left: auto;
       position: absolute;
       left: 1px;
-      top: 2px;
+      top: 3px;
       width: 8px;
       height: 8px;
+      margin-top: 0;
 
       &:before {
         line-height: 10px;
@@ -117,7 +117,7 @@ button, input[type="submit"], a.button, input.button {
       border: $default-border-width $default-border-style $button-hover-border-color;
       @include border-radius($default-border-radius);
       background: $button-hover-bg-color;
-      top: -1px;
+      top: 0px;
       right: 0px;
 
       .icon {
@@ -164,43 +164,38 @@ button, input[type="submit"], a.button, input.button {
 }
 
 button.icon_button {
-  width: 29px;
-  height: 29px;
+  background: transparent;
+  border: 0 none;
+  @include border-radius(0);
+  @include box-shadow(none);
+  @include box-sizing(content-box);
 }
 
 #new_element button.button {
   float: right;
 }
 
-div#toolbar label {
-  @include default-label-style;
-}
-
 .button_with_label {
+  position: relative;
   @include inline-block(top);
   text-align: center;
-  margin-right: 8px;
-  margin-left: 8px;
-  min-width: 70px;
+  margin: 0 2*$default-margin;
   line-height: 0;
 
-  label {
-    @include default-label-style;
-  }
-
-  &.active {
+  &.active, &:active {
 
     .icon_button {
-      $second-color: darken($sb-base-color, 10%);
-      @include sassy-button-active-shadow($second-color);
-      background-color: $second-color;
-      @include background(linear-gradient(color-stops(darken($sb-base-color, 2%), $second-color 50%, darken($second-color, 8%))))
+      background-color: darken($sb-base-color, 10%);
+      border: $default-border;
+      padding: 2px;
+      @extend %rounded-border;
     }
+  }
 
-    label {
-      color: black;
-      text-shadow: white 0 0 2px;
-    }
+  &:hover .icon_button {
+    border: $default-border;
+    padding: 2px;
+    @extend %rounded-border;
   }
 
   .select2-container {
@@ -222,6 +217,38 @@ div#toolbar label {
   }
 }
 
-div.sitemap_right_tools .sitemap_sitetools a.icon_button {
-  margin-right: 4px;
+.button_with_label, .button_group {
+
+  .icon_button {
+    width: 23px;
+    height: 23px;
+    line-height: 23px;
+  }
+
+  label {
+    display: none;
+    position: absolute;
+    top: -25px;
+    left: 50%;
+    margin-left: -13px;
+    z-index: 30;
+    background: $dark-gray;
+    color: #fff;
+    padding: $default-padding 2*$default-padding;
+    @extend %rounded-border;
+    line-height: 1;
+    @include box-shadow(0 0 4px $default-border-color);
+    white-space: nowrap;
+
+    &:before {
+      content: '';
+      position: absolute;
+      bottom: -10px;
+      left: 8px;
+      border: 5px transparent solid;
+      border-top-color: $dark-gray;
+    }
+  }
+
+  &:hover label { display: block }
 }