droom 0.0.1 → 0.2.1

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

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

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

@@ -0,0 +1,14 @@
+.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)
+
+  %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?
+    = render :partial => "droom/events/event", :collection => events, :locals => {:brief => true}
+  - else
+    = t :no_past_events

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

@@ -0,0 +1,6 @@
+#quicksearch
+  %p.instructions
+    = t :search_instructions
+  %form#searchform.searchtest{:action => droom.suggestions_url(:format => :js)}
+    = text_field_tag :term, params[:term], :placeholder => t(:quick_search), :autocomplete => "off"
+  .search_results

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

@@ -0,0 +1,9 @@
+#stream
+  %h2.section
+    = link_to t(:stream_title), droom.scraps_url
+    - 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"}
+
+  #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

@@ -1,5 +1,7 @@
-#dashboard
-  - Droom.active_dashboard_modules.each do |mod|
+#main.dashboard
+  - Droom.main_dashboard_modules.each do |mod|
     = render :partial => "droom/dashboard/#{mod}"
 
-= render :partial => 'droom/dashboard/marginalia'
+-content_for :margin do
+  - Droom.margin_dashboard_modules.each do |mod|
+    = render :partial => "droom/dashboard/#{mod}"

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

@@ -0,0 +1,7 @@
+- if editable?(document)
+  .menu{:data =>{:for => "document_#{document.id}"}}
+    %ul.actions
+      %li
+        = link_to t(:edit_document), droom.edit_document_url(document), :class => 'edit', :data => {:action => "popup", :replaced => "#document_#{document.id}", :affected => ".minimonth"}
+      %li
+        = link_to t(:delete_document), droom.document_url(document), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#document_#{document.id}", :affected => ".minimonth", :confirm => t(:confirm_delete_document, :name => document.name)}

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

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

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

@@ -1,21 +1,21 @@
 - event ||= @event
+- documents = event.documents.visible_to(@current_person)
 
 .documents{ :"data-url" => "#{event_documents_path(event)}.js", :"data-refreshable" => true}
 
   %section.holder
 
-    - if event.document_attachments.any?
+    - if documents.any?
       %h2
         = t :attachments
-        = link_to t(:add_document), droom.new_event_document_url(event), :class => "add minimal admin", :remote => true, :data => {:action => "append_form", :type => "html", :affected => ".documents"}
-      / %p
-      /   = link_to t(:download_attachments_as_zipfile), event_url(event, :format => :zip), :class => "download"
+        - if admin?
+          = link_to t(:add_document), droom.new_event_document_url(event), :class => "add minimal admin", :remote => true, :data => {:action => "popup", :type => "html", :affected => ".documents"}
       
       = render :partial => "droom/events/attachment_list", :object => event.document_attachments.unfiled, :locals => {:limit => 100}
 
     - elsif admin?
       .holder
-        = link_to t(:add_document), droom.new_event_document_url(event), :class => "add admin", :remote => true, :data => {:action => "append_form", :type => "html", :affected => ".documents"}
+        = link_to t(:add_document), droom.new_event_document_url(event), :class => "add admin", :remote => true, :data => {:action => "popup", :type => "html", :affected => ".documents"}
       
   - attachments = event.attachments_by_category
   - attachments.each_pair do |cat_name, category_attachments|
@@ -25,7 +25,7 @@
           %h3
             = cat_name
             - if admin?
-              = link_to t(:add_document), droom.new_event_document_url(event, :category_name => cat_name), :class => "add minimal admin", :remote => true, :data => {:action => "append_form", :type => "html", :affected => ".documents"}
+              = link_to t(:add_document), droom.new_event_document_url(event, :category_name => cat_name), :class => "add minimal admin", :remote => true, :data => {:action => "popup", :type => "html", :affected => ".documents"}
 
           = render :partial => "droom/events/attachment_list", :object => category_attachments, :locals => {:limit => 100}
 

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

@@ -1,13 +1,32 @@
-%tbody{:"data-url" => "#{documents_path}.js", :"data-refreshable" => true }
+%table.main.documents.sortable{:data => {:sort => @sort, :order => @order, :url => "#{documents_path}.js"}}
+  - if @documents.current_page > 1
+    %thead
+      %tr
+        %td{:colspan => 6}
+          = render :partial => 'pagination', :locals => {:with_info => false}
+  %thead
+    %tr
+      - %w{name filename filesize created}.each do |col|
+        %th
+          - if @sort == col 
+            - order = @order.downcase == 'desc' ? 'asc' : 'desc'
+            - cssclass = "sorter #{@order.downcase}"
+          - 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
+
+
   - if @documents.any?
     = render :partial => 'table_document', :collection => @documents
-    %tr
-      %td{:colspan => 6}
-        .pagination
-          = paginate @documents, :params => {:format => :js}
+    %tbody
+      %tr
+        %td{:colspan => 6}
+          = render :partial => 'pagination', :locals => {:with_info => true}
   - else
-    %tr
-      %td{:colspan => 6}
-        %p.nothing_to_see
-          = t :no_documents
-        
+    %tbody
+      %tr
+        %td{:colspan => 6}
+          %p.nothing_to_see
+            = t :no_documents
+      

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

@@ -1,8 +1,4 @@
-= form_for @document, :html => { :multipart => true, :class => 'edit document', :remote => true, :data => {:type => :html}} do |f|
-  - if @event
-    = f.hidden_field :event_id, :value => @event.id
-  - if @category
-    = f.hidden_field :attachment_category_id, :value =>  @category.id
+= 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}"
@@ -12,9 +8,9 @@
 
   .metadata
     %p.name
-      = f.text_field :name, :class => 'name', :placeholder => t(:document_name)
+      = f.text_field :name, :class => 'name', :placeholder => t(:"activerecord.attributes.droom.document.name")
     %p.description
-      = f.text_area :description, :class => 'description', :placeholder => t(:document_description)
+      = f.text_area :description, :class => 'description', :placeholder => t(:"activerecord.attributes.droom.document.description")
 
     .buttons
       = f.submit t(:save_document)

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

@@ -1,8 +1,7 @@
 - document ||= listing
 
-%li.document.holder
-  = link_to document.name, document_url(document), :class => document.file_extension, :title => t(:click_to_download, :name => document.file_file_name)
-  - if admin? && @event
-    - d_a = @event.document_attachments.find_by_document_id(document)
-    = link_to t(:remove), document_document_attachment_path(document, d_a), :method => :delete, :remote => true, :class => 'delete minimal', :data => {:confirm => t(:confirm_remove_document, :name => document.name, :event_name => @event.name)}
-
+%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)
+  - 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/_pagination.html.haml

@@ -0,0 +1,8 @@
+- with_info ||= false
+
+.pag
+  = paginate @documents, :params => {:format => :js}
+  - if with_info
+    %br
+    %span.note
+      =page_entries_info @documents

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

@@ -0,0 +1,14 @@
+- document ||= search_result
+- path = folder_document_url(document.folder, document)
+- hit = document.hit
+.document
+  = link_to "document:", path, :class => "#{document.file_extension} icon"
+  - if hit and (highlights = hit.highlights.select{|hl| hl.field_name == :name}).any?
+    = render :partial => "droom/shared/title_excerpt", :locals => {:path => path, :highlights => highlights}
+  - else
+    = link_to document.name, path, :title => t(:click_to_download, :name => document.file_file_name)
+  .excerpt
+    - if hit and (highlights = hit.highlights.select{|hl| hl.field_name != :name}).any?
+      = render :partial => "droom/shared/excerpt", :locals => { :highlights => highlights }
+    - else
+      = truncate document.extracted_text, :length => 130

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

@@ -1,9 +1,4 @@
 - document ||= suggested
-- if current_user.person
-  - if pd = current_user.person.personal_or_generic_version_of(document)
-    - document = pd
 
 %li.document
   = link_to document.name, document_url(document), :class => document.file_extension, :title => t(:click_to_download, :name => document.file_file_name)
-  %span.note
-    attachments...

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

@@ -3,7 +3,7 @@
 - cssclasses << document.file_extension
 - cssclasses << 'changed' if document.changed_since_creation?
 
-%tr.document.holder
+%tr.document.holder{:id => "document_#{document.id}"}
   %th.name
     = link_to truncate(document.name, :length => 24), document_url(document), :class => cssclasses.join(' '), :title => t(:click_to_download, :name => document.file_file_name)
   %td.filename.minor
@@ -15,15 +15,9 @@
   %td.created.minor
     %span.note
       = l document.created_at.to_date, :format => :minimal_with_year
-  %td.event.minor
-    - if document.latest_event_id
-      = link_to truncate(document.latest_event_name, :length => 18), event_url(Droom::Event.find(document.latest_event_id)), :class => "event note"
-  %td.agenda_section.minor
-    %span.note
-      = truncate(document.category_name, :length => 18, :separator => " ")
   - if current_user.admin?
     %td.admin<
-      = link_to t(:edit), edit_document_url(document), :class => 'edit minimal', :remote => true, :data => {:action => "overlay_form", :type => "html"}
+      = link_to t(:edit), edit_document_url(document), :class => 'edit minimal', :remote => true, :data => {:action => "popup", :replaced => "#document_#{document.id}"}
       = link_to t(:remove), document_url(document), :method => 'delete', :class => 'delete minimal', :remote => 'true', :data => {:confirm => t(:confirm_delete_document, :name => document.name)}
 %tr
   %td.description{:colspan => 6}

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

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

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

@@ -1,29 +1,12 @@
-#documents
-  - if current_user.admin?
-    .holder
-      %p.admin
-        = link_to t(:add_document), droom.new_document_url, :class => "add", :remote => true, :data => {:action => "append_form", :type => "html", :affected => "table.documents"}
+#main.documents{:data => {:panel => false}}
+  = render :partial => 'documents_table'
 
-  %table.main.documents.sortable
-    %thead
-      %tr
-        %th
-          %a.sorter{:href => "#", :"data-sort" => "name"}
-            = t :document_name
-        %th.minor
-          %a.sorter{:href => "#", :"data-sort" => "filename"}
-            = t :document_filename
-        %th.minor
-          %a.sorter{:href => "#", :"data-sort" => "filesize"}
-            = t :document_filesize
-        %th.minor
-          %a.sorter{:href => "#", :"data-sort" => "created"}
-            = t :document_created_at
-        %th
-          %a.sorter{:href => "#", :"data-sort" => "event"}
-            = t :document_attached_to
-        %th.minor
-          %a.sorter{:href => "#", :"data-sort" => "category"}
-            = t :document_category
 
-    = 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
+  

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

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

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

@@ -0,0 +1,6 @@
+%h3
+  Connect to your dropbox
+
+%p
+  = link_to "Auth link", @authorization_url
+  

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

@@ -0,0 +1,15 @@
+- if editable?(event)
+  .menu{:data => {:for => "event_#{event.id}"}}
+    %ul.actions
+      %li
+        = 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(: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/_event.html.haml

@@ -2,76 +2,86 @@
 - brief ||= false
 - show_header ||= false
 - event ||= @event
-- full_attachments ||= false
+- full_attachments ||= @event == event
+- brief = false if full_attachments
+- closed ||= false
+- open ||= !closed || event == @event
+- open = true if pageclass == 'events'
 
-- if event
-  - 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 holder']
-  - cssclasses << 'repeat' if repeating
-  - cssclasses << 'private' if event.private?
-  - cssclasses << 'public' if event.public?
+- 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
 
-  %div{:class => cssclasses.join(' ')}
-    .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')
+- if show_header 
+  - header = month_header_for(event.start_date)
+  - if header != @event_header
+    %p.note
+      = @event_header = header
 
-    .summary
+%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')
+
+  .summary
+    .heading
       %h2.name<
-        = link_to event.name, event_url(event)
-        - if admin?
-          %span.admin<
-            = link_to t(:edit_event), edit_event_url(event), :class => 'edit minimal', :remote => true, :data => {:action => "overlay_form", :type => "html"}
-            = link_to t(:remove), event_url(event), :method => 'delete', :class => 'delete minimal', :remote => 'true', :data => {:confirm => t(:confirm_delete_event, :name => event.name), :affected => ".minimonth"}
+        - if event.description? || event.has_documents? || event.has_people?
+          = link_to event.name, event_url(event), :class => "name"
         - else
-          = link_to t(:download_ical), event_url(event, :format => :ics), :class => 'ical icon'
-
-      - unless brief || full_attachments
-        - if admin? || event.documents.any?
-          .documents
-            - if event.documents.any?
-              %h3 
-                = t(:attachments)
-                - if admin?
-                  = link_to t(:add_document), droom.new_event_document_url(event), :class => "add admin minimal", :remote => true, :data => {:action => "append_form", :type => "html"}
-              %ul.downloads
-                = render :partial => 'droom/documents/listing', :collection => event.documents.by_date.limit(3)
-                - if event.documents.count > 3
-                  %li.more
-                    = link_to t(:more_documents_count, :count => event.documents.count - 3), event_url(event)
-            - elsif admin?
-              = link_to t(:add_document), droom.new_event_document_url(event), :class => "add admin", :remote => true, :data => {:action => "append_form", :type => "html"}
-              
-              
+          = event.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
+              = 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)
+              = link_to event.venue.proper_name + ".", venues_url(:id => event.venue.id)
             - else
-              %strong
-                = event.venue.proper_name
-                
-      - unless brief
-        = simple_format event.description, :class => "description"
+              = 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
-    = render :partial => 'droom/events/invitations', :locals => {:event => event}
-    = render :partial => 'droom/documents/documents_list', :locals => {:event => event}
+      - 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}