droom 0.0.1 → 0.2.1

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

@@ -9,7 +9,7 @@
         %span.mon= t(:mon)
         %span.dom= t(:dom)
         %span.year= t(:year)
-      
+
     = f.hidden_field :start_date
     .kal
 
@@ -18,17 +18,28 @@
       = f.text_field :name, :class => 'name', :placeholder => t(:event_name)
 
     %p.practicalities
-      = f.text_field :start_time, :class => "timepicker", :value => (I18n.l(@event.start_time, :format => :precise) if @event.start_time), :placeholder => t(:event_time)
+      = f.text_field :start_time, :class => "timepicker start", :value => (I18n.l(@event.start_time, :format => :precise) if @event.start_time), :placeholder => t(:event_time)
+      = t :to
+      = f.text_field :finish_time, :class => "timepicker finish", :value => (I18n.l(@event.finish_time, :format => :precise) if @event.finish_time), :placeholder => t(:finish_time)
       = t :at
       %span.venue
         %span.name
           = f.text_field :venue_name, :class => "venuepicker", :placeholder => t(:venue_name), :autocomplete => "off"
-          
+
+    %p.visibility
+      = f.check_box :private
+      = f.label :private
+
     .description.wysihtml
       .toolbar#t1
         = render 'droom/shared/toolbar'
       = f.text_area :description, :id => 'd1'
-  
+
+    - if admin?
+      %p.calendar
+        = f.label :calendar_id
+        = f.select :calendar_id, Droom::Calendar.all.collect{|cal| [cal.name, cal.id]}
+
     .buttons
       = f.submit t(:save_event)
       = t :or

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

@@ -1,20 +1,5 @@
 - event ||= @event
-- if admin?
-  #attendants.admin
-    %h2
-      = t :attending
-    .holder
-      .admin
-        - if admin?
-          = link_to t(:invite_group), droom.new_event_group_invitation_url(event), :class => "add", :remote => true, :data => {:action => "append_form", :type => "html", :affected => ".groups"}
-  
-    = render :partial => 'droom/group_invitations/attending_groups', :locals => {:event => event}
-  
-        
-    .holder
-      .admin
-        - if admin?
-          = link_to t(:invite_person), droom.new_event_invitation_url(event), :class => "add", :remote => true, :data => {:action => "append_form", :type => "html", :affected => ".people"}
-  
-    = render :partial => 'droom/invitations/attending_people', :locals => {:event => event}
-  
+%ul.people{ :"data-url" => "#{event_invitations_path(event)}.js", :"data-refreshable" => true}
+  - event.invitations.each do |invitation|
+    = render :partial => "droom/people/person", :object => invitation.person, :locals => {:invitation => invitation}
+

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

@@ -0,0 +1,19 @@
+- event ||= search_result
+- path = event_url(event)
+- hit = event.hit
+.event
+  .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 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 event.name, path
+  
+  .excerpt
+    - if hit and (highlights = hit.highlights.select{|hl| hl.field_name == :description}).any?
+      = render :partial => "droom/shared/excerpt", :locals => { :highlights => highlights }
+    - else
+      = truncate event.description, :length => 130

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

@@ -1,7 +1,7 @@
 %span.calendar_views
   %br
   = t('event_page.stay_up_to_date')
-  = link_to(t('event_page.rss'), calendar_url(calendar_parameters.merge(:format => :rss)))
+  = link_to(t('event_page.rss'), droom.events_url(calendar_parameters.merge(:format => :rss)))
   = t('event_page.or')
-  = link_to(t('event_page.calendar_feed'), calendar_url(calendar_parameters.merge(:format => :ics, :protocol => 'webcal://', :only_path => false)))
+  = link_to(t('event_page.calendar_feed'), droom.events_url(calendar_parameters.merge(:format => :ics, :protocol => 'webcal://', :only_path => false)))
 

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

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

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

@@ -1,12 +1,29 @@
-- if current_user.admin?
-  .holder
-    %p.admin
-      = link_to t(:add_event), droom.new_event_url, :class => "add", :remote => true, :data => {:action => "append_form", :type => "html", :affected => ".events_list, .minimonth"}
-
-#events
-  %h2.quiet
-    = t(:future_events)
-  
+#main.events
+  - if @direction == 'past'
+    %h2.section
+      = t(:past_events)
+      %span.addendum
+        = link_to t(:show_future_events), droom.events_url(:direction => "future"), :class => "future"
+
+  - else
+    %h2.section
+      = t(:future_events)
+      - if @calendar.events.past.any?
+        %span.addendum
+          = link_to t(:show_past_events), droom.events_url(:direction => "past"), :class => "past"
+    
+  - if admin?
+    %p.action
+      = link_to t(:add_event), droom.new_event_url, :class => "add", :data => {:action => "popup", :affected => ".events_list, #minicalendar"}
+      %br
+      %span.note
+        = t :new_event_note
+
   = render :partial => 'events'
 
-= render :partial => 'droom/dashboard/marginalia'
+- content_for :title do
+  = t :calendar
+
+- content_for :margin do
+  = render :partial => 'droom/shared/calendar_holder'
+  = render :partial => "droom/invitations/invitations"

data/app/views/droom/events/index.rss.builder

@@ -4,7 +4,7 @@ xml.rss :version => "2.0" do
   xml.channel do
     xml.title "Events"
     xml.description list_description
-    xml.link calendar_url(calendar_parameters.merge(:format => :html))
+    xml.link droom.events_url(calendar_parameters.merge(:format => :html))
 
     events.each do |event|
       xml.item do

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

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

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

@@ -1,4 +1,8 @@
 #events
   = render :partial => 'droom/events/event', :object => @event, :locals => {:full_attachments => true}
 
-= render :partial => 'droom/dashboard/marginalia'
+- content_for :title do
+  = link_to t(:calendar), main_app.calendar_url
+
+- content_for :margin do
+  = render :partial => 'droom/shared/calendar_holder'

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

@@ -0,0 +1,14 @@
+- if editable?(folder)
+  .menu{:data =>{:for => "folder_#{folder.id}"}}
+    %ul.actions
+      %li
+        = link_to t(:edit_folder), droom.edit_folder_url(folder), :class => "edit", :data => {:action => "popup", :type => "html", :affected => "#folder_#{folder.id}"}
+      %li
+        = link_to t(:add_document), droom.new_folder_document_url(folder), :class => "add", :data => {:action => "popup", :type => "html", :affected => "#folder_#{folder.id}"}
+      %li
+        = link_to t(:add_subfolder), droom.new_folder_folder_url(folder), :class => "add", :data => {:action => "popup", :type => "html", :affected => "#folder_#{folder.id}"}
+      %li
+        = link_to t(:delete_folder), droom.folder_url(folder), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#folder_#{folder.id}", :confirm => t(:confirm_delete_folder, :path => folder.path)}
+      - if folder.populated?
+        / %li
+        /   = link_to t(:download_folder), droom.folder_url(folder, :zip), :class => 'download'

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

@@ -0,0 +1,3 @@
+- event ||= @event
+- folder ||= event.folder
+= render :partial => "droom/folders/contents", :locals => {:folder => folder}

data/app/views/droom/folders/_contents.html.haml

@@ -0,0 +1,6 @@
+%ul.filing
+  - if folder.children.any? or folder.documents.any?
+    - children = folder.children.by_name
+    - children = children.populated unless admin?
+    = render :partial => 'droom/documents/listing', :collection => folder.documents
+    = render :partial => 'droom/folders/folder', :collection => folder.children, :locals => {:defer_contents => true}

data/app/views/droom/folders/_folder.html.haml

@@ -0,0 +1,20 @@
+- folder ||= @folder
+- standalone ||= false
+- title ||= folder.name
+- open ||= false
+- if @folder
+  - open = true if folder == @folder || folder.ancestor_of?(@folder)
+- defer_contents ||= !open
+- cssclass = "folder"
+- cssclass << " open" if open
+- cssclass << " root" if folder.loose?
+- cssclass << " empty" unless folder.populated?
+- cssclass << " standalone" if standalone
+
+%li{:class => cssclass, :id => "folder_#{folder.id}", :data => {:refreshable => true, :url => droom.folder_path(folder, :js)} }
+  = link_to shorten(title, 48), droom.folder_url(folder), :class => "folder", :data => {:remote => true, :action => 'replace', :affected => "#folder_#{folder.id}"}
+  = action_menulink(folder)
+  = dropbox_link(folder)
+  - unless defer_contents
+    = render :partial => "droom/folders/contents", :locals => {:folder => folder}
+  = action_menu(folder)

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

@@ -0,0 +1,2 @@
+%ul#folders{:data => {:refreshable => true, :url => "#{folders_path}.js"}}
+  = render :partial => 'droom/folders/folder', :collection => @folders, :locals => {:open => true}

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

@@ -0,0 +1,18 @@
+= form_for @folder, :html => {:class => 'edit folder'} do |f|
+  = f.hidden_field :parent_id
+  
+  %p.slug
+    %strong<
+      - if @folder.parent
+        = @folder.parent.path + "/"
+      - else
+        \/
+      %br
+    = f.text_field :name, :required => true, :class => "name", :placeholder => t(:"activerecord.attributes.droom.folder.name")
+    %br
+    %span.formnote
+      = t :slug_note
+  .buttons
+    = f.submit t(:save_folder)
+    = t :or
+    = link_to t(:cancel), '#', :class => 'cancel'

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

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

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

@@ -0,0 +1,32 @@
+#main.folders{:data => {:panel => false}}
+  %p
+    = t :library_introduction
+  
+  - if admin?
+    %p.action
+      = link_to t(:add_root_folder), droom.new_folder_url, :class => "add", :data => {:action => "popup", :affected => "#folders"}
+      %br
+      %span.note
+        = t :unattached_folder_note
+      
+
+  = render :partial => 'folders'
+
+- content_for :title do
+  = t :library
+
+
+- content_for :margin do
+  #finder
+    %h3
+      = t :find_documents
+
+    %form.filter{:action => droom.documents_url(:format => :js), :data => {:action => "filter"}}
+      %p
+        = text_field_tag :q, params[:q], :placeholder => t(:by_name)
+    
+    .scroller
+      #found
+        %p.waiting
+          = t :loading_documents
+  

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

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

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

@@ -0,0 +1 @@
+= render :partial => "folder"

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

@@ -1,4 +1,15 @@
-= form_for [@event, @group_invitation], :html => {:remote => true, :data => {:type => :html}} do |f|
-  %input.group_picker{:type => "text", :placeholder => t(:group_name), :autocomplete => "off"}
-  = f.hidden_field :group_id, :class => "group_picker_target"
-  = link_to t(:cancel), "/", :class => 'cancel'
+= form_for [@event, @group_invitation], :html => {:class => "invitation", :remote => true, :data => {:type => :html}} do |f|
+  %ul.groups
+    - Droom::Group.all.each do |group|
+      %li.group
+        = f.radio_button :group_id, group.id
+        = f.label :"group_id_#{group.id}", group.name
+        - if group.invited_to?(@event)
+          %br
+          %span.formnote
+            = t :group_already_invited
+
+  .buttons
+    = f.submit t(:invite), :class => "submit"
+    = t :or
+    = link_to t(:cancel), '#', :class => "cancel"

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

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

data/app/views/droom/groups/_action_menu.haml

@@ -0,0 +1,11 @@
+- if editable?(group)
+  .menu{:data => {:for => "group_#{group.id}"}}
+    %ul.actions
+      %li
+        = link_to t(:edit_group), droom.edit_group_url(group), :class => 'edit', :data => {:action => "popup", :replaced => "#group_#{group.id}"}
+      %li
+        = link_to t(:add_member), droom.new_group_membership_url(group), :class => 'add', :data => {:action => "popup", :affected => "#group_#{group.id}"}
+      %li
+        = link_to t(:add_person), droom.new_group_person_url(group), :class => 'add', :data => {:action => "popup", :affected => "#group_#{group.id}"}
+      %li
+        = link_to t(:delete_group), droom.group_url(group), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#group_#{group.id}", :confirm => t(:confirm_delete_group, :name => group.name)}

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

@@ -1,12 +1,11 @@
 = form_for @group, :html => {:class => 'edit group', :remote => true, :data => {:type => :html}} do |f|
-  %table.main.groups
-    %tr.group
-      %th.name
-        = f.text_field :name, :class => 'name', :placeholder => t(:group_name)
-      %td.description
-        = f.text_field :description, :class => 'name', :placeholder => t(:group_description)
-      %td.count
-      %td.buttons
-        = f.submit t(:save)
-        = t :or
-        = link_to t(:cancel), "/", :class => 'cancel'
+  %p.name
+    = f.text_field :name, :class => 'name', :placeholder => t(:group_name)
+    
+  %p.description
+    = f.text_area :description, :class => 'name', :placeholder => t(:group_description)
+
+  .buttons
+    = f.submit t(:save)
+    = t :or
+    = link_to t(:cancel), "/", :class => 'cancel'

data/app/views/droom/groups/_group.html.haml

@@ -1,11 +1,10 @@
 - group ||= @group
-%tr.group.holder{:id => "group_#{group.id}"}
-  %th.name
-    = link_to group.name, group
-  %td.description= group.description
-  %td.count= t(:group_members, :count => group.people.count)
-  %td.buttons
-    - if admin?
-      = link_to t(:edit_group), edit_group_url(group), :class => 'admin edit minimal', :remote => true, :data => {:action => "overlay_form", :type => "html"}
-    - if current_user.admin?
-      = link_to t(:remove), group_url(group), :method => 'delete', :class => 'admin delete minimal', :remote => 'true', :data => {:confirm => t(:confirm_delete_group, :name => group.name)}
+
+%div{:id => "group_#{group.id}", :data => {:action => "collapser", :refreshable => true, :url => group_path(group, :format => :js)} }
+  %h2
+    = group.name
+    = action_menulink(group)
+  = action_menu(group)
+
+  %ul.people
+    = render :partial => "droom/people/person", :collection => group.people, :locals => {:group => group}

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

@@ -1,3 +1,2 @@
-%table.main.groups{:data => {:refreshable => true, :url => "#{groups_path}.js"}}
-  %tbody
-    = render :partial => 'group', :collection => @groups
+.groups{:data => {:refreshable => true, :url => "#{groups_path}.js"}}
+  = render :partial => 'group', :collection => @groups

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

@@ -0,0 +1,16 @@
+- group ||= search_result
+- path = group_url(group)
+- hit = group.hit
+.group
+  = link_to "group:", group_url(group), :class => "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 group.name, path
+  %span.note
+    = t :group_members, :count => group.people.count
+  .excerpt
+    - if hit and (highlights = hit.highlights.select{|hl| hl.field_name != :name}).any?
+      = render :partial => "droom/shared/excerpt", :locals => { :highlights => highlights }
+    - else
+      = truncate group.description, :length => 130

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

@@ -0,0 +1,7 @@
+- group ||= suggested
+
+%li.group
+  = link_to group.name, group_url(group)
+  %span.note
+    = t :group_members, :count => group.people.count
+    

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

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

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

@@ -1,7 +1,10 @@
+- content_for :title do
+  = t :group_admin
+
 #groups
   - if current_user.admin?
-    .holder
-      %p.admin
-        = link_to t(:add_group), droom.new_group_url, :class => "add", :remote => true, :data => {:action => "append_form", :type => "html", :affected => "table.groups"}
+    %p.action
+      = link_to t(:add_group), droom.new_group_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "div.groups"}
+      = link_to t(:add_person), droom.new_person_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "div.groups"}
 
   = render :partial => 'groups'