droom 0.4.3 → 0.5.3

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

@@ -0,0 +1,10 @@
+- content_for :title do 
+  = t :user_admin
+
+- content_for :standfirst do
+  %p
+    = t(:users_admin_introduction)
+
+#users
+  = render :partial => "droom/users/users_table"
+

data/app/views/droom/users/confirmations/_after_confirmation.html.haml

@@ -0,0 +1,2 @@
+%p
+  Thank you for confirming your email address. Your account is now fully active.

data/app/views/droom/users/confirmations/_password_required.html.haml

@@ -0,0 +1,30 @@
+- user ||= @user
+
+%p
+  = t :set_password_preamble
+
+= form_for @user, url: droom.set_password_user_path(user), method: "PUT" do |f|
+  = hidden_field_tag :tok, params[:tok]
+  - if destination
+    = hidden_field_tag :destination, destination
+  
+  %fieldset{data: {role: 'password'}}
+    %p.set_password
+      %span.col.password>
+        = f.label :password, class: "required"
+        = f.password_field :password, placeholder: "Six characters or more, please", required: true, data: {role: "password"}
+
+      %span.col.confirmation{:data => {:role => "confirmation"}}>
+        = f.label :password_confirmation, class: "required"
+        = f.password_field :password_confirmation, placeholder: "", required: true
+
+      %span.col.button
+        %label
+           
+        = f.submit "Save password and continue"
+
+%p
+  On your next visit you will be able to sign in directly with the email address
+  %strong
+    = user.email
+  and the password you choose here.

data/app/views/droom/users/confirmations/failure.en.html.haml

@@ -0,0 +1,22 @@
+- content_for :pagetitle do
+  = t :code_unknown
+
+#account
+  %h1.pagetitle
+    =t :code_unknown
+
+  %p
+    This confirmation url is not correct. Have you already confirmed this account? In that case
+    you only need to
+    = link_to("sign in", "/") + ',' 
+    or possibly to 
+    = link_to("reset your password", new_password_path(resource_name))
+    and then sign in.
+    Otherwise, please check your invitation email and make sure that you are typing or pasting the right address. 
+    It may be that your email program has broken the address over two lines: in that case please make sure you enter 
+    the whole thing without any spaces.
+    
+  %p
+    If you are seeing this message in error, please contact the builders on 
+    = mail_to "croucher@spanner.org"
+    and they will sort it out for you right away.

data/app/views/droom/users/confirmations/show.html.haml

@@ -0,0 +1,13 @@
+-content_for :title do
+  = t :welcome
+
+%p
+  %strong
+    =t :hello
+    = @resource.formal_name.strip + "."
+
+- if @resource.password_set?
+  = render "droom/users/confirmations/after_confirmation", user: @resource
+
+- else
+  = render "droom/users/confirmations/password_required", user: @resource

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

@@ -1,10 +1,2 @@
-#edit_user
-  .header
-    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
-    %h2.titlebar
-      = t :account_settings
-      - unless @user == current_user
-        = t :for
-        = @user.name
-
-  = render :partial => 'form'
+- @view ||= 'profile'
+= render partial: "droom/users/edit/#{@view}"

data/app/views/droom/users/edit/_details.html.haml

@@ -0,0 +1,13 @@
+- user ||= @user
+- if admin?
+  %p.gender
+    = f.label :gender, class: "important"
+    = f.radio_button :gender, "f"
+    = f.label :gender, t(:"helpers.label.user.gender_f"), value: "f"
+    = f.radio_button :gender, "m"
+    = f.label :gender, t(:"helpers.label.user.gender_m"), value: "m"
+
+  - unless user.new_record? || user.confirmed?
+    %p.confirmation
+      = f.check_box :send_confirmation
+      = f.label :send_confirmation

data/app/views/droom/users/edit/_memberships.html.haml

@@ -0,0 +1,13 @@
+- user ||= @user
+
+- if admin?
+  %p.admin
+    = f.check_box :admin
+    = f.label :admin
+
+  %p.memberships
+    = f.label(:group_ids, class: "important") + ":"
+    - Droom::Group.all.each do |group|
+      %label.inline{for: "user_group_ids_#{group.id}"}
+        = check_box_tag "user[group_ids][]", group.id, user.group_ids.include?(group.id), id: "user_group_ids_#{group.id}"
+        = group.name

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

@@ -0,0 +1,16 @@
+- user ||= f.object
+
+%p
+  = f.label :password
+  %br
+  = f.password_field :password, :autocomplete => "off", :class => 'preferences password required', :required => user.new_record?, :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 => false, :pattern => ""
+
+%p.note.password_notice

data/app/views/droom/users/edit/_preferences.html.haml

@@ -0,0 +1,37 @@
+- user ||= @user
+
+#edit_user
+  .header
+    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
+    %h2.titlebar
+      - if @user == current_user
+        = t :edit_your_account
+      - else
+        = t :edit_account_of, name: @user.name
+
+  = form_for @user, :html => {:class => 'edit user password', :autocomplete => false} do |f|
+
+    %p.email
+      = f.label :email, class: "required"
+      %br
+      = f.email_field :email, :required => true, :autofocus => true
+
+    = render "droom/users/edit/password_fields", f: f, user: user
+    
+    - unless @user.confirmed?
+      %p.confirmation
+        = f.check_box :send_confirmation
+        = f.label :send_confirmation
+
+    .buttons
+      - if @user == current_user
+        = f.submit t(:save_your_preferences)
+      - else
+        = f.submit t(:save_preferences)
+      = t :or
+      = link_to t(:cancel), '#', :class => 'cancel'
+  
+
+
+
+

data/app/views/droom/users/edit/_profile.html.haml

@@ -0,0 +1,26 @@
+- user ||= @user
+
+#edit_user
+  .header
+    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
+    %h2.titlebar
+      - if @user == current_user
+        = t :edit_your_profile
+      - elsif @user.new_record?
+        = t :add_new_user
+      - else
+        = t :edit_profile_of, name: @user.name
+
+  = form_for user, :html => {:class => 'edit user', :autocomplete => false} do |f|
+    = render partial: "droom/users/edit/user_fields", locals: {f: f, user: user}
+    = render partial: "droom/users/edit/details", locals: {f: f, user: user}
+    = render partial: "droom/users/edit/memberships", locals: {f: f, user: user}
+
+    .buttons
+      - if user == current_user
+        = f.submit t(:save_your_profile)
+      - else
+        = f.submit t(:save_profile)
+      = t :or
+      = link_to t(:cancel), '#', :class => 'cancel'
+  

data/app/views/droom/users/edit/_user_fields.html.haml

@@ -0,0 +1,66 @@
+- user ||= @user
+- if user.image?
+  - img = user.image.url(:thumb)
+- else
+  - img = image_url('droom/missing/user.png')
+
+.image-upload{:data => {:role => "imagepicker"}}
+  %a.box{:href => "#", :style => "background-image: url(#{img})", :data => {:action => "pick"}}
+  = f.file_field :image
+
+%p.names
+  - if Droom.use_titles?
+    %span.title
+      = f.label :title
+      %br
+      = f.text_field :title
+  %span.name
+    = f.label :family_name, class: 'required'
+    %br
+    = f.text_field :family_name, :required => true, :autofocus => true
+  %span.name
+    = f.label :given_name, class: 'required'
+    %br
+    = f.text_field :given_name, :required => true
+  - if Droom.use_chinese_names?
+    %span.chinese_name
+      = f.label :chinese_name, "中国姓名"
+      %br
+      = f.text_field :chinese_name
+  - if Droom.use_honours?
+    %span.honours
+      = f.label :honours
+      %br
+      = f.text_field :honours
+
+.non-file-data
+  .contacts
+    %p.email
+      = f.label :email, class: 'required'
+      %br
+      = f.text_field :email, :required => true
+
+    %p.phone
+      = f.label :phone, :class => "optional"
+      %br
+      = f.text_field :phone
+
+    - if Droom.use_separate_mobile_number?
+      %p.secondary
+        = f.label :mobile, :class => "optional"
+        %br
+        = f.text_field :mobile
+
+  - if admin?
+    - if Droom.use_organisations?
+      %p.organisation
+        = f.label :organisation_id
+        %br
+        = f.select :organisation_id, Droom::Organisation.for_selection, :class => 'preferences'
+
+  - if Droom.use_biogs?
+    - user.description = "<p></p>" unless user.description?
+    .description.wysihtml
+      .toolbar#t1
+        = render 'droom/shared/toolbar'
+      = f.text_area :description

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

@@ -1,39 +1,13 @@
 #main.users
 
-  %p
+  %p.standfirst
     = t(:users_introduction)
-  %p
-    = t(:users_warning)
 
-  = render :partial => "droom/users/users_table"
-
-- content_for :somewhere do
-
-  - uninvited = Droom::Person.unusered
-  - if uninvited.any?
-    %h4
-      People not yet invited
-  
-    %ul.checklist
-      - if uninvited.length > 1
-        %li
-          = check_box_tag :user_ids, "all", false, :id => "person_ids_all"
-          %label{:for => "person_ids_all"} 
-            select all
-      - uninvited.each do |person|
-        %li
-          = check_box_tag :"person_ids[]", person.id, false, :id => "person_ids_#{person.id}"
-          %label{:for => "person_ids_#{person.id}"}
-            %strong
-              = person.name
-            %span.admin
-              = link_to t(:edit_profile), droom.edit_person_url(person), :class => 'edit minimal', :data => {:action => "popup", :affected => "#list_person_#{person.id}"}
-            - if person.organisation
-              %span.affiliation
-                %br
-                = t :of_the
-                = person.organisation.name
+  %form.filter{:action => droom.users_url(:format => :html), :autocomplete => 'off', :data => {:action => "table_filter"}}
+    %p
+      = search_field_tag :q, params[:q], :results => 5, :autosave => 'people_filter'
 
+  = render :partial => "droom/users/users"
 
 - content_for :title do 
-  = t :user_admin
+  = t :people

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

@@ -0,0 +1,3 @@
+#edit_user
+
+  = render :partial => 'droom/users/edit/profile'

data/app/views/droom/users/passwords/completed.html.haml

@@ -0,0 +1,13 @@
+#account
+  %h1.pagetitle
+    =t :thank_you
+
+  %p
+    %strong
+      = t :hello_name, name: current_user.name
+    = t :password_reset_complete
+
+    - if url = controller.stored_location_for(:user)
+      %p
+        = t :would_you_like_to_return
+        = link_to(t(:backto), url) + '.'

data/app/views/{devise → droom/users}/passwords/edit.html.haml

@@ -2,16 +2,22 @@
   %h1.pagetitle
     =t :choose_new_password
 
+  %p
+    = t :password_reset_welcome
+
   = 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
     
-    = render "droom/users/password_fields", :f => f
-
-    %p.notice
-      = t :password_notice
+    = render "droom/users/edit/password_fields", f: f, user: resource
         
     .controls
       .save.button
         %p
           = f.submit t(:set_password), :class => "submit"
+
+
+
+
+
+

data/app/views/{devise → droom/users}/passwords/new.html.haml

@@ -4,7 +4,10 @@
 
   = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
     = devise_error_messages!
-  
+
+    %p
+      = t :password_reset_instructions
+
     %p
       = f.label :email
       %br
@@ -17,5 +20,3 @@
         %p
           = f.submit t(:send_reset_instructions), :class => "submit"
 
-    %p
-      = t(:can_still_log_in, :url => droom.new_user_session_path).html_safe + '.'

data/app/views/droom/users/passwords/show.html.haml

@@ -0,0 +1,6 @@
+#account
+  %h1.pagetitle
+    =t :message_sent
+
+  %p
+    = t :password_reset_message_sent, sender: Settings.email.address

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

@@ -0,0 +1,2 @@
+- @view ||= 'welcome'
+= render partial: "droom/users/show/#{@view}"

data/app/views/droom/users/show/_listed.html.haml

@@ -0,0 +1,46 @@
+- listed ||= nil
+- user ||= listed || @user
+- invitation ||= @invitation
+- membership ||= false
+- event ||= false
+- group ||= false
+- cssclass = "person"
+- ineditable ||= false
+
+- if user.image?
+  - img = user.image.url(:thumb)
+- else
+  - img = image_url('droom/missing/thumb.png')
+
+- if invitation
+  - cssclass << " #{invitation.status}"
+  - event = invitation.event
+- if membership
+  - group = membership.group
+
+%li{id: "user_#{user.id}", class: cssclass, data: {refreshable: true, url: droom.user_path(user, view: 'listed', invitation_id: invitation ? invitation.id : nil)} }
+  %span.mugshot{style: "background-image: url(#{img})"}
+    - if invitation
+      - if editable?(invitation)
+        = link_to invitation.status, toggle_event_invitation_url(event, invitation), class: "invitation #{invitation.status}", data: {action: "affect", method: "put", affected: "#user_#{user.id}"}
+      - else
+        %span{class: "invitation #{invitation.status}"}
+
+  %span.contact
+    %span.name
+      = link_to truncate(user.colloquial_name, length: 32), user_url(user), data: {action: "popup"}
+      = action_menulink(user, class: "small")
+    %br
+    %span.note
+      - if user.email? || user.phone?
+        - if user.email?
+          = mail_to truncate(user.email, length: 32)
+        - if user.email? && user.phone?
+          %br
+        - if user.phone?
+          = user.phone
+        
+      - else
+        = t :contact_information_unavailable
+        
+    = action_menu(user, event: event, group: group)