atrium 0.0.1 → 0.1.1
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +9 -1
- data/.rspec +2 -0
- data/.rvmrc +1 -1
- data/CONTRIBUTING.md +73 -0
- data/Gemfile +27 -2
- data/Gemfile.lock +122 -246
- data/Guardfile +40 -10
- data/LICENSE +14 -0
- data/README.mkd +23 -39
- data/ROADMAP.mkd +41 -9
- data/Rakefile +39 -4
- data/app/assets/images/atrium/remove.png +0 -0
- data/app/assets/images/atrium/white-arrow.png +0 -0
- data/app/assets/javascripts/{atrium/atrium.js → atrium.js} +8 -153
- data/app/assets/stylesheets/{atrium/atrium.css → atrium.css} +110 -37
- data/app/assets/stylesheets/atrium/collections.css +4 -0
- data/app/assets/stylesheets/atrium/descriptions.css +4 -0
- data/app/assets/stylesheets/atrium/exhibits.css +4 -0
- data/app/assets/stylesheets/atrium/reset.css +69 -0
- data/app/assets/stylesheets/atrium/showcases.css +4 -0
- data/app/assets/stylesheets/atrium/theme.css +248 -0
- data/app/controllers/atrium/application_controller.rb +12 -0
- data/app/controllers/atrium/browse_levels_controller.rb +22 -0
- data/app/controllers/atrium/collections_controller.rb +42 -138
- data/app/controllers/atrium/descriptions_controller.rb +27 -146
- data/app/controllers/atrium/exhibits_controller.rb +51 -77
- data/app/controllers/atrium/order_controller.rb +74 -0
- data/app/controllers/atrium/showcases_controller.rb +96 -117
- data/app/helpers/atrium/application_helper.rb +8 -0
- data/app/helpers/atrium/collections_helper.rb +44 -0
- data/app/helpers/atrium/descriptions_helper.rb +4 -0
- data/app/helpers/atrium/exhibits_helper.rb +4 -0
- data/app/helpers/atrium/showcases_helper.rb +34 -0
- data/app/models/atrium/browse_level.rb +21 -11
- data/app/models/atrium/collection.rb +70 -36
- data/app/models/atrium/configuration.rb +66 -0
- data/app/models/atrium/description.rb +39 -88
- data/app/models/atrium/essay.rb +4 -5
- data/app/models/atrium/exhibit.rb +28 -19
- data/app/models/atrium/is_showcased_mixin.rb +34 -0
- data/app/models/atrium/query_param_mixin.rb +105 -0
- data/app/models/atrium/search/facet.rb +14 -25
- data/app/models/atrium/search/facet_selection.rb +10 -12
- data/app/models/atrium/showcase.rb +105 -95
- data/app/models/atrium/showcase/facet_selection.rb +18 -18
- data/app/models/atrium/showcase/featured_selection.rb +15 -0
- data/app/services/browse_level_evaluation_service.rb +131 -0
- data/app/services/current_filter_query_params_extraction_service.rb +91 -0
- data/app/services/navigation_tree.rb +13 -0
- data/app/services/params_adaptor_for_filter.rb +18 -0
- data/app/views/atrium/collections/_form.html.erb +149 -72
- data/app/views/atrium/collections/_head.html.erb +3 -0
- data/app/views/atrium/collections/edit.html.erb +1 -4
- data/app/views/atrium/collections/index.html.erb +14 -0
- data/app/views/atrium/collections/new.html.erb +2 -5
- data/app/views/atrium/collections/show.html.erb +11 -29
- data/app/views/atrium/descriptions/_form.html.erb +47 -49
- data/app/views/atrium/descriptions/edit.html.erb +1 -2
- data/app/views/atrium/descriptions/index.html.erb +2 -8
- data/app/views/atrium/descriptions/new.html.erb +2 -1
- data/app/views/atrium/descriptions/show.html.erb +2 -20
- data/app/views/atrium/exhibits/_exhibit.html.erb +1 -0
- data/app/views/atrium/exhibits/_form.html.erb +143 -96
- data/app/views/atrium/exhibits/edit.html.erb +1 -8
- data/app/views/atrium/exhibits/index.html.erb +2 -0
- data/app/views/atrium/exhibits/new.html.erb +0 -5
- data/app/views/atrium/exhibits/show.html.erb +2 -34
- data/app/views/atrium/showcases/_configure_menu.html.erb +55 -0
- data/app/views/atrium/showcases/_form.html.erb +40 -0
- data/app/views/atrium/showcases/edit.html.erb +3 -0
- data/app/views/atrium/showcases/index.html.erb +32 -0
- data/app/views/atrium/showcases/new.html.erb +3 -0
- data/app/views/atrium/showcases/show.html.erb +2 -1
- data/app/views/layouts/atrium.html.erb +16 -24
- data/app/views/layouts/atrium/application.html.erb +49 -0
- data/app/views/layouts/atrium/themes/default.html.erb +15 -0
- data/app/views/shared/_list_searchs.html.erb +4 -0
- data/app/views/shared/_navigation.html.erb +19 -0
- data/atrium.gemspec +31 -64
- data/config/routes.rb +40 -10
- data/{lib/generators/atrium/templates/migrations/create_atrium_collections.rb → db/migrate/20120730170406_create_atrium_collections.rb} +2 -1
- data/{lib/generators/atrium/templates/migrations/create_atrium_showcases.rb → db/migrate/20120731134846_create_atrium_showcases.rb} +3 -4
- data/{lib/generators/atrium/templates/migrations/create_atrium_exhibits.rb → db/migrate/20120731134856_create_atrium_exhibits.rb} +2 -1
- data/{lib/generators/atrium/templates/migrations/create_atrium_descriptions.rb → db/migrate/20120731134904_create_atrium_descriptions.rb} +2 -1
- data/{lib/generators/atrium/templates/migrations/create_atrium_essays.rb → db/migrate/20120731135534_create_atrium_essays.rb} +3 -2
- data/{lib/generators/atrium/templates/migrations/create_atrium_search_facets.rb → db/migrate/20120731135721_create_atrium_search_facets.rb} +1 -1
- data/{lib/generators/atrium/templates/migrations/create_atrium_showcase_facet_selections.rb → db/migrate/20120731140621_create_atrium_showcase_facet_selections.rb} +6 -2
- data/{lib/generators/atrium/templates/migrations/create_atrium_browse_levels.rb → db/migrate/20120801145241_create_atrium_browse_levels.rb} +1 -1
- data/db/migrate/20120820183808_create_selected_items.rb +16 -0
- data/db/migrate/20120823135716_update_atrium_collection_indices.rb +13 -0
- data/db/migrate/20120823143315_add_lookup_indices_as_required.rb +11 -0
- data/lib/atrium.rb +40 -36
- data/lib/atrium/engine.rb +4 -8
- data/lib/atrium/exceptions.rb +10 -0
- data/lib/atrium/version.rb +2 -2
- data/lib/generators/atrium/install/USAGE +8 -0
- data/lib/generators/atrium/install/install_generator.rb +86 -0
- data/lib/generators/atrium/install/templates/atrium_initializer.rb +21 -0
- data/lib/generators/atrium/install/templates/controllers/atrium_base_controller.rb +18 -0
- data/lib/generators/atrium/install/templates/controllers/collections_controller.rb +40 -0
- data/lib/generators/atrium/install/templates/controllers/descriptions_controller.rb +36 -0
- data/lib/generators/atrium/install/templates/controllers/exhibits_controller.rb +47 -0
- data/lib/generators/atrium/install/templates/controllers/selected_items_controller.rb +26 -0
- data/lib/generators/atrium/install/templates/helpers/application_helper.rb +42 -0
- data/lib/generators/atrium/install/templates/helpers/collections_helper.rb +15 -0
- data/lib/generators/atrium/install/templates/helpers/navigation_helper.rb +62 -0
- data/lib/generators/atrium/install/templates/helpers/solr_helper.rb +138 -0
- data/lib/generators/atrium/install/templates/models/selected_item.rb +7 -0
- data/lib/generators/atrium/install/templates/views/collections/_document.html.erb +19 -0
- data/lib/generators/atrium/install/templates/views/collections/_exhibits.html.erb +3 -0
- data/lib/generators/atrium/install/templates/views/collections/_pagination.html.erb +6 -0
- data/lib/generators/atrium/install/templates/views/collections/browse.html.erb +16 -0
- data/lib/generators/atrium/install/templates/views/collections/show.html.erb +19 -0
- data/lib/generators/atrium/install/templates/views/descriptions/show.html.erb +8 -0
- data/lib/generators/atrium/install/templates/views/exhibits/_document.html.erb +19 -0
- data/lib/generators/atrium/install/templates/views/exhibits/_pagination.html.erb +6 -0
- data/lib/generators/atrium/install/templates/views/exhibits/show.html.erb +28 -0
- data/lib/generators/atrium/install/templates/views/folder/_selected_items_form.html.erb +8 -0
- data/lib/generators/atrium/install/templates/views/folder/index.html.erb +45 -0
- data/lib/generators/atrium/install/templates/views/shared/_document_list.html.erb +14 -0
- data/lib/generators/atrium/install/templates/views/shared/_featured_sources.html.erb +19 -0
- data/lib/generators/atrium/install/templates/views/shared/_list_descriptions.html.erb +25 -0
- data/lib/generators/atrium/install/templates/views/shared/_masthead.html.erb +19 -0
- data/lib/generators/atrium/install/templates/views/shared/_navigation_browse_level.html.erb +34 -0
- data/lib/generators/atrium/install/templates/views/shared/_showcases.html.erb +12 -0
- data/lib/generators/atrium/install/templates/views/shared/_side_bar_navigation.html.erb +20 -0
- data/lib/generators/atrium/service/USAGE +9 -0
- data/lib/generators/atrium/service/service_generator.rb +16 -0
- data/lib/generators/atrium/service/templates/service.rb.erb +2 -0
- data/lib/generators/atrium/service/templates/service_spec.rb.erb +4 -0
- data/lib/generators/atrium/theme/USAGE +8 -0
- data/lib/generators/atrium/theme/templates/theme.html.erb +14 -0
- data/lib/generators/atrium/theme/theme_generator.rb +11 -0
- data/lib/tasks/atrium_tasks.rake +4 -0
- data/script/rails +10 -0
- data/spec/atrium_spec.rb +10 -0
- data/spec/controllers/atrium/application_controller_spec.rb +7 -0
- data/spec/controllers/atrium/collections_controller_spec.rb +125 -0
- data/spec/controllers/atrium/descriptions_controller_spec.rb +142 -0
- data/spec/controllers/atrium/exhibits_controller_spec.rb +102 -0
- data/spec/controllers/atrium/order_controller_spec.rb +100 -0
- data/spec/controllers/atrium/showcases_controller_spec.rb +217 -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/mailers/.gitkeep +0 -0
- data/spec/dummy/app/models/.gitkeep +0 -0
- data/spec/dummy/app/models/collection.rb +3 -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 +59 -0
- data/spec/dummy/config/boot.rb +10 -0
- data/spec/dummy/config/database.yml +25 -0
- data/spec/dummy/config/environment.rb +5 -0
- data/spec/dummy/config/environments/development.rb +37 -0
- data/spec/dummy/config/environments/production.rb +67 -0
- data/spec/dummy/config/environments/test.rb +37 -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 +5 -0
- data/spec/dummy/config/routes.rb +4 -0
- data/spec/dummy/db/schema.rb +124 -0
- data/spec/dummy/lib/assets/.gitkeep +0 -0
- data/spec/dummy/log/.gitkeep +0 -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/script/rails +6 -0
- data/spec/dummy/test/fixtures/collections.yml +11 -0
- data/spec/dummy/test/unit/collection_test.rb +7 -0
- data/spec/factories/atrium_collections.rb +8 -0
- data/spec/factories/atrium_exhibits.rb +9 -0
- data/spec/factories/atrium_search_facets.rb +8 -0
- data/spec/factories/atrium_showcases.rb +25 -0
- data/spec/helpers/atrium/collections_helper_spec.rb +57 -0
- data/spec/helpers/atrium/showcases_helper_spec.rb +56 -0
- data/spec/models/atrium/browse_level_spec.rb +56 -0
- data/spec/models/atrium/collection_spec.rb +76 -0
- data/spec/models/atrium/configuration_spec.rb +114 -0
- data/spec/models/atrium/description_spec.rb +56 -0
- data/spec/models/atrium/essay_spec.rb +16 -0
- data/spec/models/atrium/exhibit_spec.rb +90 -0
- data/spec/models/atrium/search/facet_selection_spec.rb +23 -0
- data/{test_support/spec → spec}/models/atrium/search/facet_spec.rb +2 -4
- data/{test_support/spec → spec}/models/atrium/showcase/facet_selection_spec.rb +5 -5
- data/spec/models/atrium/showcase/featured_selection_spec.rb +18 -0
- data/spec/models/atrium/showcase_spec.rb +97 -0
- data/spec/services/browse_level_evaluation_service_spec.rb +33 -0
- data/spec/services/current_filter_query_params_extraction_service_spec.rb +34 -0
- data/spec/services/navigation_tree_spec.rb +18 -0
- data/spec/services/params_adaptor_for_filter_spec.rb +8 -0
- data/spec/spec_helper.rb +39 -0
- data/spec/support/accept_nested_attributes_for.rb +39 -0
- data/{test_support/spec → spec}/support/be_accessible_matcher.rb +0 -0
- data/{test_support/spec → spec}/support/be_routed_mixin.rb +0 -0
- data/spec/support/controller_hacks.rb +35 -0
- data/spec/support/routes.rb +5 -0
- data/spec/support/shared_examples/is_showcased_mixin.rb +20 -0
- data/spec/support/shared_examples/query_param_mixin.rb +179 -0
- data/{app/assets/stylesheets/atrium → vendor/assets/images}/chosen-sprite.png +0 -0
- data/{app → vendor}/assets/javascripts/chosen.jquery.js +0 -0
- data/{app → vendor}/assets/javascripts/ckeditor.warning.js +0 -0
- data/{app → vendor}/assets/javascripts/ckeditor/config.js.coffee +0 -0
- data/{app → vendor}/assets/javascripts/ckeditor/jquery.generateId.js +0 -0
- data/{app → vendor}/assets/javascripts/ckeditor/jquery.jeditable.ckeditor.js +0 -0
- data/{app → vendor}/assets/javascripts/ckeditor/plugins/linkItem/application_link.png +0 -0
- data/{app → vendor}/assets/javascripts/ckeditor/plugins/linkItem/dialogs/linkItem.js +0 -0
- data/{app → vendor}/assets/javascripts/ckeditor/plugins/linkItem/plugin.js +0 -0
- data/{app → vendor}/assets/javascripts/ckeditor/plugins/linkItem/ui_toolbar_pencil.png +0 -0
- data/vendor/assets/javascripts/jquery-ui-1.8.23.custom.min.js +41 -0
- data/vendor/assets/javascripts/jquery-ui-build.txt +8 -0
- data/{app → vendor}/assets/javascripts/jquery.jeditable.js +0 -0
- data/{app/assets/stylesheets/atrium → vendor/assets/stylesheets}/chosen.css +4 -4
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_flat_10_000000_40x100.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-icons_222222_256x240.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-icons_228ef1_256x240.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-icons_ef8c08_256x240.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png +0 -0
- data/vendor/assets/stylesheets/ui-lightness/jquery-ui-1.8.23.custom.css +334 -0
- metadata +431 -949
- data/GETTING_STARTED.textile +0 -102
- data/app/assets/images/atrium/ajax-loader.gif +0 -0
- data/app/assets/images/atrium/lightbox-ico-loading.gif +0 -0
- data/app/assets/images/atrium/logo.png +0 -0
- data/app/assets/javascripts/jquery.colorbox.js +0 -864
- data/app/assets/stylesheets/colorbox.css +0 -42
- data/app/assets/stylesheets/controls.png +0 -0
- data/app/assets/stylesheets/loading.gif +0 -0
- data/app/controllers/atrium/base_controller.rb +0 -25
- data/app/controllers/atrium/collection_exhibit_order_controller.rb +0 -21
- data/app/controllers/atrium/customization_controller.rb +0 -41
- data/app/controllers/atrium/exhibit_facet_order_controller.rb +0 -19
- data/app/helpers/atrium/base_helper.rb +0 -6
- data/app/models/ability.rb +0 -14
- data/app/models/atrium/showcase/item.rb +0 -19
- data/app/models/role_mapper.rb +0 -23
- data/app/views/_user_util_links.html.erb +0 -25
- data/app/views/atrium/collections/_bookmark_control.html.erb +0 -25
- data/app/views/atrium/collections/_browse_index.html.erb +0 -20
- data/app/views/atrium/collections/_collection_items_index.html.erb +0 -10
- data/app/views/atrium/collections/_document.html.erb +0 -24
- data/app/views/atrium/collections/_document_list.html.erb +0 -6
- data/app/views/atrium/collections/_edit_navigation.html.erb +0 -20
- data/app/views/atrium/collections/_folder_control.html.erb +0 -12
- data/app/views/atrium/collections/_listing.html.erb +0 -18
- data/app/views/atrium/collections/_navigation.html.erb +0 -50
- data/app/views/atrium/collections/_results_pagination.html.erb +0 -9
- data/app/views/atrium/collections/_sort_and_per_page.html.erb +0 -23
- data/app/views/atrium/exhibits/_bookmark_control.html.erb +0 -25
- data/app/views/atrium/exhibits/_folder_control.html.erb +0 -12
- data/app/views/atrium/exhibits/_navigation.html.erb +0 -30
- data/app/views/atrium/showcases/_showcase_navigation.html.erb +0 -23
- data/app/views/catalog/_collection_home_text.html.erb +0 -6
- data/app/views/catalog/_constraints.html.erb +0 -9
- data/app/views/catalog/_default_collection_text.html.erb +0 -18
- data/app/views/catalog/_default_home_text.html.erb +0 -6
- data/app/views/catalog/_home_text.html.erb +0 -6
- data/app/views/catalog/_index_partials/_description.html.erb +0 -8
- data/app/views/catalog/_search_form.html.erb +0 -66
- data/app/views/catalog/_show_partials/_description.html.erb +0 -15
- data/app/views/catalog/browse_show.html.erb +0 -18
- data/app/views/catalog/index.html.erb +0 -41
- data/app/views/catalog/list_description.html.erb +0 -24
- data/app/views/catalog/list_item.html.erb +0 -3
- data/app/views/layouts/atrium_themes/default.html.erb +0 -4
- data/app/views/layouts/item_listing.html.erb +0 -36
- data/app/views/listing/_document.html.erb +0 -27
- data/app/views/listing/_document_list.html.erb +0 -3
- data/app/views/listing/_item_search.html.erb +0 -27
- data/app/views/shared/_banner.html.erb +0 -5
- data/app/views/shared/_collection_complete_list.html.erb +0 -33
- data/app/views/shared/_collection_search_form.html.erb +0 -12
- data/app/views/shared/_collection_title_header.html.erb +0 -3
- data/app/views/shared/_featured_sources.html.erb +0 -23
- data/app/views/shared/_list_descriptions.html.erb +0 -39
- data/app/views/shared/_navigation_browse_levels.html.erb +0 -34
- data/app/views/shared/_showcase_configure_menu.html.erb +0 -22
- data/app/views/shared/_top_navigation.html.erb +0 -9
- data/init.rb +0 -3
- data/lib/application_controller.rb +0 -24
- data/lib/atrium/application_helper.rb +0 -24
- data/lib/atrium/atrium_helper_behavior.rb +0 -159
- data/lib/atrium/catalog.rb +0 -203
- data/lib/atrium/collections_helper.rb +0 -172
- data/lib/atrium/controller.rb +0 -10
- data/lib/atrium/descriptions_helper.rb +0 -27
- data/lib/atrium/layout_helper.rb +0 -13
- data/lib/atrium/routes.rb +0 -100
- data/lib/atrium/solr_helper.rb +0 -440
- data/lib/generators/atrium/assets_generator.rb +0 -44
- data/lib/generators/atrium/atrium_generator.rb +0 -149
- data/lib/generators/atrium/cucumber_support_generator.rb +0 -29
- data/lib/generators/atrium/templates/config/role_map_cucumber.yml +0 -2
- data/lib/generators/atrium/templates/config/role_map_development.yml +0 -2
- data/lib/generators/atrium/templates/config/role_map_production.yml +0 -2
- data/lib/generators/atrium/templates/config/role_map_test.yml +0 -2
- data/lib/generators/atrium/templates/config/solr.yml +0 -10
- data/lib/generators/atrium/templates/db/seeds.rb +0 -87
- data/lib/generators/atrium/templates/migrations/create_atrium_showcase_items.rb +0 -17
- data/lib/generators/atrium/templates/themes/example.html.erb +0 -21
- data/lib/railties/all_tests.rake +0 -23
- data/lib/railties/atrium_cucumber.rake +0 -121
- data/lib/railties/index.rake +0 -37
- data/tasks/atrium.rake +0 -268
- data/tasks/atrium_rspec.rake +0 -91
- data/test_support/etc/Gemfile +0 -33
- data/test_support/etc/bundle_config +0 -3
- data/test_support/etc/rvmrc +0 -32
- data/test_support/features/atrium_collections.feature +0 -162
- data/test_support/features/atrium_exhibits.feature +0 -164
- data/test_support/features/step_definitions/atrium_collection_steps.rb +0 -102
- data/test_support/features/step_definitions/atrium_exhibit_steps.rb +0 -53
- data/test_support/features/step_definitions/bookmarks_steps.rb +0 -6
- data/test_support/features/step_definitions/error_steps.rb +0 -5
- data/test_support/features/step_definitions/folder_steps.rb +0 -27
- data/test_support/features/step_definitions/general_steps.rb +0 -50
- data/test_support/features/step_definitions/record_view_steps.rb +0 -12
- data/test_support/features/step_definitions/saved_searches_steps.rb +0 -22
- data/test_support/features/step_definitions/search_facets_steps.rb +0 -29
- data/test_support/features/step_definitions/search_history_steps.rb +0 -9
- data/test_support/features/step_definitions/search_result_steps.rb +0 -114
- data/test_support/features/step_definitions/search_steps.rb +0 -103
- data/test_support/features/step_definitions/user_steps.rb +0 -5
- data/test_support/features/step_definitions/web_steps.rb +0 -213
- data/test_support/features/support/env.rb +0 -67
- data/test_support/features/support/paths.rb +0 -76
- data/test_support/features/support/selectors.rb +0 -40
- data/test_support/fixtures/atrium_exhibits.yml +0 -3
- data/test_support/spec/controllers/atrium/base_controller_spec.rb +0 -13
- data/test_support/spec/controllers/atrium/collection_exhibit_order_controller_spec.rb +0 -29
- data/test_support/spec/controllers/atrium/collections_controller_spec.rb +0 -185
- data/test_support/spec/controllers/atrium/customization_controller_spec.rb +0 -38
- data/test_support/spec/controllers/atrium/descriptions_controller_spec.rb +0 -150
- data/test_support/spec/controllers/atrium/exhibit_facet_order_controller_spec.rb +0 -36
- data/test_support/spec/controllers/atrium/exhibits_controller_spec.rb +0 -192
- data/test_support/spec/controllers/atrium/showcases_controller_spec.rb +0 -219
- data/test_support/spec/helpers/atrium_collections_helper_spec.rb +0 -147
- data/test_support/spec/helpers/atrium_description_helper_spec.rb +0 -47
- data/test_support/spec/helpers/atrium_solr_helper_spec.rb +0 -522
- data/test_support/spec/models/atrium/browse_level_spec.rb +0 -31
- data/test_support/spec/models/atrium/collection_spec.rb +0 -30
- data/test_support/spec/models/atrium/description_spec.rb +0 -67
- data/test_support/spec/models/atrium/essay_spec.rb +0 -12
- data/test_support/spec/models/atrium/exhibit_spec.rb +0 -76
- data/test_support/spec/models/atrium/search/facet_selection_spec.rb +0 -24
- data/test_support/spec/models/atrium/search_facet_spec.rb +0 -54
- data/test_support/spec/models/atrium/showcase/item_spec.rb +0 -12
- data/test_support/spec/models/atrium/showcase_facet_selection_spec.rb +0 -65
- data/test_support/spec/models/atrium/showcase_spec.rb +0 -134
- data/test_support/spec/rcov.opts +0 -3
- data/test_support/spec/routing/atrium/collections_routing_spec.rb +0 -33
- data/test_support/spec/spec.opts +0 -4
- data/test_support/spec/spec_helper.rb +0 -47
- data/test_support/tmp/step_definitions/catalog_index_steps.rb +0 -14
- data/test_support/tmp/step_definitions/edit_document_steps.rb +0 -67
- data/test_support/tmp/step_definitions/hydra_metadata_steps.rb +0 -3
- data/test_support/tmp/step_definitions/hydra_steps.rb +0 -8
- data/test_support/tmp/step_definitions/search_steps.rb +0 -86
- data/test_support/tmp/step_definitions/searching_steps.rb +0 -22
- data/test_support/tmp/step_definitions/select_steps.rb +0 -8
- data/test_support/tmp/step_definitions/show_document_steps.rb +0 -73
- data/test_support/tmp/step_definitions/user_steps.rb +0 -15
- data/test_support/tmp/step_definitions/web_steps.rb +0 -273
- data/test_support/tmp/support/env.rb +0 -54
- data/test_support/tmp/support/paths.rb +0 -57
@@ -0,0 +1,18 @@
|
|
1
|
+
# TODO: Move to
|
2
|
+
class AtriumBaseController < ApplicationController
|
3
|
+
|
4
|
+
before_filter :find_collection
|
5
|
+
include ApplicationHelper
|
6
|
+
include CollectionsHelper
|
7
|
+
include CatalogHelper
|
8
|
+
include BlacklightHelper
|
9
|
+
include Blacklight::SolrHelper
|
10
|
+
include SolrHelper
|
11
|
+
|
12
|
+
layout :determine_layout
|
13
|
+
|
14
|
+
helper_method :get_solr_response_for_field_values
|
15
|
+
|
16
|
+
self.solr_search_params_logic += [:add_exclude_fq_to_solr]
|
17
|
+
|
18
|
+
end
|
@@ -0,0 +1,40 @@
|
|
1
|
+
# TODO: Move to generator
|
2
|
+
class CollectionsController < AtriumBaseController
|
3
|
+
|
4
|
+
def show
|
5
|
+
@showcases=find_showcases
|
6
|
+
end
|
7
|
+
|
8
|
+
def browse
|
9
|
+
@showcases=find_showcases
|
10
|
+
end
|
11
|
+
|
12
|
+
protected
|
13
|
+
def find_collection
|
14
|
+
if params.has_key? :id
|
15
|
+
@collection = Atrium::Collection.find(params[:id])
|
16
|
+
return __initialize_collection
|
17
|
+
else
|
18
|
+
return false
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
def find_showcases
|
23
|
+
Atrium::Showcase.with_selected_facets(@collection.id, @collection.class.name, {})
|
24
|
+
end
|
25
|
+
|
26
|
+
def evaluate_query_params
|
27
|
+
unless @collection
|
28
|
+
raise("No collection object found. Please initialize collection")
|
29
|
+
end
|
30
|
+
@extra_controller_params = prepare_extra_controller_params_for_asset_query(
|
31
|
+
@collection,
|
32
|
+
params
|
33
|
+
)
|
34
|
+
end
|
35
|
+
|
36
|
+
def determine_layout
|
37
|
+
@collection.theme_path
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
@@ -0,0 +1,36 @@
|
|
1
|
+
# TODO: Move to generator
|
2
|
+
class DescriptionsController < ApplicationController
|
3
|
+
before_filter :find_collection
|
4
|
+
layout :determine_layout
|
5
|
+
include ApplicationHelper
|
6
|
+
include Blacklight::SolrHelper
|
7
|
+
include CollectionsHelper
|
8
|
+
|
9
|
+
def show
|
10
|
+
|
11
|
+
end
|
12
|
+
|
13
|
+
protected
|
14
|
+
def find_collection
|
15
|
+
find_description
|
16
|
+
@collection = @showcase.collection
|
17
|
+
end
|
18
|
+
|
19
|
+
def find_description
|
20
|
+
@description=Atrium::Description.find(params[:id])
|
21
|
+
@showcase= @description.showcase
|
22
|
+
end
|
23
|
+
|
24
|
+
def evaluate_query_params
|
25
|
+
unless @collection
|
26
|
+
raise("No collection object found. Please initialize collection")
|
27
|
+
end
|
28
|
+
@extra_controller_params =
|
29
|
+
prepare_extra_controller_params_for_asset_query(@collection,params)
|
30
|
+
end
|
31
|
+
|
32
|
+
def determine_layout
|
33
|
+
@collection.theme_path
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
@@ -0,0 +1,47 @@
|
|
1
|
+
# TODO: Move to generator
|
2
|
+
class ExhibitsController < AtriumBaseController
|
3
|
+
|
4
|
+
|
5
|
+
def show
|
6
|
+
@exhibit_navigation_data = get_exhibit_navigation_data(@exhibit)
|
7
|
+
@showcases=find_showcases
|
8
|
+
logger.debug("Showcase: #{@showcase.inspect}")
|
9
|
+
end
|
10
|
+
|
11
|
+
def find_collection
|
12
|
+
if params.has_key? :id
|
13
|
+
@exhibit = Atrium::Exhibit.find(params[:id])
|
14
|
+
@collection = @exhibit.collection
|
15
|
+
return __initialize_collection
|
16
|
+
else
|
17
|
+
return false
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
21
|
+
def find_showcases
|
22
|
+
Atrium::Showcase.with_selected_facets(@exhibit.id, @exhibit.class.name, params[:f])
|
23
|
+
end
|
24
|
+
|
25
|
+
def evaluate_query_params
|
26
|
+
unless @exhibit
|
27
|
+
raise("No exhibit object found. Please initialize exhibit")
|
28
|
+
end
|
29
|
+
assets_to_extract_query = []
|
30
|
+
assets_to_extract_query << @exhibit
|
31
|
+
assets_to_extract_query << @exhibit.collection
|
32
|
+
|
33
|
+
if @exhibit.respond_to?(:browse_levels)
|
34
|
+
assets_to_extract_query << @exhibit.browse_levels
|
35
|
+
end
|
36
|
+
|
37
|
+
@extra_controller_params = prepare_extra_controller_params_for_asset_query(
|
38
|
+
assets_to_extract_query,
|
39
|
+
params
|
40
|
+
)
|
41
|
+
end
|
42
|
+
|
43
|
+
def determine_layout
|
44
|
+
@exhibit.collection.theme_path
|
45
|
+
end
|
46
|
+
|
47
|
+
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
# TODO: This concept should be proposed to Blacklight core
|
2
|
+
# as something to add into. Be it as an callback for the search
|
3
|
+
# or some process therein.
|
4
|
+
class SelectedItemsController < ApplicationController
|
5
|
+
|
6
|
+
def index
|
7
|
+
@searches = current_user.searches
|
8
|
+
end
|
9
|
+
|
10
|
+
def save
|
11
|
+
success = true
|
12
|
+
existing_selected_items = current_user.selected_document_ids
|
13
|
+
@selected_items = params[:items] || []
|
14
|
+
@selected_items.delete_if {|key, value| existing_selected_items.include?(value[:document_id]) }
|
15
|
+
@selected_items.each do |key, item|
|
16
|
+
success = false unless current_user.selected_items.create(item)
|
17
|
+
end
|
18
|
+
if @selected_items.length > 0 && success
|
19
|
+
flash[:notice] = 'Selected items '+ @selected_items.length.to_s + ' was saved successfully.'
|
20
|
+
elsif @selected_items.length > 0
|
21
|
+
flash[:error] = 'Error saving selected items'
|
22
|
+
end
|
23
|
+
|
24
|
+
redirect_to :back
|
25
|
+
end
|
26
|
+
end
|
@@ -0,0 +1,42 @@
|
|
1
|
+
module ApplicationHelper
|
2
|
+
include Atrium::ApplicationHelper
|
3
|
+
include Atrium::CollectionsHelper
|
4
|
+
include Atrium::ShowcasesHelper
|
5
|
+
include NavigationHelper
|
6
|
+
include SolrHelper
|
7
|
+
|
8
|
+
def in_unscoped_catalog_search?
|
9
|
+
(params[:controller] == "catalog") && !params[:id]
|
10
|
+
end
|
11
|
+
|
12
|
+
def in_collection_context?
|
13
|
+
!defined?(@collection).nil?
|
14
|
+
end
|
15
|
+
|
16
|
+
def breadcrumb_links
|
17
|
+
in_collection_context? ? breadcrumb_builder : "Search Across Collections"
|
18
|
+
end
|
19
|
+
|
20
|
+
# TODO: Improve the robustness of this implementation
|
21
|
+
def breadcrumb_builder
|
22
|
+
@collection.pretty_title
|
23
|
+
end
|
24
|
+
|
25
|
+
def if_browsing_facet?
|
26
|
+
params[:f] && current_user
|
27
|
+
end
|
28
|
+
|
29
|
+
def application_name
|
30
|
+
"Digitial Collections — Rare Books & Special Collections".html_safe
|
31
|
+
end
|
32
|
+
|
33
|
+
def collection_title
|
34
|
+
if @collection
|
35
|
+
if @collection.title_markup.blank?
|
36
|
+
"<h1 id=\"collection-title\">#{@collection.title}</h1>".html_safe
|
37
|
+
else
|
38
|
+
"<div id=\"collection-title\">#{@collection.title_markup}\n</div>".html_safe
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# TODO: Move to generator
|
2
|
+
module CollectionsHelper
|
3
|
+
include Atrium::ApplicationHelper
|
4
|
+
include Atrium::CollectionsHelper
|
5
|
+
|
6
|
+
#This methods merge params q and fq with asset q and fq
|
7
|
+
def prepare_extra_controller_params_for_asset_query(assets,params, *args)
|
8
|
+
CurrentFilterQueryParamsExtractionService.new(
|
9
|
+
method(:solr_search_params),
|
10
|
+
[assets,ParamsAdaptorForFilter.new(params)].flatten,
|
11
|
+
[:filter_query_params,:exclude_query_params]
|
12
|
+
).filter_query_params
|
13
|
+
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,62 @@
|
|
1
|
+
# TODO: Move to generator
|
2
|
+
module NavigationHelper
|
3
|
+
|
4
|
+
# Standard display of a facet value in a list. Used in both _facets sidebar
|
5
|
+
# partial and catalog/facet expanded list. Will output facet value name as
|
6
|
+
# a link to add that to your restrictions, with count in parens.
|
7
|
+
# first arg item is a facet value item from rsolr-ext.
|
8
|
+
# options consist of:
|
9
|
+
# :suppress_link => true # do not make it a link, used for an already selected value for instance
|
10
|
+
def get_browse_facet_path(facet_solr_field, value, browse_facets, exhibit_number, exhibit_id, opts={})
|
11
|
+
p = HashWithIndifferentAccess.new
|
12
|
+
p.merge!(:f=>params[:f].dup) if params[:f]
|
13
|
+
p.merge!(:id=>exhibit_id)
|
14
|
+
p = remove_related_facet_params(facet_solr_field, p, browse_facets, exhibit_number)
|
15
|
+
p = add_browse_facet_params(facet_solr_field,value,p)
|
16
|
+
exhibit_path(p.merge!({:class=>"browse_facet_select"}))
|
17
|
+
end
|
18
|
+
|
19
|
+
def get_selected_browse_facet_path(facet_solr_field, value, browse_facets, exhibit_number, exhibit_id, opts={})
|
20
|
+
value = [value] unless value.is_a? Array
|
21
|
+
p = HashWithIndifferentAccess.new
|
22
|
+
p.merge!(:f=>params[:f].dup) if params[:f]
|
23
|
+
p = remove_related_facet_params(facet_solr_field, p, browse_facets, exhibit_number)
|
24
|
+
p.merge!(:id=>exhibit_id)
|
25
|
+
# params[:action] == "edit" ? edit_atrium_collection_path(p) : atrium_collection_path(p)
|
26
|
+
exhibit_path(p)
|
27
|
+
end
|
28
|
+
|
29
|
+
def add_browse_facet_params(field, value, p=HashWithIndifferentAccess.new)
|
30
|
+
p[:f]||={}
|
31
|
+
p[:f][field] ||= []
|
32
|
+
p[:f][field].push(value)
|
33
|
+
p
|
34
|
+
end
|
35
|
+
|
36
|
+
#Remove current selected facet plus any child facets selected
|
37
|
+
def remove_related_facet_params(solr_facet_field, p, browse_facets, exhibit_number)
|
38
|
+
if params[:exhibit_number] && params[:exhibit_number].to_i != exhibit_number.to_i
|
39
|
+
p.delete(:f) if p[:f]
|
40
|
+
elsif browse_facets.include?(solr_facet_field)
|
41
|
+
#iterate through browseable facets from current on down
|
42
|
+
index = browse_facets.index(solr_facet_field)
|
43
|
+
if p[:f]
|
44
|
+
browse_facets.slice(index, browse_facets.length - index).each do |f|
|
45
|
+
p[:f].delete(f)
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
p
|
50
|
+
end
|
51
|
+
|
52
|
+
def get_selected_browse_facets(browse_facets)
|
53
|
+
selected = {}
|
54
|
+
if params[:f]
|
55
|
+
browse_facets.each do |facet|
|
56
|
+
selected.merge!({facet.to_sym=>params[:f][facet].first}) if params[:f][facet]
|
57
|
+
end
|
58
|
+
end
|
59
|
+
selected
|
60
|
+
end
|
61
|
+
|
62
|
+
end
|
@@ -0,0 +1,138 @@
|
|
1
|
+
# TODO: Move to generator
|
2
|
+
module SolrHelper
|
3
|
+
|
4
|
+
def __initialize_collection
|
5
|
+
@collection_response, @collection_document_list =
|
6
|
+
get_search_results(params, evaluate_query_params)
|
7
|
+
|
8
|
+
@extra_controller_params =
|
9
|
+
get_current_filter_query_params(
|
10
|
+
@collection,
|
11
|
+
@exhibit,
|
12
|
+
get_current_browse_level(@exhibit),
|
13
|
+
)
|
14
|
+
end
|
15
|
+
|
16
|
+
# Checks if a browse level has been navigated to for a exhibit
|
17
|
+
# @param [Atrium::Exhibit] The current exhibit in view
|
18
|
+
# @return [Atrium::BrowseLevel] It will return a browse level that is
|
19
|
+
# selected, otherwise it will return nil
|
20
|
+
def get_current_browse_level(exhibit)
|
21
|
+
return nil unless exhibit.respond_to?(:browse_levels)
|
22
|
+
NavigationTree.new(exhibit.browse_levels, params[:f]).current_level
|
23
|
+
end
|
24
|
+
|
25
|
+
def get_exhibit_navigation_data(exhibit)
|
26
|
+
browse_data=[]
|
27
|
+
if exhibit.respond_to?(:browse_levels) && !exhibit.browse_levels.nil?
|
28
|
+
updated_browse_levels = get_browse_level_data(exhibit)
|
29
|
+
exhibit.browse_levels.each_index do |index|
|
30
|
+
exhibit.browse_levels.fetch(index).values = updated_browse_levels.fetch(index).values
|
31
|
+
exhibit.browse_levels.fetch(index).label = updated_browse_levels.fetch(index).label
|
32
|
+
exhibit.browse_levels.fetch(index).selected = updated_browse_levels.fetch(index).selected
|
33
|
+
end
|
34
|
+
exhibit.browse_levels.flatten!
|
35
|
+
browse_data << exhibit
|
36
|
+
end
|
37
|
+
|
38
|
+
browse_data=[] if check_for_scope(browse_data)
|
39
|
+
@exhibit_navigation_data=browse_data
|
40
|
+
browse_data
|
41
|
+
end
|
42
|
+
|
43
|
+
private
|
44
|
+
|
45
|
+
def check_for_scope(exhibit_list)
|
46
|
+
scoped_to_items=false
|
47
|
+
#unless @collection.filter_query_params.blank? && @collection.filter_query_params[:solr_doc_ids]
|
48
|
+
# scoped_to_items=true
|
49
|
+
#end
|
50
|
+
#return scoped_to_items
|
51
|
+
end
|
52
|
+
|
53
|
+
# This is a private method and should not be called directly.
|
54
|
+
# get_exhibit_navigation_data calls this method to fill out the
|
55
|
+
# browse_level_navigation_data array This method calls itself recursively as
|
56
|
+
# it generates the current browse state data. It returns the browse levels
|
57
|
+
# array with its browse level objects passed in updated with any values,
|
58
|
+
# label, and selected value if one is selected. It will fill in values for
|
59
|
+
# the top browse level, and then will only fill in values for the second
|
60
|
+
# browse level if something is selected, and so on for any deeper browse
|
61
|
+
# levels. If no label is defined for a browse level, it will fill in the
|
62
|
+
# default label for the browse level facet.
|
63
|
+
#
|
64
|
+
# @param [Atrium::Collection] The current collection
|
65
|
+
# @param [Atrium::Exhibit] the current exhibit
|
66
|
+
# @params [Array] The current browse levels (will reduce as this method recurses)
|
67
|
+
# @param [SolrResponse] the browse response from solr
|
68
|
+
# @param [Hash] the extra controller params that need to be passed to solr if we query for another response if necessary to get child level data
|
69
|
+
# @param [Boolean] true if the top level of the exhibit
|
70
|
+
# @return [Array] An array of update BrowseLevel objects that are enhanced with current navigation data such as selected, values, and label filled in
|
71
|
+
# The relevant attributes of a BrowseLevel are
|
72
|
+
# :solr_facet_name [String] the facet used as the category for that browse level
|
73
|
+
# :label [String] browse level category label
|
74
|
+
# :values [Array] values to display for the browse level
|
75
|
+
# :selected [String] the selected value if one
|
76
|
+
def get_browse_level_data(exhibit)
|
77
|
+
BrowseLevelEvaluationService.new(
|
78
|
+
method(:solr_search_params),
|
79
|
+
method(:get_search_results),
|
80
|
+
method(:facet_in_params?),
|
81
|
+
exhibit.collection,
|
82
|
+
exhibit,
|
83
|
+
params
|
84
|
+
).extract(exhibit.browse_levels)
|
85
|
+
end
|
86
|
+
|
87
|
+
def get_current_filter_query_params(*args)
|
88
|
+
CurrentFilterQueryParamsExtractionService.new(
|
89
|
+
method(:solr_search_params),
|
90
|
+
args,
|
91
|
+
[:filter_query_params,:exclude_query_params]
|
92
|
+
).filter_query_params
|
93
|
+
end
|
94
|
+
|
95
|
+
def get_solr_documents_from_asset(asset)
|
96
|
+
p = params.dup
|
97
|
+
params.delete :f
|
98
|
+
params.delete :q
|
99
|
+
params.delete :page
|
100
|
+
logger.debug("Asset is: #{asset.class}")
|
101
|
+
if asset.is_a?(Atrium::Showcase)
|
102
|
+
if asset && !asset.showcase_items.blank?
|
103
|
+
selected_document_ids = asset.showcase_items
|
104
|
+
response, documents = get_solr_response_for_field_values("id",selected_document_ids || [])
|
105
|
+
end
|
106
|
+
else
|
107
|
+
if asset && asset.filter_query_params && asset.filter_query_params[:solr_doc_ids]
|
108
|
+
document_ids = asset.filter_query_params[:solr_doc_ids].split(',')
|
109
|
+
response, documents = get_solr_response_for_field_values("id",document_ids || [])
|
110
|
+
end
|
111
|
+
end
|
112
|
+
params.merge!(:f=>p[:f])
|
113
|
+
params.merge!(:q=>p[:q])
|
114
|
+
params.merge!(:page=>p[:page])
|
115
|
+
return [response, documents]
|
116
|
+
end
|
117
|
+
|
118
|
+
def add_exclude_fq_to_solr(solr_parameters, user_params)
|
119
|
+
logger.debug("Solr exclude!!!: #{solr_parameters.inspect}, #{user_params.inspect}")
|
120
|
+
if ( user_params[:exclude])
|
121
|
+
exclude_request_params = user_params[:exclude]
|
122
|
+
solr_parameters[:fq] ||= []
|
123
|
+
exclude_request_params.each_pair do |facet_field, value_list|
|
124
|
+
value_list ||= []
|
125
|
+
value_list = [value_list] unless value_list.respond_to? :each
|
126
|
+
value_list.each do |value|
|
127
|
+
exclude_facet="-(#{facet_value_to_fq_string(facet_field, value)})"
|
128
|
+
exclude_query="-(#{facet_value_to_fq_string(facet_field, value)})"
|
129
|
+
solr_parameters[:fq] << exclude_query
|
130
|
+
solr_parameters[:fq] << exclude_facet
|
131
|
+
end
|
132
|
+
end
|
133
|
+
end
|
134
|
+
end
|
135
|
+
|
136
|
+
|
137
|
+
|
138
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
<% # container for a single doc -%>
|
2
|
+
<div class="document <%= render_document_class document %>">
|
3
|
+
|
4
|
+
<% # header bar for doc items in index view -%>
|
5
|
+
<div class="documentHeader">
|
6
|
+
|
7
|
+
<% # bookmark/folder functions for items/docs -%>
|
8
|
+
<%= render_index_doc_actions document %>
|
9
|
+
|
10
|
+
<% # main title container for doc partial view -%>
|
11
|
+
<div class="yui-u">
|
12
|
+
<h3 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @collection_response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field, :counter => (document_counter + 1 + @collection_response.params[:start].to_i) %></h3>
|
13
|
+
</div>
|
14
|
+
</div>
|
15
|
+
|
16
|
+
<% # main container for doc partial view -%>
|
17
|
+
<%= render_document_partial document, :index %>
|
18
|
+
|
19
|
+
</div>
|