droom 0.4.3 → 0.5.3

data/app/models/droom/user_permission.rb

@@ -0,0 +1,8 @@
+module Droom
+  class UserPermission < ActiveRecord::Base
+    belongs_to :user
+    belongs_to :permission
+    belongs_to :group_permission
+    scope :for_user, -> user { where(["user_id = ?", user.id]) }
+  end
+end

data/app/models/droom/venue.rb

@@ -1,25 +1,31 @@
 require 'snail'
+require 'geocoder'
 
 module Droom
   class Venue < ActiveRecord::Base
-    attr_accessible :name, :lat, :lng, :post_line1, :post_line2, :post_city, :post_country, :post_code, :old_id
-    
+    include Droom::Concerns::Slugged
+
     belongs_to :created_by, :class_name => "Droom::User"
     has_many :events, :dependent => :nullify
 
-    default_scope :order => 'name asc'
+    before_validation :slug_from_name
 
-    geocoded_by :full_address, :latitude  => :lat, :longitude => :lng
-    # before_validation :convert_gridref
+    geocoded_by :name_and_address, :latitude  => :lat, :longitude => :lng
     before_validation :geocode
     # reverse_geocoded_by :lat, :lng
 
-    scope :matching, lambda { |fragment| 
+    scope :matching, -> fragment {
       fragment = "%#{fragment}%"
       where('droom_venues.name like ?', fragment)
     }
+    
+    scope :in_name_order, -> {
+      order('name ASC')
+    }
+    
+    default_scope -> {order('name ASC')}
 
-    def self.visible_to(person=nil)
+    def self.visible_to(user=nil)
       self.scoped({})
     end
 
@@ -28,7 +34,7 @@ module Droom
       self.all.map{|v| [v.proper_name, v.id] }
     end
 
-    def proper_name
+    def definite_name
       if prepend_article?
         "the #{name}"
       else
@@ -44,8 +50,8 @@ module Droom
       'venue'
     end
     
-    # Snail is a library that abstracts away - as far as possible - the vagaries of international address formats. Here we map our data columns onto Snail's abstract representations so that they can be rendered into the correct format for their country.
-    def address
+    #todo: remove after migrations complete
+    def postal_address
       Snail.new(
         :line_1 => post_line1,
         :line_2 => post_line2,
@@ -56,13 +62,12 @@ module Droom
       )
     end
     
-    def full_address
-      [name, address].map(&:to_s).join("\n")
+    def name_and_address
+      [name, address, post_code].compact.join("\n")
     end
 
-    def address?
-      post_line1? && post_city
-    end
+
+
 
     def as_json(options={})
       json = {
@@ -104,22 +109,6 @@ module Droom
     def to_ical
       self.as_ri_cal_calendar.to_s
     end
-
-    # We only go back to google for a new map location if there has been a change of address, but there are many places in which that could happen.
-    #
-    def address_changed?
-      name_changed? || post_line1_changed? || post_line2_changed? || post_city_changed? || post_region_changed?  || post_code_changed? || post_country_changed?
-    end
-
-  private
-
-    def convert_gridref
-      if post_code_changed?
-        if post_code.is_gridref?
-          self.lat, self.lng = post_code.to_latlng
-        end
-      end
-    end
-
+    
   end
 end

data/app/serializers/droom/user_serializer.rb

@@ -0,0 +1,45 @@
+require 'active_model_serializers'
+
+class Droom::UserSerializer < ActiveModel::Serializer
+  attributes :uid, 
+             :authentication_token, 
+             :title,
+             :given_name,
+             :family_name,
+             :chinese_name,
+             :colloquial_name,
+             :honours,
+             :email,
+             :phone,
+             :images,
+             :confirmed,
+             :permission_codes,
+             :person_uid,
+             :unconfirmed_email,
+             :password_set
+
+  def confirmed
+    object.confirmed?
+  end
+  
+  def password_set
+    object.password_set?
+  end
+
+  def images
+    if object.image?
+      {
+        icon: object.image.url(:icon),
+        thumbnail: object.image.url(:thumbnail),
+        standard: object.image.url(:standard)
+      }
+    else
+      {
+        icon: "",
+        thumbnail: "",
+        standard: ""
+      }
+    end
+  end
+
+end

data/app/serializers/droom/venue_serializer.rb

@@ -0,0 +1,5 @@
+require 'active_model_serializers'
+
+class Droom::VenueSerializer < ActiveModel::Serializer
+  attributes :id, :name, :slug, :definite_name, :address, :post_code, :country_code, :lat, :lng
+end

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

@@ -1,4 +1,4 @@
-- documents = Droom::Document.visible_to(current_user.person).latest(5)
+- documents = Droom::Document.latest(5)
 
 %h2.section
   = link_to t(:latest_documents), droom.documents_url

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

@@ -1,4 +1,4 @@
-- folders = Droom::Folder.visible_to(current_user.person).populated.latest(5)
+- folders = Droom::Folder.visible_to(current_user).populated.latest(5)
 - if folders.any?
   %h2.quiet
     = t :my_folders

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

@@ -1,18 +1,20 @@
 .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)
+#events{:data => {:refreshable => true, :url => droom.events_url(:limit => 5)}}
+  - calendar = Droom::Calendar.where(name: 'main').first_or_create
+  - events = calendar.events.future_and_current.order('start ASC').limit(5)
 
   %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 can?(:create, Droom::Event)
+      %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
+    %p.nothing
+      = t :no_future_events
   
-  - if calendar.events.future_and_current.count > 8
+  - if calendar.events.future_and_current.count > 5
     %p
-      = link_to t(:more_in_calendar), main_app.calendar_url
+      = link_to t(:more_in_calendar), main_app.calendar_url

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

@@ -1,4 +1,4 @@
-- groups = current_user.person.groups if current_user.person
+- groups = current_user.groups if current_user
 
 %h2.section
   = link_to t(:your_groups), droom.documents_url

data/app/views/droom/dashboard/_past_events.haml

@@ -1,14 +1,21 @@
-.divider
-#past_events{:data => {:refreshable => true, :url => droom.events_url(:limit => 4)}}
-  - calendar = Droom::Calendar.find_or_create_by_name('main')
-  - events = calendar.events.past.limit(4)
+- calendar = Droom::Calendar.where(name: 'main').first_or_create
+- events ||= calendar.events.past.limit(5)
 
-  %h2.section
-    = link_to t(:recent_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?
+  .divider
+  #past_events
+    %h2.section
+      = link_to t(:recent_events), main_app.calendar_url
+      - if can?(:create, Droom::Event)
+        %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_past_events
+    - if events.any?
+      = render :partial => "droom/events/event", :collection => events, :locals => {:brief => true}
+      - if calendar.events.past.count > 5
+        %p
+          = link_to t(:more_past_events), main_app.calendar_url(direction: "past")
+
+    - else
+      %p.nothing
+        = t :no_past_events

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

@@ -1,9 +1,9 @@
 #stream
   %h2.section
-    = link_to t(:stream_title), droom.scraps_url
+    = t(:stream_title)
     - if admin? || Droom.stream_shared?
       %span.action
-        = link_to t(:add_to_stream), droom.new_scrap_url, :class => "add minimal", :data => {:action => "popup", :affected => "#scraps"}
+        = link_to t(:add_to_stream), droom.new_scrap_url, :class => "add minimal", :data => {:action => "popup", :prepended => ".preload", :affected => "#scraps"}
 
   #scraps.holder{:data => {:refreshable => true, :url => scraps_path(:format => :js)}}
     = link_to t(:loading_stream), droom.scraps_url(:format => :js, :show => 8), :data => {:action => "autofetch"}

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

@@ -2,6 +2,9 @@
   - Droom.main_dashboard_modules.each do |mod|
     = render :partial => "droom/dashboard/#{mod}"
 
+-content_for :standfirst do
+  = render :partial => "droom/dashboard/welcome"
+
 -content_for :margin do
   - Droom.margin_dashboard_modules.each do |mod|
     = render :partial => "droom/dashboard/#{mod}"

data/app/views/droom/documents/_document.html.haml

@@ -5,8 +5,6 @@
 %div.document.holder
   %h2.name<
     = link_to truncate(document.name, :length => 33), droom.folder_document_url(document.folder, document), :class => cssclasses, :title => t(:click_to_download, :name => document.file_file_name)
-    - if admin?
-      = link_to t(:edit_document), edit_document_url(document), :class => 'admin edit minimal', :remote => true, :data => {:action => "overlay", :type => "html"}
 
   - if document.description
     - cssclasses = document.changed_since_creation? ? "description changed" : "description"

data/app/views/droom/documents/_documents.html.haml

@@ -1,5 +1,5 @@
 .paginated
   %ul.documents
     = render :partial => 'droom/documents/listing', :collection => @documents
-  .pagination
+  .pagination.sliding
     = paginate @documents

data/app/views/droom/documents/_documents_list.html.haml

@@ -1,5 +1,5 @@
 - event ||= @event
-- documents = event.documents.visible_to(@current_person)
+- documents = event.documents.visible_to(current_user)
 
 .documents{ :"data-url" => "#{event_documents_path(event)}.js", :"data-refreshable" => true}
 

data/app/views/droom/documents/_documents_table.html.haml

@@ -14,7 +14,7 @@
           - else
             - order = "asc"
             - cssclass = 'sorter'
-          = link_to t(:"activerecord.attributes.droom.document.#{col}"), documents_path(:sort => col, :order => order, :format => :js), :class => cssclass, :remote => true
+          = link_to t("helpers.label.document.#{col}"), documents_path(:sort => col, :order => order, :format => :js), :class => cssclass, :remote => true
 
 
   - if @documents.any?

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

@@ -1,16 +1,19 @@
 = form_for [@folder, @document], :html => { :multipart => true, :class => 'edit document', :remote => true, :data => {:type => :html}} do |f|
 
-  .filepicker
-    = link_to "choose file", "#", :class => "ul minimal #{@document.file_extension}"
+  %p.slug
+    = @folder.path + "/"
+
+  .filepicker{:data => {:role => "filepicker"}}
+    = link_to "choose file", "#", :class => "ul minimal #{@document.file_extension}", :data => {:action => "pick"}
     = f.file_field :file, :class => "file"
     %p.tip
       = t :click_to_choose_file
 
-  .metadata
+  .non-file-data
     %p.name
-      = f.text_field :name, :class => 'name', :placeholder => t(:"activerecord.attributes.droom.document.name")
+      = f.text_field :name, :class => 'name', :placeholder => t(:"helpers.label.document.name"), :autofocus => true
     %p.description
-      = f.text_area :description, :class => 'description', :placeholder => t(:"activerecord.attributes.droom.document.description")
+      = f.text_area :description, :class => 'description', :placeholder => t(:"helpers.label.document.description")
 
     .buttons
       = f.submit t(:save_document)

data/app/views/droom/documents/_listing.html.haml

@@ -1,7 +1,9 @@
 - document ||= listing
+- narrow ||= false
+- character_count = narrow ? 20 : 44
 
-%li.document{:id => "list_document_#{document.id}"}
-  = link_to truncate(document.name, :length => 24), droom.folder_document_url(document.folder, document), :class => "document #{document.file_extension.downcase}", :title => t(:click_to_download, :name => document.file_file_name)
+%li.document{:id => "list_document_#{document.id}", data: {narrow: narrow}}
+  = link_to shorten(document.name, character_count, ''), droom.folder_document_url(document.folder, document), class: "document #{document.file_extension.downcase}", target: "_blank"
   - if editable?(document)
     %span.action
       = link_to t(:remove), droom.folder_document_url(document.folder, document), :method => :delete, :class => 'delete minimal', :data => {:action => "remove", :removed => "#list_document_#{document.id}", :confirm => t(:confirm_remove_document, :name => document.name)}

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

@@ -1,12 +1,18 @@
 #main.documents{:data => {:panel => false}}
   = render :partial => 'documents_table'
 
-
-- content_for :filter do
-  %form.search{:action => documents_url, :id => "document_search"}
-    %p.input
-      = text_field_tag :q, params[:q], :name => 'q', :class => 'search', :placeholder => t(:search), :data => {:action => "filter"}
-
 - content_for :title do 
   = t :library
-  
+
+- content_for :margin do
+  #finder
+    %form.filter{:action => droom.documents_url(:format => :js), :autocomplete => 'off', :data => {:action => "filter"}}
+      %p
+        = search_field_tag :q, params[:q], :results => 5, :autosave => 'document_filter'
+
+    .scroller
+      #found
+        %p.note
+          Type a fragment of a filename or title here to see everything that matches.
+
+

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

@@ -2,9 +2,6 @@
   .header
     = link_to "X", '#', :class => "closer", :data => {:action => "close"}
     %h2
-      = t :add_document_to
-      %strong
-        = @folder.name
-      = t :folder
+      = t :add_document
       
   = render :partial => 'form'

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

@@ -5,11 +5,11 @@
         = link_to t(:edit_event), droom.edit_event_url(event), :class => 'edit', :data => {:action => "popup", :replaced => "#event_#{event.id}", :affected => ".minimonth"}
       %li
         = link_to t(:add_document), droom.new_folder_document_url(event.folder), :class => "add", :data => {:action => "popup", :affected => "#event_#{event.id}"}
+      %li
+        = link_to t(:edit_event_folder), droom.edit_folder_url(event.folder), :class => "add", :data => {:action => "popup", :affected => "#event_#{event.id}"}
       %li
         = link_to t(:add_subfolder), droom.new_folder_folder_url(event.folder), :class => "add", :data => {:action => "popup", :affected => "#event_#{event.id}"}
       %li
         = link_to t(:invite_group), droom.new_event_group_invitation_url(event), :class => "add", :data => {:action => "popup", :affected => "#event_#{event.id}"}
-      %li
-        = link_to t(:invite_person), droom.new_event_invitation_url(event), :class => "add", :data => {:action => "popup", :affected => ".people"}
       %li
         = link_to t(:delete_event), droom.event_url(event), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#event_#{event.id}", :affected => ".minimonth", :confirm => t(:confirm_delete_event, :name => event.name)}

data/app/views/droom/events/_attachments.html.haml

@@ -0,0 +1,8 @@
+- event ||= @event
+- folder ||= event.folder
+
+.col.attachments
+  - if folder.populated?
+    %h3
+      = t :attachments
+    = render :partial => "droom/folders/contents", :locals => {:folder => folder, :narrow => false}

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

@@ -1,14 +1,10 @@
-- if params[:day]
-  - date = Date.new(params[:year], params[:month], params[:mday])
-- elsif params[:month]
-  - date = Date.new(params[:year], params[:month], 1)
-- else
-  - date ||= Date.today
+- date ||= Time.zone.now
+
 - month = date.month
 - month_events = Droom::Event.coincident_with(date.beginning_of_month, date.end_of_month)
 
-- first_shown = date.beginning_of_month.beginning_of_week
-- last_shown = date.end_of_month.end_of_week
+- first_shown = date.beginning_of_month.beginning_of_week.to_date
+- last_shown = date.end_of_month.end_of_week.to_date
 - before = date.beginning_of_month - 1.day
 - after = date.end_of_month + 1.day
 

data/app/views/droom/events/_event.html.haml

@@ -1,86 +1,67 @@
 - @seen_events ||= []
-- brief ||= false
-- show_header ||= false
 - event ||= @event
-- full_attachments ||= @event == event
-- brief = false if full_attachments
-- closed ||= false
-- open ||= !closed || event == @event
+- open ||= event == @event
 - open = true if pageclass == 'events'
+- full_attachments ||= false
 
 - event_master_id = event.master_id || event.id
 - if @seen_events[event_master_id]
   - repeating = true 
   - brief = true
 - @seen_events[event_master_id] = true;
+
 - cssclasses = ['event']
 - cssclasses << 'repeat' if repeating
-- cssclasses << 'private' if event.private?
-- cssclasses << 'public' if event.public?
 - cssclasses << 'open' if open
-- cssclasses << 'closed' if closed
-- cssclasses << 'invited' if event.attended_by?(current_person)
-
-- if show_header 
-  - header = month_header_for(event.start_date)
-  - if header != @event_header
-    %p.note
-      = @event_header = header
+- cssclasses << 'invited' if event.attended_by?(current_user)
 
 %div{:class => cssclasses.join(' '), :id => "event_#{event.id}", :data => {:action => "collapser", :refreshable => true, :url => event_path(event, :format => :js)} }
-  .datemark
-    %span.mon= event.start.strftime('%b')
-    %span.dom= event.start.strftime('%d')
-    - if event.start.year != Date.today.year
-      %span.year= event.start.strftime('%Y')
+  = link_to event_url(event) do
+    .datemark
+      %span.mon= event.start.strftime('%b')
+      %span.dom= event.start.strftime('%d')
+      - if @year || event.start.year != Date.today.year
+        %span.year= event.start.strftime('%Y')
 
   .summary
     .heading
       %h2.name<
-        - if event.description? || event.has_documents? || event.has_people?
-          = link_to event.name, event_url(event), :class => "name"
-        - else
-          = event.name
+        = link_to event.name, event_url(event), :class => "name"
         = action_menulink(event)
       = action_menu(event)
         
-      %p.practicalities
-        %time
-          = l(event.start_time, :format => :natural)
-        - if event.finish?
-          = t :to
-          = l(event.finish_time, :format => :natural)
-        - if event.venue
-          %span.location
-            = t(:at)
-            - if event.venue.url
-              = link_to event.venue.proper_name + ".", event.venue.url
-            - elsif Droom.show_venue_map
-              = link_to event.venue.proper_name + ".", venues_url(:id => event.venue.id)
-            - else
-              = event.venue.proper_name + "."
-
-        - unless full_attachments
-          - if event.has_documents?
-            %span.attachments
-              = link_to t(:attachment_count, :count => event.all_documents.count), droom.event_url(event)
-          - elsif brief && event.description?
-            = link_to t(:more), droom.event_url(event)
-            
-    - unless brief
       .detail
-        = event.description.html_safe
+        - if !full_attachments && event.folder.populated?
+          .attachments
+            %h3
+              = link_to t(:attachments), event_url(event)
+            = render :partial => "droom/folders/contents", :locals => {:folder => event.folder, :open => true, :flat => true, :limit => 2, :for_more => event_url(event)}
+
+        %p.practicalities
+          %time
+            = l(event.start_time, :format => :natural)
+
+          - if event.finish?
+            = t :to
+            %time
+              = l(event.finish_time, :format => :natural)
+          - if event.timezone == "London"
+            = "(#{t(:uk_time)})"
+
+          - if event.venue
+            %span.location
+              = t(:at)
+              - if event.venue.url
+                = link_to event.venue.definite_name + ".", event.venue.url
+              - elsif Droom.show_venue_map?
+                = link_to event.venue.definite_name + ".", venues_url(:id => event.venue.id)
+              - else
+                = event.venue.definite_name + "."
+
+        - if event.description?
+          = event.description.html_safe 
 
-      - if full_attachments && event.detail_visible_to?(current_person)
-        .invitations
-          - if event.invitations.any?
-            %h2
-              = t :attending
-            = render :partial => 'droom/events/invitations', :locals => {:event => event}
-        .attachments
-          - if event.folder.populated?
-            %h2
-              = t(:attachments)
-              = action_menulink(event.folder)
-            = action_menu(event.folder)
-            = render :partial => "droom/folders/attachments", :locals => {:folder => event.folder, :title => t(:attachments), :open => true}
+  - if full_attachments
+    .addenda
+      = render :partial => 'droom/events/attachments', :locals => {:event => event}
+      = render :partial => 'droom/events/invitations', :locals => {:event => event}