locomotive_cms 2.0.0.rc11 → 2.0.0.rc12

data/config/locales/devise.ru.yml

@@ -45,7 +45,7 @@ ru:
 
 
   locomotive_account:
-    mailer:
+    devise_mailer:
       common:
         hello: Здравствуйте
 

data/config/locales/flash.fr.yml

@@ -16,7 +16,7 @@ fr:
       content_entries:
         create:
           notice: "L'élément a été crée avec succès."
-          alert: "L'élément a été crée avec succès."
+          alert: "L'élément n'a pas été crée avec succès."
         update:
           notice: "L'élément a été mis à jour avec succès."
           alert: "L'élément n'a pas été mis à jour."

data/config/routes.rb

@@ -9,8 +9,8 @@ Locomotive::Engine.routes.draw do
     :controllers  => { :sessions => 'locomotive/sessions', :passwords => 'locomotive/passwords' }
 
   devise_scope :locomotive_account do
-      match '/'         => 'sessions#new'
-      delete 'signout'  => 'sessions#destroy', :as => :destroy_locomotive_session
+    match '/'         => 'sessions#new'
+    delete 'signout'  => 'sessions#destroy', :as => :destroy_locomotive_session
   end
 
   root :to => 'pages#index'
@@ -76,6 +76,8 @@ Rails.application.routes.draw do
 
       resource  :current_site, :controller => 'current_site'
 
+      resource  :my_account, :controller => 'my_account'
+
     end
   end
 

data/lib/generators/locomotive/install/templates/carrierwave.rb

@@ -15,7 +15,7 @@ CarrierWave.configure do |config|
       :provider                 => 'AWS',
       :aws_access_key_id        => ENV['S3_KEY_ID'],
       :aws_secret_access_key    => ENV['S3_SECRET_KEY'],
-      :region                   => 'us-east-1'
+      :region                   => ENV['S3_BUCKET_REGION']
     }
     config.fog_directory    = ENV['S3_BUCKET']
 

data/lib/locomotive/liquid/tags/editable/base.rb

@@ -43,14 +43,14 @@ module Locomotive
 
           def default_element_attributes
             {
-              :block                => @options[:block] || @context[:current_block].try(:name),
-              :slug                 => @slug,
-              :hint                 => @options[:hint],
-              :priority             => @options[:priority] || 0,
-              :fixed                => !!@options[:fixed],
-              :disabled             => false,
-              :from_parent          => false,
-              :_type                => self.document_type.to_s
+              :block         => self.current_block_name,
+              :slug          => @slug,
+              :hint          => @options[:hint],
+              :priority      => @options[:priority] || 0,
+              :fixed         => !!@options[:fixed],
+              :disabled      => false,
+              :from_parent   => false,
+              :_type         => self.document_type.to_s
             }
           end
 
@@ -62,8 +62,16 @@ module Locomotive
             raise 'FIXME: has to be overidden'
           end
 
+          def current_block_name
+            @options[:block] || @context[:current_block].try(:name)
+          end
+
           def render_default_content(context)
-            render_all(@nodelist, context).join(' ')
+            begin
+              render_all(@nodelist, context).join(' ')
+            rescue
+              raise ::Liquid::SyntaxError.new("Error in the #{self.current_block_name || 'default'} block for the #{@slug} editable_element - No liquid tags are allowed inside.")
+            end
           end
         end
 

data/lib/locomotive/middlewares/inline_editor.rb

@@ -18,7 +18,7 @@ module Locomotive
         [].tap do |parts|
           response.each do |part|
             parts << part.to_s.gsub('</body>', %(
-             <a  href="_admin"
+             <a  href="#{File.join(response.request.path, '/_admin')}"
                  onmouseout="this.style.backgroundPosition='0px 0px'"
                  onmouseover="this.style.backgroundPosition='0px -45px'"
                  onmousedown="this.style.backgroundPosition='0px -90px'"
@@ -33,4 +33,4 @@ module Locomotive
 
     end
   end
-end
+end

data/lib/locomotive/routing/site_dispatcher.rb

@@ -44,7 +44,7 @@ module Locomotive
         return true if current_site.present? && current_site.accounts.include?(current_locomotive_account)
 
         sign_out(current_locomotive_account)
-        flash[:alert] = I18n.t(:no_membership, :scope => [:devise, :failure, :locomotive])
+        flash[:alert] = I18n.t(:no_membership, :scope => [:devise, :failure, :locomotive_account])
         redirect_to new_locomotive_account_session_url and return false
       end
 

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.0.0.rc11'
+  VERSION = '2.0.0.rc12'
 end

data/vendor/assets/javascripts/locomotive/datepicker_i18n.js.erb

@@ -0,0 +1,28 @@
+<%# encoding: utf-8 %>
+
+<%# FIXME: Assets precompilation requires to load the I18n since we disable the config.assets.initialize_on_precompile option %>
+<% if !I18n.backend.initialized? && I18n.t('locomotive.locales.en', :locale => :en, :default => '').blank? %>
+  <% I18n.load_path += Dir[Locomotive::Engine.root.join('config', 'locales', '**/*.{rb,yml}').to_s] %>
+  <% I18n.reload! %>
+<% end %>
+
+jQuery(function($){
+<% Locomotive.config.locales.each do |locale| %>
+  <% I18n.with_locale(locale) do %>
+    $.datepicker.regional['<%= locale %>'] = {
+      closeText:        '<%= I18n.t('date_picker.close_text', :default => 'Close') %>',
+      prevText:         '<%= I18n.t('date_picker.prev_text', :default => '&#x3c;Prev') %>',
+      nextText:         '<%= I18n.t('date_picker.next_text', :default => 'Next&#x3e;') %>',
+      currentText:      '<%= I18n.t('date_picker.current_text', :default => 'Current') %>',
+      monthNames:       [<%= I18n.t('date.month_names').delete_if { |m| m.blank? }.map { |m| "'#{m.capitalize}'" }.join(', ') %>],
+      monthNamesShort:  [<%= I18n.t('date.abbr_month_names').delete_if { |m| m.blank? }.map { |m| "'#{m.capitalize.gsub(/\.$/, '')}'" }.join(', ') %>],
+      dayNames:         [<%= I18n.t('date.day_names').delete_if { |d| d.blank? }.map { |d| "'#{d.capitalize}'" }.join(', ') %>],
+      dayNamesShort:    [<%= I18n.t('date.abbr_day_names').delete_if { |d| d.blank? }.map { |d| "'#{d.capitalize}'" }.join(', ') %>],
+      dayNamesMin:      [<%= I18n.t('date.abbr_day_names').delete_if { |d| d.blank? }.map { |d| "'#{d[0..1].capitalize}'" }.join(', ') %>],
+      dateFormat:       '<%= I18n.t('date.formats.default').gsub('%d', 'dd').gsub('%m', 'mm').gsub('%Y', 'yy') %>',
+      firstDay:         1,
+      isRTL:            false
+    };
+  <% end %>
+<% end %>
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc11
+  version: 2.0.0.rc12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +258,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.7.2
+        version: 3.4.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.7.2
+        version: 3.4.7.3
 - !ruby/object:Gem::Dependency
   name: locomotive-aloha-rails
   requirement: !ruby/object:Gem::Requirement
@@ -794,6 +794,7 @@ files:
 - app/controllers/locomotive/api/content_types_controller.rb
 - app/controllers/locomotive/api/current_site_controller.rb
 - app/controllers/locomotive/api/memberships_controller.rb
+- app/controllers/locomotive/api/my_account_controller.rb
 - app/controllers/locomotive/api/pages_controller.rb
 - app/controllers/locomotive/api/sites_controller.rb
 - app/controllers/locomotive/api/snippets_controller.rb
@@ -922,9 +923,6 @@ files:
 - app/views/locomotive/layouts/application.html.haml
 - app/views/locomotive/layouts/error.html.haml
 - app/views/locomotive/layouts/not_logged_in.html.haml
-- app/views/locomotive/mailer/confirmation_instructions.html.haml
-- app/views/locomotive/mailer/reset_password_instructions.html.haml
-- app/views/locomotive/mailer/unlock_instructions.html.haml
 - app/views/locomotive/memberships/new.html.haml
 - app/views/locomotive/my_account/edit.html.haml
 - app/views/locomotive/notifications/new_content_entry.html.haml
@@ -1120,7 +1118,7 @@ files:
 - vendor/assets/javascripts/locomotive/backbone.sync.js
 - vendor/assets/javascripts/locomotive/cmd.js
 - vendor/assets/javascripts/locomotive/cookies.js
-- vendor/assets/javascripts/locomotive/datepicker_fr.js
+- vendor/assets/javascripts/locomotive/datepicker_i18n.js.erb
 - vendor/assets/javascripts/locomotive/editable_field.js
 - vendor/assets/javascripts/locomotive/form_submit_notification.js
 - vendor/assets/javascripts/locomotive/growl.js
@@ -1171,7 +1169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3115491061164600224
+      hash: -3713943705302971803
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/locomotive/mailer/confirmation_instructions.html.haml

@@ -1,8 +0,0 @@
-%p
-  != t('locomotive.mailer.common.hello')
-  = @resource.email
-  \!
-%p
-  != t('.you_can_confirm_your_account_through_the_link_below')
-%p
-  = link_to t('.confirm_my_account'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)

data/app/views/locomotive/mailer/reset_password_instructions.html.haml

@@ -1,12 +0,0 @@
-/ %p
-/   != t('locomotive.mailer.common.hello')
-/   = @resource.email
-/   \!
-/ %p
-/   != t('.reset_password_instruction')
-/ %p
-/   = link_to t('.change_my_password'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
-/ %p
-/   != t('.wrong_request_instruction')
-/ %p
-/   != t('.unchange_password_message')

data/app/views/locomotive/mailer/unlock_instructions.html.haml

@@ -1,10 +0,0 @@
-%p
-  != t('locomotive.mailer.common.hello')
-  = @resource.email
-  \!
-%p
-  != t('.locked_account_message')
-%p
-  != t('.unlock_account_instruction')
-%p
-  = link_to t('.unlock_my_account'), unlock_url(@resource, :unlock_token => @resource.unlock_token)

data/vendor/assets/javascripts/locomotive/datepicker_fr.js

@@ -1,16 +0,0 @@
-/* French initialisation for the jQuery UI date picker plugin. */
-/* Written by Keith Wood (kbwood@virginbroadband.com.au) and Stéphane Nahmani (sholby@sholby.net). */
-jQuery(function($){
-  $.datepicker.regional['fr'] = {
-    closeText: 'Fermer',
-    prevText: '<Préc',
-    nextText: 'Suiv>',
-    currentText: 'Courant',
-    monthNames: ['Janvier','Février','Mars','Avril','Mai','Juin', 'Juillet','Août','Septembre','Octobre','Novembre','Décembre'],
-    monthNamesShort: ['Jan','Fév','Mar','Avr','Mai','Jun', 'Jul','Aoû','Sep','Oct','Nov','Déc'],
-    dayNames: ['Dimanche','Lundi','Mardi','Mercredi','Jeudi','Vendredi','Samedi'],
-    dayNamesShort: ['Dim','Lun','Mar','Mer','Jeu','Ven','Sam'],
-    dayNamesMin: ['Di','Lu','Ma','Me','Je','Ve','Sa'],
-    dateFormat: 'dd/mm/yy', firstDay: 1,
-    isRTL: false};
-});