droom 0.4.2 → 0.4.3

data/app/assets/javascripts/droom/widgets.js.coffee

@@ -242,6 +242,7 @@ jQuery ($) ->
       @fields.attr('data-strict', false)
       @unsubmittable()
       @confirmation_holder.hide()
+      console.log 'password form', @
 
     checkForm: () =>
       @fields.removeClass('invalid').addClass('valid')

data/app/views/devise/confirmations/show.html.haml

@@ -10,20 +10,7 @@
   = form_for resource, :url => confirm_password_path, :html => {:class => 'password'} do |f|
     = f.hidden_field :confirmation_token
     
-    %p
-      = f.label :password
-      %br
-      = f.password_field :password, :autocomplete => "off", :class => 'preferences password required', :required => true, :pattern => ".{6,}"
-      %br
-      %span.note
-        = t :password_requirements
-
-    %p.confirmation
-      = f.label :password_confirmation
-      %br
-      = f.password_field :password_confirmation, :class => 'preferences password_confirmation required', :required => true, :pattern => ""
-
-    %p.note.password_notice
+    = render "droom/users/password_fields", :f => f
 
     .controls
       .save.button

data/app/views/devise/passwords/edit.html.haml

@@ -2,28 +2,14 @@
   %h1.pagetitle
     =t :choose_new_password
 
-  = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
+  = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "password" }) do |f|
     = devise_error_messages!
     = f.hidden_field :reset_password_token
-
-    %p
-      = f.label :password, t(:password_instructions)
-      %br
-      = f.password_field :password, :autocomplete => "off", :class => 'preferences password required', :required => true
-      %br
-      %span.formnote
-        = t :password_requirements
     
-    %p{:class => 'confirmation'}
-      = f.label :password_confirmation, t(:password_confirmation_instructions)
-      %br
-      = f.password_field :password_confirmation, :autocomplete => "off", :class => 'preferences required'
-      %br
-      %span.formnote
-        = t :password_confirmation_requirements
+    = render "droom/users/password_fields", :f => f
 
     %p.notice
-      You must choose a password before you can proceed (unless you remember your old one: in that case you can just log in).
+      = t :password_notice
         
     .controls
       .save.button

data/app/views/droom/users/_form.html.haml

@@ -5,20 +5,7 @@
     %br
     = f.email_field :email, :class => 'preferences', :autocomplete => false
 
-  %p.password
-    = f.label :password
-    %br
-    = f.password_field :password, :autocomplete => "off", :class => 'preferences password', :pattern => ".{6,}"
-    %br
-    %span.note
-      = t :password_requirements
-
-  %p.confirmation
-    = f.label :password_confirmation
-    %br
-    = f.password_field :password_confirmation, :class => 'preferences password_confirmation', :pattern => ""
-
-  %p.password_notice
+  = render "droom/users/password_fields", :f => f
 
   .buttons
     = f.submit t(:save_changes), :class => "submit"

data/app/views/droom/users/_password_fields.html.haml

@@ -0,0 +1,15 @@
+- if f
+  %p
+    = f.label :password
+    %br
+    = f.password_field :password, :autocomplete => "off", :class => 'preferences password required', :required => true, :pattern => Droom.password_pattern
+    %br
+    %span.note
+      = t :password_requirements
+
+  %p.confirmation
+    = f.label :password_confirmation
+    %br
+    = f.password_field :password_confirmation, :class => 'preferences password_confirmation required', :required => true, :pattern => ""
+
+  %p.note.password_notice

data/config/locales/en.yml

@@ -226,6 +226,7 @@ en:
   page_summary_explanation: "The page summary is a two- or three-line description that we use whenever this page appears in a list. You would normally see it on the help index page."
   page_youtube_explanation: "Soon there will be a little video-finding gadget here, but to start with please paste in a video id. The embedding will be handled automatically. Omit if not relevant."
   
+  password_notice: "You must choose a password before you can proceed (unless you remember your old one: in that case you can just log in)."
   person_title: "Title"
   person_forename: "Forename"
   person_name: "Name"

data/lib/droom.rb

@@ -53,7 +53,8 @@ module Droom
                  :required_calendar_names,
                  :stream_shared,
                  :aws_bucket_name,
-                 :calendar_closed
+                 :calendar_closed,
+                 :password_pattern
   
   class DroomError < StandardError; end
   class PermissionDenied < DroomError; end
@@ -212,6 +213,10 @@ module Droom
       @@required_calendar_names ||= %w{main stream}
     end
     
+    def password_pattern
+      @@password_pattern ||= ".{6,}"
+    end
+    
     # Droom's preferences are arbitrary and open-ended. You can ask for any preference key: if it 
     # doesn't exist you just get back the default value, or nil if there isn't one. This is where you
     # set the defaults.

data/lib/droom/version.rb

@@ -1,3 +1,3 @@
 module Droom
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droom
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -841,6 +841,7 @@ files:
 - app/views/droom/users/_extra_columns_header.html.haml
 - app/views/droom/users/_extra_columns_note.html.haml
 - app/views/droom/users/_form.html.haml
+- app/views/droom/users/_password_fields.html.haml
 - app/views/droom/users/_user.html.haml
 - app/views/droom/users/_user_or_person.html.haml
 - app/views/droom/users/_users_table.html.haml