droom 0.0.1 → 0.2.1

data/config/locales/en.yml

@@ -5,79 +5,214 @@ en:
   activerecord:
     attributes:
       droom:
+        document:
+          category: "Category"
+          name: "Name"
+          filename: "Filename"
+          filesize: "Size"
+          created_at: "Created"
+          attached_to: "Attached to"
+          name: "Document name"
+          description: "Document description"
         event:
           name: "Event name"
           venue_name: "Choose or add a location"
           start_time: "Time"
+          finish_time: "Finish (optional)"
           start_date: "Date"
+          calendar_id: "Calendar"
+          private: "hidden unless attending"
+        folder: 
+          name: "Folder name"
+        organisation:
+          name: "Name"
+          url: "Web link"
+          description: "Mission and description"
         person:
           invite_on_creation: "Invite on creation"
           admin_user: "as admin user"
+          post_line1: "Address"
+          post_line2: ""
+          post_city: "City"
+          post_region: "Region"
+          post_country: "Country"
+          post_code: "Postcode"
+          dob: "Date of birth"
+        scrap:
+          scraptype:
+            image: "Image"
+          scraptype_text: "Text"
+          scraptype_video: "Video"
+          scraptype_link: "Link"
+          scraptype_quote: "Quote"
+        user:
+          name: "Preferred name"
+          email: "Private email address"
+          update_person_email: "Set your public address to match"
+  preferences:
+    dav:
+      enabled?: "Use DAV folder"
+      strategy:
+        everything: "Sync everything"
+        relevant: "Sync only relevant documents"
+        clicked: "Copy on command only"
+    dropbox:
+      strategy:
+        everything: "Sync everything"
+        selected: "Sync these folders..."
+        relevant: "Sync relevant documents"
+        clicked: "Copy on command only"
+      events?: "Your events"
+      topics?: "Your topics"
+      groups?: "Your groups"
+    email:
+      enabled?: "Receive administrative messages"
+      mailing_lists?: "Join group mailing lists"
+      digest?: "Receive a weekly summary"
+      event_invitations?: "Receive event invitations"
+  views:
+    pagination:
+      previous: "«"
+      next: "»"
+  account: "Account"
+  action: "*"
   admin: "Admin"
+  advanced_search: "Search terms"
+  advanced_search_link: "...advanced search"
+  quick_search_prompt: "Type anything here"
   attachments: "Attachments"
   attending: "Attending"
+  by_name: "Search by name or filename"
+  by_name_or_email: "Search by name or email"
   cancel: "cancel"
   mon: "MON"
+  devices: "Devices"
   dom: "00"
   year: "YEAR"
-  add_event: "Add an event"
-  add_document: "Add a document"
-  add_page: "Add a page"
-  add_person: "Add a person"
-  add_group: "Add a group"
+  add_event: "add an event"
+  add_document: "add a document"
+  add_document_to: "Add a document to the"
+  add_folder: "add a folder"
+  add_root_folder: "add a new root folder"
+  add_member: "add group member"
+  add_member_to: Add a member to the
+  add_page: "add a page"
+  add_person: "add a person"
+  add_group: "add a group"
+  add_to_stream: "add to stream"
+  add_subfolder: add a sub-folder
   added_to: "has been added to '%{group}'."
   continue: "Continue"
+  copy: "copy"
   dashboard: "Dashboard"
+  document_created: "Document '%{name}' created"
+  download_folder: "download as zipfile"
   hello: "Hello world"
   sign_in: "Sign in"
   can_still_log_in: 'Your password has not changed until you complete this process, <br />so if you remember the old one you can still <a href="%{url}">log in</a>'
   choose_new_password: "Choose a new password"
   clear_search: "Clear search"
   click_to_choose_file: "Click to choose a file"
+  click_to_upload: "Click here to choose an image file"
+  dav_preferences: "Document reader preferences"
+  drop_to_upload: "or drop a picture in this box"
   confirm_delete_document: "Are you sure you want to delete the document '%{name}'? This cannot be undone."
+  confirm_delete_folder: "Are you sure you want to delete the folder '%{path}'? This will permanentely delete all the documents in the folder."
   confirm_delete_event: "Are you sure you want to delete the event '%{name}'? This cannot be undone."
-  confirm_delete_group: "Are you sure you want to delete the group '%{name}'? This cannot be undone."
+  confirm_delete_group: "Are you sure you want to delete the group '%{name}'? Its members will remain the system but the group cannot be retrieved."
   confirm_delete_page: "Are you sure you want to delete the page '%{title}'? This cannot be undone."
   confirm_delete_person: "Are you sure you want to delete the person '%{name}'? This cannot be undone."
-  confirm_remove_document: "Are you sure you want to remove the document '%{name}' from the event '%{event_name}? If it has no other attachments, the document will also be deleted." 
+  confirm_remove_document: "Are you sure you want to remove the document '%{name}'?" 
   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}'?"
-  document_category: "Category"
-  document_name: "Name"
-  document_filename: "Filename"
-  document_filesize: "Size"
-  document_created: "Document '%{name}' created"
-  document_created_at: "Created"
-  document_attached_to: "Attached to"
-  document_name: "Document name"
-  document_description: "Document description"
-  download_ical: "Download event"
-  downloads: "Downloads"
+  contact_information_unavailable: "No contact information"
+  copy_to_dropbox: "Copy folder to dropbox"
+  delete_event: "remove event"
+  delete_folder: "delete folder"
+  delete_group: "delete group"
+  delete_scrap: "remove"
+  delete_person: "delete person"
+  confirm_delete_scrap: "Are you sure you want to remove this %{type} scrap?"
+  containing: "containing"
+  detach_upload: "detach upload"
+  attachment_count: 
+    zero: "No documents attached."
+    one: "One document attached."
+    other: "%{count} documents attached."
+  document_count: 
+    zero: "no documents"
+    one: "one document"
+    other: "%{count} documents"
+  subfolder_count:
+    zero: ""
+    one: "one subfolder"
+    other: "%{count} subfolders"
+  download_contacts: "download contacts"
+  download_ical: "download event"
+  downloads: "downloads"
   download_attachments_as_zipfile: "Download all attachments as a zipfile"
+  download_vcards: "Download this list to your address book"
+  dropbox_copy_all: "Copy everything"
+  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."
   edit: "Edit"
-  edit_event: "Edit event"
+  edit_event: "edit event"
+  edit_folder: "edit folder"
+  edit_group: "edit group"
+  edit_person: "edit person"
+  edit_scrap: "edit"
+  edit_profile: "edit profile"
+  edit_organisation: "edit organisation"
+  edit_account: "edit preferences"
+  edit_your_preferences: "Edit your account settings"
+  edit_your_preferences_note: "These are administrative settings like your password and private email address. "
+  edit_your_profile: "Edit your profile"
+  edit_your_profile_note: "This is the contact information that other people see when you are listed."
+  email_note: "This should be the email address at which you received your invitation, and other correspondence from us."
   events: "Events"
   events_between: "Events between %{start} and %{finish}"
   events_in: "Events in %{period}"
   events_on: "Events on %{day}"
   event_created: "Event '%{name}' created"
+  expel: "remove from group"
+  find_documents: "Find documents"
+  find_people: "Find people"
+  folder: "folder"
+  follow_stream: "Follow the stream in an RSS reader"
+  group: "group"
+  group_admin: "Groups"
   group_created: "Group '%{name}' created"
   calendar: "Calendar"
   library: "Library" 
-  preferences: "Preferences"
+  networks: "Networks"
+  next: "Next"
+  normal_RSS_link: "normal RSS link"
+  personal_RSS_link: "personal link"
+  previous: "Previous"
   set_preferences: "Account preferences"
+  subscribe_to_calendar: "Subscribe to the calendar"
   user_preferences: "User preferences"
   user_updated: "Preferences for %{name} have been updated."
+  update_person_email: "also update your public email address"
   your_preferences_saved: "Thank you. Your preferences have been updated"
-  
+  posted: "Posted"
   directory: "Directory"
-  
+  invite: "Invite"
+  invite_group: "invite a group"
+  invite_group_to: "Invite a group to %{name}"
+  invite_person: "invite a person"
+  invite_person_to: "Invite a person to %{name}"
   group_name: "Name"
   group_description: "Description"
-  
+  invitations_highlighted: "Events to which you are invited will be highlighted."
   help: "Help"
   help_pages: "Help pages"
+  copy_to_dropbox: "copy to dropbox"
+  loading_people: "Loading people"
+  loading_documents: "Loading documents"
   
   page_title: "Page title"
   page_slug: "Slug"
@@ -102,16 +237,15 @@ en:
   person_post_code: "Post code"
   has_been_created: "has been added to the system"
   and_invited: "and invited to log in."
-  
   new_membership_instructions: "Start typing a name here and a list of possible matches will appear. Click on someone to add them to the %{name} group."
-  
-  preferences: "Preferences"
+  new_event_note: ""
+  type_name: "Start typing a name"
   profile: "Profile"
   search: "Search"
   "on": "on"
   at: "at"
   or: "or"
-  event_time: "Time"
+  event_time: "Start"
   your_future_events: 
     zero: "You have no invitations at the moment."
     one: "You have one invitation:"
@@ -122,21 +256,32 @@ en:
   click_to_download: "Click to download %{name}"
   forgot_password: "Forgotten your password?"
   your_personal_documents: "Your personal documents"
+  library_introduction: "The library is organised into folders, which are usually attached to an event or group. You can browse through the folder hierarchy below, or search for a particular document on the right."
+  loading_stream: "Loading stream: please wait."
+  finish_time: "Finish?"
+  event_url: "Web link?"
   other_documents: "Other available documents"
   personal_calendar_feed: "Personal calendar subscription"
   general_calendar_feed: "General calendar subscription"
+  more_in_calendar: "More future events..."
   password_confirmation_instructions: "Please confirm your password."
   password_instructions: "Please choose a password of at least six letters."
   password_leave_same: "Leave this field blank to keep your existing password."
   password_confirmation_requirements: "We will not be able to remind you of your password but you can always set a new one if you forget it."
   password_requirements: "Ideally your password should include numbers and punctuation, and should not resemble a dictionary word."
-  remove: "remove"
+  remove: "Remove"
   search: Search
   save: "Save"
   save_event: "Save event"
   save_document: "Save document"
+  save_folder: "Save folder"
   save_person: "Save person"
-  manage_groups: "Manage groups"
+  save_your_profile: "Save profile"
+  send_reset_instructions: "Send reset instructions"
+  manage_folders: "manage folders"
+  manage_groups: "manage groups"
+  manage_users: "manage users"
+  manage_venues: "manage locations"
   map: "Map"
   my_future_events: "Your invitations"
   my_past_events: "Your past events"
@@ -144,9 +289,28 @@ en:
   quick_search: "Quick search"
   future_events: "Events coming up"
   event_name: "Event name"
+  slug_note: "Spaces and odd characters will be replaced with dashes"
+  to: "to"
   venue_name: "Venue name"
+  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"
+  stream: "Stream"
+  uninvite: "uninvite"
+  more: "more..."
+  accept: "accept"
+  reject: "reject"
+  phone_unknown: "phone unknown"
+  group_already_invited: "Already invited: select to reissue any missing personal invitations."
+  your_invitations: "Your invitations"
+  invitation_successful: "Success: %{name} has been invited."
   future_event_count:
     zero: "No events coming up"
     one: "One event coming up"
@@ -157,13 +321,14 @@ en:
     other: "%{count} members"
   more_documents_count:
     zero: "No more documents"
-    one: "and one more document..."
-    other: "and %{count} more documents..."
+    one: "and one more document"
+    other: "and %{count} more documents"
   time:
     formats:
       natural: "%l:%M%P"
       natural_with_date: "%l:%M%P, %d %B %Y"
       precise: "%H:%M"
+      month_and_year: "%b %Y"
   date:
     formats:
       dashed_short_date_format: "%d-%m-%Y"
@@ -188,4 +353,10 @@ en:
       password:
         confirmation: "The password and its confirmation do not match"
         too_short: "Your password must have at least 6 letters"
-      
+  msg:
+    groups:
+      unconfirmed: "anyone who hasn't activated their account"
+      personed: "people in the directory"
+      administrative: "administrators"
+      selected: "selected users"
+    droom/user: "users"

data/config/routes.rb

@@ -7,45 +7,84 @@ Droom::Engine.routes.draw do
     :log_to => [(Rails.root + 'log/dav.log').to_s, Logger::DEBUG]
   ), :anchor => false, :constraints => { :subdomain => Droom.dav_subdomain }
 
+  devise_for :users, :class_name => 'Droom::User', :module => :devise, :controllers => {:confirmations => 'droom/confirmations'}
+
+  # intermediate confirmation step to allow invitation without setting a password
+  devise_scope :user do
+    put "/confirm_password" => "confirmations#update", :as => :confirm_password
+  end
+
+  resources :users
+  resources :documents
+  resources :preferences
+  resources :calendars
+  resources :invitations
+  resources :memberships
+
+  resources :scraps do
+    collection do
+      match "feed/:auth_token.:format" => "scraps#index", :as => :feed
+    end
+  end
+
   resources :events do
-    resources :invitations
+    resources :invitations do
+      member do
+        put :accept
+        put :refuse
+        put :toggle
+      end
+    end
     resources :group_invitations
-    get "calendar", :on => :collection
     resources :documents
+    resources :agenda_categories
     collection do
+      get "calendar"
       match "feed/:auth_token.:format" => "events#feed", :as => :feed
     end
   end
   
+  resources :documents#, :only => [:index, :show]
+  resources :folders do
+    get "dropbox", :on => :member, :as => :dropbox
+    resources :documents
+    resources :folders
+  end
+  
+  resources :organisations do
+    resources :people
+  end
+  
   resources :people do
+    get "invite", :on => :member, :as => :invite
     resources :events do
       collection do
-        match "feed/:auth_token.:format" => "events#feed", :as => :feed
+        match "feed/:auth_token.:format" => "events#index", :as => :feed
       end
     end
   end
   
-  resources :documents do
-    resources :document_attachments
-  end
-  
   resources :groups do
     resources :memberships
+    resources :people
   end
   
   resources :venues
   resources :pages
+
+  resources :dropbox_tokens do
+    get "/register", :on => :collection, :action => :create
+  end
   
-  
-  match "/library" => 'documents#index', :as => :library
-  match "/directory" => 'people#index', :as => :directory
-  match "/calendar" => 'events#index', :as => :calendar
-  match "/map" => 'venues#index', :as => :map
-  match "/me" => 'dashboard#index', :as => :dashboard
+
   match '/help/:slug', :to => 'pages#show', :as => 'help_page'
   match '/help', :to => 'pages#index', :as => 'help'
   
-  match '/suggestions', :to => 'suggestions#index', :as => "suggestions"
-  match '/suggestions/:type', :to => 'suggestions#index'
-  
+  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'}
+  match '/suggestions/:type.:format', :to => 'suggestions#index', :defaults => {:format => 'json'}
+
+  root :to => "dashboard#index", :as => :dashboard
 end

data/config/sunspot.yml

@@ -0,0 +1,17 @@
+production:
+  solr:
+    hostname: localhost
+    port: 8983
+    log_level: WARNING
+
+development:
+  solr:
+    hostname: localhost
+    port: 8982
+    log_level: INFO
+
+test:
+  solr:
+    hostname: localhost
+    port: 8981
+    log_level: WARNING