droom 0.0.1 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +2 -2
- data/app/assets/images/droom/Untitled-1.png +0 -0
- data/app/assets/images/droom/acceptance.png +0 -0
- data/app/assets/images/droom/add.png +0 -0
- data/app/assets/images/droom/asterisk.png +0 -0
- data/app/assets/images/droom/asterisk_up.png +0 -0
- data/app/assets/images/droom/checkboxes.png +0 -0
- data/app/assets/images/droom/clear.png +0 -0
- data/app/assets/images/droom/cog.png +0 -0
- data/app/assets/images/droom/copy.png +0 -0
- data/app/assets/images/droom/copy_to_dropbox.png +0 -0
- data/app/assets/images/droom/crosses.png +0 -0
- data/app/assets/images/droom/dark_scrap_icons.png +0 -0
- data/app/assets/images/droom/defilter.png +0 -0
- data/app/assets/images/droom/delete.png +0 -0
- data/app/assets/images/droom/dropbox.png +0 -0
- data/app/assets/images/droom/dropbox_button.png +0 -0
- data/app/assets/images/droom/dropbox_button_small.png +0 -0
- data/app/assets/images/droom/edit.png +0 -0
- data/app/assets/images/droom/expand.png +0 -0
- data/app/assets/images/droom/expander.png +0 -0
- data/app/assets/images/droom/folder.png +0 -0
- data/app/assets/images/droom/image_box.png +0 -0
- data/app/assets/images/droom/in_dropbox.png +0 -0
- data/app/assets/images/droom/integration_buttons.png +0 -0
- data/app/assets/images/droom/leftright.png +0 -0
- data/app/assets/images/droom/manage.png +0 -0
- data/app/assets/images/droom/medium_object_icons.png +0 -0
- data/app/assets/images/droom/object_icons.png +0 -0
- data/app/assets/images/droom/playable.png +0 -0
- data/app/assets/images/droom/revoke.png +0 -0
- data/app/assets/images/droom/scrap_icons.png +0 -0
- data/app/assets/images/droom/search.png +0 -0
- data/app/assets/images/droom/small_asterisk.png +0 -0
- data/app/assets/images/droom/small_cog.png +0 -0
- data/app/assets/images/droom/small_download.png +0 -0
- data/app/assets/images/droom/small_image_box.png +0 -0
- data/app/assets/images/droom/smalladd.png +0 -0
- data/app/assets/images/droom/smallarrows.png +0 -0
- data/app/assets/images/droom/smallcopy.png +0 -0
- data/app/assets/images/droom/smalldelete.png +0 -0
- data/app/assets/images/droom/smalldownload.png +0 -0
- data/app/assets/images/droom/smalledit.png +0 -0
- data/app/assets/images/droom/smallmanage.png +0 -0
- data/app/assets/images/droom/star.png +0 -0
- data/app/assets/images/droom/symbols.png +0 -0
- data/app/assets/images/droom/tinyarrows.png +0 -0
- data/app/assets/images/droom/to_dropbox.png +0 -0
- data/app/assets/images/droom/twisty.png +0 -0
- data/app/assets/images/droom/youtube_icon.png +0 -0
- data/app/assets/javascripts/droom.js.coffee +62 -65
- data/app/assets/javascripts/droom/actions.js.coffee +492 -0
- data/app/assets/javascripts/droom/ajax.js.coffee +84 -0
- data/app/assets/javascripts/droom/{lib/extensions.js.coffee → extensions.js.coffee} +22 -15
- data/app/assets/javascripts/droom/lib/ZeroClipboard.js +334 -0
- data/app/assets/javascripts/droom/lib/ZeroClipboard.swf +0 -0
- data/app/assets/javascripts/droom/lib/ZeroClipboard10.swf +0 -0
- data/app/assets/javascripts/droom/map.js.coffee +124 -86
- data/app/assets/javascripts/droom/popups.js.coffee +252 -0
- data/app/assets/javascripts/droom/stream.js.coffee +92 -0
- data/app/assets/javascripts/droom/utilities.js.coffee +120 -0
- data/app/assets/javascripts/droom/widgets.js.coffee +1209 -0
- data/app/assets/stylesheets/_definitions.css.sass +189 -0
- data/app/assets/stylesheets/droom.css.sass +1429 -376
- data/app/assets/stylesheets/lib/_kalendae.css.sass +2 -5
- data/app/assets/stylesheets/lib/_popups.css.sass +86 -0
- data/app/assets/stylesheets/lib/_toolbar.css.sass +17 -11
- data/app/controllers/droom/agenda_categories_controller.rb +24 -0
- data/app/controllers/droom/calendars_controller.rb +29 -0
- data/app/controllers/droom/confirmations_controller.rb +38 -0
- data/app/controllers/droom/dashboard_controller.rb +2 -0
- data/app/controllers/droom/documents_controller.rb +42 -51
- data/app/controllers/droom/dropbox_tokens_controller.rb +61 -0
- data/app/controllers/droom/engine_controller.rb +8 -23
- data/app/controllers/droom/events_controller.rb +39 -27
- data/app/controllers/droom/folders_controller.rb +106 -0
- data/app/controllers/droom/group_invitations_controller.rb +15 -7
- data/app/controllers/droom/groups_controller.rb +4 -4
- data/app/controllers/droom/invitations_controller.rb +37 -9
- data/app/controllers/droom/memberships_controller.rb +5 -3
- data/app/controllers/droom/organisations_controller.rb +53 -0
- data/app/controllers/droom/people_controller.rb +46 -27
- data/app/controllers/droom/preferences_controller.rb +34 -0
- data/app/controllers/droom/scraps_controller.rb +77 -0
- data/app/controllers/droom/search_controller.rb +66 -0
- data/app/controllers/droom/suggestions_controller.rb +22 -35
- data/app/controllers/droom/users_controller.rb +69 -0
- data/app/controllers/droom/venues_controller.rb +1 -2
- data/app/controllers/droom/youtube_controller.rb +22 -0
- data/app/helpers/droom/droom_helper.rb +93 -5
- data/app/models/droom/agenda_category.rb +8 -1
- data/app/models/droom/calendar.rb +19 -0
- data/app/models/droom/category.rb +4 -6
- data/app/models/droom/document.rb +103 -64
- data/app/models/droom/document_attachment.rb +13 -47
- data/app/models/droom/dropbox_document.rb +41 -0
- data/app/models/droom/dropbox_token.rb +29 -0
- data/app/models/droom/event.rb +125 -90
- data/app/models/droom/folder.rb +134 -0
- data/app/models/droom/group.rb +68 -27
- data/app/models/droom/group_invitation.rb +12 -3
- data/app/models/droom/invitation.rb +50 -8
- data/app/models/droom/mailing_list_membership.rb +128 -0
- data/app/models/droom/membership.rb +71 -9
- data/app/models/droom/organisation.rb +22 -0
- data/app/models/droom/page.rb +3 -3
- data/app/models/droom/person.rb +180 -166
- data/app/models/droom/personal_folder.rb +31 -0
- data/app/models/droom/preference.rb +35 -0
- data/app/models/droom/recurrence_rule.rb +1 -1
- data/app/models/droom/scrap.rb +110 -0
- data/app/models/droom/tag.rb +120 -0
- data/app/models/droom/tagging.rb +13 -0
- data/app/models/droom/user.rb +211 -0
- data/app/models/droom/user_action_observer.rb +12 -0
- data/app/models/droom/venue.rb +56 -39
- data/app/views/cropper/uploads/_crop.html.haml +46 -0
- data/app/views/devise/mailer/confirmation_instructions.en.html.haml +24 -0
- data/app/views/devise/mailer/reset_password_instructions.en.html.haml +21 -0
- data/app/views/devise/passwords/edit.html.haml +31 -0
- data/app/views/devise/passwords/new.html.haml +21 -0
- data/app/views/devise/sessions/new.html.haml +33 -0
- data/app/views/droom/agenda_categories/_form.html.haml +22 -0
- data/app/views/droom/agenda_categories/new.html.haml +6 -0
- data/app/views/droom/calendars/_action_menu.html.haml +6 -0
- data/app/views/droom/calendars/index.html.haml +12 -0
- data/app/views/droom/calendars/show.rss.builder +0 -0
- data/app/views/droom/confirmations/show.html.haml +40 -0
- data/app/views/droom/dashboard/_calendar.html.haml +1 -0
- data/app/views/droom/dashboard/_folders.html.haml +5 -0
- data/app/views/droom/dashboard/_future_events.html.haml +18 -0
- data/app/views/droom/dashboard/_invitations.html.haml +1 -0
- data/app/views/droom/dashboard/_past_events.haml +14 -0
- data/app/views/droom/dashboard/_quicksearch.html.haml +6 -0
- data/app/views/droom/dashboard/_stream.html.haml +9 -0
- data/app/views/droom/dashboard/index.html.haml +5 -3
- data/app/views/droom/documents/_action_menu.html.haml +7 -0
- data/app/views/droom/documents/_documents.html.haml +5 -0
- data/app/views/droom/documents/_documents_list.html.haml +6 -6
- data/app/views/droom/documents/_documents_table.html.haml +29 -10
- data/app/views/droom/documents/_form.html.haml +3 -7
- data/app/views/droom/documents/_listing.html.haml +5 -6
- data/app/views/droom/documents/_pagination.html.haml +8 -0
- data/app/views/droom/documents/_search_result.html.haml +14 -0
- data/app/views/droom/documents/_suggested.html.haml +0 -5
- data/app/views/droom/documents/_table_document.html.haml +2 -8
- data/app/views/droom/documents/edit.html.haml +7 -1
- data/app/views/droom/documents/index.html.haml +10 -27
- data/app/views/droom/documents/new.html.haml +10 -1
- data/app/views/droom/dropbox_tokens/new.html.haml +6 -0
- data/app/views/droom/events/_action_menu.html.haml +15 -0
- data/app/views/droom/events/_event.html.haml +67 -57
- data/app/views/droom/events/_form.html.haml +15 -4
- data/app/views/droom/events/_invitations.html.haml +4 -19
- data/app/views/droom/events/_search_result.html.haml +19 -0
- data/app/views/droom/events/_views.html.haml +2 -2
- data/app/views/droom/events/edit.html.haml +7 -1
- data/app/views/droom/events/index.html.haml +27 -10
- data/app/views/droom/events/index.rss.builder +1 -1
- data/app/views/droom/events/new.html.haml +6 -1
- data/app/views/droom/events/show.html.haml +5 -1
- data/app/views/droom/folders/_action_menu.html.haml +14 -0
- data/app/views/droom/folders/_attachments.html.haml +3 -0
- data/app/views/droom/folders/_contents.html.haml +6 -0
- data/app/views/droom/folders/_folder.html.haml +20 -0
- data/app/views/droom/folders/_folders.html.haml +2 -0
- data/app/views/droom/folders/_form.html.haml +18 -0
- data/app/views/droom/folders/edit.html.haml +6 -0
- data/app/views/droom/folders/index.html.haml +32 -0
- data/app/views/droom/folders/new.html.haml +6 -0
- data/app/views/droom/folders/show.html.haml +1 -0
- data/app/views/droom/group_invitations/_form.html.haml +15 -4
- data/app/views/droom/group_invitations/new.html.haml +6 -1
- data/app/views/droom/groups/_action_menu.haml +11 -0
- data/app/views/droom/groups/_form.html.haml +10 -11
- data/app/views/droom/groups/_group.html.haml +9 -10
- data/app/views/droom/groups/_groups.html.haml +2 -3
- data/app/views/droom/groups/_search_result.html.haml +16 -0
- data/app/views/droom/groups/_suggested.html.haml +7 -0
- data/app/views/droom/groups/edit.html.haml +7 -1
- data/app/views/droom/groups/index.html.haml +6 -3
- data/app/views/droom/groups/new.html.haml +7 -0
- data/app/views/droom/groups/show.html.haml +1 -1
- data/app/views/droom/invitations/_created.html.haml +1 -1
- data/app/views/droom/invitations/_form.html.haml +9 -5
- data/app/views/droom/invitations/_invitation.html.haml +9 -0
- data/app/views/droom/invitations/_invitations.html.haml +8 -0
- data/app/views/droom/invitations/new.html.haml +6 -1
- data/app/views/droom/memberships/_member.html.haml +1 -1
- data/app/views/droom/memberships/_membership_toggle.html.haml +10 -0
- data/app/views/droom/memberships/new.html.haml +10 -0
- data/app/views/droom/organisations/_action_menu.html.haml +7 -0
- data/app/views/droom/organisations/_form.html.haml +25 -0
- data/app/views/droom/organisations/_organisation.html.haml +23 -0
- data/app/views/droom/organisations/_organisations.html.haml +2 -0
- data/app/views/droom/organisations/_suggested.html.haml +7 -0
- data/app/views/droom/organisations/edit.html.haml +6 -0
- data/app/views/droom/organisations/index.html.haml +20 -0
- data/app/views/droom/organisations/new.html.haml +6 -0
- data/app/views/droom/organisations/show.html.haml +1 -0
- data/app/views/droom/pages/_full_page.html.haml +1 -1
- data/app/views/droom/pages/index.html.haml +1 -1
- data/app/views/droom/panels/_account.html.haml +16 -0
- data/app/views/droom/panels/_admin.html.haml +23 -0
- data/app/views/droom/panels/_devices.html.haml +19 -0
- data/app/views/droom/panels/_dropbox.html.haml +17 -0
- data/app/views/droom/panels/_email.html.haml +16 -0
- data/app/views/droom/panels/_keywords.html.haml +3 -0
- data/app/views/droom/panels/_networks.html.haml +3 -0
- data/app/views/droom/panels/_readers.html.haml +18 -0
- data/app/views/droom/panels/_rss.html.haml +10 -0
- data/app/views/droom/panels/_search.html.haml +16 -0
- data/app/views/droom/panels/_vcal.html.haml +3 -0
- data/app/views/droom/people/_action_menu.html.haml +22 -0
- data/app/views/droom/people/_form.html.haml +69 -39
- data/app/views/droom/people/_listing.html.haml +19 -0
- data/app/views/droom/people/_memberships.html.haml +24 -0
- data/app/views/droom/people/_people.html.haml +5 -29
- data/app/views/droom/people/_person.html.haml +30 -32
- data/app/views/droom/people/_search_result.html.haml +14 -0
- data/app/views/droom/people/_suggested.html.haml +10 -5
- data/app/views/droom/people/edit.html.haml +9 -1
- data/app/views/droom/people/index.html.haml +6 -9
- data/app/views/droom/people/new.html.haml +6 -1
- data/app/views/droom/people/show.html.haml +1 -1
- data/app/views/droom/preferences/_checkbox.html.haml +7 -0
- data/app/views/droom/preferences/_radio_set.html.haml +9 -0
- data/app/views/droom/scraps/_action_menu.html.haml +9 -0
- data/app/views/droom/scraps/_caption.html.haml +9 -0
- data/app/views/droom/scraps/_credit.html.haml +10 -0
- data/app/views/droom/scraps/_form.html.haml +77 -0
- data/app/views/droom/scraps/_heading.html.haml +16 -0
- data/app/views/droom/scraps/_scrap.html.haml +17 -0
- data/app/views/droom/scraps/_search_result.html.haml +5 -0
- data/app/views/droom/scraps/_stream.html.haml +4 -0
- data/app/views/droom/scraps/_suggested.html.haml +5 -0
- data/app/views/droom/scraps/_thumb.html.haml +5 -0
- data/app/views/droom/scraps/edit.html.haml +2 -0
- data/app/views/droom/scraps/full/_document.html.haml +6 -0
- data/app/views/droom/scraps/full/_event.html.haml +20 -0
- data/app/views/droom/scraps/full/_image.html.haml +4 -0
- data/app/views/droom/scraps/full/_link.html.haml +5 -0
- data/app/views/droom/scraps/full/_quote.html.haml +8 -0
- data/app/views/droom/scraps/full/_text.html.haml +4 -0
- data/app/views/droom/scraps/full/_video.html.haml +4 -0
- data/app/views/droom/scraps/index.atom.builder +26 -0
- data/app/views/droom/scraps/index.html.haml +15 -0
- data/app/views/droom/scraps/new.html.haml +2 -0
- data/app/views/droom/scraps/show.html.haml +4 -0
- data/app/views/droom/scraps/thumbs/_document.html.haml +9 -0
- data/app/views/droom/scraps/thumbs/_event.html.haml +17 -0
- data/app/views/droom/scraps/thumbs/_image.html.haml +6 -0
- data/app/views/droom/scraps/thumbs/_link.html.haml +10 -0
- data/app/views/droom/scraps/thumbs/_quote.html.haml +8 -0
- data/app/views/droom/scraps/thumbs/_text.html.haml +8 -0
- data/app/views/droom/scraps/thumbs/_video.html.haml +6 -0
- data/app/views/droom/shared/_controls.html.haml +5 -3
- data/app/views/droom/shared/_excerpt.html.haml +2 -0
- data/app/views/droom/shared/_navigation.html.haml +4 -4
- data/app/views/droom/shared/_panels.html.haml +4 -0
- data/app/views/droom/shared/_quicklinks.html.haml +5 -0
- data/app/views/droom/shared/_search_form.html.haml +2 -1
- data/app/views/droom/shared/_search_results.html.haml +9 -0
- data/app/views/droom/shared/_suggestions.html.haml +13 -9
- data/app/views/droom/shared/_title_excerpt.haml +2 -0
- data/app/views/droom/shared/search.html.haml +18 -0
- data/app/views/droom/users/_confirmation.html.haml +2 -0
- data/app/views/droom/users/_dropbox_status.html.haml +2 -0
- data/app/views/droom/users/_form.html.haml +34 -0
- data/app/views/droom/users/_user.html.haml +2 -0
- data/app/views/droom/users/_user_or_person.html.haml +63 -0
- data/app/views/droom/users/_users_table.html.haml +17 -0
- data/app/views/droom/users/edit.html.haml +10 -0
- data/app/views/droom/users/index.html.haml +42 -0
- data/app/views/droom/users/unwelcome.en.html.haml +17 -0
- data/app/views/droom/venues/_search_result.html.haml +17 -0
- data/app/views/droom/youtube/show.html.haml +12 -0
- data/app/views/kaminari/_paginator.html.haml +16 -0
- data/app/views/layouts/droom/application.html.haml +17 -17
- data/app/views/layouts/droom/email.html.haml +59 -0
- data/config/cucumber.yml +8 -0
- data/config/initializers/devise.rb +240 -0
- data/config/locales/devise.en.yml +58 -0
- data/config/locales/en.yml +203 -32
- data/config/routes.rb +55 -16
- data/config/sunspot.yml +17 -0
- data/db/migrate/20121120115447_tags.rb +18 -0
- data/db/migrate/20130116155331_dropbox_tokens.rb +9 -0
- data/db/migrate/20130118103540_folders.rb +47 -0
- data/db/migrate/20130124113715_preferences.rb +10 -0
- data/db/migrate/20130125132427_users_in_droom.rb +58 -0
- data/db/migrate/20130129142307_mobile_phones.rb +7 -0
- data/db/migrate/20130130120124_folder_ancestry_to_parents.rb +7 -0
- data/db/migrate/20130131161430_mailing_lists.rb +37 -0
- data/db/migrate/20130207091903_preference_uuids.rb +5 -0
- data/db/migrate/20130207123614_stream.rb +13 -0
- data/db/migrate/20130208035113_access_token_secret.rb +5 -0
- data/db/migrate/20130214145014_person_image.rb +9 -0
- data/db/migrate/20130217152644_devise_confirmable.rb +13 -0
- data/db/migrate/20130225095328_create_droom_calendars.rb +20 -0
- data/db/migrate/20130226092944_give_scraps_document.rb +5 -0
- data/db/migrate/20130228083509_privateness.rb +9 -0
- data/db/migrate/20130228134143_store_metadata.rb +5 -0
- data/db/migrate/20130305150648_folders_nicely.rb +6 -0
- data/db/migrate/20130305151936_niceties.rb +7 -0
- data/db/migrate/20130308103807_create_droom_dropbox_documents.rb +11 -0
- data/db/migrate/20130308154552_dropbox_documents_changed.rb +5 -0
- data/db/migrate/20130326135738_user_titles.rb +5 -0
- data/lib/droom.rb +189 -22
- data/lib/droom/engine.rb +6 -1
- data/lib/droom/folders.rb +106 -0
- data/lib/droom/lazy_hash.rb +73 -0
- data/lib/droom/{helpers.rb → model_helpers.rb} +1 -1
- data/lib/droom/monkeys.rb +21 -2
- data/lib/droom/routing.rb +13 -0
- data/lib/droom/searchability.rb +25 -0
- data/lib/droom/taggability.rb +60 -0
- data/lib/droom/title_case.rb +101 -0
- data/lib/droom/user_config.rb +67 -0
- data/lib/droom/validators.rb +6 -0
- data/lib/droom/version.rb +1 -1
- data/lib/generators/droom/install/templates/droom_initializer.rb +0 -1
- data/lib/tasks/cucumber.rake +65 -0
- data/spec/datasets/calendar_events_dataset.rb +44 -0
- data/spec/datasets/calendar_pages_dataset.rb +8 -0
- data/spec/datasets/calendar_sites_dataset.rb +6 -0
- data/spec/datasets/calendars_dataset.rb +34 -0
- data/spec/datasets/documents_dataset.rb +28 -0
- data/spec/datasets/recurrence_dataset.rb +7 -0
- data/spec/dummy/README.rdoc +261 -0
- data/spec/dummy/Rakefile +7 -0
- data/spec/dummy/app/assets/javascripts/application.js +15 -0
- data/spec/dummy/app/assets/stylesheets/application.css +13 -0
- data/spec/dummy/app/controllers/application_controller.rb +3 -0
- data/spec/dummy/app/helpers/application_helper.rb +2 -0
- data/spec/dummy/app/views/layouts/application.html.erb +14 -0
- data/spec/dummy/config.ru +4 -0
- data/spec/dummy/config/application.rb +65 -0
- data/spec/dummy/config/boot.rb +10 -0
- data/spec/dummy/config/database.yml +21 -0
- data/spec/dummy/config/environment.rb +5 -0
- data/spec/dummy/config/environments/development.rb +38 -0
- data/spec/dummy/config/environments/production.rb +67 -0
- data/spec/dummy/config/environments/test.rb +38 -0
- data/spec/dummy/config/initializers/backtrace_silencers.rb +7 -0
- data/spec/dummy/config/initializers/inflections.rb +15 -0
- data/spec/dummy/config/initializers/mime_types.rb +5 -0
- data/spec/dummy/config/initializers/secret_token.rb +7 -0
- data/spec/dummy/config/initializers/session_store.rb +8 -0
- data/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
- data/spec/dummy/config/locales/en.yml +7 -0
- data/spec/dummy/config/routes.rb +3 -0
- data/spec/dummy/config/sunspot.yml +17 -0
- data/spec/dummy/db/migrate/20120911070124_create_droom_data.droom.rb +135 -0
- data/spec/dummy/db/migrate/20120921094604_agenda_sections.droom.rb +14 -0
- data/spec/dummy/db/migrate/20120921094605_add_postal_address_to_people.droom.rb +11 -0
- data/spec/dummy/db/migrate/20121102064845_give_groups_descriptions.droom.rb +6 -0
- data/spec/dummy/db/migrate/20121102064846_more_names.droom.rb +6 -0
- data/spec/dummy/db/migrate/20121102064847_event_agenda_sections.droom.rb +14 -0
- data/spec/dummy/db/migrate/20121102064848_create_group_invitations.droom.rb +11 -0
- data/spec/dummy/db/migrate/20121102064849_give_people_positions.droom.rb +6 -0
- data/spec/dummy/db/migrate/20121102064850_help_pages.droom.rb +14 -0
- data/spec/dummy/db/migrate/20121102064851_category_slugs.droom.rb +6 -0
- data/spec/dummy/db/migrate/20121102064852_document_links.droom.rb +15 -0
- data/spec/dummy/db/migrate/20121102064853_people_visibility.droom.rb +8 -0
- data/spec/dummy/db/migrate/20121102094820_shy_people.droom.rb +6 -0
- data/spec/dummy/db/migrate/20121102095927_visibility_defaults.droom.rb +10 -0
- data/spec/dummy/db/migrate/20130121122352_tags.droom.rb +19 -0
- data/spec/dummy/db/migrate/20130121122353_dropbox.droom.rb +10 -0
- data/spec/dummy/db/migrate/20130121122354_folders.droom.rb +48 -0
- data/spec/dummy/db/migrate/20130128142902_memberships_expire.droom.rb +6 -0
- data/spec/dummy/db/migrate/20130128142903_give_documents_extracted_text.droom.rb +6 -0
- data/spec/dummy/db/migrate/20130128142904_preferences.droom.rb +11 -0
- data/spec/dummy/db/migrate/20130128142905_users_in_droom.droom.rb +59 -0
- data/spec/dummy/db/migrate/20130130120631_folder_ancestry_to_parents.droom.rb +8 -0
- data/spec/dummy/db/migrate/20130201103737_mobile_phones.droom.rb +8 -0
- data/spec/dummy/db/migrate/20130201103738_mailing_lists.droom.rb +38 -0
- data/spec/dummy/db/schema.rb +327 -0
- data/spec/dummy/log/sunspot-solr-test.log.1 +222 -0
- data/spec/dummy/public/404.html +26 -0
- data/spec/dummy/public/422.html +26 -0
- data/spec/dummy/public/500.html +25 -0
- data/spec/dummy/public/favicon.ico +0 -0
- data/spec/dummy/public/system/droom/documents/files/000/000/001/original/frog.png +0 -0
- data/spec/dummy/public/system/droom/documents/files/000/000/001/original/rat.png +0 -0
- data/spec/dummy/script/rails +6 -0
- data/spec/dummy/solr/conf/admin-extra.html +31 -0
- data/spec/dummy/solr/conf/elevate.xml +36 -0
- data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt +246 -0
- data/spec/dummy/solr/conf/protwords.txt +21 -0
- data/spec/dummy/solr/conf/schema.xml +238 -0
- data/spec/dummy/solr/conf/scripts.conf +24 -0
- data/spec/dummy/solr/conf/solrconfig.xml +934 -0
- data/spec/dummy/solr/conf/spellings.txt +2 -0
- data/spec/dummy/solr/conf/stopwords.txt +58 -0
- data/spec/dummy/solr/conf/synonyms.txt +31 -0
- 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/dummy/webdav/1/group/rat.png +0 -0
- data/spec/dummy/webdav/1/unattached/rat.png +0 -0
- data/spec/dummy/webdav/group/rat.png +0 -0
- data/spec/dummy/webdav/unattached/rat.png +0 -0
- data/spec/dummy/webdav/unattached/rat_v1.png +0 -0
- data/spec/factories/agenda_categories.rb +5 -0
- data/spec/factories/categories.rb +5 -0
- data/spec/factories/documents.rb +16 -0
- data/spec/factories/events.rb +41 -0
- data/spec/factories/folders.rb +5 -0
- data/spec/factories/groups.rb +6 -0
- data/spec/factories/memberships.rb +5 -0
- data/spec/factories/people.rb +16 -0
- data/spec/factories/recurrence_rules.rb +25 -0
- data/spec/factories/user.rb +6 -0
- data/spec/fixtures/dummy.ics +59 -0
- data/spec/fixtures/images/frog.png +0 -0
- data/spec/fixtures/images/rat.png +0 -0
- data/spec/fixtures/ny.ics +36 -0
- data/spec/lib/droom/folders_spec.rb +46 -0
- data/spec/lib/droom/lazy_hash_spec.rb +33 -0
- data/spec/models/droom/agenda_category_spec.rb +15 -0
- data/spec/models/droom/document_spec.rb +76 -0
- data/spec/models/droom/event_spec.rb +154 -0
- data/spec/models/droom/folder_spec.rb +5 -0
- data/spec/models/droom/ical_spec.rb +62 -0
- data/spec/models/droom/mailing_list_membership_spec.rb +81 -0
- data/spec/models/droom/membership_spec.rb +22 -0
- data/spec/models/droom/person_spec.rb +72 -0
- data/spec/models/droom/recurrence_rule_spec.rb +81 -0
- data/spec/models/droom/user_spec.rb +27 -0
- data/spec/models/droom/visibility_spec.rb +6 -0
- data/spec/spec_helper.rb +119 -0
- data/spec/support/matchers/content_type_matcher.rb +17 -0
- metadata +591 -36
- data/app/assets/javascripts/droom/calendar.js.coffee +0 -121
- data/app/assets/javascripts/droom/drag_sort.js.coffee +0 -22
- data/app/assets/javascripts/droom/forms.js.coffee +0 -746
- data/app/assets/javascripts/droom/sort.js.coffee +0 -126
- data/app/assets/javascripts/droom/suggester.js.coffee +0 -230
- data/app/controllers/droom/document_attachments_controller.rb +0 -19
- data/app/models/droom/document_link.rb +0 -31
- data/app/models/droom/personal_document.rb +0 -98
- data/app/views/droom/dashboard/_marginalia.html.haml +0 -3
- data/app/views/droom/dashboard/_my_future_events.html.haml +0 -9
- data/app/views/droom/dashboard/_my_group_documents.html.haml +0 -6
- data/app/views/droom/dashboard/_my_past_events.haml +0 -6
- data/app/views/droom/documents/_event_document_form.html.haml +0 -15
- data/app/views/droom/errors/bang.html.haml +0 -12
- data/app/views/droom/errors/not_allowed.html.haml +0 -12
- data/app/views/droom/errors/not_found.html.haml +0 -12
- data/app/views/droom/events/_attachment.html.haml +0 -1
- data/app/views/droom/events/_attachment_list.html.haml +0 -4
- data/app/views/droom/invitations/_attending_people.html.haml +0 -8
- data/config/initializers/dav.rb +0 -2
@@ -1,6 +1,7 @@
|
|
1
1
|
module Droom
|
2
2
|
class MembershipsController < Droom::EngineController
|
3
3
|
respond_to :js, :html
|
4
|
+
layout :no_layout_if_pjax
|
4
5
|
|
5
6
|
before_filter :build_membership, :only => [:new, :create]
|
6
7
|
before_filter :get_membership, :only => :destroy
|
@@ -10,7 +11,7 @@ module Droom
|
|
10
11
|
@group = @membership.group
|
11
12
|
@person = @membership.person
|
12
13
|
@membership.destroy
|
13
|
-
render :partial => "
|
14
|
+
render :partial => "membership_toggle"
|
14
15
|
end
|
15
16
|
|
16
17
|
def new
|
@@ -20,13 +21,14 @@ module Droom
|
|
20
21
|
@membership = @group.memberships.create!(:person_id => @person.id, :group_id => @group.id)
|
21
22
|
render :partial => "button"
|
22
23
|
else
|
23
|
-
|
24
|
+
respond_with @membership
|
24
25
|
end
|
25
26
|
end
|
26
27
|
|
27
28
|
def create
|
28
29
|
if @membership.save
|
29
|
-
|
30
|
+
@person = @membership.person
|
31
|
+
render :partial => "membership_toggle"
|
30
32
|
else
|
31
33
|
respond_with @membership
|
32
34
|
end
|
@@ -0,0 +1,53 @@
|
|
1
|
+
module Droom
|
2
|
+
class OrganisationsController < Droom::EngineController
|
3
|
+
respond_to :html
|
4
|
+
layout :no_layout_if_pjax
|
5
|
+
helper Droom::DroomHelper
|
6
|
+
|
7
|
+
before_filter :authenticate_user!
|
8
|
+
before_filter :get_people, :only => [:index]
|
9
|
+
before_filter :find_organisations, :only => [:index]
|
10
|
+
before_filter :get_organisation, :only => [:show, :edit, :update, :destroy]
|
11
|
+
before_filter :build_organisation, :only => [:new, :create]
|
12
|
+
|
13
|
+
def create
|
14
|
+
@organisation.update_attributes(params[:organisation])
|
15
|
+
respond_with @organisation
|
16
|
+
end
|
17
|
+
|
18
|
+
def update
|
19
|
+
@organisation.update_attributes(params[:organisation])
|
20
|
+
respond_with @organisation
|
21
|
+
end
|
22
|
+
|
23
|
+
def show
|
24
|
+
respond_with @organisation
|
25
|
+
end
|
26
|
+
|
27
|
+
def destroy
|
28
|
+
@organisation.destroy
|
29
|
+
head :ok
|
30
|
+
end
|
31
|
+
|
32
|
+
protected
|
33
|
+
|
34
|
+
def find_organisations
|
35
|
+
@organisations = Droom::Organisation.order("name asc")
|
36
|
+
end
|
37
|
+
|
38
|
+
def get_people
|
39
|
+
@show = params[:show] || 10
|
40
|
+
@page = params[:page] || 1
|
41
|
+
@people = Droom::Person.order("name asc").page(@page).per(@show)
|
42
|
+
end
|
43
|
+
|
44
|
+
def get_organisation
|
45
|
+
@organisation = Droom::Organisation.find(params[:id])
|
46
|
+
end
|
47
|
+
|
48
|
+
def build_organisation
|
49
|
+
@organisation = Droom::Organisation.new(params[:organisation])
|
50
|
+
end
|
51
|
+
|
52
|
+
end
|
53
|
+
end
|
@@ -4,10 +4,10 @@ module Droom
|
|
4
4
|
layout :no_layout_if_pjax
|
5
5
|
|
6
6
|
before_filter :authenticate_user!
|
7
|
-
before_filter :
|
7
|
+
before_filter :scale_image_params, :only => [:create, :update]
|
8
8
|
before_filter :find_people, :only => :index
|
9
|
-
before_filter :get_groups
|
10
|
-
before_filter :get_person, :only => [:show, :edit, :update, :destroy]
|
9
|
+
before_filter :get_groups
|
10
|
+
before_filter :get_person, :only => [:show, :edit, :update, :destroy, :invite]
|
11
11
|
before_filter :build_person, :only => [:new, :create]
|
12
12
|
before_filter :confine_to_self, :except => [:index, :show]
|
13
13
|
|
@@ -19,36 +19,42 @@ module Droom
|
|
19
19
|
end
|
20
20
|
|
21
21
|
def show
|
22
|
-
respond_with @person
|
22
|
+
respond_with @person do |format|
|
23
|
+
format.js {
|
24
|
+
@invitation = Droom::Invitation.find_by_id(params[:invitation_id])
|
25
|
+
render :partial => 'droom/people/person'
|
26
|
+
}
|
27
|
+
end
|
23
28
|
end
|
24
29
|
|
25
30
|
def create
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
respond_with @person
|
31
|
+
@person.update_attributes(params[:person])
|
32
|
+
respond_with @person do |format|
|
33
|
+
format.js { render :partial => "droom/users/user_or_person" }
|
30
34
|
end
|
31
35
|
end
|
32
36
|
|
33
37
|
def update
|
34
|
-
Rails.logger.warn params[:person]
|
35
38
|
@person.update_attributes(params[:person])
|
36
|
-
@person
|
37
|
-
respond_with @person do |format|
|
38
|
-
format.json {
|
39
|
-
render
|
40
|
-
}
|
41
|
-
end
|
42
|
-
# if @person.save
|
43
|
-
# render :partial => "person"
|
44
|
-
# else
|
45
|
-
# respond_with @person
|
46
|
-
# end
|
39
|
+
respond_with @person
|
47
40
|
end
|
48
41
|
|
49
42
|
def destroy
|
43
|
+
@user = @person.user
|
50
44
|
@person.destroy
|
51
|
-
|
45
|
+
if @user
|
46
|
+
respond_with @user do |format|
|
47
|
+
format.js { render :partial => "droom/users/user_or_person"}
|
48
|
+
format.html { head :ok }
|
49
|
+
end
|
50
|
+
else
|
51
|
+
head :ok
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
def invite
|
56
|
+
@user = @person.invite!
|
57
|
+
render :partial => "droom/users/user_or_person", :locals => {:user_or_person => @person}
|
52
58
|
end
|
53
59
|
|
54
60
|
protected
|
@@ -67,26 +73,39 @@ module Droom
|
|
67
73
|
|
68
74
|
def find_people
|
69
75
|
if current_user.admin?
|
70
|
-
@people = Person.
|
76
|
+
@people = Person.scoped({})
|
71
77
|
else
|
72
|
-
@people = Person.visible_to(
|
78
|
+
@people = Person.visible_to(current_person)
|
73
79
|
end
|
74
80
|
|
75
|
-
if params[:
|
76
|
-
@people = @people.not_in_group(Droom::Group.find(params[:
|
81
|
+
if params[:not_group_id]
|
82
|
+
@people = @people.not_in_group(Droom::Group.find(params[:not_group_id]))
|
77
83
|
end
|
78
84
|
|
79
85
|
unless params[:q].blank?
|
80
86
|
@searching = true
|
81
|
-
@people = @people.
|
87
|
+
@people = @people.matching(params[:q])
|
82
88
|
end
|
83
89
|
|
84
|
-
@
|
90
|
+
@show = params[:show] || 10
|
91
|
+
@page = params[:page] || 1
|
92
|
+
@people = @people.page(@page).per(@show)
|
85
93
|
end
|
86
94
|
|
87
95
|
def confine_to_self
|
88
96
|
@person = current_user.person unless current_user.admin?
|
89
97
|
end
|
90
98
|
|
99
|
+
def scale_image_params
|
100
|
+
multiplier = params[:multiplier] || 4
|
101
|
+
Rails.logger.warn ">>> before scale_image_params (with multiplier #{multiplier}), params for person: #{params[:person].inspect}"
|
102
|
+
if params[:person]
|
103
|
+
[:image_scale_width, :image_scale_height, :image_offset_left, :image_offset_top].each do |p|
|
104
|
+
params[:person][p] = (params[:person][p].to_i * multiplier.to_i) unless params[:person][p].blank?
|
105
|
+
end
|
106
|
+
end
|
107
|
+
Rails.logger.warn ">>> after scale_image_params, params for person: #{params[:person].inspect}"
|
108
|
+
end
|
109
|
+
|
91
110
|
end
|
92
111
|
end
|
@@ -0,0 +1,34 @@
|
|
1
|
+
module Droom
|
2
|
+
class PreferencesController < Droom::EngineController
|
3
|
+
respond_to :js, :html
|
4
|
+
layout :no_layout_if_pjax
|
5
|
+
|
6
|
+
before_filter :authenticate_user!
|
7
|
+
before_filter :get_preference, :only => [:show, :edit, :update]
|
8
|
+
before_filter :build_preference, :only => [:new, :create]
|
9
|
+
|
10
|
+
def create
|
11
|
+
@preference.update_attributes(params[:preference])
|
12
|
+
@preference.save
|
13
|
+
render :partial => "preference"
|
14
|
+
end
|
15
|
+
|
16
|
+
def update
|
17
|
+
@preference.update_attributes(params[:preference])
|
18
|
+
@preference.save
|
19
|
+
render :partial => "preference"
|
20
|
+
end
|
21
|
+
|
22
|
+
protected
|
23
|
+
|
24
|
+
def get_preference
|
25
|
+
@preference = current_user.preferences.find(params[:id])
|
26
|
+
end
|
27
|
+
|
28
|
+
def build_preference
|
29
|
+
key = params[:preference][:key] || params[:key]
|
30
|
+
@preference = current_user.preferences.find_or_initialize_by_key(key)
|
31
|
+
end
|
32
|
+
|
33
|
+
end
|
34
|
+
end
|
@@ -0,0 +1,77 @@
|
|
1
|
+
module Droom
|
2
|
+
class ScrapsController < Droom::EngineController
|
3
|
+
respond_to :html, :js, :json, :atom
|
4
|
+
layout :no_layout_if_pjax
|
5
|
+
|
6
|
+
before_filter :authenticate_user!
|
7
|
+
before_filter :scale_image_params, :only => [:create, :update]
|
8
|
+
before_filter :find_scraps, :only => [:index]
|
9
|
+
before_filter :get_scrap, :only => [:show, :edit, :update, :destroy, :chart]
|
10
|
+
before_filter :build_scrap, :only => [:new, :create]
|
11
|
+
|
12
|
+
def index
|
13
|
+
respond_with(@scraps) do |format|
|
14
|
+
format.js { render :partial => 'droom/scraps/stream' }
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
def show
|
19
|
+
respond_with(@scrap)
|
20
|
+
end
|
21
|
+
|
22
|
+
def new
|
23
|
+
respond_with(@scrap)
|
24
|
+
end
|
25
|
+
|
26
|
+
def edit
|
27
|
+
respond_with(@scrap)
|
28
|
+
end
|
29
|
+
|
30
|
+
def update
|
31
|
+
@scrap.update_attributes(params[:scrap])
|
32
|
+
respond_with(@scrap)
|
33
|
+
end
|
34
|
+
|
35
|
+
def create
|
36
|
+
@scrap.update_attributes(params[:scrap])
|
37
|
+
respond_with(@scrap)
|
38
|
+
end
|
39
|
+
|
40
|
+
def destroy
|
41
|
+
@scrap.destroy
|
42
|
+
head :ok
|
43
|
+
end
|
44
|
+
|
45
|
+
def feed
|
46
|
+
|
47
|
+
end
|
48
|
+
|
49
|
+
protected
|
50
|
+
|
51
|
+
def find_scraps
|
52
|
+
@show = params[:show] || 10
|
53
|
+
@page = params[:page] || 1
|
54
|
+
@scraps = Droom::Scrap.by_date.page(@page).per(@show) unless @show == 'all'
|
55
|
+
end
|
56
|
+
|
57
|
+
def get_scrap
|
58
|
+
@scrap = Droom::Scrap.find(params[:id])
|
59
|
+
end
|
60
|
+
|
61
|
+
def build_scrap
|
62
|
+
params[:scrap]
|
63
|
+
@scrap = Droom::Scrap.new(params[:scrap])
|
64
|
+
@folder = Droom::Folder.find_or_create_by_slug("stream")
|
65
|
+
@scrap.scraptype ||= 'text'
|
66
|
+
end
|
67
|
+
|
68
|
+
def scale_image_params
|
69
|
+
if multiplier = params[:multiplier]
|
70
|
+
[:image_scale_width, :image_scale_height, :image_offset_left, :image_offset_top].each do |p|
|
71
|
+
params[:scrap][p] = (params[:scrap][p].to_i * multiplier.to_i) unless params[:scrap][p].blank?
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
76
|
+
end
|
77
|
+
end
|
@@ -0,0 +1,66 @@
|
|
1
|
+
module Droom
|
2
|
+
class SearchController < Droom::EngineController
|
3
|
+
respond_to :json, :js, :html
|
4
|
+
before_filter :authenticate_user!
|
5
|
+
before_filter :get_classes
|
6
|
+
before_filter :get_fields
|
7
|
+
|
8
|
+
def index
|
9
|
+
@results = []
|
10
|
+
if @fragment = params[:term]
|
11
|
+
@page = params[:page] || 1
|
12
|
+
frag = @fragment.force_encoding("US-ASCII")
|
13
|
+
# if term isn't empty
|
14
|
+
unless frag == ""
|
15
|
+
classes = Droom.searchable_classes.values.collect {|klass| klass.constantize}
|
16
|
+
highlights = @highlights.collect {|field| field.to_sym}
|
17
|
+
# search the searchable classes
|
18
|
+
# highlight matching words from highlightable fields
|
19
|
+
search = Sunspot.search classes do
|
20
|
+
fulltext frag do
|
21
|
+
highlights.each do |hl|
|
22
|
+
highlight hl
|
23
|
+
end
|
24
|
+
with visible_to?(current_person)
|
25
|
+
end
|
26
|
+
paginate :page => @page, :per_page => 10
|
27
|
+
end
|
28
|
+
# push the hits (for retrieving highlights) into the search results
|
29
|
+
search.each_hit_with_result do |hit, result|
|
30
|
+
if @requested_types.include? result.class.to_s
|
31
|
+
result[:hit] = if hit.highlights.length > 0 then hit else nil end
|
32
|
+
@results.push result
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
respond_with @results do |format|
|
38
|
+
format.html { render "droom/shared/search" }
|
39
|
+
format.json { render :json => @results.map(&:as_search_result).to_json }
|
40
|
+
format.js { render :partial => "droom/shared/search_results" }
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
protected
|
45
|
+
|
46
|
+
def get_fields
|
47
|
+
@highlights = []
|
48
|
+
@requested_types.each do |klass|
|
49
|
+
klass.constantize.highlight_fields.each do |hlf|
|
50
|
+
@highlights.push hlf unless @highlights.include? hlf
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
def get_classes
|
56
|
+
searchable_classes = Droom.searchable_classes
|
57
|
+
@types = [params[:type]].flatten.compact.uniq
|
58
|
+
@types = searchable_classes.keys if @types.empty?
|
59
|
+
|
60
|
+
logger.warn ">>> requested_types is #{@types.inspect}"
|
61
|
+
|
62
|
+
@requested_types = searchable_classes.values_at(*@types)
|
63
|
+
end
|
64
|
+
|
65
|
+
end
|
66
|
+
end
|
@@ -2,29 +2,28 @@ module Droom
|
|
2
2
|
class SuggestionsController < Droom::EngineController
|
3
3
|
respond_to :json, :js
|
4
4
|
before_filter :authenticate_user!
|
5
|
-
before_filter :get_current_person
|
6
5
|
before_filter :get_classes
|
7
|
-
|
6
|
+
|
8
7
|
def index
|
9
8
|
fragment = params[:term]
|
10
9
|
max = params[:limit] || 10
|
11
|
-
|
12
|
-
if
|
13
|
-
@suggestions =
|
14
|
-
|
10
|
+
show_when_empty = params[:empty] == "all"
|
11
|
+
if !show_when_empty && fragment.blank?
|
12
|
+
@suggestions = []
|
15
13
|
else
|
16
|
-
@
|
17
|
-
|
18
|
-
|
14
|
+
if @types.include?('event') && fragment.length > 6 && span = Chronic.parse(fragment, :guess => false)
|
15
|
+
@suggestions = Droom::Event.falling_within(span).visible_to(current_user.person)
|
16
|
+
@title = span.width > 86400 ? "Events in #{fragment}" : "Events on #{fragment}"
|
17
|
+
else
|
18
|
+
@suggestions = @klasses.collect {|klass|
|
19
|
+
logger.warn ">>> getting #{klass}"
|
20
|
+
klass.constantize.visible_to(current_user.person).matching(fragment).limit(max.to_i)
|
21
|
+
}.flatten.sort_by(&:name).slice(0, max.to_i)
|
22
|
+
end
|
19
23
|
end
|
20
|
-
|
21
24
|
respond_with @suggestions do |format|
|
22
25
|
format.json {
|
23
|
-
render :json => @suggestions.map
|
24
|
-
:type => suggestion.identifier,
|
25
|
-
:text => suggestion.name,
|
26
|
-
:id => suggestion.id
|
27
|
-
}}.to_json
|
26
|
+
render :json => @suggestions.map(&:as_suggestion).to_json
|
28
27
|
}
|
29
28
|
format.js {
|
30
29
|
render :partial => "droom/shared/suggestions"
|
@@ -33,26 +32,14 @@ module Droom
|
|
33
32
|
end
|
34
33
|
|
35
34
|
protected
|
36
|
-
|
35
|
+
|
37
36
|
def get_classes
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
@klasses = searchable_classes.values_at(*@types)
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
def searchable_classes
|
48
|
-
{
|
49
|
-
"event" => "Droom::Event",
|
50
|
-
"person" => "Droom::Person",
|
51
|
-
"document" => "Droom::Document",
|
52
|
-
"group" => "Droom::Group",
|
53
|
-
"venue" => "Droom::Venue"
|
54
|
-
}
|
37
|
+
suggestible_classes = Droom.suggestible_classes
|
38
|
+
requested_types = [params[:type]].flatten.compact.uniq
|
39
|
+
requested_types = Droom.suggestible_classes.keys if requested_types.empty?
|
40
|
+
@types = suggestible_classes.keys & requested_types
|
41
|
+
@klasses = suggestible_classes.values_at(*@types)
|
55
42
|
end
|
56
|
-
|
43
|
+
|
57
44
|
end
|
58
|
-
end
|
45
|
+
end
|