droom 0.2.1 → 0.4.1

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

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

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

@@ -1,4 +1,7 @@
 #main.events
+  %p.standfirst
+    = t :calendar_introduction
+
   - if @direction == 'past'
     %h2.section
       = t(:past_events)
@@ -8,10 +11,9 @@
   - 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"
-    
+      %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"}

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

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

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

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

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

@@ -1,6 +1,6 @@
 - folder ||= @folder
 - standalone ||= false
-- title ||= folder.name
+- title ||= folder.name || folder.slug
 - open ||= false
 - if @folder
   - open = true if folder == @folder || folder.ancestor_of?(@folder)
@@ -11,7 +11,7 @@
 - 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)} }
+%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)

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

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

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

@@ -1,9 +1,11 @@
 #main.folders{:data => {:panel => false}}
-  %p
+  %p.standfirst
     = t :library_introduction
   
   - 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

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

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

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

@@ -1,10 +1,13 @@
 - group ||= @group
 
 %div{:id => "group_#{group.id}", :data => {:action => "collapser", :refreshable => true, :url => group_path(group, :format => :js)} }
-  %h2
-    = group.name
+
+  %h2.section
+    = link_to group.name, '#', :class => "name"
     = action_menulink(group)
   = action_menu(group)
 
-  %ul.people
+  %ul.people.detail
     = render :partial => "droom/people/person", :collection => group.people, :locals => {:group => group}
+  %p.suffix.note
+    = t :group_members, :count => group.people.count

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

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

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

@@ -1,10 +1,29 @@
 - content_for :title do
   = t :group_admin
 
-#groups
+#groups.main
+
+  %p.standfirst
+    = t :directory_introduction
+
   - if current_user.admin?
     %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'
+
+- content_for :margin do
+  #finder
+    %h3
+      = t :find_people
+
+    %form.filter{:action => droom.people_url(:format => :js), :data => {:action => "filter"}}
+      %p
+        = text_field_tag :q, params[:q], :placeholder => t(:by_name_or_email)
+
+    .scroller
+      #found
+        %p.waiting
+          = t :loading_people
+  

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

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

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

@@ -2,6 +2,8 @@
   .menu{:data => {:for => "organisation_#{organisation.id}"}}
     %ul.actions
       %li
-        = link_to t(:edit_organisation), droom.edit_organisation_url(organisation), :class => 'edit', :data => {:action => "popup", :replaced => "#organisation_#{organisation.id}", :affected => ".minimonth"}
+        = link_to t(:edit_organisation), droom.edit_organisation_url(organisation), :class => 'edit', :data => {:action => "popup", :replaced => "#organisation_#{organisation.id}"}
+      %li
+        = link_to t(:add_person), droom.new_organisation_person_url(organisation), :class => 'add', :data => {:action => "popup", :affected => "#organisation_#{organisation.id}"}
       %li
         = link_to t(:delete_organisation), droom.organisation_url(organisation), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#organisation_#{organisation.id}", :affected => ".minimonth", :confirm => t(:confirm_delete_organisation, :name => organisation.name)}

data/app/views/droom/organisations/_organisation.html.haml

@@ -16,7 +16,6 @@
     - if organisation.url?
       %p.note
         = link_to organisation.url_without_protocol, organisation.url_with_protocol, :class => "external"
-    
 
     - if organisation.people.any?
       %ul.people

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

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

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

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

data/app/views/droom/panels/_dropbox.html.haml

@@ -10,7 +10,7 @@
 
   - else
     %p
-      = t :dropbox_introduction
+      = t :dropbox_introduction, :name => Droom.dropbox_app_name
     %p
       = link_to "Connect to your dropbox", droom.new_dropbox_token_url, :class => "dropbox"
       

data/app/views/droom/panels/{_search.html.haml → _suggestions.html.haml}

@@ -1,8 +1,9 @@
 - dashboard = request.path == main_app.dashboard_path
-#search.panel
+#suggestions.panel
   - if dashboard
     %p.instructions
-      = t :search_instructions
+      = t :suggestions_instructions
+      
   %form#suggestions{:action => droom.suggestions_url(:format => :js)}
     %p
       - unless dashboard
@@ -10,7 +11,5 @@
           = t :quick_search
           %br
       = text_field_tag :term, params[:term], :placeholder => t(:quick_search_prompt), :autocomplete => "off"
-    %p.formnote
-      = link_to t(:advanced_search_link), droom.search_url, :class => "search"
       
   #suggestion_box

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

@@ -1,19 +1,7 @@
 = form_for @person, :html => {:class => 'edit person'} do |f|
   .image
-    .upload
-      - @person.build_image_upload unless @person.image_upload
-      = f.fields_for :image_upload do |iuf|
-        .uploadbox{:data => {:action => "upload", :url => cropper.uploads_path(:format => :js, :for => "person"), :scale => 2}}
-          = iuf.file_field :file, :class => 'file_upload', :accept => "image"
-          .img
-            - if @person.image_upload.persisted?
-              = link_to image_tag(@person.image.url(:cropped), :width => 260, :height => 260), cropper.edit_upload_url(@person.image_upload), :data => {:action => "recrop"}, :class => "recrop"
-              = link_to t(:detach_upload), '#', :class => 'detach'
-            .prompt
-              = link_to t(:click_to_upload), cropper.new_upload_url, :class => 'picker'
-              .droppable
-                .note
-                  = t :drop_to_upload
+    - @person.build_image_upload unless @person.image_upload
+    = render :partial => "cropper/uploads/pick", :locals => {:upload => @person.image_upload, :holder => @person, :multiplier => 4}
 
   - if Droom.use_forenames?
     %p.name
@@ -49,6 +37,12 @@
         = f.text_field :mobile
 
   - if admin?
+    - if Droom.use_organisations?
+      %p.organisation
+        = f.label :organisation_id
+        %br
+        = f.select :organisation_id, Droom::Organisation.for_selection, :class => 'preferences'
+
     - if @person.new_record?
       %p.admin
         = f.check_box :invite_on_creation, :class => 'invite'
@@ -56,11 +50,13 @@
         = f.check_box :admin_user
         = f.label :admin_user
 
-    / %p.organisation
-    /   = f.label :organisation_id, :class => "optional"
-    /   %br
-    /   = f.select :organisation_id, Droom::Organisation.for_selection
-  
+  - if Droom.use_biogs?
+    - @person.description = "<p></p>" unless @person.description?
+    .description.wysihtml
+      .toolbar#t1
+        = render 'droom/shared/toolbar'
+      = f.text_area :description
+
   .buttons
     - if current_user.is_person?(@person)
       = f.submit t(:save_your_profile)

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

@@ -2,7 +2,7 @@
 
 %li.person{:id => "list_person_#{person.id}", :data => {:refreshable => true, :url => droom.edit_person_path(person, :format => :js)} }
   %span.name
-    = person.formal_name
+    = link_to person.formal_name, person_url(person), :data => {:action => "popup"}
     = action_menulink(person)
   = action_menu(person)
 

data/app/views/droom/people/_person.html.haml

@@ -12,7 +12,7 @@
   - group = membership.group
 
 %li{:id => "person_#{person.id}", :class => cssclass, :data => {:refreshable => true, :url => droom.person_path(person, :format => :js, :invitation_id => invitation ? invitation.id : nil)} }
-  %span.mugshot{:style => "background-image: url(#{person.image.url('cropped')})"}
+  %span.mugshot{:style => "background-image: url(#{person.image.url('icon')})"}
     - if invitation
       - if editable?(invitation)
         = link_to invitation.status, toggle_event_invitation_url(event, invitation), :class => "invitation #{invitation.status}", :data => {:action => "affect", :method => "put", :affected => "#person_#{person.id}"}
@@ -20,12 +20,12 @@
         %span{:class => "invitation #{invitation.status}"}
   %span.contact
     %span.name
-      = person.formal_name
+      = link_to truncate(person.formal_name, :length => 14), person_url(person), :data => {:action => "popup"}
       = action_menulink(person, :class => "small")
     %br
     %span.note
       - if person.email?
-        = mail_to person.email
+        = mail_to truncate(person.email, :length => 20)
       - else
         = t :contact_information_unavailable
 

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

@@ -1,7 +1,7 @@
 - person ||= suggested
 
 %li.person
-  = mail_to person.email, person.formal_name
+  = link_to person.formal_name, person_url(person), :data => {:action => "popup"}
   %span.note
     - if person.phone? || person.email?
       - if person.phone?

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

@@ -1,7 +1,7 @@
 #person
   .header
     = link_to "X", '#', :class => "closer", :data => {:action => "close"}
-    %h2
+    %h2.titlebar
       - if current_user.is_person?(@person)
         = t :edit_your_profile
       - else

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

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

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

@@ -1 +1,31 @@
-= render :partial => "person", :object => @person
+- person ||= @person
+
+#person
+  .header
+    = link_to "X", '#', :class => "closer", :data => {:action => "close"}
+    %h2.titlebar
+      = person.formal_name
+  .person
+    .mugshot.full{:style => "background-image: url(#{person.image.url('thumb')})"}
+    .detail
+      %h3
+        = person.formal_name
+
+      %p.contact
+        - if person.organisation
+          %strong
+            = person.organisation.name
+            %br
+        - if person.email?
+          = mail_to person.email
+        - if person.email? && person.phone?
+          = t :or
+        - if person.phone?
+          = person.phone
+      .description
+        - if person.description?
+          = sanitize(person.description.html_safe)
+        - else
+          %p
+            = t :no_person_description
+          

data/app/views/droom/scraps/full/_document.html.haml

@@ -1,6 +1,6 @@
 - if document = scrap.document
   .body.scrapdocument
     %p.name
-      = link_to document.name, document_url(document), :class => "dl #{document.file_extension}"
+      = link_to document.name, droom.folder_document_url(document.folder, document), :class => "dl #{document.file_extension}"
 
   = render "droom/scraps/caption", :scrap => scrap

data/app/views/droom/scraps/thumbs/_document.html.haml

@@ -1,7 +1,7 @@
 - if document = scrap.document
-  = link_to "document:", droom.folder_document_url(document.folder, document), :class => "#{document.file_extension} icon"
+  = link_to "document:", droom.scrap_url(scrap), :data => {:action => "popup"}, :class => "#{document.file_extension} icon"
   %p.scrapdocument
-    = link_to document.name, droom.folder_document_url(document.folder, document), :class => "external", :target => "_scrap"
+    = link_to document.name, droom.scrap_url(scrap), :data => {:action => "popup"}
     = action_menulink(scrap, :class => "small")
     %span.caption
       = shorten(scrap.note, 120)

data/app/views/droom/shared/{_search_form.html.haml → _suggestion_form.html.haml}

@@ -1,5 +1,5 @@
 #search
-  %form#searchform{:action => droom.suggestions_url(:format => :js)}<
+  %form#suggestionform{:action => droom.suggestions_url(:format => :js)}<
     = text_field_tag :term, params[:term], :placeholder => t(:quick_search), :autocomplete => "off"
     = submit_tag "go"
   .search_results

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

@@ -1,29 +1,22 @@
-= form_for @user, :html => {:class => 'edit user', :autocomplete => false} do |f|
+= form_for @user, :html => {:class => 'edit user password', :autocomplete => false} do |f|
 
   %p.email
     = f.label :email
     %br
-    = f.text_field :email, :class => 'preferences', :autocomplete => false
-    - if @user.person
-      %br
-        = f.check_box :update_person_email
-        = f.label :update_person_email, :class => 'minor'
-      %span.formnote
-        = t :update_person_email_note
+    = f.email_field :email, :class => 'preferences', :autocomplete => false
 
   %p.password
     = f.label :password
     %br
-    = f.password_field :password, :autocomplete => "off", :class => 'preferences password'
+    = f.password_field :password, :autocomplete => "off", :class => 'preferences password', :pattern => ".{6,}"
     %br
-    %span.formnote
+    %span.note
       = t :password_requirements
-      = t :password_leave_same
 
   %p.confirmation
     = f.label :password_confirmation
     %br
-    = f.password_field :password_confirmation, :class => 'preferences'
+    = f.password_field :password_confirmation, :class => 'preferences password_confirmation', :pattern => ""
 
   %p.password_notice