droom 0.0.1 → 0.2.1

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

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

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

@@ -10,4 +10,4 @@
   - if current_user.admin?
     .holder
       %p.admin
-        = link_to t(:add_member), droom.new_group_membership_url(@group), :class => "add", :remote => true, :data => {:action => "append_form", :type => "html", :affected => "table.people"}
+        = link_to t(:add_member), droom.new_group_membership_url(@group), :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "table.people"}

data/app/views/droom/invitations/_created.html.haml

@@ -1,3 +1,3 @@
 %p.notification
   %strong
-  = t(:person_invited, :name => @invitation.person.name)
+  = t(:invitation_successful, :name => @invitation.person.name)

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

@@ -1,5 +1,9 @@
-= form_for [@event, @invitation], :html => {:remote => true, :data => {:type => :html}} do |f|
-  %input.person_picker{:type => "text", :placeholder => t(:person_name), :autocomplete => "off"}
-  = f.hidden_field :person_id, :class => "person_picker_target"
-  = link_to t(:cancel), "/", :class => 'cancel'
-  
+= form_for [@event, @invitation], :html => { :class => "invitation", :remote => true, :data => {:type => :html}} do |f|
+  %p
+    %input.person_selector.name{:type => "text", :placeholder => t(:type_name), :autocomplete => "off"}
+    = f.hidden_field :person_id, :class => "person_picker_target"
+
+  .buttons
+    = f.submit t(:invite), :class => "submit"
+    = t :or
+    = link_to t(:cancel), '#', :class => "cancel"

data/app/views/droom/invitations/_invitation.html.haml

@@ -0,0 +1,9 @@
+- invitation ||= @invitation
+
+%li.invitation{:class => invitation.status, :id => "invitation_#{invitation.id}"}
+  = link_to invitation.event.name, droom.event_url(invitation.event)
+  %span.action
+    - unless invitation.accepted? 
+      = link_to t(:accept), accept_event_invitation_url(invitation.event, invitation), :class => 'accept', :data => {:action => "replace", :method => "put", :replaced => "#invitation_#{invitation.id}"}
+    - unless invitation.refused? 
+      = link_to t(:refuse), refuse_event_invitation_url(invitation.event, invitation), :class => 'refuse', :data => {:action => "replace", :method => "put", :replaced => "#invitation_#{invitation.id}"}

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

@@ -0,0 +1,8 @@
+- invitations ||= false
+- if invitations || current_person
+  - invitations ||= current_person.invitations.future
+  - if invitations && invitations.any?
+    %h2.section
+      = t :your_invitations
+    %ul.invitations
+      = render :partial => "droom/invitations/invitation", :collection => current_person.invitations.future

data/app/views/droom/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_person_to, :name => @event.name
+  = render :partial => 'form'

data/app/views/droom/memberships/_member.html.haml

@@ -28,6 +28,6 @@
   %td.buttons
     %a{:href => person_url(person, :format => :vcf), :class => 'vcard'}
     / - if admin?
-    /   = link_to t(:edit_person), edit_person_url(person), :class => 'admin edit minimal', :remote => true, :data => {:action => "overlay_form", :type => "html"}
+    /   = link_to t(:edit_person), edit_person_url(person), :class => 'admin edit minimal', :remote => true, :data => {:action => "popup", :type => "html"}
     - if current_user.admin?
       = link_to t(:remove), group_membership_url(@group, Droom::Membership.find_by_group_id_and_person_id(@group.id, person.id)), :method => 'delete', :class => 'admin delete minimal', :remote => 'true', :data => {:confirm => t(:confirm_remove_member, :name => person.name, :group => @group.name)}

data/app/views/droom/memberships/_membership_toggle.html.haml

@@ -0,0 +1,10 @@
+- group ||= @group
+- person ||= @person
+- membership ||= person.membership_of(group)
+
+- linkid = "#{person.id}_#{group.name.parameterize}"
+
+- if membership
+  = link_to " ", group_membership_url(group, membership), :id => linkid, :class => "yes", :method => :delete, :data => {:action => "replace", :replaced => "##{linkid}"}
+- else
+  = link_to " ", group_memberships_url(group, :membership => {:person_id => person.id}), :id => linkid, :class => "no", :method => :post, :data => {:action => "replace", :replaced => "##{linkid}"}

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

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

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

@@ -0,0 +1,7 @@
+- if editable?(organisation)
+  .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"}
+      %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/_form.html.haml

@@ -0,0 +1,25 @@
+= form_for @organisation, :html => {:class => 'edit organisation'} do |f|
+  %p.name
+    = f.label :name
+    %br
+    = f.text_field :name, :required => true, :class => "name"
+
+  %p.secondary
+    = f.label :url
+    %br
+    = f.text_field :url, :class => "url"
+
+  %p.secondary
+    = f.label :description
+    %span.formnote
+      = t :organisation_description_note
+
+  .description.wysihtml
+    .toolbar#t1
+      = render 'droom/shared/toolbar'
+    = f.text_area :description
+    
+  .buttons
+    = f.submit t(:save_organisation)
+    = t :or
+    = link_to t(:cancel), '#', :class => 'cancel'

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

@@ -0,0 +1,23 @@
+- organisation ||= @organisation
+- open ||= organisation == @organisation
+
+.organisation.holder{:id => "organisation_#{organisation.id}", :class => open ? "name open" : "name", :data => {:action => "collapser", :refreshable => true, :url => droom.organisation_path(organisation, :format => :js)} }
+  .heading
+    %h2.name<
+      = link_to organisation.name, organisation_url(organisation), :class => "name"
+      = action_menulink(organisation)
+    = action_menu(organisation)
+      
+  %p.preview
+    = shorten(organisation.description, :length => 64)
+
+  .detail
+    = organisation.description.html_safe
+    - if organisation.url?
+      %p.note
+        = link_to organisation.url_without_protocol, organisation.url_with_protocol, :class => "external"
+    
+
+    - if organisation.people.any?
+      %ul.people
+        = render :partial => "droom/people/person", :collection => organisation.people.order("name ASC")

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

@@ -0,0 +1,2 @@
+.organisations_list{:data => {:refreshable => true, :url => "#{droom.organisations_path}.js"}}
+  = render :partial => 'droom/organisations/organisation', :collection => @organisations

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

@@ -0,0 +1,7 @@
+- organisation ||= suggested
+
+%li.organisation
+  %strong
+    = link_to organisation.name, organisation_url(organisation)
+
+= render :partial => "droom/person/suggested", :collection => organisation.people

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

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

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

@@ -0,0 +1,20 @@
+#main.organisations
+  = render :partial => 'droom/organisations/organisations'
+
+- content_for :title do
+  = t :directory
+
+- 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/organisations/new.html.haml

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

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

@@ -0,0 +1 @@
+= render :partial => 'organisation', :object => @organisation

data/app/views/droom/pages/_full_page.html.haml

@@ -5,7 +5,7 @@
     = page.title
     - if admin?
       %span.admin<
-        = link_to t(:edit_page), edit_page_url(page), :class => 'edit minimal', :remote => true, :data => {:action => "overlay_form", :type => "html"}
+        = link_to t(:edit_page), edit_page_url(page), :class => 'edit minimal', :remote => true, :data => {:action => "popup", :type => "html"}
         = link_to t(:remove), page_url(page), :method => 'delete', :class => 'delete minimal', :remote => 'true', :data => {:confirm => t(:confirm_delete_page, :title => page.title), :affected => ".contents"}
 
   - if page.video_id?

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

@@ -1,7 +1,7 @@
 - if current_user.admin?
   .holder
     %p.admin
-      = link_to t(:add_page), droom.new_page_url, :class => "add", :remote => true, :data => {:action => "append_form", :type => "html", :affected => ".page_list"}
+      = link_to t(:add_page), droom.new_page_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => ".page_list"}
 
 #help_pages
   %h1.pagetitle

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

@@ -0,0 +1,16 @@
+#account.panel
+  %h4
+    = t :account_preferences
+  
+  %ul
+    - if current_person
+      %li
+        = link_to t(:edit_your_profile), droom.edit_person_url(current_person), :data => {:action => "popup", :affected => ".people_list"}
+        %br
+        %span.note
+          = t(:edit_your_profile_note)
+    %li
+      = link_to t(:edit_your_preferences), droom.edit_user_url(current_user), :data => {:action => "popup"}
+      %br
+      %span.note
+        = t(:edit_your_preferences_note)

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

@@ -0,0 +1,23 @@
+#admin.panel
+  - if admin?
+    %h4
+      = t :admin
+    %ul
+      %li
+        = link_to t(:add_event), droom.new_event_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => ".events_list, .minimonth"}
+      %li
+        = link_to t(:add_document), droom.new_document_url, :class => "add", :remote => true, :data => {:action => "popup", :affected => "table.documents"}
+      %li
+        = link_to t(:add_person), droom.new_person_url, :class => "add", :remote => true, :data => {:action => "popup", :type => "html", :affected => "table.people"}
+      %li
+        = link_to t(:add_organisation), droom.new_organisation_url, :class => "add", :remote => true, :data => {:action => "popup", :affected => ".organisations_list"}
+
+    %ul
+      %li
+        = link_to t(:manage_venues), droom.venues_url, :class => "edit notyet"
+      %li
+        = link_to t(:manage_folders), droom.folders_url, :class => "edit notyet"
+      %li
+        = link_to t(:manage_users), droom.users_url, :class => "edit notyet"
+      %li
+        = link_to t(:manage_groups), droom.groups_url, :class => "edit"

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

@@ -0,0 +1,19 @@
+#devices.panel
+  %h4
+    = t :mobile_devices
+  %p
+    = t :device_instructions
+  %ul
+    - if current_user.person
+      %li
+        = link_to t(:subscribe_to_calendar), droom.feed_events_url(:auth_token => current_user.authentication_token, :protocol => "webcals", :format => :ics)
+    %li
+      = link_to t(:download_contacts), droom.people_url(:format => :vcf)
+    %li
+      = link_to t(:follow_stream), droom.feed_scraps_url(:format => :rss, :auth_token => current_user.authentication_token)
+    %li
+      = link_to t(:setup_dropbox), '#'
+    %li
+      = link_to t(:setup_dav), '#'
+  %p.note
+    These links are all personal to you and include an automatic login. Keep them secret.

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

@@ -0,0 +1,17 @@
+#dropbox.panel
+  - if dropbox?
+    %h4
+      = t :dropbox_preferences
+      
+    = form_for [droom, current_user], :format => :js, :html => {:remote => true, :class => "preferences"} do |f|
+      = preference_radio_set 'dropbox.strategy', 'everything', 'relevant', 'clicked'
+    %p
+      = button_to "revoke dropbox access", droom.dropbox_token_url(current_user.dropbox_token), :method => 'delete', :class => "dropbox revoke"
+
+  - else
+    %p
+      = t :dropbox_introduction
+    %p
+      = link_to "Connect to your dropbox", droom.new_dropbox_token_url, :class => "dropbox"
+      
+      

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

@@ -0,0 +1,16 @@
+#email.panel
+  %h4
+    = t :email_preferences
+    
+  = form_for [droom, current_user], :format => :js, :html => {:remote => true, :class => "preferences"} do |f|
+    %p
+      %span.preference
+        = preference_checkbox 'email.enabled?'
+      %span.preference
+        = preference_checkbox 'email.event_invitations?'
+      %span.preference
+        = preference_checkbox 'email.mailing_lists?'
+      %span.preference
+        = preference_checkbox 'email.digest?'
+
+  %p.confirmation

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

@@ -0,0 +1,3 @@
+#keywords.panel
+  %p
+    = t :keywords_instructions

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

@@ -0,0 +1,3 @@
+#networks.panel
+  %p
+    = t :networks_instructions

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

@@ -0,0 +1,18 @@
+#readers.panel
+  %h4
+    = t :dav_preferences
+
+  %p
+    If you use a document reader like GoodReader but you don't have a dropbox, you can sync it with
+    a WebDAV folder on this server: 
+
+  = form_for [droom, current_user], :format => :js, :html => {:remote => true, :class => "preferences"} do |f|
+    %span.preference
+      = preference_checkbox 'dav.enabled?'
+      %span.subpreference
+        = preference_radio_set 'dav.strategy', 'everything', 'relevant', 'clicked'
+  %p.note
+    = link_to "How to use your WebDAV folder", "#", :class => "help"
+          
+  %p.confirmation
+    

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

@@ -0,0 +1,10 @@
+#rss.panel
+  %h4
+    Follow the stream
+  %p
+    If your RSS reader will let you enter login information, you can use this 
+    = link_to t(:normal_RSS_link), droom.scraps_url(:format => :atom)
+    to access the stream. If not, you can also use this 
+    = link_to t(:personal_RSS_link), droom.feed_scraps_url(:format => :atom, :auth_token => current_user.authentication_token)
+    with a secret token that will log you in automatically. Please don't share it.
+    

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

@@ -0,0 +1,16 @@
+- dashboard = request.path == main_app.dashboard_path
+#search.panel
+  - if dashboard
+    %p.instructions
+      = t :search_instructions
+  %form#suggestions{:action => droom.suggestions_url(:format => :js)}
+    %p
+      - unless dashboard
+        %label
+          = 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/panels/_vcal.html.haml

@@ -0,0 +1,3 @@
+#vcal.panel
+  %p
+    = t :vcal_instructions

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

@@ -0,0 +1,22 @@
+- event ||= false
+- group ||= false
+
+- if editable?(person)
+  .menu{:data => {:for => "person_#{person.id}"}}
+    %ul.actions
+      %li
+        = link_to t(:edit_profile), droom.edit_person_url(person), :class => 'edit', :data => {:action => "popup", :replaced => "#person_#{person.id}"}
+      - if person.user
+        %li
+          = link_to t(:edit_account), droom.edit_user_url(person.user), :class => 'edit', :data => {:action => "popup", :replaced => "#person_#{person.id}"}
+      %li
+        = link_to t(:delete_person), droom.person_url(person), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#person_#{person.id}", :confirm => t(:confirm_delete_person, :name => person.full_name)}
+
+      - if event && invitation = person.invitation_to(event)
+        %li
+          = link_to t(:uninvite), droom.event_invitation_url(event, invitation), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#person_#{person.id}"}
+
+      - if group && membership = person.membership_of(group)
+        %li
+          = link_to t(:expel), droom.membership_url(membership), :method => 'delete', :class => 'delete', :data => {:action => "remove", :removed => "#person_#{person.id}"}
+        

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

@@ -1,40 +1,70 @@
-= form_for @person, :html => {:class => 'edit person', :remote => true, :data => {:type => :html}} do |f|
-  %table.main.people
-    %tr.person
-      %td.icon
-        %span
-      %th.name
-        = f.text_field :title, :class => 'title', :placeholder => t(:person_title)
-        - if Droom.use_forenames
-          = f.text_field :forename, :class => 'forename', :placeholder => t(:person_forename)
-          = f.text_field :name, :class => 'name', :placeholder => t(:person_surname)
-        - else
-          = f.text_field :name, :class => 'name', :placeholder => t(:person_name)
-        %br
-        - if @person.new_record?
-          = f.check_box :invite_on_creation, :class => 'invite'
-          = f.label :invite_on_creation      
-          = f.check_box :admin_user
-          = f.label :admin_user
+= 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
+
+  - if Droom.use_forenames?
+    %p.name
+      = f.label :forename
+      %br
+      = f.text_field :forename, :required => true
+    %p.name
+      = f.label :name, "Surname"
+      %br
+      = f.text_field :name, :required => true
+
+  - else
+    %p.name
+      = f.label :name
+      %br
+      = f.text_field :name, :required => true
+
+  .contacts
+    %p.email
+      = f.label :email
+      %br
+      = f.text_field :email, :required => true
     
-      %td.email
-        = f.email_field :email, :class => 'email', :placeholder => t(:person_email)
-      %td.phone
-        = f.text_field :phone, :class => 'phone', :placeholder => t(:person_phone)
-      / %td.address
-      /   = f.text_field :post_line1, :class => 'post_line1', :placeholder => t(:person_post_line1)
-      /   %br
-      /   = f.text_field :post_line2, :class => 'post_line2', :placeholder => t(:person_post_line2)
-      /   %br
-      /   = f.text_field :post_city, :class => 'post_city', :placeholder => t(:person_post_city)
-      /   %br
-      /   = f.text_field :post_region, :class => 'post_region', :placeholder => t(:person_post_region)
-      /   %br
-      /   = f.text_field :post_country, :class => 'post_country', :placeholder => t(:person_post_country)
-      /   %br
-      /   = f.text_field :post_code, :class => 'post_code', :placeholder => t(:person_post_code)
-      %td.buttons
-        = f.submit t(:save)
-        = t :or
-        = link_to t(:cancel), "/", :class => 'cancel'
-  
+    %p.phone
+      = f.label :phone, :class => "optional"
+      %br
+      = f.text_field :phone
+
+    - if Droom.use_separate_mobile_number
+      %p.secondary
+        = f.label :mobile, :class => "optional"
+        %br
+        = f.text_field :mobile
+
+  - if admin?
+    - if @person.new_record?
+      %p.admin
+        = f.check_box :invite_on_creation, :class => 'invite'
+        = f.label :invite_on_creation      
+        = 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
+  
+  .buttons
+    - if current_user.is_person?(@person)
+      = f.submit t(:save_your_profile)
+    - else
+      = f.submit t(:save_person)
+    = t :or
+    = link_to t(:cancel), '#', :class => 'cancel'