RubyGems - droom - Versions diffs - 0.4.3 → 0.5.3 - Mend

droom 0.4.3 → 0.5.3

Files changed (396) hide show

checksums.yaml +7 -0
data/app/assets/images/droom/admin_menu.png +0 -0
data/app/assets/images/droom/applications_menu.png +0 -0
data/app/assets/images/droom/arrows_small.png +0 -0
data/app/assets/images/droom/config_menu.png +0 -0
data/app/assets/images/droom/dropdown.png +0 -0
data/app/assets/images/droom/menu/asterisk.png +0 -0
data/app/assets/images/droom/{smalladd.png → menu/smalladd.png} +0 -0
data/app/assets/images/droom/{small_asterisk.png → menu/smallasterisk.png} +0 -0
data/app/assets/images/droom/{smalldelete.png → menu/smalldelete.png} +0 -0
data/app/assets/images/droom/{smalldownload.png → menu/smalldownload.png} +0 -0
data/app/assets/images/droom/{smalledit.png → menu/smalledit.png} +0 -0
data/app/assets/images/droom/message.png +0 -0
data/app/assets/images/droom/missing/scrap.jpg +0 -0
data/app/assets/images/droom/missing/scrap.png +0 -0
data/app/assets/images/droom/missing/thumb.png +0 -0
data/app/assets/images/droom/missing/user.png +0 -0
data/app/assets/images/droom/object_icons.png +0 -0
data/app/assets/images/droom/panel/add.png +0 -0
data/app/assets/images/droom/panel/edit.png +0 -0
data/app/assets/images/droom/panel/manage.png +0 -0
data/app/assets/images/droom/pointer_upwards.png +0 -0
data/app/assets/images/droom/search_menu.png +0 -0
data/app/assets/images/droom/setter.png +0 -0
data/app/assets/images/droom/small_icons.png +0 -0
data/app/assets/images/droom/stream/closer.png +0 -0
data/app/assets/images/droom/stream/next.png +0 -0
data/app/assets/images/droom/stream/prev.png +0 -0
data/app/assets/images/droom/stream/previous.png +0 -0
data/app/assets/images/droom/subscribe.png +0 -0
data/app/assets/javascripts/droom.js.coffee +23 -13
data/app/assets/javascripts/droom/actions.js.coffee +104 -10
data/app/assets/javascripts/droom/ajax.js.coffee +36 -24
data/app/assets/javascripts/droom/extensions.js.coffee +13 -0
data/app/assets/javascripts/droom/lib/jquery.datepicker.js +1026 -0
data/app/assets/javascripts/droom/lib/jquery.deserialize.js +142 -0
data/app/assets/javascripts/droom/lib/jquery_ujs.js +416 -0
data/app/assets/javascripts/droom/lib/swipe.js +568 -0
data/app/assets/javascripts/droom/lib/underscore.js +1276 -0
data/app/assets/javascripts/droom/popups.js.coffee +98 -37
data/app/assets/javascripts/droom/stream.js.coffee +119 -77
data/app/assets/javascripts/droom/utilities.js.coffee +25 -3
data/app/assets/javascripts/droom/widgets.js.coffee +318 -253
data/app/assets/stylesheets/droom.css.sass +482 -955
data/app/assets/stylesheets/droom/_mixins.css.sass +12 -42
data/app/assets/stylesheets/droom/_popups.css.sass +28 -11
data/app/assets/stylesheets/droom/_stream.css.sass +375 -0
data/app/assets/stylesheets/droom/_toolbar.css.sass +0 -6
data/app/assets/stylesheets/droom/_variables.css.sass +4 -2
data/app/controllers/droom/agenda_categories_controller.rb +6 -14
data/app/controllers/droom/api/api_controller.rb +56 -0
data/app/controllers/droom/api/events_controller.rb +74 -0
data/app/controllers/droom/api/users_controller.rb +92 -0
data/app/controllers/droom/api/venues_controller.rb +71 -0
data/app/controllers/droom/calendars_controller.rb +4 -10
data/app/controllers/droom/{user_confirmations_controller.rb → confirmations_controller.rb} +8 -7
data/app/controllers/droom/dashboard_controller.rb +2 -19
data/app/controllers/droom/documents_controller.rb +12 -60
data/app/controllers/droom/dropbox_tokens_controller.rb +3 -4
data/app/controllers/droom/engine_controller.rb +39 -11
data/app/controllers/droom/events_controller.rb +62 -84
data/app/controllers/droom/folders_controller.rb +30 -40
data/app/controllers/droom/group_invitations_controller.rb +6 -23
data/app/controllers/droom/group_permissions_controller.rb +26 -0
data/app/controllers/droom/groups_controller.rb +10 -14
data/app/controllers/droom/invitations_controller.rb +7 -25
data/app/controllers/droom/memberships_controller.rb +13 -18
data/app/controllers/droom/organisations_controller.rb +6 -25
data/app/controllers/droom/permissions_controller.rb +50 -0
data/app/controllers/droom/preferences_controller.rb +9 -10
data/app/controllers/droom/scraps_controller.rb +23 -26
data/app/controllers/droom/services_controller.rb +50 -0
data/app/controllers/droom/suggestions_controller.rb +6 -4
data/app/controllers/droom/users/confirmations_controller.rb +24 -0
data/app/controllers/droom/users/passwords_controller.rb +39 -0
data/app/controllers/droom/users/sessions_controller.rb +7 -0
data/app/controllers/droom/users_controller.rb +60 -38
data/app/controllers/droom/venues_controller.rb +8 -15
data/app/controllers/droom/youtube_controller.rb +1 -1
data/app/helpers/droom/droom_helper.rb +22 -17
data/app/models/droom/ability.rb +81 -0
data/app/models/droom/agenda_category.rb +0 -1
data/app/models/droom/calendar.rb +12 -7
data/app/models/droom/category.rb +4 -10
data/app/models/droom/concerns/slugged.rb +21 -0
data/app/models/droom/document.rb +15 -17
data/app/models/droom/dropbox_document.rb +3 -6
data/app/models/droom/dropbox_token.rb +2 -3
data/app/models/droom/event.rb +117 -163
data/app/models/droom/event_type.rb +25 -0
data/app/models/droom/folder.rb +36 -48
data/app/models/droom/group.rb +35 -27
data/app/models/droom/group_invitation.rb +7 -10
data/app/models/droom/group_permission.rb +29 -0
data/app/models/droom/invitation.rb +14 -23
data/app/models/droom/mailing_list_membership.rb +0 -1
data/app/models/droom/membership.rb +32 -31
data/app/models/droom/organisation.rb +6 -3
data/app/models/droom/permission.rb +19 -0
data/app/models/droom/personal_folder.rb +9 -21
data/app/models/droom/preference.rb +1 -2
data/app/models/droom/scrap.rb +31 -26
data/app/models/droom/service.rb +31 -0
data/app/models/droom/tag.rb +10 -9
data/app/models/droom/tagging.rb +1 -1
data/app/models/droom/user.rb +453 -130
data/app/models/droom/user_permission.rb +8 -0
data/app/models/droom/venue.rb +21 -32
data/app/serializers/droom/user_serializer.rb +45 -0
data/app/serializers/droom/venue_serializer.rb +5 -0
data/app/views/droom/dashboard/_documents.html.haml +1 -1
data/app/views/droom/dashboard/_folders.html.haml +1 -1
data/app/views/droom/dashboard/_future_events.html.haml +10 -8
data/app/views/droom/dashboard/_groups.html.haml +1 -1
data/app/views/droom/dashboard/_past_events.haml +19 -12
data/app/views/droom/dashboard/_stream.html.haml +2 -2
data/app/views/droom/{users/_extra_columns.html.haml → dashboard/_welcome.html.haml} +0 -0
data/app/views/droom/dashboard/index.html.haml +3 -0
data/app/views/droom/documents/_document.html.haml +0 -2
data/app/views/droom/documents/_documents.html.haml +1 -1
data/app/views/droom/documents/_documents_list.html.haml +1 -1
data/app/views/droom/documents/_documents_table.html.haml +1 -1
data/app/views/droom/documents/_form.html.haml +8 -5
data/app/views/droom/documents/_listing.html.haml +4 -2
data/app/views/droom/documents/index.html.haml +13 -7
data/app/views/droom/documents/new.html.haml +1 -4
data/app/views/droom/events/_action_menu.html.haml +2 -2
data/app/views/droom/events/_attachments.html.haml +8 -0
data/app/views/droom/events/_calendar.html.haml +4 -8
data/app/views/droom/events/_event.html.haml +44 -63
data/app/views/droom/events/_event_line.html.haml +1 -1
data/app/views/droom/events/_events.html.haml +18 -2
data/app/views/droom/events/_form.html.haml +26 -19
data/app/views/droom/events/_invitations.html.haml +7 -3
data/app/views/droom/events/_scrap_events.html.haml +8 -0
data/app/views/droom/events/_suggested.html.haml +4 -1
data/app/views/droom/events/calendar.html.haml +8 -0
data/app/views/droom/events/index.html.haml +24 -26
data/app/views/droom/events/show.html.haml +6 -6
data/app/views/droom/folders/_contents.html.haml +34 -4
data/app/views/droom/folders/_folder.html.haml +7 -2
data/app/views/droom/folders/_form.html.haml +11 -8
data/app/views/droom/folders/index.html.haml +19 -22
data/app/views/droom/group_invitations/_attending_groups.html.haml +1 -1
data/app/views/droom/group_permissions/_toggle.html.haml +18 -0
data/app/views/droom/groups/_action_menu.haml +0 -2
data/app/views/droom/groups/_created.html.haml +0 -1
data/app/views/droom/groups/_form.html.haml +3 -0
data/app/views/droom/groups/_group.html.haml +10 -8
data/app/views/droom/groups/_groups.html.haml +1 -1
data/app/views/droom/groups/_search_result.html.haml +1 -1
data/app/views/droom/groups/_suggested.html.haml +1 -1
data/app/views/droom/groups/index.html.haml +15 -16
data/app/views/droom/invitations/_form.html.haml +1 -1
data/app/views/droom/invitations/_invitation.html.haml +1 -1
data/app/views/droom/invitations/_invitations.html.haml +4 -4
data/app/views/droom/memberships/_button.html.haml +5 -5
data/app/views/droom/memberships/_form.html.haml +26 -7
data/app/views/droom/memberships/_member.html.haml +1 -1
data/app/views/droom/memberships/{_membership_toggle.html.haml → _toggle.html.haml} +4 -4
data/app/views/droom/memberships/index.html.haml +9 -0
data/app/views/droom/organisations/_action_menu.html.haml +1 -1
data/app/views/droom/organisations/_organisation.html.haml +2 -2
data/app/views/droom/organisations/_suggested.html.haml +1 -1
data/app/views/droom/organisations/index.html.haml +11 -11
data/app/views/droom/panels/_admin.html.haml +2 -2
data/app/views/droom/panels/_configuration.html.haml +28 -0
data/app/views/droom/panels/_devices.html.haml +2 -4
data/app/views/droom/panels/_search.html.haml +9 -0
data/app/views/droom/permissions/_action_menu.html.haml +10 -0
data/app/views/droom/permissions/_created.html.haml +3 -0
data/app/views/droom/permissions/_form.html.haml +17 -0
data/app/views/droom/permissions/edit.html.haml +7 -0
data/app/views/droom/permissions/new.html.haml +8 -0
data/app/views/droom/permissions/show.html.haml +4 -0
data/app/views/droom/preferences/_checkbox.html.haml +4 -2
data/app/views/droom/scraps/_caption.html.haml +0 -2
data/app/views/droom/scraps/_credit.html.haml +1 -1
data/app/views/droom/scraps/_form.html.haml +68 -69
data/app/views/droom/scraps/_preload.html.haml +4 -0
data/app/views/droom/scraps/_stream.html.haml +11 -3
data/app/views/droom/scraps/_thumb.html.haml +33 -1
data/app/views/droom/scraps/edit.html.haml +6 -1
data/app/views/droom/scraps/full/_document.html.haml +4 -3
data/app/views/droom/scraps/full/_event.html.haml +17 -16
data/app/views/droom/scraps/full/_image.html.haml +1 -2
data/app/views/droom/scraps/full/_link.html.haml +4 -3
data/app/views/droom/scraps/full/_quote.html.haml +4 -7
data/app/views/droom/scraps/full/_text.html.haml +3 -2
data/app/views/droom/scraps/full/_video.html.haml +2 -2
data/app/views/droom/scraps/new.html.haml +6 -1
data/app/views/droom/scraps/show.html.haml +4 -3
data/app/views/droom/services/_action_menu.html.haml +12 -0
data/app/views/droom/services/_created.html.haml +3 -0
data/app/views/droom/services/_form.html.haml +18 -0
data/app/views/droom/services/_services.html.haml +44 -0
data/app/views/droom/services/edit.html.haml +7 -0
data/app/views/droom/services/index.html.haml +5 -0
data/app/views/droom/{people → services}/new.html.haml +4 -3
data/app/views/droom/services/show.html.haml +4 -0
data/app/views/droom/shared/_controls.html.haml +2 -2
data/app/views/droom/shared/_navigation.html.haml +2 -2
data/app/views/droom/shared/_toolbar.html.haml +1 -1
data/app/views/droom/suggestions/index.html.haml +1 -0
data/app/views/droom/users/_action_menu.html.haml +21 -0
data/app/views/droom/users/_suggested.html.haml +14 -0
data/app/views/droom/users/_user.html.haml +2 -2
data/app/views/droom/users/_users.html.haml +7 -0
data/app/views/droom/users/_users_table.html.haml +21 -22
data/app/views/droom/users/admin.html.haml +10 -0
data/app/views/droom/users/confirmations/_after_confirmation.html.haml +2 -0
data/app/views/droom/users/confirmations/_password_required.html.haml +30 -0
data/app/views/droom/users/confirmations/failure.en.html.haml +22 -0
data/app/views/droom/users/confirmations/show.html.haml +13 -0
data/app/views/droom/users/edit.html.haml +2 -10
data/app/views/droom/users/edit/_details.html.haml +13 -0
data/app/views/droom/users/edit/_memberships.html.haml +13 -0
data/app/views/droom/users/edit/_password_fields.html.haml +16 -0
data/app/views/droom/users/edit/_preferences.html.haml +37 -0
data/app/views/droom/users/edit/_profile.html.haml +26 -0
data/app/views/droom/users/edit/_user_fields.html.haml +66 -0
data/app/views/droom/users/index.html.haml +6 -32
data/app/views/droom/users/new.html.haml +3 -0
data/app/views/droom/users/passwords/completed.html.haml +13 -0
data/app/views/{devise → droom/users}/passwords/edit.html.haml +10 -4
data/app/views/{devise → droom/users}/passwords/new.html.haml +4 -3
data/app/views/droom/users/passwords/show.html.haml +6 -0
data/app/views/droom/users/show.html.haml +2 -0
data/app/views/droom/users/show/_listed.html.haml +46 -0
data/app/views/droom/users/show/_profile.html.haml +33 -0
data/app/views/droom/users/show/_tabled.html.haml +28 -0
data/config/initializers/chronic.rb +2 -0
data/config/initializers/devise.rb +35 -2
data/config/initializers/paperclip.rb +11 -6
data/config/locales/devise.en.yml +1 -1
data/config/locales/en.yml +198 -103
data/config/routes.rb +37 -45
data/db/migrate/20130207123614_stream.rb +5 -1
data/db/migrate/20130225095328_create_droom_calendars.rb +0 -1
data/db/migrate/20130627065459_permissions.rb +34 -0
data/db/migrate/20130627071938_users_take_over.rb +38 -0
data/db/migrate/20130627073759_user_properties.rb +34 -0
data/db/migrate/20130627080021_no_more_people.rb +11 -0
data/db/migrate/20130701122935_directory_groups.rb +8 -0
data/db/migrate/20130701123152_remove_old_access_control.rb +16 -0
data/db/migrate/20130729102857_more_scrap_data.rb +12 -0
data/db/migrate/20130904080340_international_names.rb +17 -0
data/db/migrate/20130904080341_honours.rb +5 -0
data/db/migrate/20131124082222_simple_addresses.rb +25 -0
data/db/migrate/20131201093351_event_time_zone.rb +5 -0
data/db/migrate/20131217060311_session_revocable.rb +5 -0
data/db/migrate/20131219180311_event_types.rb +15 -0
data/lib/devise/strategies/cookie_authenticatable.rb +46 -0
data/lib/droom.rb +48 -33
data/lib/droom/auth_cookie.rb +82 -0
data/lib/droom/cropper.rb +24 -0
data/lib/droom/engine.rb +20 -2
data/lib/droom/folders.rb +6 -6
data/lib/droom/lazy_hash.rb +11 -1
data/lib/droom/monkeys.rb +6 -6
data/lib/droom/taggability.rb +1 -1
data/lib/droom/validators.rb +1 -1
data/lib/droom/version.rb +1 -1
data/lib/generators/droom/install/templates/droom_initializer.rb +10 -2
data/lib/paperclip/geometry_transformation.rb +80 -0
data/lib/paperclip/validators/attachment_height_validator.rb +89 -0
data/lib/paperclip/validators/attachment_width_validator.rb +89 -0
data/lib/paperclip_processors/offset_thumbnail.rb +85 -0
data/spec/dummy/config/application.rb +0 -7
data/spec/dummy/config/environments/development.rb +1 -10
data/spec/dummy/config/environments/production.rb +1 -0
data/spec/dummy/config/environments/test.rb +2 -7
data/spec/dummy/db/migrate/20130130120631_folder_ancestry_to_parents.droom.rb +1 -1
data/spec/dummy/db/migrate/20130724124758_dropbox_tokens.droom.rb +10 -0
data/spec/dummy/db/migrate/20130724124759_preference_uuids.droom.rb +6 -0
data/spec/dummy/db/migrate/20130724124760_stream.droom.rb +14 -0
data/spec/dummy/db/migrate/20130724124761_access_token_secret.droom.rb +6 -0
data/spec/dummy/db/migrate/20130724124762_person_image.droom.rb +10 -0
data/spec/dummy/db/migrate/20130724124763_devise_confirmable.droom.rb +14 -0
data/spec/dummy/db/migrate/20130724124764_create_droom_calendars.droom.rb +20 -0
data/spec/dummy/db/migrate/20130724124765_give_scraps_document.droom.rb +6 -0
data/spec/dummy/db/migrate/20130724124766_privateness.droom.rb +10 -0
data/spec/dummy/db/migrate/20130724124767_store_metadata.droom.rb +6 -0
data/spec/dummy/db/migrate/20130724124768_folders_nicely.droom.rb +7 -0
data/spec/dummy/db/migrate/20130724124769_niceties.droom.rb +8 -0
data/spec/dummy/db/migrate/20130724124770_create_droom_dropbox_documents.droom.rb +12 -0
data/spec/dummy/db/migrate/20130724124771_dropbox_documents_changed.droom.rb +6 -0
data/spec/dummy/db/migrate/20130724124772_user_titles.droom.rb +6 -0
data/spec/dummy/db/migrate/20130724124773_permissions.droom.rb +35 -0
data/spec/dummy/db/migrate/20130724124774_users_take_over.droom.rb +39 -0
data/spec/dummy/db/migrate/20130724124775_user_properties.droom.rb +35 -0
data/spec/dummy/db/migrate/20130724124776_no_more_people.droom.rb +12 -0
data/spec/dummy/db/migrate/20130724124777_directory_groups.droom.rb +9 -0
data/spec/dummy/db/migrate/20130724124778_remove_old_access_control.droom.rb +17 -0
data/spec/dummy/db/schema.rb +217 -140
data/spec/factories/documents.rb +0 -5
data/spec/factories/events.rb +0 -9
data/spec/factories/user.rb +4 -2
data/spec/lib/droom/folders_spec.rb +8 -8
data/spec/models/droom/document_spec.rb +6 -43
data/spec/models/droom/event_spec.rb +0 -34
data/spec/models/droom/mailing_list_membership_spec.rb +4 -4
data/spec/models/droom/membership_spec.rb +2 -2
data/spec/spec_helper.rb +1 -10
metadata +322 -282
data/app/assets/images/droom/Untitled-1.png +0 -0
data/app/assets/images/droom/asterisk.png +0 -0
data/app/assets/images/droom/smallmanage.png +0 -0
data/app/assets/javascripts/droom/lib/kalendae.js +0 -1692
data/app/assets/stylesheets/lib/_kalendae.css.sass +0 -139
data/app/controllers/droom/pages_controller.rb +0 -61
data/app/controllers/droom/people_controller.rb +0 -111
data/app/models/droom/document_attachment.rb +0 -37
data/app/models/droom/page.rb +0 -26
data/app/models/droom/person.rb +0 -309
data/app/models/droom/recurrence_rule.rb +0 -82
data/app/models/droom/user_action_observer.rb +0 -12
data/app/views/devise/confirmations/failure.en.html.haml +0 -20
data/app/views/devise/confirmations/show.html.haml +0 -19
data/app/views/droom/confirmations/show.html.haml +0 -40
data/app/views/droom/documents/_document_line.html.haml +0 -2
data/app/views/droom/events/_created.html.haml +0 -2
data/app/views/droom/folders/_attachments.html.haml +0 -3
data/app/views/droom/pages/_contents.html.haml +0 -10
data/app/views/droom/pages/_form.html.haml +0 -36
data/app/views/droom/pages/_full_page.html.haml +0 -17
data/app/views/droom/pages/_page.html.haml +0 -5
data/app/views/droom/pages/_pages.html.haml +0 -2
data/app/views/droom/pages/admin.html.haml +0 -24
data/app/views/droom/pages/edit.html.haml +0 -1
data/app/views/droom/pages/index.html.haml +0 -10
data/app/views/droom/pages/new.html.haml +0 -4
data/app/views/droom/pages/show.html.haml +0 -5
data/app/views/droom/panels/_account.html.haml +0 -16
data/app/views/droom/panels/_readers.html.haml +0 -18
data/app/views/droom/panels/_suggestions.html.haml +0 -15
data/app/views/droom/people/_action_menu.html.haml +0 -22
data/app/views/droom/people/_created.html.haml +0 -6
data/app/views/droom/people/_form.html.haml +0 -66
data/app/views/droom/people/_listing.html.haml +0 -19
data/app/views/droom/people/_memberships.html.haml +0 -24
data/app/views/droom/people/_people.html.haml +0 -5
data/app/views/droom/people/_person.html.haml +0 -32
data/app/views/droom/people/_search_result.html.haml +0 -14
data/app/views/droom/people/_suggested.html.haml +0 -14
data/app/views/droom/people/edit.html.haml +0 -9
data/app/views/droom/people/index.html.haml +0 -8
data/app/views/droom/people/show.html.haml +0 -31
data/app/views/droom/scraps/_heading.html.haml +0 -16
data/app/views/droom/scraps/thumbs/_document.html.haml +0 -9
data/app/views/droom/scraps/thumbs/_event.html.haml +0 -17
data/app/views/droom/scraps/thumbs/_image.html.haml +0 -6
data/app/views/droom/scraps/thumbs/_link.html.haml +0 -10
data/app/views/droom/scraps/thumbs/_quote.html.haml +0 -8
data/app/views/droom/scraps/thumbs/_text.html.haml +0 -8
data/app/views/droom/scraps/thumbs/_video.html.haml +0 -6
data/app/views/droom/users/_extra_columns_header.html.haml +0 -0
data/app/views/droom/users/_extra_columns_note.html.haml +0 -0
data/app/views/droom/users/_form.html.haml +0 -14
data/app/views/droom/users/_password_fields.html.haml +0 -15
data/app/views/droom/users/_user_or_person.html.haml +0 -72
data/app/views/kaminari/_paginator.html.haml +0 -16
data/lib/droom/dav_resource.rb +0 -36
data/lib/droom/model_helpers.rb +0 -25
data/lib/droom/routing.rb +0 -13
data/spec/datasets/calendar_events_dataset.rb +0 -44
data/spec/datasets/calendar_pages_dataset.rb +0 -8
data/spec/datasets/calendar_sites_dataset.rb +0 -6
data/spec/datasets/calendars_dataset.rb +0 -34
data/spec/datasets/documents_dataset.rb +0 -28
data/spec/datasets/recurrence_dataset.rb +0 -7
data/spec/dummy/config/sunspot.yml +0 -17
data/spec/dummy/log/dav.log +0 -1
data/spec/dummy/log/development.log +0 -2
data/spec/dummy/log/test.log +0 -1
data/spec/dummy/solr/conf/admin-extra.html +0 -31
data/spec/dummy/solr/conf/elevate.xml +0 -36
data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +0 -246
data/spec/dummy/solr/conf/protwords.txt +0 -21
data/spec/dummy/solr/conf/schema.xml +0 -238
data/spec/dummy/solr/conf/scripts.conf +0 -24
data/spec/dummy/solr/conf/solrconfig.xml +0 -934
data/spec/dummy/solr/conf/spellings.txt +0 -2
data/spec/dummy/solr/conf/stopwords.txt +0 -58
data/spec/dummy/solr/conf/synonyms.txt +0 -31
data/spec/dummy/solr/data/development/index/segments.gen +0 -0
data/spec/dummy/solr/data/development/index/segments_1 +0 -0
data/spec/dummy/solr/data/development/spellchecker/segments.gen +0 -0
data/spec/dummy/solr/data/development/spellchecker/segments_1 +0 -0
data/spec/dummy/solr/data/test/index/segments.gen +0 -0
data/spec/dummy/solr/data/test/index/segments_3nu +0 -0
data/spec/dummy/solr/data/test/spellchecker/segments.gen +0 -0
data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
data/spec/factories/recurrence_rules.rb +0 -25
data/spec/models/droom/person_spec.rb +0 -72
data/spec/models/droom/recurrence_rule_spec.rb +0 -81

data/app/assets/stylesheets/droom.css.sass CHANGED

@@ -28,19 +28,24 @@ $input: $blue !default
 $admin: $blue
 $datemark_width: 50px
-$datemark_margin: 5px
+$datemark_margin: 10px
 $tool_button_height: 32px
 $tool_button_width: 32px
 @import droom/mixins
-@import droom/toolbar
-@import lib/kalendae
 @import droom/popups
+@import droom/stream
+p.quitelarge
+  font-size: 1.4em
 p.large
   font-size: 1.6em
+p.nothing
+  color: $mid
+  margin-bottom: 2em
 a.dropbox
   +big_icon_link("droom/dropbox.png")
   color: #4ea1ea
@@ -63,14 +68,26 @@ a.dropboxer
 input.dropbox.revoke[type="submit"]
   +icon_link("droom/revoke_small.png")
-  background-color: none
+  background-color: transparent
   color: $blue
   padding: 0
   height: auto
   line-height: 20px
   &:hover
     color: $hover
+label
+  &.required
+    font-weight: bold
+  &.important
+    font-weight: bold
+  &.disabled
+    color: $pale
+  &.inline
+    display: inline-block
+    vertical-align: top
+    white-space: nowrap
 a.cancel, a.cancel:visited
   +pale
   +hover
@@ -81,17 +98,38 @@ a.external
 a.toggle
   +icon_link("droom/toggle.png")
   color: $blue
+  &:hover
+    color: $hover
   &.showing
+    background-position: 0 -64px
+    &:hover
+      color: $hover
+      background-position: 0 -96px
+a.setter
+  +icon_link("droom/setter.png")
+  &.yes
+    color: $green
+    background-position: 0 0
+    &:hover
+      background-position: 0 -32px
+  &.no
+    color: $pale
     background-position: 0 -64px
     &:hover
       background-position: 0 -96px
+  &:hover
+    color: $hover
+  +waitable
 .unavailable
   +small
   +pale
 .suffix
-  clear: both
+  clear: left
 a.autofetch
   display: inline-block
@@ -124,38 +162,28 @@ p.stretcher
   +outset
   text-align: right
   color: $mid
-  line-height: 3em
   padding-top: 5px
   a, a:visited
     color: $mid
     +hover
   span
     display: block
-    line-height: 1
     text-align: center
   span.mon
     text-transform: uppercase
     font-size: 1em
+    line-height: 1
   span.dom
     font-size: 2em
-    letter-spacing: -0.1em
-    margin-left: -4px
-    margin-top: -2px
+    line-height: 1
   span.year
     font-size: 1em
-    margin-top: -2px
+    line-height: 1
   &.editing
     +box-shadow
     a, a:visited
       color: $dark
-h2.section
-  font-size: 1.25em
-  line-height: 26px
-  clear: both
-  margin-top: 2em
 .relations
   position: relative
@@ -164,7 +192,7 @@ h2.section
     margin-bottom: 0
   p
     margin-top: 0.1em
 #help_page
   position: relative
   margin-left: 10px
@@ -197,15 +225,19 @@ h2.section
 .preview
   color: $mid
-div.event, div.document
+div.event, div.document, div.group
   position: relative
   clear: both
-  margin-bottom: 30px
+  margin-bottom: 10px
+  &.quiet
+    color: $pale
+    a
+      color: $pale
 form.event, form.document
   position: relative
   width: 495px
-  margin-left: 55px
+  margin-left: $datemark_width + $datemark_margin
 div.event, form.event, div.project
   .summary
@@ -224,50 +256,61 @@ div.event, form.event, div.project
     .detail
       p
         margin-top: 0
+  .col
+    float: left
+    width: 450px
+    margin-right: 20px
+    &:last-child
+      margin-right: 0
+      width: 300px
-ul.invitations
-  padding: 0
-  list-style: none
-  li.invitation
-    text-indent: 20px
-    background:
-      repeat: no-repeat
-      position: 0 0
-      image: image-url('droom/acceptance.png')
-    &.refused
-      color: $mid
-      text-decoration: line-through
-      background-position: 0 -32px
-      a
+#margin
+  ul.invitations
+    padding: 0
+    margin-bottom: 2em
+    margin-top: 0.25em
+    li.invitation
+      list-style: none
+      text-indent: 20px
+      margin-left: -20px
+      background:
+        repeat: no-repeat
+        position: 0 0
+        image: image-url('droom/acceptance.png')
+      &.refused
         color: $mid
-    &.accepted
-      background-position: 0 -64px
-      a
-        color: $green
-    span.action
-      display: inline-block
-      margin: 0 0 0 10px
-      text-indent: 0
-      a.accept, a.refuse
-        display: inline-block
-        text-indent: 20px
-        height: 16px
-        width: 16px
-        line-height: 16px
-        overflow: hidden
-        background:
-          position: 0 0
-          repeat: no-repeat
-          image: image-url("droom/acceptance.png")
-      a.accept
-        background-position: 0 -162px
-      a.refuse
-        background-position: 0 -130px
-      a.waiting
-        background-image: image-url('droom/spinner.gif')
-        background-position: 0 0
+        text-decoration: line-through
+        background-position: 0 -32px
+        a
+          color: $mid
+      &.accepted
+        background-position: 0 -64px
         a
-          color: $pale
+          color: $green
+      span.action
+        display: inline-block
+        margin: 0 0 0 10px
+        text-indent: 0
+        a.accept, a.refuse
+          display: inline-block
+          text-indent: 20px
+          height: 16px
+          width: 16px
+          line-height: 16px
+          overflow: hidden
+          background:
+            position: 0 0
+            repeat: no-repeat
+            image: image-url("droom/acceptance.png")
+        a.accept
+          background-position: 0 -162px
+        a.refuse
+          background-position: 0 -130px
+        a.waiting
+          background-image: image-url('droom/spinner.gif')
+          background-position: 0 0
+          a
+            color: $pale
 form.invitation
   min-height: 200px
@@ -288,28 +331,35 @@ span.admin.documents
 .interjected
   margin: 10px 0
-.people
+.users
   .person_picker
     font-size: 1.8em
 form.event
   p.name
     margin: 0
-  a.datepicker
-    color: $input
+  div.datemark
+    background-color: white
+    border: 1px solid $pale
+    padding: 4px 0
+    margin-top: 1px
+    margin-left: -$datemark_width
+    margin-right: $datemark_margin - 4px
   input.name
     width: 470px
-    font-size: 3em
+    height: 45px
+    font-size: 2.5em
   p.practicalities
-    margin: 0
+    margin: 7px 0 0 0
   input.timepicker
-    font-size: 1.2em
     width: 50px
+    font-size: 1.2em
+    padding: 4px
     &.start
       font-weight: bold
   input.venuepicker
     font-size: 1.2em
-    width: 303px
+    width: 200px
     padding: 4px
   .description
     margin-top: 0.5em
@@ -317,10 +367,15 @@ form.event
       width: 470px
       font-size: 1em
       height: 250px
-  p.calendar
+  p.admin
     clear: both
     float: right
     margin: 5px 10px
+    label
+      display: inline-block
+      width: 75px
+    select
+      width: 75px
   .buttons
     margin-top: 10px
@@ -328,10 +383,15 @@ form.folder
   input.name
     width: 480px
     font-size: 2em
+  input.slug
+    width: 480px
+    color: $mid
 form.document
+  p.slug
+    margin: 0
   .filepicker
-    +outset
+    +outset(40px)
     margin-top: 5px
     input[type="file"]
       display: none
@@ -350,75 +410,131 @@ form.document
     font-size: 1em
     height: 60px
-form.page
-  width: 600px
-  input[type="text"], input[type="email"], input[type="password"], select, textarea
-    width: 600px
-    font-size: 1.2em
-  input.pagetitle
-    width: 600px
-    font-size: 4em
-  textarea.large
-    height: 600px
-    font-size: 1.1em
-  textarea.small
-    height: 100px
-    font-size: 1.1em
-  label
-    font-weight: bold
-  p.explanatory
-    width: 50%
-    color: $mid
-form.person
-  .image
+.image-upload
+  position: relative
+  width: 132px
+  height: 132px
+  margin-right: 20px
+  float: left
+  overflow: hidden
+  a.remover
+    display: block
+    position: absolute
+    top: 5px
+    right: 3px
+    width: 24px
+    height: 24px
+    background:
+      position: 0 -646px
+      image: image-url('droom/minisymbols.png')
+  a.box
+    display: block
     width: 130px
     height: 130px
-    margin-right: 20px
-    float: left
-    .uploadbox
-      width: 130px
-      height: 130px
-      border: 4px solid white
-      +box-shadow(1px 2px 5px $mid)
-      margin-top: -4px
-      margin-left: -4px
-    .img
-      width: 130px
-      height: 130px
-    .prompt
-      padding-top: 30px
-      +small
-    .scaler
+    border: 1px solid $pale
+    background:
+      color: white
+      position: center center
+      repeat: no-repeat
+      size: cover
+    input[type="file"]
+      position: absolute
+      top: 200px
+      left: 0
+.youtube-search
+  position: relative
+  width: 132px
+  height: 132px
+  margin-right: 20px
+  float: left
+  a.remover
+    display: block
+    position: absolute
+    top: 5px
+    right: 3px
+    width: 24px
+    height: 24px
+    background:
+      position: 0 -646px
+      image: image-url('droom/minisymbols.png')
+  .thumbnail
+    display: block
+    width: 130px
+    height: 73px
+    border: 1px solid $pale
+    background:
+      color: white
+      position: center center
+      repeat: no-repeat
+      size: cover
+  input[type="text"]
+    width: 120px
+    padding: 5px
+    margin: 20px 0 0 0
+form.user
+  .image-upload
+    margin-top: 2px
+  p.names
+    margin: 0
+    span.title
+      display: inline-block
+      vertical-align: top
+      width: 71px
+      margin-right: 10px
+      input
+        width: 53px
+    span.name
+      display: inline-block
+      vertical-align: top
       width: 100px
-    p.range
-      .slider
-        width: 70px
+      margin-right: 10px
+      input
+        width: 82px
+    span.chinese_name, span.honours
+      display: inline-block
+      vertical-align: top
+      width: 71px
+      margin-right: 0
+      input
+        width: 53px
+  p.email
+    input[type="email"]
+      width: 520px
+      font-weight: bold
+      font-size: 1.4em
   p.name
     margin: 0
     input
-      width: 375px
+      width: 360px
       font-size: 1.5em
       font-weight: bold
   .contacts
     overflow: hidden
     p
       float: left
-      width: 184px
+      width: 185px
       margin-top: 0.5em
       margin-bottom: 0
       input
-        width: 170px
+        width: 167px
         font-size: 1em
         margin-top: 0
     p.email
-      margin-right: 20px
+      margin-right: 15px
   p.organisation
     clear: left
     select
       width: 536px
       font-size: 1em
+  p.memberships
+    label.inline
+      margin-right: 10px
+  div.description
+    clear: both
+    margin-top: 24px
   .user, .buttons
     clear: left
@@ -427,12 +543,21 @@ form.person
       width: 520px
       height: 150px
       font-size: 1em
+  p.gender, p.status, p.confirmation
+    float: left
+    margin-right: 25px
+  p.memberships
+    clear: left
   .buttons
     position: relative
+    clear: left
     margin-top: 0.5em
-form.group
-  input[type="text"], textarea
+form.group, form.service, form.permission
+  input[type="text"], textarea, select
     width: 520px
     font-size: 1em
   textarea
@@ -453,30 +578,32 @@ form.user
       font-size: 1.5em
       font-weight: bold
 h2.name
   font-size: 2em
   margin: 0
+h2.quiet
+  color: $pale
 a.dl, a.ul
   display: inline-block
-  min-height: 50px
-  padding-top: 4px
-  text-indent: 60px
-  line-height: 50px
+  min-height: 40px
+  text-indent: 40px
+  line-height: 40px
   background:
-    position: 0 -10px
+    position: 0 0
     repeat: no-repeat
-    image: image-url('droom/medium_icons.png')
+    image: image-url('droom/small_icons.png')
   &.pdf
-    background-position: 0 -110px
+    background-position: 0 -100px
   &.doc, &.docx
-    background-position: 0 -210px
+    background-position: 0 -200px
   &.xls, &.xlsx
-    background-position: 0 -310px
+    background-position: 0 -300px
   &.minimal
-    width: 50px
-    height: 50px
+    width: 40px
+    height: 40px
     overflow: hidden
 span.icon
@@ -501,10 +628,12 @@ li.person
 div.document
   h2.name
-    font-size: 1.75em
+    font-size: 1.1em
     line-height: 1
+    a.dl
+      margin-left: -40px
     + p.description
-      margin-top: -20px
+      margin-top: -4px
   p.attachment
     margin: 0
     color: $mid
@@ -650,79 +779,101 @@ table.people
     width: 80px
-table.users
-  margin-top: 40px
+table.toggles
+  margin: 40px 0
   border-collapse: collapse
-  thead
-    th
-      max-width: 24px
-      height: 50px
-      padding-top: 36px
-      padding-left: 6px
-      span.rotated
-        display: block
-        line-height: 1
-        white-space: nowrap
-        +rotate(-75deg)
-    th.spacer
-      padding: 10px
-    th.note
-      font-weight: normal
-      height: 20px
-      color: $pale
-      font-size: 85%
-      padding: 5px
-      border-bottom: 1px solid $pale
+  tr.rotated
+    td, th
+      position: relative
+      height: 120px
+      width: 32px
       text-align: center
-      &.spacer
-        border: none
-  tbody
-    td
-      padding-top: 15px
-    td.hover
-      background-color: $palest
-    tr:hover
-      td
-        background-color: $palest
-        border-color: $palest
-    td[data-hoverable]:hover
-      background-color: $pale
-    td.name
-      min-width: 140px
-      min-height: 36px
+      a.menu
+        visibility: hidden
+      &:hover
+        a.menu
+          visibility: visible
+      &.spacer, &.action
+        width: auto
+        text-align: left
+    span.rotated
+      display: inline-block
+      position: absolute
+      top: 120px
+      left: 10px
       line-height: 1
-      text-align: left
-    td.email
-      +small
-      +pale
-      line-height: 1.8em
-      text-align: left
-    td.spacer
-      padding: 10px
+      white-space: nowrap
+      +apply-origin(top left, false)
+      +rotate(-90deg)
+  th
+    font-weight: normal
+    a, a:visited
+      color: $dark
+      +hover
+    a.menu
+      visibility: hidden
+    &:hover
+      a.menu
+        visibility: visible
+    h4
+      margin: 0
+      line-height: 1.1
+  td, th
+    border: 1px solid $verypale
+    padding: 4px
+  th.action, th.spacer
+    border: 0
+  th.action
+    form.filter
+      position: absolute
+      bottom: 10px
+      input[type="search"]
+        width: 200px
+  th.d, td.d
+    border-right-color: $text
+  td.hover
+    background-color: $coolgrey0
+  tr:hover
     td
-      width: 30px
-      text-align: center
-      span, a.yes, a.no
-        +icon("droom/minisymbols.png")
-        &.yes
-          background-position: 0 -384px
-        &.no
-          background-position: 0 -528px
-        &.not_applicable
-          background-position: 0 -600px
-        &.waiting
-          background-image: image-url('droom/spinner.gif')
-          background-position: 2px 2px
-      span.no, span.yes
+      background-color: $coolgrey0
+    td.hover
+      background-color: $coolgrey1
+  td.name
+    min-width: 140px
+    min-height: 36px
+    line-height: 1
+    text-align: left
+    a
+      color: $dark
+      +hover
+  td.spacer
+    padding: 10px
+  td.toggle
+    min-height: 32px
+    text-align: center
+    span.no, span.yes, a.yes, a.no
+      +icon("droom/minisymbols.png")
+      margin: 5px 0 0 3px
+      &.yes
+        background-position: 0 -384px
+      &.no
+        background-position: 0 -528px
         +opacity(0.3)
-      a.no
         &:hover
-          background-position: 0 -648px
-      a.yes
-        &:hover
-          background-position: 0 -480px
+          +opacity(1)
+      &.not_applicable
+        background-position: 0 -600px
+      &.waiting
+        background-image: image-url('droom/spinner.gif')
+        background-position: 2px 2px
+    span.no, span.yes
+      +opacity(0.3)
+    a.no:hover
+      background-position: 0 -648px
+    a.yes:hover
+      background-position: 0 -480px
 table.groups
   margin-bottom: 25px
@@ -828,80 +979,14 @@ span.erratic
         position: 3px -58px
         repeat: no-repeat
-div.menu
-  position: absolute
-  z-index: 50
-  display: none
-  +box-shadow(0 4px 6px $dark)
-  background-color: $admin
-  ul.actions
-    padding: 0
-    margin: 8px 10px 3px 5px
-    list-style: none
-    font-size: 14px
-    li
-      a
-        color: white !important
-        &.add
-          +menu_link("droom/smalladd.png")
-        &.edit
-          +menu_link("droom/smalledit.png")
-        &.delete
-          +menu_link("droom/smalldelete.png")
-        &.download
-          +menu_link("droom/smalldownload.png")
-        &.send
-          +menu_link("droom/smalledit.png")
-a.menu
-  display: inline-block
-  text-indent: 26px
-  height: 24px
-  width: 26px
-  padding-top: 3px
-  overflow: hidden
-  +opacity(0.4)
-  background:
-    color: transparent
-    position: 0 0
-    repeat: no-repeat
-    image: image-url('droom/asterisk.png')
-  &:hover
-    background-position: 0 -48px
-    +opacity(1)
-  &:active
-    background-position: 0 0
-    +opacity(1)
-  &.up
-    +box-shadow(0 4px 6px $dark)
-    +opacity(1)
-    background:
-      position: 0 -144px
-      color: $blue
-  &.small
-    background-image: image-url('droom/small_asterisk.png')
-    width: 20px
-    height: 18px
-// .no-touch
-//   a.action
-//     display: none
-//     &.up
-//       display: inline-block
-//   *:hover
-//     >a.action
-//       display: inline-block
 span.action
   display: inline-block
-p.action, span.action
-  font-size: 14px
+*.action
   font-weight: normal
   a.add
     color: $green
     font-weight: normal
-    font-size: 16px
     white-space: nowrap
     +icon_link("droom/add.png")
     &:hover
@@ -909,7 +994,6 @@ p.action, span.action
   a.edit
     color: $blue
     font-weight: normal
-    font-size: 16px
     white-space: nowrap
     +icon_link("droom/edit.png")
     &:hover
@@ -917,7 +1001,6 @@ p.action, span.action
   a.delete
     color: $darkred
     font-weight: normal
-    font-size: 16px
     white-space: nowrap
     +icon_link("droom/delete.png")
     &:hover
@@ -925,10 +1008,16 @@ p.action, span.action
   a.revert
     color: $mid
     font-weight: normal
-    font-size: 16px
     white-space: nowrap
     &:hover
       color: $warmred
+  a.subscribe
+    color: $blue
+    font-weight: normal
+    white-space: nowrap
+    +icon_link("droom/subscribe.png")
+    &:hover
+      color: $warmred
 div.copyholder
   display: inline-block
@@ -958,18 +1047,17 @@ ul.dropdown
   border-top: 0
   z-index: 100
   list-style: none
-  max-height: 300px
+  max-height: 140px
   +box-shadow
   li
     a, a:visited
       display: block
-      padding: 8px 8px 8px 25px
+      padding: 8px
       cursor: hand
       color: $dark
       background:
         position: 6px 11px
         repeat: no-repeat
-        scroll: scroll
       &.hover
         color: white
         background-color: $active
@@ -978,18 +1066,6 @@ ul.dropdown
         color: $active
         background-color: white
         background-position: 6px -132px
-    &.person
-      a
-        background-image: image-url('droom/person_bullet.png')
-    &.event
-      a
-        background-image: image-url('droom/event_bullet.png')
-    &.document
-      a
-        background-image: image-url('droom/document_bullet.png')
-    &.venue
-      a
-        background-image: image-url('droom/venue_bullet.png')
     &.video
       clear: left
       margin-bottom: 4px
@@ -1010,50 +1086,9 @@ ul.dropdown
         margin-top: -2px
-ul.suggestion_search
-  margin: 0
-  margin-left: 7px
-  padding: 0
-  list-style: none
-  li
-    span.note
-      display: block
-      margin-left: 28px
-    > a
-      display: block
-      padding: 8px 0 0 28px
-      cursor: hand
-      background:
-        repeat: no-repeat
-        scroll: scroll
-        image: image-url('droom/object_icons.png')
-    &.event
-      a
-        background-position: 0 4px
-    &.person
-      a
-        background-position: 0 -46px
-    &.venue
-      a
-        background-position: 0 -146px
-    &.document
-      a
-        background-image: image-url('droom/icons.png')
-    &.group
-      a
-        background-position: 0 -196px
-    &.cancel
-      margin-top: 20px
-      a
-        color: $mid
-        background-image: image-url('droom/minisymbols.png')
-        background-position: 0 -598px
-        padding: 0 0 0 24px
-        margin-top: 6px
-        line-height: 28px
-        height: 24px
-ul.downloads
+ul.downloads
   margin: 0
   padding: 0
   list-style: none
@@ -1061,9 +1096,9 @@ ul.downloads
 a.document
   display: inline-block
   padding: 8px 0 0 28px
-  font-size: 14px
   min-height: 20px
   line-height: 22px
+  color: $mid
   background:
     repeat: no-repeat
     position: 0 0
@@ -1087,79 +1122,8 @@ li.more
     padding: 5px 0
     min-height: 22px
-input[type="text"], input[type="password"], input[type="email"], select, textarea
-  color: $input
-  padding: 5px
-  border: 1px solid $pale
-  &.strong
-    font-weight: bold
-  &.destination
-    color: $blue
-  &.empty
-    color: $pale
-  &[disabled]
-    color: $pale
-    background-color: #fff
-    border-color: $verypale
-input[type="submit"]
-  +button($green)
-  display: inline-block
-  &.unavailable
-    background-color: $mid
-    +opacity(0.5)
-    &:hover
-      background-color: $mid
-  &.waiting
-    background-color: $pale
-    &:hover
-      background-color: $pale
-#account
-  position: relative
-  clear: both
-  width: 600px
-  label
-    font-size: 1.1em
-    &.minor
-      font-size: 0.9em
-  input[type="text"], input[type="password"], input[type="email"]
-    width: 590px
-    padding: 4px
-    &.login
-      font-size: 2em
-    &.preferences
-      font-size: 2em
-    &.ok
-      border-color: $green
-    &.notok
-      border-color: $error
-  p.confirmation
-    display: none
-  span.reminder
-    float: right
-    +pale
-#mask
-  position: fixed
-  top: 0
-  left: 0
-  height: 100%
-  width: 100%
-  background-color: white
-  display: none
-  z-index: 200
-.mask
-  position: fixed
-  top: 0
-  left: 0
-  height: 100%
-  width: 100%
-  background-color: white
-  display: none
-  z-index: 190
 .overlay
   position: absolute
@@ -1179,7 +1143,7 @@ div.kal
   padding: 10px
   background-color: white
   +box-shadow
-  z-index: 200
+  z-index: 300
 div.timepicker
   +box-shadow(0 2px 2px #444)
@@ -1187,7 +1151,7 @@ div.timepicker
   display: none
   height: 191px
   width: 60px
-  overflow-x: none
+  overflow-x: hidden
   overflow-y: auto
   background: #fff
   border: 1px solid #aaa
@@ -1210,12 +1174,38 @@ div.timepicker
       background: $link
       color: #fff
+#stream, .search_results, .suggestion_search
+  .scrolled
+    width: 320px
+  .scroller
+    margin-left: 5px
+    width: 640px
+    .paginated
+      width: 320px
+      position: relative
+      float: left
+#groups
+  div.group
+    .scrolled
+      width: 680px
+      border-bottom: 1px solid white
+    .scroller
+      margin-left: 5px
+      width: 1360px
+      .paginated
+        width: 680px
+        position: relative
+        float: left
 #minicalendar
   position: relative
   overflow: hidden
-  width: 222px
+  width: 280px
+  margin: 0
   .scroller
-    width: 500px
+    width: 600px
     height: 260px
     table
       position: relative
@@ -1236,7 +1226,25 @@ div.timepicker
 #search, .search_results
   position: relative
+#margin
+  form.filter
+    margin-top: 3px
+    p
+      margin: 0.2em 0
+    input[type="text"]
+      font-size: 1.2em
+      padding: 4px
+      width: 95%
+    input[type="search"]
+      font-size: 18px
+      width: 100%
+  .filtered_list
+$calendar_width: 280px
+$day_width: 40px
+$box: $day_width - 2
 table.minimonth
   font-style: normal
   border-collapse: collapse
@@ -1245,7 +1253,7 @@ table.minimonth
     width: 1px
     color: white
   color: $text
-  margin: 5px 0
+  margin: 0
   h3
     font-size: 1.2em
     line-height: 22px
@@ -1264,9 +1272,9 @@ table.minimonth
       color: white
     vertical-align: top
     text-align: center
-    height: 32px
-    width: 30px
-    line-height: 32px
+    height: $box
+    width: $box
+    line-height: $box
     padding: 0
     overflow: hidden
   td.m
@@ -1275,8 +1283,8 @@ table.minimonth
       overflow: hidden
       font-size: 1.4em
       line-height: 1
-      width: 32px
-      height: 32px
+      width: $box
+      height: $box
       text-indent: 50px
       background:
         position: 5px 5px
@@ -1359,7 +1367,7 @@ ul.setup
     max-height: 120px
 .note, .formnote
-  font-size: 0.8em
+  font-size: 90%
   line-height: 1.1
   color: $mid
   a, a:visited
@@ -1432,45 +1440,59 @@ a.expander
     &:hover
       background-position: 0 -96px
-.search
-  position: relative
-  float: right
-  width: 342px
-  margin: 5px
-  p.input
-    margin: 0
-  p.controls
-    clear: left
-  input[type="text"]
-    position:relative
-    font-size: 1.5em
-    width: 275px
-    float: left
-    +border-radius(100px)
-    padding: 10px 30px
 ul.filing
+  position: relative
   padding: 0
   list-style: none
+  li.document
+    position: relative
+    white-space: nowrap
+    overflow: hidden
+    span.action
+      position: absolute
+      top: 0
+      right: 0
-ul.folder
+.no-touch
+  ul.filing
+    li.document
+      span.action
+        visibility: hidden
+      &:hover
+        span.action
+          visibility: visible
+div.attachments
   position: relative
   float: right
-  width: 240px
-  padding-left: 20px
-  margin-bottom: 10px
-  margin-top: 0
-  list-style: none
-  li.folder
-    a.folder
-      font-weight: bold
-      color: $text
+  width: 210px
+  font-size: 90%
+  h3
+    margin: 0
+    padding-left: 20px
+    font-weight: normal
+    line-height: 1.5
+    a
+      +inverted
+  ul
+    padding-left: 20px
+    margin-bottom: 10px
+    margin-top: 0
+    list-style: none
+    li.folder
+      a.folder
+        font-weight: bold
+        color: $text
+  &.col
+    h3, ul
+      padding-left: 0
 ul#folders, div.attachments
   padding-left: 0
   li
     list-style: none
   li.folder
+    margin: 4px 0
     ul.filing
       padding-left: 30px
       margin-top: 0
@@ -1481,6 +1503,7 @@ ul#folders, div.attachments
       font-weight: bold
       +hover
       +waitable
+      padding: 4px 0
     &.root
       > a.folder
         font-size: 140%
@@ -1534,45 +1557,6 @@ input.search_box
         position: 0 -96px
         repeat: no-repeat
-nav.icons
-  position: relative
-  display: inline-block
-  a
-    display: inline-block
-    float: left
-  a.dropbox
-    +panel_icon("droom/integration_buttons.png", 0, 0)
-  a.rss
-    +panel_icon("droom/integration_buttons.png", -32px, 0)
-  a.email
-    +panel_icon("droom/integration_buttons.png", -64px, 0)
-  a.readers
-    +panel_icon("droom/integration_buttons.png", -96px, 0)
-  a.vcal
-    +panel_icon("droom/integration_buttons.png", -128px, 0)
-  a.account
-    +panel_icon("droom/integration_buttons.png", -160px, 0)
-  a.signout
-    +panel_icon("droom/integration_buttons.png", -192px, 0)
-  a.keywords
-    +panel_icon("droom/integration_buttons.png", -224px, 0)
-  a.suggestions
-    +panel_icon("droom/integration_buttons.png", -256px, 0)
-  a.devices
-    +panel_icon("droom/integration_buttons.png", -288px, 0)
-  a.networks
-    +panel_icon("droom/integration_buttons.png", -320px, 0)
-  a.admin
-    +panel_icon("droom/integration_buttons.png", -356px, 0)
-    &.here
-      background-color: $blue
-  span.spacer
-    display: inline-block
-    float: left
-    width: 64px
-    height: 32px
 /* -------- map infowindows -------- */
@@ -1659,19 +1643,20 @@ span.preference
     margin: 3px 0 3px 20px
 ul.documents
-  margin: 20px 0 32px -2px
+  margin: 20px 0 0 -2px
   padding: 0
   list-style: none
 ul.people
-  margin: 20px 0 32px -2px
+  margin: 10px 0 0 -2px
   padding: 0
   list-style: none
   li.person
     display: inline-block
-    width: 190px
+    vertical-align: top
+    width: 250px
     height: 48px
-    line-height: 1.1
+    line-height: 1.1em
     margin-bottom: 10px
     &.refused
       +opacity(0.4)
@@ -1682,8 +1667,7 @@ ul.people
       width: 32px
       height: 32px
       margin-right: 9px
-      border: 2px solid white
-      +box-shadow(1px 2px 5px $mid)
+      margin-top: 11px
       background:
         color: $mid
         repeat: no-repeat
@@ -1694,7 +1678,7 @@ ul.people
         position: absolute
         overflow: hidden
         top: -6px
-        right: -10px
+        right: -6px
         width: 14px
         height: 14px
         text-indent: 20px
@@ -1712,7 +1696,6 @@ ul.people
     span.contact
       display: block
       overflow: hidden
-      padding-top: 4px
       span.name
         font-size: 1em
@@ -1736,7 +1719,6 @@ ul.people
       height: 70px
       background:
         repeat: no-repeat
-        scroll: scroll
   .document
     a.icon
       background:
@@ -1761,125 +1743,18 @@ ul.people
     a.icon
       background-position: 0 -196px
-// streams and scraps
-a.minidatemark
-  display: block
-  float: left
-  width: 28px
-  margin-right: 12px
-  span
-    display: block
-    line-height: 1
-    text-align: center
-  span.mon
-    text-transform: uppercase
-    font-size: 0.9em
-  span.dom
-    font-size: 1.8em
-    letter-spacing: -0.1em
-    margin-left: -1px
-    margin-top: 0
-  span.year
-    font-size: 0.9em
-    margin-top: 0
-#stream, .search_results, .suggestion_search
-  .scrolled
-    width: 320px
-  .scroller
-    margin-left: 5px
-    width: 640px
-    .paginated
-      width: 320px
-      position: relative
-      float: left
-  .scrap
-    position: relative
-    clear: left
-    &.document
-      a.icon
-        background:
-          position: 3px 0
-          image: image-url('droom/icons.png')
-        &.pdf
-          background-position: 3px -48px
-        &.doc, &.docx
-          background-position: 3px -96px
-        &.xls, &.xlsx
-          background-position: 3px -144px
-    a.thumb
-      height: 18px
-    a.icon
-      height: 32px
-    a.thumb, a.icon
-      display: block
-      float: left
-      width: 32px
-      margin-right: 8px
-      margin-bottom: 25px
-      margin-top: 0
-      overflow: hidden
-      text-indent: 50px
-      line-height: 32px
-      +border-radius(3px)
-      background:
-        repeat: no-repeat
-        position: 0 0
-      &.playable
-        &:before
-          content: image-url('droom/playable.png')
-          position: absolute
-          width: 32px
-          height: 18px
-          left: -50px
-    a.icon
-      background:
-        image: image-url('droom/dark_scrap_icons.png')
-      &.text
-        background-position: 0 -48px
-      &.quote
-        background-position: 0 -96px
-      &.link
-        background: none
-    a
-      color: $mid
-      +hover
-      &:hover, &.hover
-        color: $hover
-    p.caption, p.scrapevent, p.scrapdocument
-      overflow: hidden
-      line-height: 1.2
-    span.attribution, span.caption
-      color: $pale
-      display: block
-#stream
-  .scrap
-    margin-bottom: 25px
-span.credit
-  display: block
-  font-size: 90%
-  font-weight: bold
-  color: $mid
-  margin-top: 4px
 div.popup
-  #event, #document, #person, #group, #membership, #folder
-    width: 580px
-  .scrap
+  #event, #document, #user, #group, #membership, #folder
     width: 580px
+    > p
+      margin: 10px 20px 0 20px
 div.popup
   form.event
     margin-left: $datemark_width + $datemark_margin
   form.document
     margin-left: 60px
-  form.scrap
-    margin: 0
   div.notifier
     position: absolute
@@ -1889,7 +1764,7 @@ div.popup
     background-color: white
     padding: 20px 140px
-  div.person
+  div.user
     margin: 20px 20px
     div.mugshot
       position: relative
@@ -1899,8 +1774,7 @@ div.popup
       height: 130px
       margin-right: 20px
       margin-bottom: 10px
-      border: 2px solid white
-      +box-shadow(1px 2px 5px $mid)
+      +border-radius(8px)
       background:
         color: $mid
         repeat: no-repeat
@@ -1914,357 +1788,8 @@ div.popup
       p.contact
         +pale
         margin-top: 0
-  div.body
-    position: relative
-    margin-top: 0
-    overflow: hidden
-    height: 326px
-    p
-      margin: 20px 20px
-      font-size: 1.5em
-      line-height: 1.25
-    &.image
-      overflow: hidden
-    p.attribution
-      color: lighten($mid, 10)
-  div.scrapdocument
-    .filepicker
-      margin-top: 5px
-      input[type="file"]
-        display: none
-      p.tip
-        font-size: 0.65em
-        line-height: 1.1
-        color: $pale
-        margin: 0 5px
-  div.scrapvideo
-    position: relative
-    margin: 0 20px 0 20px
-    overflow: auto
-    padding-top: 10px
-    background-color: white
-    height: 316px
-    .thumb
-      margin: 10px 0
-      img.main_thumb, iframe.thumb
-        float: left
-        width: 265px
-        height: 200px
-        margin: 0 10px 0 70px
-      p
-        float: left
-        margin: 0
-        width: 170px
-    .icon
-      width: 60px
-      height: 60px
-      background:
-        image: url("droom/youtube_icon.png")
-        size: 60px
-      float: left
-      margin: 10px 10px 0 0
-  div.scrapevent, div.scrapdocument
-    position: relative
-    margin: 0
-    overflow: auto
-    padding-top: 126px
-    background-color: white
-    height: 200px
-    .datemark, .filemark
-      float: left
-      width: 50px
-      margin: 15px 10px 0 10px
-      color: $input
-    p.name
-      margin-bottom: 0
-      margin-top: 20px
-      line-height: 1.2
-      a.dl, .eventname
-        font-size: 1.4em
-        max-height: 50px
-      span.note
-        display: block
-        margin-left: 50px
-    p.practicalities
-      margin-top: 2px
-  div.caption
-    p.scrapnote
-      min-height: 2em
-    p.action
-      float: right
-    p
-      color: $text
-      margin: 10px 20px
-      span.credit
-        font-size: 80%
-        color: $mid
-  form.scrap
-    ul.scraptypes
-      padding: 0
-      margin: 0
-      li
-        display: inline-block
-        margin-right: 3px
-        font-size: 80%
-        label
-          display: inline-block
-          height: 32px
-          line-height: 28px
-          padding-left: 34px
-          color: white
-          overflow: hidden
-          font-size: 0.9em
-          cursor: pointer
-          background:
-            repeat: no-repeat
-            position: 0 0
-            image: image-url('droom/scrap_icons.png')
-          &.text
-            background-position: 0 -48px
-          &.quote
-            background-position: 0 -96px
-          &.video
-            background-position: 0 -144px
-          &.image
-            background-position: 0 -192px
-          &.document
-            background-position: 0 -240px
-          &.event
-            background-position: 0 -288px
-        input[type="radio"]
-          display: none
-        input[type="radio"] + label
-          +opacity(0.4)
-        input[type="radio"]:checked + label
-          +opacity(1)
-    .fields
-      min-height: 180px
-      .name
-        input[type="text"]
-          width: 532px
-          font-size: 1.25em
-          font-weight: bold
-      .body, .caption
-        textarea
-          width: 532px
-          background-color: white
-          font-size: 100%
-      .body
-        textarea
-          height: 290px
-          line-height: 1.2
-      .scrapevent, .scrapdocument
-        display: none
-        .summary
-          p.name
-            margin: 10px 0
-        input.name
-          width: 350px
-          font-size: 2.4em
-        p.url
-          margin: 10px 0 0 70px
-          input.url
-            font-size: 1.2em
-            width: 350px
-      .scrapvideo
-        display: none
-        input.name
-          width: 440px
-          font-size: 1.8em
-          &.waiting
-            background:
-              position: 430px 15px
-              repeat: no-repeat
-              image: image-url('droom/spinner.gif')
-      .caption
-        textarea
-          height: 80px
-          color: $mid
-      .upload
-        display: none
-        margin-top: 0
-        .uploadbox
-          width: 580px
-          height: 326px
-          border: 0
-          margin: 0
-          background-color: $mid
-          .img
-            width: 580px
-            height: 326px
-          .prompt
-            padding-top: 140px
-            .note
-              color: $dark
-          .progress_holder
-            top: 138px
-      &.image
-        .upload
-          display: block
-        p.body
-          display: none
-      &.event
-        margin-bottom: 10px
-        .scrapevent
-          display: block
-        .upload, .body, .scrapdocument, .scrapvideo
-          display: none
-      &.document
-        margin-bottom: 10px
-        .scrapdocument
-          display: block
-        .upload, .body, .scrapevent, .scrapvideo
-          display: none
-      &.video
-        .scrapvideo
-          display: block
-        .upload, .body, .scrapevent, .scrapdocument
-          display: none
-    .buttons
-      margin: 10px 20px 20px 20px
-// uploader, scaler, cropper
-.uploadbox
-  position: relative
-  overflow: hidden
-  background-color: $mid
-  input
-    position: absolute
-    top: 1000px
-    left: 0
-  .prompt
-    text-align: center
-    padding: 20px
-    line-height: 1.25
-    a
-      color: white
-      +glow_on_hover
-    .note
-      color: $pale
-      margin-top: 2px
-  .img
-    position: absolute
-    top: 0
-    left: 0
-    &:empty
-      display: none
-  &.hover
-    .img
-    .prompt
-      a
-        color: white
-        text-shadow: 0 0 3px white
-  a.detach
-    position: absolute
-    top: 10px
-    right: 5px
-    width: 24px
-    height: 24px
-    text-indent: 50px
-    overflow: hidden
-    background:
-      repeat: no-repeat
-      position: 0 -648px
-      image: image-url('droom/minisymbols.png')
-  .progress_holder
-    position: absolute
-    overflow: hidden
-    top: 10%
-    left: 10%
-    width: 80%
-    height: 32px
-    border: 1px solid $mid
-    background-color: $verypale
-    z-index: 900
-    +border-radius
-    .progress
-      position: relative
-      width: 0%
-      height: 100%
-      background-color: $pale
-    .commentary
-      position: absolute
-      top: 0
-      left: 0
-      width: 100%
-      font-size: 1em
-      line-height: 1
-      padding: 1em
-      text-align: center
-  .waiter
-    position: absolute
-    overflow: hidden
-    top: 150px
-    left: 410px
-    width: 32px
-    height: 32px
-    background: transparent image-url('cropper/upload_spinner.gif') no-repeat center center scroll
-    display: none
-  .preview
-    position: absolute
-    top: 0
-    left: 0
-    cursor: move
-    img
-      width: 100%
-      height: 100%
-  .scaler
-    position: absolute
-    overflow: hidden
-    top: 60%
-    left: 10%
-    width: 80%
-    height: 40px
-    color: white
-    p.range
-      position: relative
-      margin: 0 auto
-      overflow: hidden
-      .slider
-        display: block
-        position: relative
-        float: left
-        width: 100%
-        height: 40px
-        background: transparent image-url('cropper/scale.png') no-repeat 0 20px
-        .scale
-          display: block
-          width: 100%
-          height: 100%
-        .marker
-          display: block
-          position: absolute
-          background-color: white
-          +box-shadow
-          top: 9px
-          left: 50px
-          width: 12px
-          height: 24px
-          cursor: move
-          z-index: 1000
-.overflow
-  position: absolute
-  overflow: hidden
-  top: 0
-  left: 0
-  +opacity(0.3)
-  img
-    width: 100%
-    height: 100%
+      div.description
+        min-height: 80px
 ul.checklist
@@ -2278,3 +1803,5 @@ ul.checklist
     display: block
     margin-left: 20px
     overflow: hidden