droom 0.4.3 → 0.5.3

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

@@ -10,4 +10,4 @@
     = l event.start_date, :format => date_format
     - if event.venue
       = t :at
-      = event.venue.proper_name
+      = event.venue.definite_name

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

@@ -1,2 +1,18 @@
-.events_list{:data => {:refreshable => true, :url => "#{events_path}.js"}}
-  = render :partial => 'droom/events/event', :collection => @events
+- events ||= @events
+#events{:data => {:refreshable => true, :url => droom.events_url(:js)}}
+  - if events.any?
+    = render :partial => 'droom/events/event', :collection => events
+  - else
+    %p.nothing
+      = t :no_events
+
+- if @year
+  - entry_name = t(:events_in, period: @year)
+- elsif @direction == 'past'
+  - entry_name = t(:past_events)
+- else
+  - entry_name = t(:future_events)
+
+%p.note
+  = page_entries_info @events, entry_name: entry_name
+= paginate @events

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

@@ -1,5 +1,7 @@
+- @event.calendar ||= Droom::Calendar.default_calendar
+
 = form_for @event, :html => {:class => 'edit event', :remote => true, :data => {:type => :html}} do |f|
-  .datemark.datepicker
+  .datemark{data: {role: "datepicker"}}
     %a{:href => "#"}
       - if @event.start
         %span.mon= @event.start.strftime('%b')
@@ -9,38 +11,43 @@
         %span.mon= t(:mon)
         %span.dom= t(:dom)
         %span.year= t(:year)
-
     = f.hidden_field :start_date
-    .kal
 
   .summary
     %p.name
-      = f.text_field :name, :class => 'name', :placeholder => t(:event_name)
+      = f.text_field :name, :class => 'name', :placeholder => t(:event_name), :autofocus => true
 
     %p.practicalities
-      = 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.times
+        = 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
+        = f.text_field :venue_name, :class => "venuepicker", :placeholder => t(:venue_name), :autocomplete => "off",  data: {role: "venuepicker", width: 300}
+      - if Droom.second_time_zone?
+        %span.timezone
+          = f.check_box :timezone, {id: "event_timezone_UK"}, "London", "Hong Kong"
+          %label{for: "event_timezone_UK"} 
+            = t :uk_time
 
     .description.wysihtml
       .toolbar#t1
         = render 'droom/shared/toolbar'
       = f.text_area :description, :id => 'd1'
-
-    - if admin?
-      %p.calendar
+    
+    %p.admin
+      = f.label :event_type_id, t(:file_under)
+      = f.select :event_type_id, Droom::EventType.for_selection, {}, class: "small"
+      - if admin?
+        %br
         = f.label :calendar_id
-        = f.select :calendar_id, Droom::Calendar.all.collect{|cal| [cal.name, cal.id]}
-
+        = f.select :calendar_id, Droom::Calendar.for_selection, {}, class: "small"
+      - else
+        = f.hidden_field :calendar_id
+    
     .buttons
       = f.submit t(:save_event)
+      %br
       = t :or
       = link_to t(:cancel), "/", :class => 'cancel'

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

@@ -1,5 +1,9 @@
 - 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}
 
+.col
+  - if event.invitations.any?
+    %h3
+      = t :invitations
+    %ul.people{ :"data-url" => "#{event_invitations_path(event)}.js", :"data-refreshable" => true}
+      - event.invitations.each do |invitation|
+        = render :partial => "droom/users/show/listed", :object => invitation.user, :locals => {:invitation => invitation}

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

@@ -0,0 +1,8 @@
+- scraps = Droom::Scrap.with_future_or_current_event
+
+- if scraps.any?
+  #stream
+    %h2.section
+      = t :stream_events
+  
+    = render partial: 'droom/scraps/thumb', collection: scraps

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

@@ -5,8 +5,11 @@
   = link_to event.name, event_url(event)
   %span.note
     = l event.start_time, :format => :natural
+    - if event.timezone == "London"
+      = "(#{t(:uk_time)})"
     = t :on
     = l event.start_date, :format => date_format
     - if event.venue
       = t :at
-      = event.venue.proper_name
+      = event.venue.definite_name
+

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

@@ -0,0 +1,8 @@
+- if params[:day]
+  - date = Time.zone.local(params[:year].to_i, params[:month].to_i, params[:mday].to_i)
+- elsif params[:month]
+  - date = Time.zone.local(params[:year].to_i, params[:month].to_i, 1)
+- else
+  - date ||= Time.zone.now
+
+= render "calendar", date: date

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

@@ -1,31 +1,29 @@
-#main.events
-  %p.standfirst
-    = t :calendar_introduction
-
-  - 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)
-      %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
-
+#calendar
+  %p.navigation
+    = link_to_unless_current "Future events", events_url(direction: "future")
+    \|
+    = link_to_unless_current "Past events", events_url(direction: "past")
+    - 4.times do |i|
+      - year = Date.today.year + 1 - i
+      \|
+      = link_to_unless_current year, events_url(year: year)
+      
   = render :partial => 'events'
 
-- content_for :title do
-  = t :calendar
+  %p.action
+    = link_to t(:subscribe_to_calendar), "webcal://#{Settings.host}/events.ics", class: "subscribe"
+    - if can?(:create, Droom::Event)
+      = link_to t(:add_event), droom.new_event_url, :class => "add", :data => {:action => "popup", :affected => "#events"}
 
+- content_for :title do
+  - if @year
+    = t(:events_in, period: @year)
+  - elsif @direction == "past"
+    = t(:past_events)
+  - else
+    = t(:calendar)
+    
 - content_for :margin do
-  = render :partial => 'droom/shared/calendar_holder'
+  = render :partial => "droom/shared/calendar_holder"
   = render :partial => "droom/invitations/invitations"
+  = render :partial => "droom/events/scrap_events"

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

@@ -1,8 +1,8 @@
-#events
-  = render :partial => 'droom/events/event', :object => @event, :locals => {:full_attachments => true}
-
 - content_for :title do
-  = t(:calendar)
+  = link_to t(:calendar), droom.events_url
+
+- content_for :standfirst do
+  %p
+    = t :event_introduction
 
-- content_for :margin do
-  = render :partial => 'droom/shared/calendar_holder'
+= render :partial => 'droom/events/event', :object => @event, :locals => {:full_attachments => true}

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

@@ -1,6 +1,36 @@
+- limit ||= false
+- for_more ||= false
+- flat ||= false
+- narrow ||= false
+- document_count = folder.documents.count
+
 %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}
+    - if limit && limit < document_count
+      = render :partial => 'droom/documents/listing', :collection => folder.documents.limit(limit)
+      - if for_more
+        %li.more
+          = link_to t(:more_documents_count, :count => document_count - limit), for_more
+
+    - else
+      = render :partial => 'droom/documents/listing', :collection => folder.documents, locals: {narrow: narrow}
+      - children = folder.children
+      - if flat
+        - if children.any? && for_more
+          %li.more
+            = link_to t(:more_subfolders_count, :count => children.count), for_more
+        
+      - else
+        // special case: if we're looking at a private folder that means we are allowed to see its children.
+        - unless admin? || !folder.public?
+          - children = folder.children.populated
+
+        - if limit && limit < document_count + folder.children.count
+          - children = children.limit(limit - document_count)
+          = render :partial => 'droom/folders/folder', :collection => children, :locals => {:defer_contents => true}
+          - if for_more
+            %li.more
+              = link_to t(:more), for_more
+
+        - else
+          = render :partial => 'droom/folders/folder', :collection => children, :locals => {:defer_contents => true}

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

@@ -2,6 +2,11 @@
 - standalone ||= false
 - title ||= folder.name || folder.slug
 - open ||= false
+- limit ||= false
+- for_more ||= false
+- flat ||= false
+- stem ||= ""
+
 - if @folder
   - open = true if folder == @folder || folder.ancestor_of?(@folder)
 - defer_contents ||= !open
@@ -12,9 +17,9 @@
 - 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}"}
+  = link_to shorten(title, 32), 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}
+    = render :partial => "droom/folders/contents", :locals => {:folder => folder, :limit => limit, :for_more => for_more, :flat => flat}
   = action_menu(folder)

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

@@ -1,17 +1,20 @@
 = form_for @folder, :html => {:class => 'edit folder'} do |f|
   = f.hidden_field :parent_id
   
+  %p.name
+    = f.label :name
+    %br
+    = f.text_field :name, required: true, class: "name", placeholder: t("helpers.label.folder.name"), autofocus: true, data: {role: 'name'}
+
   %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")
+    - if @folder.parent
+      = @folder.parent.path + "/"
+    - else
+      \/
     %br
-    %span.formnote
-      = t :slug_note
+    = f.text_field :slug, :class => "slug", :placeholder => t("helpers.label.folder.slug"), data: {role: 'slug'}
+
   .buttons
     = f.submit t(:save_folder)
     = t :or

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

@@ -1,34 +1,31 @@
-#main.folders{:data => {:panel => false}}
-  %p.standfirst
+- content_for :title do
+  = t :library
+
+- content_for :standfirst do
+  %p
     = t :library_introduction
-  
+
+
+- content_for :margin do
   - if admin?
     %p.action
       = link_to t(:hide_empty_folders), '#', :class => "toggle", :data => {:action => "toggle", :affected => ".folder.empty"}
       %br
       = 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"}}
+    %form.filter{:action => droom.documents_url(:format => :js), :autocomplete => 'off', :data => {:action => "filter"}}
       %p
-        = text_field_tag :q, params[:q], :placeholder => t(:by_name)
-    
+        = search_field_tag :q, params[:q], :results => 5, :autosave => 'document_filter'
+
     .scroller
       #found
-        %p.waiting
-          = t :loading_documents
+        %p.note
+          = t :find_document_notes
+
+
+
   
+#main.folders{:data => {:panel => false}}
+  = render :partial => 'folders'
+

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

@@ -5,4 +5,4 @@
     %li.group.holder
       = link_to group.name, group_url(group)
       - if admin?
-        = link_to t(:remove), event_group_invitation_path(event, event.group_invitations.find_by_group_id(group.id)), :remote => true, :method => "delete", :class => 'delete minimal', :data => {:confirm => t(:confirm_uninvite_group, :name => group.name, :event_name => @event.name)}
+        = link_to t(:remove), event_group_invitation_path(event, event.group_invitations.find_by(group_id: group.id)), :remote => true, :method => "delete", :class => 'delete minimal', :data => {:confirm => t(:confirm_uninvite_group, :name => group.name, :event_name => @event.name)}

data/app/views/droom/group_permissions/_toggle.html.haml

@@ -0,0 +1,18 @@
+- group_permission ||= @group_permission
+- group ||= @group
+- permission ||= @permission
+
+- unless group_permission
+  - if @group_permissions
+    - group_permission = @group_permissions[group.id][permission.id] if @group_permissions[group.id]
+  - else
+    - group_permission = permission.for_group(group).first
+
+- group ||= group_permission.group
+- permission ||= group_permission.permission
+- linkid = "#{group.slug}_#{permission.slug.gsub('.', '_')}"
+
+- if group_permission && !group_permission.destroyed?
+  = link_to t(:disallow), group_group_permission_url(group, group_permission), :id => linkid, :class => "yes", :method => :delete, :data => {:action => "replace", :replaced => "##{linkid}"}
+- else
+  = link_to t(:allow), group_group_permissions_url(group, :group_permission => {:permission_id => permission.id}), :id => linkid, :class => "no", :method => :post, :data => {:action => "replace", :replaced => "##{linkid}"}

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

@@ -5,7 +5,5 @@
         = 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/_created.html.haml

@@ -1,3 +1,2 @@
 %p.notification
-  %strong
   = t(:group_created, :name => @group.name)

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

@@ -4,6 +4,9 @@
     
   %p.description
     = f.text_area :description, :class => 'name', :placeholder => t(:group_description)
+    %br
+    = f.check_box :directory
+    = f.label :directory
 
   .buttons
     = f.submit t(:save)

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

@@ -1,13 +1,15 @@
 - group ||= @group
+- users = @users || Droom::User.in_group(group).page(1)
 
-%div{:id => "group_#{group.id}", :data => {:action => "collapser", :refreshable => true, :url => group_path(group, :format => :js)} }
-
-  %h2.section
-    = link_to group.name, '#', :class => "name"
+%div.group{:id => "group_#{group.id}", :data => {:refreshable => true, :url => group_path(group, :format => :js)} }
+  %h2
+    = group.name
     = action_menulink(group)
   = action_menu(group)
 
-  %ul.people.detail
-    = render :partial => "droom/people/person", :collection => group.people, :locals => {:group => group}
-  %p.suffix.note
-    = t :group_members, :count => group.people.count
+  .scroller
+    .paginated
+      %ul.people
+        = render partial: "droom/users/show/listed", collection: users
+      .pagination.sliding<
+        = paginate users

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

@@ -1,2 +1,2 @@
 .groups{:data => {:refreshable => true, :url => "#{groups_path}.js"}}
-  = render :partial => 'group', :collection => @groups
+  = render partial: "droom/groups/group", collection: @groups