locomotive_cms 2.0.0.rc8 → 2.0.0.rc9

data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee

@@ -82,7 +82,14 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
         content.slideUp 100, -> parent.addClass('folded')
 
   enable_save_with_keys_combination: ->
-    $.cmd 'S', (() => @$('form input[type=submit]').trigger('click')), [], ignoreCase: true
+    $.cmd 'S', (() =>
+      # make sure that the current text field gets saved too
+      input = @$('form input[type=text]:focus, form input[type=password]:focus')
+      input.trigger('change') if input.size() > 0
+
+      @$('form input[type=submit]').trigger('click')
+    ), [], ignoreCase: true
+
 
   enable_form_notifications: ->
     @$('form').formSubmitNotification()

data/app/cells/locomotive/global_actions_cell.rb

@@ -25,7 +25,7 @@ module Locomotive
       end
 
       add :help, :url => 'http://doc.locomotivecms.com/templates/basics', :class => 'tutorial', :id => 'help'
-      add :logout, :url => destroy_locomotive_session_url, :confirm => t('locomotive.messages.confirm'), :method => :delete
+      add :logout, :url => destroy_locomotive_session_url, :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
     end
 
     def localize_label(label, options = {})

data/app/models/locomotive/account.rb

@@ -5,6 +5,20 @@ module Locomotive
 
     devise *Locomotive.config.devise_modules
 
+    ## devise fields (need to be declared since 2.x) ##
+    field :remember_created_at,     :type => Time
+    field :email,                   :type => String, :null => false
+    field :encrypted_password,      :type => String, :null => false
+    field :authentication_token,    :type => String
+    field :reset_password_token,    :type => String
+    field :reset_password_sent_at,  :type => Time
+    field :password_salt,           :type => String
+    field :sign_in_count,           :type => Integer
+    field :current_sign_in_at,      :type => Time
+    field :last_sign_in_at,         :type => Time
+    field :current_sign_in_ip,      :type => String
+    field :last_sign_in_ip,         :type => String
+
     ## attributes ##
     field :name
     field :locale, :default => Locomotive.config.default_locale.to_s or 'en'

data/app/views/locomotive/content_assets/_asset.html.haml

@@ -2,4 +2,4 @@
   %h4= link_to truncate(asset.name, :length => 17), edit_admin_asset_path(asset)
   = vignette_tag(asset)
   .actions
-    = link_to image_tag('admin/list/icons/cross.png'), '#', :class => 'remove', :confirm => t('locomotive.messages.confirm')
+    = link_to image_tag('admin/list/icons/cross.png'), '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }

data/app/views/locomotive/content_entries/_list.html.haml

@@ -16,4 +16,4 @@
             != t('locomotive.content_entries.index.updated_at')
           = l entry.updated_at, :format => :short rescue 'n/a'
 
-          = link_to 'x', content_entry_url(content_type.slug, entry), :class => 'remove', :confirm => t('locomotive.messages.confirm'), :method => :delete
+          = link_to 'x', content_entry_url(content_type.slug, entry), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete

data/app/views/locomotive/content_entries/index.html.haml

@@ -29,4 +29,4 @@
 - if can?(:manage, Locomotive::ContentType)
   #local-actions-bottom-bar
     %p.tleft
-      = link_to t('.destroy'), content_type_url(@content_type), :confirm => t('locomotive.messages.confirm'), :method => :delete, :class => 'button remove'
+      = link_to t('.destroy'), content_type_url(@content_type), :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete, :class => 'button remove'

data/app/views/locomotive/custom_fields/_form.html.haml

@@ -52,7 +52,7 @@
 
     %span.actions
       = link_to 'toggle', '#', :class => 'toggle'
-      = link_to 'x', '#', :class => 'remove', :confirm => t('locomotive.messages.confirm')
+      = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
 
     .clear
 
@@ -72,4 +72,4 @@
 
     %span.actions
       = link_to 'drag', '#', :class => 'drag'
-      = link_to 'x', '#', :class => 'remove', :confirm => t('locomotive.messages.confirm')
+      = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }

data/app/views/locomotive/custom_fields/types/_has_many.html.haml

@@ -32,7 +32,7 @@
 
         %span.actions
           = link_to 'e', '#', :class => 'edit'
-          = link_to 'x', '#', :class => 'remove', :confirm => t('locomotive.messages.confirm')
+          = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
 
 
   - content_for :backbone_view_data do

data/app/views/locomotive/custom_fields/types/_many_to_many.html.haml

@@ -33,7 +33,7 @@
           {{label}}
 
         %span.actions
-          = link_to 'x', '#', :class => 'remove', :confirm => t('locomotive.messages.confirm')
+          = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
 
 
   - content_for :backbone_view_data do

data/app/views/locomotive/my_account/edit.html.haml

@@ -35,6 +35,6 @@
 
               - if admin_on?(site) && site != current_site
                 %span{ :class => 'actions' }
-                  = link_to 'x', site_url(site), :class => 'remove', :confirm => t('locomotive.messages.confirm'), :method => :delete
+                  = link_to 'x', site_url(site), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
 
   = render 'locomotive/shared/form_actions', :button_label => :update

data/app/views/locomotive/pages/_page.html.haml

@@ -28,7 +28,7 @@
       = l page.updated_at, :format => :short
 
       - if !page.index_or_not_found? && can?(:manage, page)
-        = link_to 'x', page_url(page), :class => 'remove', :confirm => t('locomotive.messages.confirm'), :method => :delete
+        = link_to 'x', page_url(page), :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
 
   - if with_children
     %ul{ :id => "folder-#{page._id}", :class => "page folder depth-#{(page.depth || 0) + 1}", :'data-url' => sort_page_url(page), :style => "display: #{cookies["folder-#{page._id}"] || 'block'}" }

data/app/views/locomotive/snippets/_snippet.html.haml

@@ -5,4 +5,4 @@
     %span!= t('.updated_at')
     {{updated_at}}
 
-    = link_to 'x', '#', :class => 'remove', :confirm => t('locomotive.messages.confirm')
+    = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }

data/app/views/locomotive/theme_assets/_asset.html.haml

@@ -7,5 +7,5 @@
     %span.date {{updated_at}}
 
     {{#if can_be_deleted}}
-    = link_to 'x', '#', :class => 'remove', :confirm => t('locomotive.messages.confirm')
+    = link_to 'x', '#', :class => 'remove', :data => { :confirm => t('locomotive.messages.confirm') }
     {{/if}}

data/config/routes.rb

@@ -6,7 +6,9 @@ Locomotive::Engine.routes.draw do
     :path         => '',
     :path_prefix  => nil,
     :failure_app  => 'Locomotive::Devise::FailureApp',
-    :controllers  => { :sessions => 'locomotive/sessions', :passwords => 'locomotive/passwords' } do
+    :controllers  => { :sessions => 'locomotive/sessions', :passwords => 'locomotive/passwords' }
+
+  devise_scope :locomotive_account do
       match '/'         => 'sessions#new'
       delete 'signout'  => 'sessions#destroy', :as => :destroy_locomotive_session
   end

data/lib/locomotive.rb

@@ -1,6 +1,7 @@
 require 'locomotive/version'
 require 'locomotive/core_ext'
 require 'locomotive/configuration'
+require 'locomotive/devise'
 require 'locomotive/logger'
 require 'locomotive/haml'
 require 'locomotive/formtastic'

data/lib/locomotive/dependencies.rb

@@ -3,6 +3,7 @@ require 'mongoid/railtie'
 require 'mongoid/tree'
 require 'devise'
 require 'devise/orm/mongoid'
+require 'devise-encryptable'
 require 'kaminari'
 require 'haml'
 require 'liquid'

data/lib/locomotive/devise.rb

@@ -1 +1 @@
-# patches for devise here
+# patches for devise here

data/lib/locomotive/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc8
+  version: 2.0.0.rc9
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.5
+- !ruby/object:Gem::Dependency
+  name: devise-encryptable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,13 +74,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
@@ -72,7 +88,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.7
 - !ruby/object:Gem::Dependency
@@ -1147,7 +1163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3452373036066186043
+      hash: -2595751512290909456
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: