alchemy_cms 3.0.0.rc7 → 3.0.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02135f0ba23a59280b20309cec71a326a544ff42
-  data.tar.gz: 053e8ad503e06ae42a9c07435c41ef161828161e
+  metadata.gz: dcb7647a1797d45f8881a956cde924671bc30f2d
+  data.tar.gz: 7b9dee0e4b299543fe51364f7c3be41b70e6e2e5
 SHA512:
-  metadata.gz: 19c8cb6b48175d8b27345fff351ff9d5acea1e7a95af065e2c2094a44f6428474f79b6d1d5a8be2ac7aaf78068295c4a41131d4a9a6d1cdff975046a53462e47
-  data.tar.gz: e182d4b3f9a33a1e2c148e83b8b0824df7474d5c952cfdc3ab42c7c3bf612d8992df8dc4eab8ddd6db0ba614f214e3e2edd8a94469a568fbf829296d7a88a894
+  metadata.gz: 3d184d7e8aac2c27eea62560fa1ff1140500ee0b59a07a6009fbcf4ec33ca2926c5a789953e7bb70bd9ed8bc0da662394bde3d8692ba9e6afacac8107fcd08a8
+  data.tar.gz: ec05398a5321e6a0e709329aec857b6bc4b3031eb8f160a59ea39d66b0e95ac1b52c7fa0043aa4751dbc0ce4dd52bed366444ceaf18570ce5b5052e3376ea90d

data/Gemfile

@@ -12,12 +12,13 @@ gem 'coveralls', require: false
 # Fixes issues with wrong exit codes. See: https://github.com/colszowka/simplecov/issues/269
 gem 'simplecov', '0.7.1'
 
+gem 'database_cleaner'
+
 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'
-  gem 'connection_pool' # https://gist.github.com/mperham/3049152
   unless ENV['CI']
     gem 'launchy'
   end

data/README.md

@@ -60,7 +60,7 @@ Installation
 
 #### 1. Use the installer:
 
-    gem install alchemy_cms
+    gem install alchemy_cms --pre
     alchemy new my_magicpage
     cd my_magicpage
 

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

@@ -47,11 +47,9 @@ $.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).parents(".element_editor")
+    $element = $(this).parent(".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,5 +1,22 @@
 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) ->
@@ -9,6 +26,7 @@ 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 =>
@@ -21,12 +39,18 @@ 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() - 75
+    height = $(window).height() - 73
     @element_window.css
       height: height
     @element_area.css
-      height: height
+      height: height - 46
     height
 
   reload: ->

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() - 75
+    height = $window.height() - 73
     width = 240 if width < 240
     @currentWidth = width
     @currentWindow.css

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

@@ -66,3 +66,25 @@ Alchemy.translations =
     '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'
+
+
+  # French
+  fr:
+    allowed_chars: 'von %{count} signes'
+    cancel: 'abandonner'
+    cancelled: 'annulé'
+    click_to_edit: 'Cliquez pour modifier'
+    complete: 'terminé'
+    element_dirty_notice: 'Cet élément a des modifications non enregistrées. Souhaitez-vous vraiment plier?'
+    help: 'Aide'
+    ok: 'Ok'
+    page_dirty_notice: 'Vous avez des modifications non enregistrées sur la page. Ce sera perdue si vous continuez.'
+    page_found: 'page trouvée'
+    pages_found: 'pages trouvées'
+    url_validation_failed: "L'URL n'est pas correctement formatée."
+    warning: 'Attention!'
+    'File is too large': 'Le fichier est trop grand.'
+    'File is too small': 'Le fichier est trop petit.'
+    'File type not allowed': 'Type de document non autorisé.'
+    'Maximum number of files exceeded': 'Le nombre maximum de fichiers est atteint.'
+    'Uploaded bytes exceed file size': 'Taille de fichier maximale autorisée atteint.'

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

@@ -542,10 +542,6 @@ select#url_protocol.medium {
   overflow-x: hidden;
   overflow-y: auto;
   margin-bottom: 1em;
-
-  .insert-element-button {
-    display: none;
-  }
 }
 
 .mceEditor table {
@@ -560,7 +556,7 @@ div.browse {
   @include box-sizing(border-box);
   position: absolute;
   left: 66px;
-  top: 75px;
+  top: 73px;
   width: auto;
   height: auto;
   border: 0 none;

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

@@ -2,7 +2,7 @@
   @include box-sizing(border-box);
   position: absolute;
   right: 0;
-  top: 75px;
+  top: 73px;
   width: 400px;
   height: auto;
   border-left: $default-border;
@@ -25,50 +25,6 @@
   }
 }
 
-.insert-element-button {
-  display: block;
-  text-align: center;
-  margin-bottom: 2 * $default-margin;
-  background-color: transparent;
-  border: 1px solid $medium-gray;
-  height: 20px;
-  line-height: 20px;
-  @extend %rounded-border;
-  @include transition(all 100ms ease-in-out);
-
-  &:hover, &.expanded {
-    height: 30px;
-    line-height: 30px;
-    background-color: darken($medium-gray, 2%);
-    text-decoration: none;
-    cursor: pointer;
-    border-color: darken($medium-gray, 2%);
-
-    label { display: inline-block; }
-    .icon { @include opacity(1) }
-  }
-
-  &.expanded:hover {
-    background-color: darken($medium-gray, 5%);
-
-    label { color: #000 }
-  }
-
-  label {
-    display: inline-block;
-    vertical-align: middle;
-    cursor: pointer;
-    display: none;
-  }
-
-  .icon {
-    display: inline-block;
-    vertical-align: text-top;
-    @include opacity(0.7);
-    @include transition(opacity 100ms ease-in-out);
-  }
-}
-
 .element_heading {
   padding: 0;
   z-index: 0;
@@ -165,7 +121,10 @@ span.preview_text_element_name {
 }
 
 .element_editor {
+  border: 1px solid $default-border-color;
+  @extend %rounded-border;
   background-color: $light-gray;
+  margin-bottom: 2*$default-margin;
 
   &.not-draggable {
     @include opacity(0.5);
@@ -179,17 +138,14 @@ span.preview_text_element_name {
     }
   }
 
-  &.selected > .edit_element {
+  &.selected {
     border-color: $blue;
     @include box-shadow(0 0 4px $blue);
   }
 
   form {
     margin: 0;
-    padding: 0 8px;
-    margin-bottom: 2*$default-margin;
-    border: $default-border;
-    @include border-radius($default-border-radius);
+    padding: 8px 8px 0 8px;
   }
 
   .validation_notice {
@@ -246,22 +202,14 @@ span.preview_text_element_name {
 
 .element_head, .element_foot {
   position: relative;
-  background-color: $medium-gray;
-  margin-left: -8px;
-  margin-right: -8px;
 }
 
 .element_head {
   padding: 8px 0 6px;
-  margin-bottom: 2*$default-margin;
+  margin-bottom: 0;
   height: 20px;
+  background-color: $medium-gray;
   @extend .disable-user-select;
-  @include border-top-radius($default-border-radius);
-
-  .folded & {
-    margin-bottom: 0;
-    @include border-bottom-radius($default-border-radius);
-  }
 
   .spinner {
     top: 9px;
@@ -273,7 +221,9 @@ span.preview_text_element_name {
   padding: 2*$default-padding;
   width: 100%;
   height: 29px;
-  @include border-bottom-radius($default-border-radius);
+  margin-left: -8px;
+  margin-right: -8px;
+  background-color: $medium-gray;
 
   .element_tools {
     float: left;

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

@@ -142,7 +142,7 @@ div#overlay_text_box {
 #main_content {
   @include box-sizing(border-box);
   background-color: $light-gray;
-  padding: 83px 8px 8px 74px;
+  padding: 73px 8px 8px 74px;
   z-index: 0;
   width: 100%;
   height: 100%;

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -21,7 +21,7 @@
   line-height: normal;
   font-weight: normal;
   text-align: left;
-  @include box-sizing(border-box);
+  @include box-sizing(content-box);
   direction: ltr;
 }
 

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -58,7 +58,7 @@ module Alchemy
           page: params[:page],
           query: params[:query]
         )
-        flash[:notice] = _t("File: '%{name}' deleted successfully", name: name)
+        flash[:notice] = _t('File deleted successfully', name: name)
       end
 
       def download

data/app/controllers/alchemy/admin/base_controller.rb

@@ -59,21 +59,15 @@ module Alchemy
         end
       end
 
-      def get_clipboard
-        session[:clipboard] ||= Clipboard.new
-      rescue NoMethodError => e
-        exception_logger(e)
-        @notice = "You have an old style clipboard in your session. Please remove your cookies and try again."
-        render :action => "error_notice", :layout => false
+      # Returns clipboard items for given category
+      def get_clipboard(category)
+        session[:alchemy_clipboard] ||= {}
+        session[:alchemy_clipboard][category.to_s] ||= []
       end
 
-      def clipboard_empty?(category = nil)
-        return true if session[:clipboard].blank?
-        if category
-          session[:clipboard][category.pluralize].blank?
-        else
-          false
-        end
+      # Checks if clipboard for given category is blank
+      def clipboard_empty?(category)
+        get_clipboard(category).blank?
       end
 
       def trash_empty?(category)

data/app/controllers/alchemy/admin/clipboard_controller.rb

@@ -1,21 +1,23 @@
 module Alchemy
   module Admin
     class ClipboardController < Alchemy::Admin::BaseController
-      authorize_resource class: Alchemy::Clipboard
+      authorize_resource class: :alchemy_admin_clipboard
+      before_filter :set_clipboard
 
       def index
-        @clipboard = get_clipboard
-        @clipboard_items = model_class.all_from_clipboard(@clipboard.all(params[:remarkable_type]))
+        @clipboard_items = model_class.all_from_clipboard(@clipboard)
         respond_to do |format|
           format.html
         end
       end
 
       def insert
-        @clipboard = get_clipboard
         @item = model_class.find(params[:remarkable_id])
-        unless @clipboard.contains? params[:remarkable_type], params[:remarkable_id]
-          @clipboard.push params[:remarkable_type], {:id => params[:remarkable_id], :action => params[:remove] ? 'cut' : 'copy'}
+        unless @clipboard.detect { |item| item['id'] == params[:remarkable_id] }
+          @clipboard << {
+            'id' => params[:remarkable_id],
+            'action' => params[:remove] ? 'cut' : 'copy'
+          }
         end
         respond_to do |format|
           format.js
@@ -23,19 +25,22 @@ module Alchemy
       end
 
       def remove
-        @clipboard = get_clipboard
         @item = model_class.find(params[:remarkable_id])
-        @clipboard.remove params[:remarkable_type], params[:remarkable_id]
+        @clipboard.delete_if { |item| item['id'] == params[:remarkable_id] }
         respond_to do |format|
           format.js
         end
       end
 
       def clear
-        session[:clipboard].clear(params[:remarkable_type])
+        @clipboard.clear
       end
 
-    private
+      private
+
+      def set_clipboard
+        @clipboard = get_clipboard(params[:remarkable_type])
+      end
 
       def model_class
         "alchemy/#{params[:remarkable_type]}".classify.constantize

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -26,7 +26,8 @@ module Alchemy
         @page = Page.find_by_id(params[:page_id])
         @element = @page.elements.build
         @elements = @page.available_element_definitions
-        @clipboard_items = Element.all_from_clipboard_for_page(get_clipboard[:elements], @page)
+        @clipboard = get_clipboard('elements')
+        @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
       end
 
       # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
@@ -44,10 +45,8 @@ module Alchemy
             end
             @element.save
           end
-          if params[:insert_after].present?
-            @element_before = Element.find(params[:insert_after])
-            @element.insert_at(@element_before.position + 1)
-          else
+          if @page.definition['insert_elements_at'] == 'top'
+            @insert_at_top = true
             @element.move_to_top
           end
         end
@@ -57,7 +56,8 @@ module Alchemy
         else
           @element.page = @page
           @elements = @page.available_element_definitions
-          @clipboard_items = Element.all_from_clipboard_for_page(get_clipboard[:elements], @page)
+          @clipboard = get_clipboard('elements')
+          @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
           render :new
         end
       end
@@ -128,24 +128,28 @@ module Alchemy
       end
 
       def element_from_clipboard
-        @clipboard = get_clipboard
-        @clipboard.get(:elements, params[:paste_from_clipboard])
+        @element_from_clipboard ||= begin
+          @clipboard = get_clipboard('elements')
+          @clipboard.detect { |item| item['id'].to_i == params[:paste_from_clipboard].to_i }
+        end
       end
 
       def paste_element_from_clipboard
-        @source_element = Element.find(element_from_clipboard[:id])
+        @source_element = Element.find(element_from_clipboard['id'])
         new_attributes = {:page_id => @page.id}
         if @page.can_have_cells?
           new_attributes = new_attributes.merge({:cell_id => find_or_create_cell.try(:id)})
         end
         element = Element.copy(@source_element, new_attributes)
-        cut_element if element_from_clipboard[:action] == 'cut'
+        if element_from_clipboard['action'] == 'cut'
+          cut_element
+        end
         element
       end
 
       def cut_element
         @cutted_element_id = @source_element.id
-        @clipboard.remove :elements, @source_element.id
+        @clipboard.delete_if { |item| item['id'] == @source_element.id.to_s }
         @source_element.destroy
       end