alchemy_cms 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 611a1e37fe56a17099be81544930085f61508212
-  data.tar.gz: cd2ec040d0c1099bd916761ff305f976b20c7908
+  metadata.gz: 22899ddac5bccee25b1e3438bcec28374381edc6
+  data.tar.gz: 92792959062f3873ff293a491a7c981e83ed2797
 SHA512:
-  metadata.gz: 7345ebd721ad3d3823c25d0ea98f768684fd8187df860bba180967060a272d7f03a08b0c7d0b68bf610d38da1a268909857f080b0bb9196be2322fd61d615f58
-  data.tar.gz: c957bfb8d7512694346a4213c91c7e0714365ad1593dd34ecf9252937b2767f258792f45f6b543862a143a0fa2f4d41e353bf596f2e59c7fd6dc26ec746cbb1d
+  metadata.gz: ec3084ada69925e12a6458ed3768d4f63e23c3b20def9ebe63543946b05ad3d4288fd040ef20c88fa2857a0c123daa8462ef2f87d2facaa8b78ff7dd4926eea7
+  data.tar.gz: 8f0f74f54d0b903c5d02c445107ea8358927c5faa2ff4ab30ac37f0b1612f92ef63ed00d9b4bdbe6cb856200d43664e82754e4d197200a044fe84e797b8dc2c3

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 2.1
 branches:
   only:
-    - master
+    - 3.0-stable
 script: rake
 env:
   - DB=mysql

data/README.md

@@ -1,7 +1,7 @@
 ![Alchemy CMS](http://alchemy-cms.com/assets/alchemy_logo.svg)
 
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.png)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://travis-ci.org/magiclabs/alchemy_cms.svg?branch=master)](https://travis-ci.org/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=master)](https://coveralls.io/r/magiclabs/alchemy_cms?branch=master)
+[![Build Status](https://travis-ci.org/magiclabs/alchemy_cms.svg?branch=3.0-stable)](https://travis-ci.org/magiclabs/alchemy_cms) [![Code Climate](https://codeclimate.com/github/magiclabs/alchemy_cms.png)](https://codeclimate.com/github/magiclabs/alchemy_cms) [![Coverage Status](https://coveralls.io/repos/magiclabs/alchemy_cms/badge.png?branch=3.0-stable)](https://coveralls.io/r/magiclabs/alchemy_cms?branch=3.0-stable)
 
 About
 -----
@@ -10,9 +10,6 @@ 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/3.0.0),
-or the [latest stable branch (3.0-stable)](https://github.com/magiclabs/alchemy_cms/tree/3.0-stable).**
-
 Features
 --------
 
@@ -60,7 +57,7 @@ Installation
 
 #### 1. Use the installer:
 
-    gem install alchemy_cms --pre
+    gem install alchemy_cms
     alchemy new my_magicpage
     cd my_magicpage
 
@@ -84,7 +81,7 @@ Open `http://localhost:3000` and follow the on screen instructions.
 
 In your App's Gemfile:
 
-    gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: 'master'
+    gem 'alchemy_cms', github: 'magiclabs/alchemy_cms', branch: '3.0-stable'
 
 #### 2. Install Alchemy into your app:
 

data/alchemy_cms.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'acts-as-taggable-on',              '~> 3.1'
   gem.add_runtime_dependency 'cancan',                           '~> 1.6.10'
   gem.add_runtime_dependency 'dragonfly',                        '~> 1.0.1'
-  gem.add_runtime_dependency 'kaminari',                         '~> 0.15.0'
+  gem.add_runtime_dependency 'kaminari',                         '~> 0.15'
   gem.add_runtime_dependency 'acts_as_list',                     '~> 0.3.0'
   gem.add_runtime_dependency 'magiclabs-userstamp',              '~> 2.1.0'
   gem.add_runtime_dependency 'simple_form',                      '~> 3.0.1'

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

@@ -117,12 +117,12 @@ 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: 0px;
-      right: 0px;
+      top: -1px;
+      right: -1px;
 
       .icon {
-        left: 0px;
-        top: 2px;
+        left: 1px;
+        top: 3px;
       }
     }
   }

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

@@ -262,7 +262,7 @@ div.page_infos {
 }
 
 .alchemy-dialog .page_status {
-  margin: 4px 4px 0 0;
+  margin: 2px 4px 0 0;
 }
 
 #sitemap {

data/app/controllers/alchemy/pages_controller.rb

@@ -8,20 +8,20 @@ module Alchemy
 
     rescue_from ActionController::RoutingError, :with => :render_404
 
-    before_filter :enforce_primary_host_for_site
-    before_filter :render_page_or_redirect, :only => [:show]
-    before_filter :load_page
-    authorize_resource only: 'show'
+    before_action :enforce_primary_host_for_site
+    before_action :render_page_or_redirect, only: [:show]
 
     # Showing page from params[:urlname]
     #
     def show
+      authorize! :show, @page
+
       if render_fresh_page?
         respond_to do |format|
           format.html { render layout: !request.xhr? }
           format.rss do
             if @page.contains_feed?
-              render action: 'show', layout: false, handlers: [:builder]
+              render layout: false, handlers: [:builder]
             else
               render xml: {error: 'Not found'}, status: 404
             end

data/app/helpers/alchemy/admin/elements_helper.rb

@@ -72,12 +72,12 @@ module Alchemy
         end
         other_elements = elements - celled_elements
         unless other_elements.blank?
-          optgroup_label = _t(:main_content)
-          options[optgroup_label] = other_elements.map do |e|
+          options[_t(:main_content)] = other_elements.map do |e|
             element_array_for_options(e, object_method)
           end
         end
-        options
+        # We don't want to show empty cells
+        options.delete_if { |cell, elements| elements.blank? }
       end
 
       def element_array_for_options(e, object_method, cell = nil)

data/app/helpers/alchemy/admin/navigation_helper.rb

@@ -163,7 +163,8 @@ module Alchemy
         {
           controller: entry['controller'],
           action: entry['action'],
-          only_path: true
+          only_path: true,
+          params: entry['params']
         }
       end
 

data/app/models/alchemy/cell.rb

@@ -19,7 +19,7 @@
 #
 # Render cells with the +render_cell+ helper
 #
-# Views for cells are inside the +app/views/cells+ folder in you project.
+# Views for cells are inside the +app/views/cells+ folder in your project.
 #
 module Alchemy
   class Cell < ActiveRecord::Base

data/app/models/alchemy/element.rb

@@ -47,6 +47,7 @@ module Alchemy
 
     after_create :create_contents, :unless => proc { |e| e.create_contents_after_create == false }
     after_update :touch_pages
+    after_update :touch_cell, unless: -> { self.cell.nil? }
 
     scope :trashed,           -> { where(position: nil).order('updated_at DESC') }
     scope :not_trashed,       -> { where(Element.arel_table[:position].not_eq(nil)) }
@@ -461,5 +462,14 @@ module Alchemy
       available_page_cells(page).collect(&:name).uniq
     end
 
+    # If element has a +cell+ associated,
+    # it updates it's timestamp.
+    #
+    # Called after_update
+    #
+    def touch_cell
+      self.cell.touch
+    end
+
   end
 end

data/app/models/alchemy/page/page_naming.rb

@@ -72,11 +72,11 @@ module Alchemy
     def set_urlname
       if Config.get(:url_nesting)
         url_name = [
-          parent.nil? || parent.language_root? ? nil : parent.urlname,
-          convert_url_name((urlname.blank? ? name : slug))
+          parent_urlname,
+          convert_url_name(urlname.blank? ? name : slug)
         ].compact.join('/')
       else
-        url_name = convert_url_name((urlname.blank? ? name : urlname))
+        url_name = convert_url_name(urlname.blank? ? name : urlname)
       end
       write_attribute :urlname, url_name
     end
@@ -98,5 +98,12 @@ module Alchemy
         url_name
       end
     end
+
+    # Urlname of parent page.
+    # Returns nil, if the parent is either a language root page or the root page itself
+    def parent_urlname
+      return if parent.nil? || parent.language_root? || parent.root?
+      parent.urlname
+    end
   end
 end

data/app/models/alchemy/picture.rb

@@ -39,9 +39,13 @@ module Alchemy
       raise PictureInUseError, I18n.t(:cannot_delete_picture_notice) % { name: name }
     end
 
+    # Enables Dragonfly image processing
     dragonfly_accessor :image_file, app: :alchemy_pictures do
-      if Config.get(:preprocess_image_resize).present?
-        after_assign { |a| a.process!(:resize, "#{Config.get(:preprocess_image_resize)}>") }
+      # Preprocess after uploading the picture
+      after_assign do |p|
+        if Config.get(:preprocess_image_resize).present?
+          p.thumb!("#{Config.get(:preprocess_image_resize)}>")
+        end
       end
     end
 

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -12,7 +12,7 @@
           alchemy.info_admin_page_path(page),
           {
             title: _t(:page_infos),
-            size: '480x290'
+            size: '520x290'
           },
           {
             title: _t(:page_infos),

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -32,7 +32,7 @@
       alchemy.info_admin_page_path(@page),
       {
         title: _t(:page_infos),
-        size: '480x320'
+        size: '520x320'
       },
       {
         class: 'icon_button',

data/app/views/alchemy/admin/pages/info.html.erb

@@ -5,9 +5,18 @@
   <% end %>
   <% end %>
   <div class="value">
-    <label><%= _t(:page_type) %></label>
+    <label><%= Alchemy::Page.human_attribute_name(:page_layout) %></label>
     <p><%= @page.layout_display_name %></p>
   </div>
+  <div class="value">
+  <% if @page.redirects_to_external? %>
+    <label><%= Alchemy::Page.human_attribute_name(:urlname) %></label>
+    <p><%= @page.urlname %></p>
+  <% else %>
+    <label><%= Alchemy::LegacyPageUrl.human_attribute_name(:urlname) %></label>
+    <p><%= "/#{@page.urlname}" %></p>
+  <% end %>
+  </div>
   <div class="value">
     <label><%= _t(:page_status) %></label>
     <p><%= combined_page_status(@page) %></p>

data/app/views/alchemy/base/leave.html.erb

@@ -6,6 +6,6 @@
   <%= link_to _t('stay logged in'), alchemy.root_path, class: 'button' %>
 </p>
 <%= form_tag Alchemy.logout_path, method: 'delete', class: 'buttons' do %>
-  <label><%= _t('or to completly') %></label>
+  <label><%= _t('or to completely') %></label>
   <%= button _t(:logout), autofocus: true %>
 <% end %>

data/config/locales/alchemy.de.yml

@@ -579,7 +579,7 @@ de:
     "You are about to leave Alchemy": "Sie sind dabei Alchemy zu verlassen"
     "Do you want to": "Wollen Sie dabei"
     "stay logged in": "angemeldet bleiben"
-    "or to completly": "oder Sich komplett"
+    "or to completely": "oder Sich komplett"
     "Are you sure?": "Sind Sie sicher?"
     "Create": "Hinzufügen"
     "Edit": "Bearbeiten"

data/config/locales/alchemy.en.yml

@@ -201,7 +201,7 @@ en:
     "Hide Elements": "Hide Elements"
     "If you have any problems using the Flash uploader you can switch to": "If you have any problems using the Flash uploader you can switch to %{link}"
     "Image missing": "Image missing"
-    "Image size": "Imagesize"
+    "Image size": "Image size"
     "Language successfully created": "Language successfully created."
     "Language successfully removed": "Language successfully removed."
     "Language successfully updated": "Language successfully updated."
@@ -244,7 +244,7 @@ en:
     "Please enter a new password": "Please enter a new password."
     "Please enter your email address": "Please enter your email address."
     "Please log in": "Please log in."
-    "Please seperate the tags with commata": "* Please seperate the tags with commata."
+    "Please seperate the tags with commata": "* Please seperate the tags with commas."
     "Properties": "Properties"
     "Publish page": "Publish page"
     "Read the License": "Read the License"
@@ -579,7 +579,7 @@ en:
     "You are about to leave Alchemy": "You are about to leave Alchemy"
     "Do you want to": "Do you want to"
     "stay logged in": "stay logged in"
-    "or to completly": "or to completly"
+    "or to completely": "or to completely"
     "Are you sure?": "Are you sure?"
     "Create": "Create"
     "Edit": "Edit"

data/config/locales/alchemy.fr.yml

@@ -605,7 +605,7 @@ fr:
     "You are about to leave Alchemy": "Vous êtes sur le point de quitter l'Alchimie"
     "Do you want to": "Voulez-vous "
     "stay logged in": "rester connecté"
-    "or to completly": "ou vous-même complètement"
+    "or to completely": "ou vous-même complètement"
     "Please wait. Flash® is loading...": "S'il vous plaît attendre. Uploader Flash ® est en cours de chargement..."
     "Are you sure?": "Etes-vous sûr?"
     "Create": "ajouter"

data/config/locales/alchemy.nl.yml

@@ -579,7 +579,7 @@ nl:
     "You are about to leave Alchemy": "U staat op het punt de NVM Regiosite te verlaten"
     "Do you want to": "Wilt u"
     "stay logged in": "ingelogd blijven"
-    "or to completly": "of compleet"
+    "or to completely": "of compleet"
     "Are you sure?": "Weet u het zeker?"
     "Create": "Aanmaken"
     "Edit": "Aanpassen"

data/lib/alchemy/test_support/factories.rb

@@ -5,19 +5,19 @@ FactoryGirl.define do
     password 's3cr3t'
 
     factory :admin_user do
-      alchemy_roles 'admin'
+      alchemy_roles ['admin']
     end
 
     factory :member_user do
-      alchemy_roles 'member'
+      alchemy_roles ['member']
     end
 
     factory :author_user do
-      alchemy_roles 'author'
+      alchemy_roles ['author']
     end
 
     factory :editor_user do
-      alchemy_roles 'editor'
+      alchemy_roles ['editor']
     end
   end
 

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/essence/essence_generator.rb

@@ -36,7 +36,7 @@ CLASSMETHOD
       end
 
       def copy_templates
-        essence_name = @essence_name.classify.demodulize
+        essence_name = @essence_name.classify.demodulize.underscore
         template "view.html.erb", "#{@essence_view_path}/_#{essence_name}_view.html.erb"
         template "editor.html.erb", "#{@essence_view_path}/_#{essence_name}_editor.html.erb"
       end

data/lib/rails/generators/alchemy/essence/templates/editor.html.erb

@@ -6,7 +6,7 @@
   Please consult Alchemy::Content.rb docs for further methods on the content object
 %>
 <%% cache(content) do %>
-<div class="content_editor <%= @essence_name.classify.demodulize %>" id="<%%= content.dom_id %>">
+<div class="content_editor <%= @essence_name.classify.demodulize.underscore %>" id="<%%= content.dom_id %>" data-content-id="<%%= content.id %>">
   <%%= label_and_remove_link(content) %>
   <%%= text_field_tag(
     content.form_field_name,

data/spec/features/page_feature_spec.rb

@@ -234,5 +234,25 @@ module Alchemy
       end
     end
 
+    describe 'accessing restricted pages' do
+      let!(:restricted_page) { create(:restricted_page, public: true) }
+
+      context 'as a guest user' do
+        it "I am not able to visit the page" do
+          visit restricted_page.urlname
+          current_path.should == Alchemy.login_path
+        end
+      end
+
+      context 'as a member user' do
+        before { authorize_as_admin(create(:member_user)) }
+
+        it "I am able to visit the page" do
+          visit restricted_page.urlname
+          current_path.should == "/#{restricted_page.urlname}"
+        end
+      end
+    end
+
   end
 end

data/spec/helpers/admin/elements_helper_spec.rb

@@ -26,8 +26,11 @@ module Alchemy
       }
 
       before do
-        page.stub(layout_description: {'name' => "foo", 'cells' => ["foo_cell"]})
-        cell_descriptions = [{'name' => "foo_cell", 'elements' => ["1", "2"]}]
+        page.stub(layout_description: {'name' => "foo", 'cells' => ["foo_cell", "empty_cell"]})
+        cell_descriptions = [
+          {'name' => "foo_cell", 'elements' => ["1", "2"]},
+          {'name' => 'empty_cell', 'elements' => []}
+        ]
         Cell.stub(:definitions).and_return(cell_descriptions)
         helper.instance_variable_set('@page', page)
       end
@@ -48,6 +51,12 @@ module Alchemy
           helper.grouped_elements_for_select(elements).should == ""
         end
       end
+
+      context "with cell having no elements" do
+        it "should remove that cell from hash" do
+          expect(helper.grouped_elements_for_select(elements)['Empty cell']).to be_nil
+        end
+      end
     end
 
     describe "#elements_for_select" do

data/spec/helpers/admin/navigation_helper_spec.rb

@@ -27,6 +27,24 @@ describe Alchemy::Admin::NavigationHelper do
     }
   } }
 
+  let(:event_module_with_params) { {
+    'navigation' => {
+      'controller' => '/admin/events',
+      'action' => 'index',
+      'params' => {
+          'key' => 'value'
+      },
+      'sub_navigation' => [{
+        'controller' => '/admin/events',
+        'action' => 'index',
+        'params' => {
+           'key' => 'value',
+           'key2' => 'value2'
+        }
+     }]
+      }
+  } }
+
   let(:navigation) { alchemy_module['navigation'] }
 
   describe '#alchemy_main_navigation_entry' do
@@ -180,6 +198,10 @@ describe Alchemy::Admin::NavigationHelper do
       it "returns correct url string" do
         helper.url_for_module(event_module).should == '/admin/events'
       end
+
+      it "returns correct url string with params" do
+        helper.url_for_module(event_module_with_params).should == '/admin/events?key=value'
+      end
     end
   end
 
@@ -209,6 +231,14 @@ describe Alchemy::Admin::NavigationHelper do
       end
     end
 
+    context "with module within host app with params" do
+      let(:current_module) { event_module_with_params }
+
+      it "returns correct url string with params" do
+        should == '/admin/events?key2=value2&key=value'
+      end
+    end
+
     context 'without module found' do
       before do
         helper.stub(module_definition_for: nil)

data/spec/models/element_spec.rb

@@ -422,16 +422,20 @@ module Alchemy
     end
 
     describe '.after_update' do
+      let(:page)    { create(:page) }
+      let(:element) { create(:element, page: page) }
+      let(:now)     { Time.now }
+
+      before do
+        Time.stub(now: now)
+      end
+
       context 'with touchable pages' do
         let(:locker)  { mock_model('DummyUser') }
-        let(:page)    { create(:page) }
-        let(:element) { create(:element, page: page) }
-        let(:now)     { Time.now }
         let(:pages)   { [page] }
 
         before do
           Alchemy.user_class.stub(:stamper).and_return(locker.id)
-          Time.stub(now: now)
         end
 
         it "updates page timestamps" do
@@ -446,6 +450,25 @@ module Alchemy
           page.updater_id.should eq(locker.id)
         end
       end
+
+      context 'with cell associated' do
+        let(:cell) { mock_model('Cell') }
+
+        before do
+          element.stub(cell: cell)
+        end
+
+        it "updates timestamp of cell" do
+          element.cell.should_receive(:touch)
+          element.save
+        end
+      end
+
+      context 'without cell associated' do
+        it "does not update timestamp of cell" do
+          expect { element.save }.to_not raise_error
+        end
+      end
     end
 
     describe '#taggable?' do

data/spec/models/page_spec.rb

@@ -1203,12 +1203,13 @@ module Alchemy
     end
 
     context 'urlname updating' do
-      let(:parentparent) { FactoryGirl.create(:page, name: 'parentparent', visible: true) }
-      let(:parent)       { FactoryGirl.create(:page, parent_id: parentparent.id, name: 'parent', visible: true) }
-      let(:page)         { FactoryGirl.create(:page, parent_id: parent.id, name: 'page', visible: true) }
-      let(:invisible)    { FactoryGirl.create(:page, parent_id: page.id, name: 'invisible', visible: false) }
-      let(:contact)      { FactoryGirl.create(:page, parent_id: invisible.id, name: 'contact', visible: true) }
-      let(:external)     { FactoryGirl.create(:page, parent_id: parent.id, name: 'external', page_layout: 'external', urlname: 'http://google.com') }
+      let(:parentparent)  { FactoryGirl.create(:page, name: 'parentparent', visible: true) }
+      let(:parent)        { FactoryGirl.create(:page, parent_id: parentparent.id, name: 'parent', visible: true) }
+      let(:page)          { FactoryGirl.create(:page, parent_id: parent.id, name: 'page', visible: true) }
+      let(:invisible)     { FactoryGirl.create(:page, parent_id: page.id, name: 'invisible', visible: false) }
+      let(:contact)       { FactoryGirl.create(:page, parent_id: invisible.id, name: 'contact', visible: true) }
+      let(:external)      { FactoryGirl.create(:page, parent_id: parent.id, name: 'external', page_layout: 'external', urlname: 'http://google.com') }
+      let(:language_root) { parentparent.parent }
 
       context "with activated url_nesting" do
         before { Config.stub(:get).and_return(true) }
@@ -1218,7 +1219,9 @@ module Alchemy
         end
 
         it "should not include the root page" do
-          page.urlname.should_not =~ /root/
+          Page.root.update_column(:urlname, 'root')
+          language_root.update(urlname: 'new-urlname')
+          language_root.urlname.should_not =~ /root/
         end
 
         it "should not include the language root page" do

data/spec/models/picture_spec.rb

@@ -32,6 +32,25 @@ module Alchemy
       picture.should be_valid
     end
 
+    context 'with enabled preprocess_image_resize config option' do
+      let(:image_file) do
+        File.new(File.expand_path('../../fixtures/80x60.png', __FILE__))
+      end
+
+      before do
+        Config.stub(:get) do |arg|
+          if arg == :preprocess_image_resize
+            '10x10'
+          end
+        end
+      end
+
+      it "it resizes the image after upload" do
+        picture = Picture.new(image_file: image_file)
+        expect(picture.image_file.data[0x10..0x18].unpack('NN')).to eq([10, 8])
+      end
+    end
+
     describe '#suffix' do
       it "should return the suffix of original filename" do
         pic = stub_model(Picture, image_file_name: 'kitten.JPG')

data/vendor/assets/javascripts/tinymce/langs/fr.js

@@ -0,0 +1,184 @@
+tinymce.addI18n('fr',{
+"Cut": "Couper",
+"Header 2": "Titre 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Votre navigateur ne supporte pas la copie directe. Merci d'utiliser les touches Ctrl+X\/C\/V.",
+"Div": "Div",
+"Paste": "Coller",
+"Close": "Fermer",
+"Font Family": "Polices de caract\u00e8res",
+"Pre": "Pre",
+"Align right": "Aligner \u00e0 droite",
+"New document": "Nouveau document",
+"Blockquote": "Citation",
+"Numbered list": "Num\u00e9rotation",
+"Increase indent": "Augmenter le retrait",
+"Formats": "Formats",
+"Headers": "Titres",
+"Select all": "Tout s\u00e9lectionner",
+"Header 3": "Titre 3",
+"Blocks": "Blocs",
+"Undo": "Annuler",
+"Strikethrough": "Barr\u00e9",
+"Bullet list": "Puces",
+"Header 1": "Titre 1",
+"Superscript": "Exposant",
+"Clear formatting": "Effacer la mise en forme",
+"Font Sizes": "Tailles de la police",
+"Subscript": "Indice",
+"Header 6": "Titre 6",
+"Redo": "R\u00e9tablir",
+"Paragraph": "Paragraphe",
+"Ok": "Ok",
+"Bold": "Gras",
+"Code": "Code",
+"Italic": "Italique",
+"Align center": "Aligner au centre",
+"Header 5": "Titre 5",
+"Decrease indent": "Diminuer le retrait",
+"Header 4": "Titre 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Le presse-papiers est maintenant en mode \"texte plein\". Les contenus seront coll\u00e9s sans retenir les formatages jusqu'\u00e0 ce que vous d\u00e9sactiviez cette option.",
+"Underline": "Soulign\u00e9",
+"Cancel": "Annuler",
+"Justify": "Justifi\u00e9",
+"Inline": "En ligne",
+"Copy": "Copier",
+"Align left": "Aligner \u00e0 gauche",
+"Visual aids": "Aides visuelle",
+"Lower Greek": "Grec minuscule",
+"Square": "Carr\u00e9",
+"Default": "Par d\u00e9faut",
+"Lower Alpha": "Alpha minuscule",
+"Circle": "Cercle",
+"Disc": "Disque",
+"Upper Alpha": "Alpha majuscule",
+"Upper Roman": "Romain majuscule",
+"Lower Roman": "Romain minuscule",
+"Name": "Nom",
+"Anchor": "Ancre",
+"You have unsaved changes are you sure you want to navigate away?": "Vous avez des modifications non enregistr\u00e9es, \u00eates-vous s\u00fbr de quitter la page?",
+"Restore last draft": "Restaurer le dernier brouillon",
+"Special character": "Caract\u00e8res sp\u00e9ciaux",
+"Source code": "Code source",
+"Right to left": "Droite \u00e0 gauche",
+"Left to right": "Gauche \u00e0 droite",
+"Emoticons": "Emotic\u00f4nes",
+"Robots": "Robots",
+"Document properties": "Propri\u00e9t\u00e9 du document",
+"Title": "Titre",
+"Keywords": "Mots-cl\u00e9s",
+"Encoding": "Encodage",
+"Description": "Description",
+"Author": "Auteur",
+"Fullscreen": "Plein \u00e9cran",
+"Horizontal line": "Ligne horizontale",
+"Horizontal space": "Espacement horizontal",
+"Insert\/edit image": "Ins\u00e9rer\/\u00e9diter une image",
+"General": "G\u00e9n\u00e9ral",
+"Advanced": "Avanc\u00e9",
+"Source": "Source",
+"Border": "Bordure",
+"Constrain proportions": "Contraindre les proportions",
+"Vertical space": "Espacement vertical",
+"Image description": "Description de l'image",
+"Style": "Style",
+"Dimensions": "Dimensions",
+"Insert image": "Ins\u00e9rer une image",
+"Insert date\/time": "Ins\u00e9rer date\/heure",
+"Remove link": "Enlever le lien",
+"Url": "Url",
+"Text to display": "Texte \u00e0 afficher",
+"Anchors": "Ancres",
+"Insert link": "Ins\u00e9rer un lien",
+"New window": "Nouvelle fen\u00eatre",
+"None": "n\/a",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?",
+"Target": "Cible",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?",
+"Insert\/edit link": "Ins\u00e9rer\/\u00e9diter un lien",
+"Insert\/edit video": "Ins\u00e9rer\/\u00e9diter une vid\u00e9o",
+"Poster": "Publier",
+"Alternative source": "Source alternative",
+"Paste your embed code below:": "Collez votre code d'int\u00e9gration ci-dessous :",
+"Insert video": "Ins\u00e9rer une vid\u00e9o",
+"Embed": "Ins\u00e9rer",
+"Nonbreaking space": "Espace ins\u00e9cable",
+"Page break": "Saut de page",
+"Paste as text": "Coller comme texte",
+"Preview": "Pr\u00e9visualiser",
+"Print": "Imprimer",
+"Save": "Enregistrer",
+"Could not find the specified string.": "Impossible de trouver la cha\u00eene sp\u00e9cifi\u00e9e.",
+"Replace": "Remplacer",
+"Next": "Suiv",
+"Whole words": "Mots entiers",
+"Find and replace": "Trouver et remplacer",
+"Replace with": "Remplacer par",
+"Find": "Chercher",
+"Replace all": "Tout remplacer",
+"Match case": "Respecter la casse",
+"Prev": "Pr\u00e9c ",
+"Spellcheck": "V\u00e9rification orthographique",
+"Finish": "Finie",
+"Ignore all": "Tout ignorer",
+"Ignore": "Ignorer",
+"Insert row before": "Ins\u00e9rer une ligne avant",
+"Rows": "Lignes",
+"Height": "Hauteur",
+"Paste row after": "Coller la ligne apr\u00e8s",
+"Alignment": "Alignement",
+"Column group": "Groupe de colonnes",
+"Row": "Ligne",
+"Insert column before": "Ins\u00e9rer une colonne avant",
+"Split cell": "Diviser la cellule",
+"Cell padding": "Espacement interne cellule",
+"Cell spacing": "Espacement inter-cellulles",
+"Row type": "Type de ligne",
+"Insert table": "Ins\u00e9rer un tableau",
+"Body": "Corps",
+"Caption": "Titre",
+"Footer": "Pied",
+"Delete row": "Effacer la ligne",
+"Paste row before": "Coller la ligne avant",
+"Scope": "Etendue",
+"Delete table": "Supprimer le tableau",
+"H Align": "Alignement H",
+"Top": "Haut",
+"Header cell": "Cellule d'en-t\u00eate",
+"Column": "Colonne",
+"Row group": "Groupe de lignes",
+"Cell": "Cellule",
+"Middle": "Milieu",
+"Cell type": "Type de cellule",
+"Copy row": "Copier la ligne",
+"Row properties": "Propri\u00e9t\u00e9s de la ligne",
+"Table properties": "Propri\u00e9t\u00e9s du tableau",
+"Bottom": "Bas",
+"V Align": "Alignement V",
+"Header": "En-t\u00eate",
+"Right": "Droite",
+"Insert column after": "Ins\u00e9rer une colonne apr\u00e8s",
+"Cols": "Colonnes",
+"Insert row after": "Ins\u00e9rer une ligne apr\u00e8s",
+"Width": "Largeur",
+"Cell properties": "Propri\u00e9t\u00e9s de la cellule",
+"Left": "Gauche",
+"Cut row": "Couper la ligne",
+"Delete column": "Effacer la colonne",
+"Center": "Centr\u00e9",
+"Merge cells": "Fusionner les cellules",
+"Insert template": "Ajouter un th\u00e8me",
+"Templates": "Th\u00e8mes",
+"Background color": "Couleur d'arri\u00e8re-plan",
+"Text color": "Couleur du texte",
+"Show blocks": "Afficher les blocs",
+"Show invisible characters": "Afficher les caract\u00e8res invisibles",
+"Words: {0}": "Mots : {0}",
+"Insert": "Ins\u00e9rer",
+"File": "Fichier",
+"Edit": "Editer",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide.",
+"Tools": "Outils",
+"View": "Voir",
+"Table": "Tableau",
+"Format": "Format"
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -1075,6 +1075,7 @@ files:
 - vendor/assets/javascripts/requestAnimationFrame.js
 - vendor/assets/javascripts/spin.min.js
 - vendor/assets/javascripts/tinymce/langs/de.js
+- vendor/assets/javascripts/tinymce/langs/fr.js
 - vendor/assets/javascripts/tinymce/langs/nl.js
 - vendor/assets/javascripts/tinymce/license.txt
 - vendor/assets/javascripts/tinymce/plugins/anchor/plugin.min.js