droom 0.0.1 → 0.2.1

data/app/models/droom/user_action_observer.rb

@@ -0,0 +1,12 @@
+module Droom
+  class UserActionObserver < ActiveRecord::Observer 
+    observe "droom/event", "droom/document", "droom/person", "droom/scrap"
+  
+    def before_save(model)
+      if model.respond_to? :created_by
+        model.created_by ||= Droom::User.current
+      end
+    end
+
+  end
+end

data/app/models/droom/venue.rb

@@ -2,20 +2,44 @@ require 'snail'
 
 module Droom
   class Venue < ActiveRecord::Base
-    attr_accessible :name, :lat, :lng, :post_line1, :post_line2, :post_city, :post_country, :post_code
+    attr_accessible :name, :lat, :lng, :post_line1, :post_line2, :post_city, :post_country, :post_code, :old_id
     
-    belongs_to :created_by, :class_name => 'User'
+    belongs_to :created_by, :class_name => "Droom::User"
     has_many :events, :dependent => :nullify
-    acts_as_mappable
 
     default_scope :order => 'name asc'
-    before_validation :geocode_and_get_address
 
-    scope :name_matching, lambda { |fragment| 
+    geocoded_by :full_address, :latitude  => :lat, :longitude => :lng
+    # before_validation :convert_gridref
+    before_validation :geocode
+    # reverse_geocoded_by :lat, :lng
+
+    searchable do
+      text :name, :boost => 10, :stored => true
+      text :description, :stored => true
+      text :post_line1, :stored => true
+      text :post_line2, :stored => true
+      text :post_city, :stored => true
+      text :post_region, :stored => true
+      text :post_country, :stored => true
+      text :post_code, :stored => true
+    end
+
+    handle_asynchronously :solr_index
+
+    def self.highlight_fields
+      [:name, :description, :post_line1, :post_line2, :post_city, :post_region, :post_country, :post_code]
+    end
+
+    scope :matching, lambda { |fragment| 
       fragment = "%#{fragment}%"
       where('droom_venues.name like ?', fragment)
     }
 
+    def self.visible_to(person=nil)
+      self.scoped({})
+    end
+
     # *for_selection* returns a set of [name, id] pairs suitable for use as select options.
     def self.for_selection
       self.all.map{|v| [v.proper_name, v.id] }
@@ -48,6 +72,10 @@ module Droom
         :country => post_country
       )
     end
+    
+    def full_address
+      [name, address].map(&:to_s).join("\n")
+    end
 
     def address?
       post_line1? && post_city
@@ -60,8 +88,25 @@ module Droom
         :postcode => post_code,
         :address => address.to_s,
         :lat => lat,
-        :lng => lng,
-        :events => events.visible_to(options[:person]).as_json(options)
+        :lng => lng
+      }
+    end
+
+    def as_suggestion
+      {
+        :type => 'venue',
+        :prompt => name,
+        :value => name,
+        :id => id
+      }
+    end
+
+    def as_search_result
+      {
+        :type => 'venue',
+        :prompt => name,
+        :value => name,
+        :id => id
       }
     end
 
@@ -85,40 +130,12 @@ module Droom
 
   private
 
-    # This is the main geocoding routine, called before validation on every save. If there has been a significant change, 
-    # it will trigger the goecoding mechanism with a block that updates our address when a match is found. 
-    # It's fairly uncritical and probably needs to be more careful about overriding user-entered data.
-    #
-    def geocode_and_get_address(options={})
-      unless Rails.env.test?
-        if new_record? || address_changed? || options[:force]
-          geocode_with(:name) do |geo|
-            self.post_line1 = geo.street_address
-            self.post_city = geo.city
-            self.post_region = geo.province
-            self.post_country = geo.country
-            self.post_code = geo.zip
-            sleep(options[:delay].seconds) if options[:delay]
-          end
-        end
-      end
-    end
-
-    # *geocode_with* does the actual lookup, passing the value of the specified column to the google geocoder service (with help from Geokit)
-    # and yielding to the supplied block as soon as a match is found.
-    #
-    def geocode_with(attribute, &block)
-      value = send(attribute)
-      found = false
-      unless value.blank?
-        geo = Geokit::Geocoders::GoogleGeocoder3.geocode(value, :bias => Droom.geocode_bias, :language => 'en')
-        if geo.success
-          self.lat, self.lng = geo.lat, geo.lng
-          yield geo if block_given?
-          found = true
+    def convert_gridref
+      if post_code_changed?
+        if post_code.is_gridref?
+          self.lat, self.lng = post_code.to_latlng
         end
       end
-      found
     end
 
   end

data/app/views/cropper/uploads/_crop.html.haml

@@ -0,0 +1,46 @@
+// default state of precrop upload
+
+- upload ||= @upload
+- recipient = (params[:for] || "scrap").to_sym
+
+- if recipient == :scrap
+  - object = Droom::Scrap.new
+  - w = 580
+  - h = 326
+  - multiplier = 1
+
+- elsif recipient == :person
+  - object = Droom::Person.new
+  - w = 130
+  - h = 130
+  - multiplier = 4
+
+- prefix = 'image'
+
+- max_w = upload.width(:precrop)
+- max_h = upload.height(:precrop)
+- image_w = max_w * 3 / 4
+- image_h = max_h * 3 / 4
+- image_l = (w - image_w)/2
+- image_t = (h - image_h)/2
+
+// scale_* will already be defined when editing an existing crop
+- scale_w = params[:scale_w] || image_w
+- scale_h = params[:scale_h] || image_h
+- offset_l = params[:offset_l] || image_l
+- offset_t = params[:offset_t] || image_t
+
+.cropper
+  .preview{:style => "width: #{scale_w}px; height: #{scale_h}px; top: #{offset_t}px; left: #{offset_l}px"}
+    %img{:src => upload.file.url(:precrop)}
+
+  = fields_for recipient, object do |sf|
+    %fieldset.crop
+      = hidden_field_tag :multiplier, multiplier
+      = sf.hidden_field :"#{prefix}_offset_left", :value => offset_l, :class => 'ol'
+      = sf.hidden_field :"#{prefix}_offset_top", :value => offset_t, :class => 'ot'
+      = sf.hidden_field :"#{prefix}_upload_id", :value => upload.id
+      .scaler
+        %p.range
+          = sf.range_field :"#{prefix}_scale_width", :min => w, :max => max_w, :value => scale_w, :class => 'sw'
+          = sf.hidden_field :"#{prefix}_scale_height", :value => scale_h, :class => 'sh'

data/app/views/devise/mailer/confirmation_instructions.en.html.haml

@@ -0,0 +1,24 @@
+%p
+  Dear 
+  = @resource.name + ','
+  
+%p
+  You are cordially invited to visit our new Data Room.
+
+%p
+  The data room is a private space for the dissemination of useful information.
+
+%p
+  An account has been created for you; all that remains is to activate it and choose a password.
+  
+%h2
+  = link_to "Please click here to begin", confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
+  
+%p
+  As always your comments and suggestions will be very welcome.
+
+%p
+  With best wishes,
+
+%p
+  = Droom.email_from_name

data/app/views/devise/mailer/reset_password_instructions.en.html.haml

@@ -0,0 +1,21 @@
+%p
+  Hello 
+  = @user.best_name + ','
+  
+%p
+  Someone, perhaps you, has entered your email address into the 'forgotten password' form in the data room.
+
+%p
+  If that person was not you, please don't be concerned: you are receiving this message and they are not. 
+  Please ignore it and carry on as usual.
+  
+%p
+  If you would like to change your password, please click on the link below:
+  
+%h2
+  = link_to "Change your password here", edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
+  
+%p
+  Your password will not change until you complete this process, so if you have just remembered it you can still 
+  = link_to "log in", new_user_session_url
+  as usual.

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

@@ -0,0 +1,31 @@
+#account
+  %h1.pagetitle
+    =t :choose_new_password
+
+  = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) 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
+
+    %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).
+        
+    .controls
+      .save.button
+        %p
+          = f.submit t(:set_password), :class => "submit"

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

@@ -0,0 +1,21 @@
+#account
+  %h1.pagetitle
+    =t :forgot_password
+
+  = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
+    = devise_error_messages!
+  
+    %p
+      = f.label :email
+      %br
+      = f.email_field :email, :class => 'login'
+      %span.note
+        = t :email_note
+        
+    .controls
+      .save.button
+        %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/devise/sessions/new.html.haml

@@ -0,0 +1,33 @@
+- content_for(:pagetitle) do
+  =t :sign_in
+  
+#account
+  %h1.pagetitle
+    =t :sign_in
+    
+  - if flash[:notice]
+    %p.standfirst.green
+      = flash[:notice]
+
+  = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+    %p
+      = f.label :email
+      %br
+      = f.email_field :email, :class => 'login'
+
+    %p
+      = f.label :password
+      %span.reminder
+        = link_to t(:forgot_password), new_password_path(resource_name)
+      %br
+      = f.password_field :password, :class => 'login'
+
+    %p
+      - if devise_mapping.rememberable?
+        = f.check_box :remember_me
+        = f.label :remember_me, :class => "minor"
+
+    .controls
+      .save.button
+        %p
+          = f.submit t(:sign_in), :class => "submit"

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

@@ -0,0 +1,22 @@
+= form_for [droom, @event, @agenda_category], :html => {:class => 'edit agenda_category'} do |f|
+  %p.category
+    %span#existing_category{:data => {:action => "alternate", :selector => "#new_category"}}
+      = f.select :category_id, Droom::Category.for_selection
+      %br
+      %span.action
+        = link_to t(:add_category), '#', :class => "add"
+
+    %span#new_category
+      - @category = Droom::Category.new
+      = f.fields_for :category, @category do |ncf|
+        = ncf.text_field :name
+        %br
+        %span.action
+          = link_to t(:existing_category), '#', :class => "revert"
+
+  %p.stretcher
+    
+  .buttons
+    = f.submit t(:save_agenda_category)
+    = t :or
+    = link_to t(:cancel), '#', :class => 'cancel'

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

@@ -0,0 +1,6 @@
+#new_event
+  .header
+    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
+    %h2
+      = t :add_agenda_category
+  = render :partial => 'form'

data/app/views/droom/calendars/_action_menu.html.haml

@@ -0,0 +1,6 @@
+- cal ||= calendar
+- if editable?(cal)
+  .menu{:data => {:for => "calendar_#{calendar.id}"}}
+    %ul.actions
+      %li= link_to t(:edit_calendar), droom.edit_calendar_url(cal), :class => 'edit', :data => {:action => "popup", :replaced => "#calendar_#{calendar.id}", :affected => "#calendars"}
+      %li= link_to t(:delete_calendar), droom.calendar_url(cal), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#calendar_#{calendar.id}", :affected => "#calendars", :confirm => t(:confirm_delete_calendar, :name => calendar.name)}

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

@@ -0,0 +1,12 @@
+- @calendars.each do |cal|
+  .calendar
+    %h2.name
+      = cal.name
+      = action_menulink(cal)
+    = action_menu(cal)
+    - cal.events.each do |event|
+      .event
+        %span.name
+          = event.name
+          = action_menulink(event)
+        = action_menu(event)

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

@@ -0,0 +1,40 @@
+- content_for :pagetitle do
+  = t :welcome
+
+#account
+  %h1.pagetitle
+    =t :welcome
+
+  = form_for resource, :url => confirm_password_path, :html => {:class => 'edit user'} do |f|
+    = f.hidden_field :confirmation_token
+    
+    %p
+      %strong
+        = t :hello
+        = @user.name
+      = t :welcome_preamble
+
+    = devise_error_messages!
+
+    %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, :class => 'preferences required'
+      %br
+      %span.formnote
+        = t :password_confirmation_requirements
+
+    %p.password_notice
+      Please choose a password before you proceed.
+        
+    .controls
+      .save.button
+        = f.submit t(:continue), :class => "submit"

data/app/views/droom/dashboard/_calendar.html.haml

@@ -0,0 +1 @@
+= render :partial => "droom/shared/calendar_holder"

data/app/views/droom/dashboard/_folders.html.haml

@@ -0,0 +1,5 @@
+- folders = Droom::Folder.visible_to(current_user.person).populated.latest(5)
+- if folders.any?
+  %h2.quiet
+    = t :my_folders
+  = render :partial => "droom/folders/folder", :collection => documents, :locals => {:closed => true}

data/app/views/droom/dashboard/_future_events.html.haml

@@ -0,0 +1,18 @@
+.divider
+#events{:data => {:refreshable => true, :url => droom.events_url(:limit => 8)}}
+  - calendar = Droom::Calendar.find_or_create_by_name('main')
+  - events = calendar.events.future_and_current.order('start ASC').limit(8)
+
+  %h2.section
+    = link_to t(:future_events), main_app.calendar_url
+    %span.action
+      = link_to t(:add_event), droom.new_event_url, :class => "add minimal", :data => {:action => "popup", :affected => "#events"}
+
+  - if events.any?
+    = render :partial => "droom/events/event", :collection => events, :locals => {:brief => true}
+  - else
+    = t :no_future_events
+  
+  - if calendar.events.future_and_current.count > 8
+    %p
+      = link_to t(:more_in_calendar), main_app.calendar_url