droom 0.2.1 → 0.4.1

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

@@ -16,11 +16,15 @@
   %td.name
     - if person
       = link_to person.full_name, person_url(person)
+      = action_menulink(person)
+      = action_menu(person)
     - else
       = user_or_person.full_name
+
   %td.email
     = mail_to user_or_person.email
-  %td.invited
+
+  %td.invited{:data => {:hoverable => true}}
     - if user
       %span.yes
     - else
@@ -28,7 +32,8 @@
         = link_to t(:invite), invite_person_url(person), :class => "no", :data => {:action => "replace", :replaced => "##{rowid}"}
       - else
         %span.not_applicable
-  %td.confirmed
+
+  %td.confirmed{:data => {:hoverable => true}}
     - if user
       - if user.confirmed?
         %span.yes
@@ -36,18 +41,8 @@
         = link_to " ", user_url(user, :user => { :confirm => true }, :format => :js, :response_partial => "user_or_person"), :class => "no", :method => :put, :remote => true, :data => { :action => "replace", :replaced => "##{rowid}" }
     - else
       %span.not_applicable
-  %td.admin
-    - if user && user.confirmed?
-      - if user.admin?
-        = link_to " ", user_url(user, :user => { :admin => false }, :format => :js, :response_partial => "user_or_person"), :class => "yes", :method => :put, :remote => true, :data => { :action => "replace", :replaced => "##{rowid}" }
-      - else
-        = link_to " ", user_url(user, :user => { :admin => true }, :format => :js, :response_partial => "user_or_person"), :class => "no", :method => :put, :remote => true, :data => { :action => "replace", :replaced => "##{rowid}" }
-    - else
-      %span.not_applicable
-  %td.settings
-    - if user
-      = link_to " ", edit_user_url(user), :data => {:action => "popup"}
-  %td.directory
+
+  %td.directory{:data => {:hoverable => true}}
     - if user
       - if person
         = link_to " ", person_url(person, :format => :js), :class => "yes", :method => :delete, :remote => true, :confirm => "Really delete person?", :data => { :action => "replace", :replaced => "##{rowid}" }
@@ -55,9 +50,23 @@
         = link_to " ", people_url(:person => { :user_id => user.id, :email => user.email, :name => user.name, :forename => user.forename}, :format => :js), :class => "no", :method => :post, :remote => true, :data => { :action => "replace", :replaced => "##{rowid}" }
     - else
       %span.yes
+
+  %td.admin{:data => {:hoverable => true}}
+    - if user
+      - if user.admin?
+        = link_to " ", user_url(user, :user => { :admin => false }, :format => :js, :response_partial => "user_or_person"), :class => "yes", :method => :put, :remote => true, :data => { :action => "replace", :replaced => "##{rowid}" }
+      - else
+        = link_to " ", user_url(user, :user => { :admin => true }, :format => :js, :response_partial => "user_or_person"), :class => "no", :method => :put, :remote => true, :data => { :action => "replace", :replaced => "##{rowid}" }
+    - else
+      %span.not_applicable
+
+  %td.spacer
+
   - Droom::Group.all.each do |group|
-    %td.group
+    %td.group{:class => "group #{group.slug}", :data => {:hoverable => true}}
       - if person
         = render :partial => "droom/memberships/membership_toggle", :locals => { :group => group, :person => person}
       - else
         %span.not_applicable
+
+  = render :partial => 'extra_columns', :locals => {:person => person, :user => user}

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

@@ -1,17 +1,35 @@
+- groups = Droom::Group.all
+
 - if @everyone.any?
   %table.main.users{:data => {:refreshable => true, :url => "#{users_path}.js"}}
     %thead
       %tr
-        - %w{name email invited confirmed admin settings directory}.each do |col|
+        - %w{name email invited confirmed directory admin}.each do |col|
           %th{:class => col}
-            = col unless col == "name" || col == "email"
-        - Droom::Group.all.each do |group|
-          %th{:class => "group"}
-            = group.name
+            - unless col == "name" || col == "email"
+              %span.rotated
+                = col
+        %th.spacer
+        - groups.each do |group|
+          %th.group
+            %span.rotated
+              = group.name
+
+        = render :partial => 'extra_columns_header'
+
+      %tr
+        %td{:colspan => 2}
+        %th.note{:colspan => 4}
+          = t(:status)
+        %th.spacer.note
+        %th.note{:colspan => groups.count}
+          = t(:membership)
+
+        = render :partial => 'extra_columns_note'
 
     = render :partial => 'user_or_person', :collection => @everyone
 
 - else
   .everyone
     %p
-      No users have been created. How odd that you can see this page.
+      No users have been created. It is odd that you can see this page.

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

@@ -1,7 +1,7 @@
 #edit_user
   .header
     = link_to "X", '#', :class => "closer", :data => {:action => "close"}
-    %h2
+    %h2.titlebar
       = t :account_settings
       - unless @user == current_user
         = t :for

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

@@ -1,12 +1,9 @@
 #main.users
 
   %p
-    Here "people" are the people listed in the directory, and "users" are the accounts they use to log in. 
-    The distinction is needed because a person can appear in the directory without having a login account,
-    and a user can log in to administer the site without being a person in the directory.
+    = t(:users_introduction)
   %p
-    Most of these columns are now clickable and can be used to make quite large changes quickly. 
-    Clicking a green button under 'directory', for example, will entirely delete a person from the system. Please handle with care.
+    = t(:users_warning)
 
   = render :partial => "droom/users/users_table"
 

data/config/locales/devise.en.yml

@@ -2,7 +2,7 @@
 
 en:
   devise:
-    confirmations:
+    user_confirmations:
       confirmed: "Your account was successfully confirmed. You are now signed in."
       send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
       send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."

data/config/locales/en.yml

@@ -30,7 +30,7 @@ en:
           description: "Mission and description"
         person:
           invite_on_creation: "Invite on creation"
-          admin_user: "as admin user"
+          admin_user: "...as admin user"
           post_line1: "Address"
           post_line2: ""
           post_city: "City"
@@ -38,6 +38,7 @@ en:
           post_country: "Country"
           post_code: "Postcode"
           dob: "Date of birth"
+          organisation_id: "Organisation"
         scrap:
           scraptype:
             image: "Image"
@@ -101,6 +102,7 @@ en:
   add_group: "add a group"
   add_to_stream: "add to stream"
   add_subfolder: add a sub-folder
+  by: "by"
   added_to: "has been added to '%{group}'."
   continue: "Continue"
   copy: "copy"
@@ -126,7 +128,7 @@ en:
   confirm_remove_member: "Are you sure you want to remove '%{name}' from '%{group}'?"
   confirm_uninvite_group: "Are you sure you want to remove '%{name}' from '%{event_name}'?"
   confirm_uninvite_person: "Are you sure you want to remove '%{name}' from '%{event_name}'?"
-  contact_information_unavailable: "No contact information"
+  contact_information_unavailable: "No contact"
   copy_to_dropbox: "Copy folder to dropbox"
   delete_event: "remove event"
   delete_folder: "delete folder"
@@ -157,7 +159,7 @@ en:
   dropbox_copy_personal: "Copy only the most useful folders"
   dropbox_copy_topics: "Copy only selected topics"
   dropbox_copy_selected: "Copy only when you click"
-  dropbox_introduction: "We can copy document folders to your dropbox either automatically or in response to your selections. They will be placed within a new 'hkfx' folder. To begin, please click the link below and log into your dropbox."
+  dropbox_introduction: "We can copy document folders to your dropbox either automatically or in response to your selections. They will be placed within a new '%{name}' folder. To begin, please click the link below and log into your dropbox."
   edit: "Edit"
   edit_event: "edit event"
   edit_folder: "edit folder"
@@ -183,7 +185,7 @@ en:
   folder: "folder"
   follow_stream: "Follow the stream in an RSS reader"
   group: "group"
-  group_admin: "Groups"
+  group_admin: "Directory"
   group_created: "Group '%{name}' created"
   calendar: "Calendar"
   library: "Library" 
@@ -200,6 +202,7 @@ en:
   your_preferences_saved: "Thank you. Your preferences have been updated"
   posted: "Posted"
   directory: "Directory"
+  hide_empty_folders: "hide empty folders"
   invite: "Invite"
   invite_group: "invite a group"
   invite_group_to: "Invite a group to %{name}"
@@ -278,6 +281,7 @@ en:
   save_person: "Save person"
   save_your_profile: "Save profile"
   send_reset_instructions: "Send reset instructions"
+  suggestions: "Suggestions"
   manage_folders: "manage folders"
   manage_groups: "manage groups"
   manage_users: "manage users"
@@ -286,6 +290,10 @@ en:
   my_future_events: "Your invitations"
   my_past_events: "Your past events"
   my_group_documents: "Your documents"
+  no_documents: "No documents to show"
+  no_groups: "You have no group memberships"
+  no_past_events: No past events to show
+  no_person_description: "No biography available."
   quick_search: "Quick search"
   future_events: "Events coming up"
   event_name: "Event name"
@@ -295,13 +303,12 @@ en:
   venue_post_code: "Post Code"
   of_the: "of the"
   preferred_name_explanation: "This is the name by which we will address you. To change your directory entry, please edit your profile."
-  no_documents: "Sorry: there are no documents accessible by your account."
   no_people: "Sorry: there are no directory entries accessible by your account."
   no_stream: "Nothing yet to show here."
   search_still_dumb: "This is a very basic title search. Full-text coming soon."
   scrap_title: "Title (optional)"
   unattached_folder_note: "A folder not attached to anything is visible to everyone and can be used to share documents of general interest."
-  user_admin: "Users"
+  user_admin: "User admin"
   stream: "Stream"
   uninvite: "uninvite"
   more: "more..."
@@ -309,8 +316,12 @@ en:
   reject: "reject"
   phone_unknown: "phone unknown"
   group_already_invited: "Already invited: select to reissue any missing personal invitations."
+  users_introduction: "Here 'people' are the people listed in the directory, and 'users' are the accounts they use to log in. The distinction is needed because a person can appear in the directory without having a login account and a user can log in to administer the site without being a person in the directory."
+  users_warning: "Most of these columns are now clickable and can be used to make quite large changes quickly. Clicking a green button under 'directory', for example, will delete a person object and all its group memberships. Please handle with care."
   your_invitations: "Your invitations"
   invitation_successful: "Success: %{name} has been invited."
+  welcome_preamble: "Welcome to the data room. Before we do anything else, please choose a password for your account."
+  hello_name: "Hello %{name}."
   future_event_count:
     zero: "No events coming up"
     one: "One event coming up"
@@ -359,4 +370,8 @@ en:
       personed: "people in the directory"
       administrative: "administrators"
       selected: "selected users"
-    droom/user: "users"
+    droom/user: "users"
+
+  apps:
+    data_room: "Data<br />Room"
+    

data/config/routes.rb

@@ -1,4 +1,4 @@
-Droom::Engine.routes.draw do
+Droom::Engine.routes.draw do 
   
   match '/' => DAV4Rack::Handler.new(
     :root => Rails.root.to_s, 
@@ -11,8 +11,10 @@ Droom::Engine.routes.draw do
 
   # intermediate confirmation step to allow invitation without setting a password
   devise_scope :user do
-    put "/confirm_password" => "confirmations#update", :as => :confirm_password
+    get "/users/:id/welcome/:confirmation_token" => "user_confirmations#show", :as => :welcome
+    put "/users/:id/confirm" => "user_confirmations#update", :as => :confirm_password
   end
+  
 
   resources :users
   resources :documents
@@ -80,7 +82,6 @@ Droom::Engine.routes.draw do
   match '/help/:slug', :to => 'pages#show', :as => 'help_page'
   match '/help', :to => 'pages#index', :as => 'help'
   
-  match '/search', :to => 'search#index', :as => "search"
   match '/videos.:format', :to => 'youtube#index', :as => "videos"
   match '/videos/:yt_id.:format', :to => 'youtube#show', :as => "video"
   match '/suggestions.:format', :to => 'suggestions#index', :as => "suggestions", :defaults => {:format => 'json'}

data/lib/droom.rb

@@ -17,6 +17,7 @@ module Droom
   # Boolean items also offer the interrogative form.
   
   mattr_accessor :root_path,
+                 :home_url,
                  :suggestible_classes,
                  :searchable_classes,
                  :yt_client,
@@ -33,8 +34,10 @@ module Droom
                  :dav_root,
                  :dav_subdomain,
                  :use_forenames,
+                 :use_biogs,
                  :use_separate_mobile_number,
                  :use_titles,
+                 :use_organisations,
                  :enable_mailing_lists,
                  :mailman_table_name,
                  :mailing_lists_active_by_default,
@@ -44,16 +47,22 @@ module Droom
                  :default_event_private,
                  :dropbox_app_key,
                  :dropbox_app_secret,
+                 :dropbox_app_name,
                  :user_defaults,
                  :people_sort,
                  :required_calendar_names,
                  :stream_shared,
-                 :aws_bucket_name
+                 :aws_bucket_name,
+                 :calendar_closed
   
   class DroomError < StandardError; end
   class PermissionDenied < DroomError; end
 
   class << self
+    def home_url
+      @@home_url ||= "http://example.com"
+    end
+    
     def layout
       @@layout ||= "droom/application"
     end
@@ -103,7 +112,7 @@ module Droom
     end
     
     def panels
-      @@panels ||= %w{dropbox email rss devices readers account search admin}
+      @@panels ||= %w{dropbox email rss devices readers account suggestions admin}
     end
     
     def scrap_types
@@ -127,6 +136,14 @@ module Droom
     def use_titles?
       !!@@use_titles
     end
+    
+    def use_biogs?
+      !!@@use_biogs
+    end
+    
+    def use_organisations?
+      !!@@use_organisations
+    end
 
     def stream_shared?
       !!@@stream_shared
@@ -140,6 +157,14 @@ module Droom
       !!@@enable_mailing_lists
     end
 
+    def calendar_closed?
+      !!@@calendar_closed
+    end
+
+    def dropbox_app_name
+      @@dropbox_app_name ||= 'droom'
+    end
+
     def mailman_table_name
       @@mailman_table_name ||= 'mailman_mysql'
     end
@@ -166,17 +191,6 @@ module Droom
       }
     end
 
-    def searchable_classes
-      @@searchable_classes ||= {
-        "event" => "Droom::Event",
-        "document" => "Droom::Document",
-        "person" => "Droom::Person", 
-        "group" => "Droom::Group",
-        "scrap" => "Droom::Scrap",
-        "venue" => "Droom::Venue"
-      }
-    end
-
     def add_suggestible_class(label, klass=nil)
       klass ||= label.titlecase
       suggestible_classes[label] = klass.to_s
@@ -197,7 +211,7 @@ module Droom
     def required_calendar_names
       @@required_calendar_names ||= %w{main stream}
     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/engine.rb

@@ -1,3 +1,5 @@
+require 'msg'
+
 module Droom
   class Engine < ::Rails::Engine
     isolate_namespace Droom

data/lib/droom/version.rb

@@ -1,3 +1,3 @@
 module Droom
-  VERSION = "0.2.1"
+  VERSION = "0.4.1"
 end

data/spec/dummy/log/dav.log

@@ -0,0 +1 @@
+# Logfile created on 12:43:24 by logger.rb/31641

data/spec/dummy/log/development.log

@@ -0,0 +1,2 @@
+Connecting to database specified by database.yml
+>>> Msg.add_receiving_class Droom::User

data/spec/dummy/log/test.log

@@ -0,0 +1 @@
+Connecting to database specified by database.yml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droom
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -380,23 +380,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sunspot_rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sunspot_solr
+  name: yomu
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -536,11 +520,13 @@ files:
 - app/assets/images/droom/dropbox.png
 - app/assets/images/droom/dropbox_button.png
 - app/assets/images/droom/dropbox_button_small.png
+- app/assets/images/droom/dropbox_small.png
 - app/assets/images/droom/edit.png
 - app/assets/images/droom/expand.png
 - app/assets/images/droom/expander.png
 - app/assets/images/droom/folder.png
 - app/assets/images/droom/greyblob.png
+- app/assets/images/droom/handle.png
 - app/assets/images/droom/help/goodreader.jpg
 - app/assets/images/droom/ical.png
 - app/assets/images/droom/icons.png
@@ -560,6 +546,7 @@ files:
 - app/assets/images/droom/playable.png
 - app/assets/images/droom/plus_bullet.png
 - app/assets/images/droom/revoke.png
+- app/assets/images/droom/revoke_small.png
 - app/assets/images/droom/scrap_icons.png
 - app/assets/images/droom/search.png
 - app/assets/images/droom/setup.png
@@ -586,6 +573,7 @@ files:
 - app/assets/images/droom/tinyarrows.png
 - app/assets/images/droom/tinysymbols.png
 - app/assets/images/droom/to_dropbox.png
+- app/assets/images/droom/toggle.png
 - app/assets/images/droom/twister.png
 - app/assets/images/droom/twisty.png
 - app/assets/images/droom/Untitled-1.png
@@ -612,14 +600,14 @@ files:
 - app/assets/javascripts/droom/utilities.js.coffee
 - app/assets/javascripts/droom/widgets.js.coffee
 - app/assets/javascripts/droom.js.coffee
-- app/assets/stylesheets/_definitions.css.sass
+- app/assets/stylesheets/droom/_mixins.css.sass
+- app/assets/stylesheets/droom/_popups.css.sass
+- app/assets/stylesheets/droom/_toolbar.css.sass
+- app/assets/stylesheets/droom/_variables.css.sass
 - app/assets/stylesheets/droom.css.sass
 - app/assets/stylesheets/lib/_kalendae.css.sass
-- app/assets/stylesheets/lib/_popups.css.sass
-- app/assets/stylesheets/lib/_toolbar.css.sass
 - app/controllers/droom/agenda_categories_controller.rb
 - app/controllers/droom/calendars_controller.rb
-- app/controllers/droom/confirmations_controller.rb
 - app/controllers/droom/dashboard_controller.rb
 - app/controllers/droom/documents_controller.rb
 - app/controllers/droom/dropbox_tokens_controller.rb
@@ -635,8 +623,8 @@ files:
 - app/controllers/droom/people_controller.rb
 - app/controllers/droom/preferences_controller.rb
 - app/controllers/droom/scraps_controller.rb
-- app/controllers/droom/search_controller.rb
 - app/controllers/droom/suggestions_controller.rb
+- app/controllers/droom/user_confirmations_controller.rb
 - app/controllers/droom/users_controller.rb
 - app/controllers/droom/venues_controller.rb
 - app/controllers/droom/youtube_controller.rb
@@ -668,9 +656,9 @@ files:
 - app/models/droom/user.rb
 - app/models/droom/user_action_observer.rb
 - app/models/droom/venue.rb
-- app/views/cropper/uploads/_crop.html.haml
-- app/views/devise/mailer/confirmation_instructions.en.html.haml
-- app/views/devise/mailer/reset_password_instructions.en.html.haml
+- app/views/devise/confirmations/failure.en.html.haml
+- app/views/devise/confirmations/new.html.haml
+- app/views/devise/confirmations/show.html.haml
 - app/views/devise/passwords/edit.html.haml
 - app/views/devise/passwords/new.html.haml
 - app/views/devise/sessions/new.html.haml
@@ -681,8 +669,10 @@ files:
 - app/views/droom/calendars/show.rss.builder
 - app/views/droom/confirmations/show.html.haml
 - app/views/droom/dashboard/_calendar.html.haml
+- app/views/droom/dashboard/_documents.html.haml
 - app/views/droom/dashboard/_folders.html.haml
 - app/views/droom/dashboard/_future_events.html.haml
+- app/views/droom/dashboard/_groups.html.haml
 - app/views/droom/dashboard/_invitations.html.haml
 - app/views/droom/dashboard/_past_events.haml
 - app/views/droom/dashboard/_quicksearch.html.haml
@@ -788,7 +778,7 @@ files:
 - app/views/droom/panels/_networks.html.haml
 - app/views/droom/panels/_readers.html.haml
 - app/views/droom/panels/_rss.html.haml
-- app/views/droom/panels/_search.html.haml
+- app/views/droom/panels/_suggestions.html.haml
 - app/views/droom/panels/_vcal.html.haml
 - app/views/droom/people/_action_menu.html.haml
 - app/views/droom/people/_created.html.haml
@@ -841,21 +831,21 @@ files:
 - app/views/droom/shared/_navigation.html.haml
 - app/views/droom/shared/_panels.html.haml
 - app/views/droom/shared/_quicklinks.html.haml
-- app/views/droom/shared/_search_form.html.haml
-- app/views/droom/shared/_search_results.html.haml
+- app/views/droom/shared/_suggestion_form.html.haml
 - app/views/droom/shared/_suggestions.html.haml
 - app/views/droom/shared/_title_excerpt.haml
 - app/views/droom/shared/_toolbar.html.haml
-- app/views/droom/shared/search.html.haml
 - app/views/droom/users/_confirmation.html.haml
 - app/views/droom/users/_dropbox_status.html.haml
+- app/views/droom/users/_extra_columns.html.haml
+- 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/_user.html.haml
 - app/views/droom/users/_user_or_person.html.haml
 - app/views/droom/users/_users_table.html.haml
 - app/views/droom/users/edit.html.haml
 - app/views/droom/users/index.html.haml
-- app/views/droom/users/unwelcome.en.html.haml
 - app/views/droom/venues/_search_result.html.haml
 - app/views/droom/venues/_suggested.html.haml
 - app/views/droom/venues/index.html.haml
@@ -986,7 +976,10 @@ files:
 - spec/dummy/db/migrate/20130201103737_mobile_phones.droom.rb
 - spec/dummy/db/migrate/20130201103738_mailing_lists.droom.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/log/dav.log
+- spec/dummy/log/development.log
 - spec/dummy/log/sunspot-solr-test.log.1
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -1068,7 +1061,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Droom is your new data room.
@@ -1126,7 +1119,10 @@ test_files:
 - spec/dummy/db/migrate/20130201103737_mobile_phones.droom.rb
 - spec/dummy/db/migrate/20130201103738_mailing_lists.droom.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/log/dav.log
+- spec/dummy/log/development.log
 - spec/dummy/log/sunspot-solr-test.log.1
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html