From 8f42e790ed5d0191e62237e24a6e0a68514ff087 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos
Date: Thu, 27 Jun 2013 10:05:35 -0300
Subject: [PATCH] merging with stable
---
AUTHORS | 44 ++++++++++++++++++++++++++++++++++++++++++++
Gemfile | 23 +++++++++++++++--------
Gemfile.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++----------------------
INSTALL | 10 +---------
INSTALL.chat | 24 ++++++++++++------------
RELEASING | 9 +++++----
Rakefile | 8 ++++++--
app/controllers/admin/environment_design_controller.rb | 3 ++-
app/controllers/admin/region_validators_controller.rb | 2 +-
app/controllers/admin/users_controller.rb | 14 ++++++++++++--
app/controllers/application_controller.rb | 14 ++++++++++++++
app/controllers/box_organizer_controller.rb | 4 ++--
app/controllers/my_profile/cms_controller.rb | 2 +-
app/controllers/my_profile/profile_design_controller.rb | 13 +++++++++++--
app/controllers/my_profile/profile_members_controller.rb | 1 -
app/controllers/public/account_controller.rb | 4 ----
app/controllers/public/catalog_controller.rb | 2 +-
app/controllers/public/profile_search_controller.rb | 2 +-
app/controllers/public/search_controller.rb | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
app/helpers/application_helper.rb | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------
app/helpers/block_helper.rb | 19 ++++++++++++++++++-
app/helpers/blog_helper.rb | 19 ++++---------------
app/helpers/catalog_helper.rb | 2 +-
app/helpers/content_viewer_helper.rb | 4 ++--
app/helpers/dates_helper.rb | 30 ++++++++++++++++++++++++++----
app/helpers/forms_helper.rb | 49 +++++++++++--------------------------------------
app/helpers/layout_helper.rb | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
app/helpers/profile_editor_helper.rb | 2 +-
app/helpers/search_helper.rb | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------
app/helpers/tags_helper.rb | 8 +++-----
app/models/approve_comment.rb | 2 +-
app/models/article.rb | 137 +++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------
app/models/article_block.rb | 16 +++++++++++++++-
app/models/blog.rb | 3 ++-
app/models/category.rb | 26 +++++++-------------------
app/models/certifier.rb | 8 ++++++--
app/models/comment.rb | 12 ++++++------
app/models/enterprise.rb | 14 +++++++++++---
app/models/environment.rb | 12 ++++--------
app/models/event.rb | 15 +++++++++++++--
app/models/external_feed.rb | 9 +++++++++
app/models/feed_reader_block.rb | 8 ++++----
app/models/license.rb | 6 ++++++
app/models/link_list_block.rb | 2 +-
app/models/national_region.rb | 5 +++++
app/models/organization.rb | 5 +++++
app/models/organization_mailing.rb | 2 +-
app/models/person.rb | 5 +++++
app/models/product.rb | 100 ++++++++++++++++------------------------------------------------------------------------------------
app/models/product_category.rb | 2 --
app/models/profile.rb | 115 ++++++++++++++++---------------------------------------------------------------------------------------------------
app/models/profile_list_block.rb | 5 ++---
app/models/qualifier.rb | 6 ++++--
app/models/raw_html_block.rb | 2 +-
app/models/region.rb | 6 ------
app/models/scrap.rb | 3 +++
app/models/spammer_logger.rb | 4 ++--
app/models/tags_block.rb | 29 ++++++++++++++++++++---------
app/models/uploaded_file.rb | 2 +-
app/models/user.rb | 10 ++++++----
app/views/account/_signup_form.rhtml | 3 ++-
app/views/account/forgot_password.rhtml | 2 +-
app/views/admin_panel/site_info.rhtml | 2 +-
app/views/box_organizer/_article_block.rhtml | 39 +++++++++++++++++++++++++++++++++++----
app/views/box_organizer/_block_types.rhtml | 10 ----------
app/views/box_organizer/_highlights_block.rhtml | 26 ++++++--------------------
app/views/box_organizer/add_block.rhtml | 42 ++++++++++++++++++++++++------------------
app/views/box_organizer/edit.rhtml | 4 ++--
app/views/box_organizer/index.rhtml | 2 +-
app/views/catalog/index.rhtml | 24 ++++++++++++++----------
app/views/cms/_text_editor_sidebar.rhtml | 7 ++++++-
app/views/cms/select_article_type.rhtml | 6 +++++-
app/views/content_viewer/blog_page.rhtml | 16 ++++++++++++----
app/views/content_viewer/view_page.rhtml | 3 +--
app/views/favorite_enterprises/index.rhtml | 2 +-
app/views/layouts/_user.html.erb | 24 ++++++++++++++++++++++++
app/views/layouts/application-ng.rhtml | 52 +++++-----------------------------------------------
app/views/map_balloon/product.rhtml | 2 +-
app/views/profile/_profile_wall.rhtml | 2 +-
app/views/profile_members/_manage_roles.html.erb | 4 ++--
app/views/search/_article.rhtml | 12 ------------
app/views/search/_blog.rhtml | 24 ------------------------
app/views/search/_compact_profile.html.erb | 5 +++++
app/views/search/_content.rhtml | 1 -
app/views/search/_display_results.rhtml | 26 ++++++++++++++------------
app/views/search/_event.rhtml | 25 -------------------------
app/views/search/_facets_menu.rhtml | 36 ------------------------------------
app/views/search/_facets_unselect_menu.rhtml | 6 ------
app/views/search/_folder.rhtml | 24 ------------------------
app/views/search/_forum.rhtml | 24 ------------------------
app/views/search/_full_article.html.erb | 12 ++++++++++++
app/views/search/_full_blog.html.erb | 24 ++++++++++++++++++++++++
app/views/search/_full_enterprise.html.erb | 38 ++++++++++++++++++++++++++++++++++++++
app/views/search/_full_event.html.erb | 25 +++++++++++++++++++++++++
app/views/search/_full_folder.html.erb | 24 ++++++++++++++++++++++++
app/views/search/_full_forum.html.erb | 24 ++++++++++++++++++++++++
app/views/search/_full_gallery.html.erb | 13 +++++++++++++
app/views/search/_full_product.rhtml | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
app/views/search/_full_text_article.html.erb | 13 +++++++++++++
app/views/search/_full_uploaded_file.html.erb | 25 +++++++++++++++++++++++++
app/views/search/_gallery.rhtml | 13 -------------
app/views/search/_google_maps.rhtml | 4 ++--
app/views/search/_image.html.erb | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
app/views/search/_image.rhtml | 52 ----------------------------------------------------
app/views/search/_product.rhtml | 85 -------------------------------------------------------------------------------------
app/views/search/_profile.rhtml | 42 ------------------------------------------
app/views/search/_results_header.rhtml | 23 ++++-------------------
app/views/search/_search_form.rhtml | 13 +++----------
app/views/search/_search_form_extra_fields.html.erb | 6 ++++++
app/views/search/_text_article.rhtml | 13 -------------
app/views/search/_uploaded_file.rhtml | 25 -------------------------
app/views/search/articles.html.erb | 1 +
app/views/search/articles.rhtml | 17 -----------------
app/views/search/category_index.rhtml | 1 -
app/views/search/category_index.rhtml | 28 ++++++++++++++++++++++++++++
app/views/search/communities.html.erb | 1 +
app/views/search/communities.rhtml | 25 -------------------------
app/views/search/contents.rhtml | 1 -
app/views/search/enterprises.html.erb | 1 +
app/views/search/enterprises.rhtml | 28 ----------------------------
app/views/search/events.html.erb | 2 ++
app/views/search/events.rhtml | 3 ---
app/views/search/facets_browse.rhtml | 8 --------
app/views/search/index.rhtml | 2 +-
app/views/search/people.html.erb | 1 +
app/views/search/people.rhtml | 19 -------------------
app/views/search/products.html.erb | 1 +
app/views/search/products.rhtml | 26 --------------------------
app/views/search/search_page.html.erb | 17 +++++++++++++++++
app/views/search/tag.rhtml | 2 +-
app/views/shared/logged_in/xmpp_chat.rhtml | 2 +-
app/views/shared/tiny_mce.rhtml | 2 +-
app/views/tasks/_task.rhtml | 4 ++--
app/views/templates/index.html.erb | 6 +++---
app/views/themes/index.rhtml | 16 ++++++++--------
app/views/users/_user_csv.rhtml | 1 -
app/views/users/index_csv.rhtml | 2 --
app/views/users/send_mail.rhtml | 2 +-
config/cucumber.yml | 19 +++++++++++++++++--
config/database.yml.sqlite3 | 1 +
config/environment.rb | 2 +-
config/environments/cucumber.rb | 11 +++++++++--
config/initializers/dependencies.rb | 2 --
config/solr.yml.dist | 25 -------------------------
db/migrate/20130117132943_remove_index_articles_on_name.rb | 9 +++++++++
db/migrate/20130304200849_add_default_value_to_product_highlighted.rb | 10 ++++++++++
db/migrate/20130429214630_destroy_inconsistent_abuse_complaints.rb | 13 +++++++++++++
db/migrate/20130605135210_change_article_published_at_from_date_to_datetime.rb | 9 +++++++++
db/migrate/20130606110602_change_article_versions_published_at_from_date_to_datetime.rb | 9 +++++++++
db/schema.rb | 26 +++++++++++++-------------
debian/changelog | 36 ++++++++++++++++++++++++++++++++++++
debian/noosfero.install | 1 -
debian/noosfero.links | 1 -
debian/solr.yml | 22 ----------------------
etc/init.d/noosfero | 43 ++++++++++++++++---------------------------
features/accept_member.feature | 9 ++++++---
features/activate_enterprise.feature | 22 +++++++++++-----------
features/admin_categories.feature | 28 ++++++++++++++--------------
features/approve_article.feature | 30 +++++++++++++++---------------
features/balloon.feature | 29 +++++++++++++----------------
features/blog.feature | 26 +++++++++++++-------------
features/browse.feature | 82 +++++++++++++++++++++++++++++++++++++++++++---------------------------------------
features/browse_catalogs.feature | 30 +++++++++++++++---------------
features/browse_enterprises.feature | 4 ++--
features/categories_block.feature | 33 ++++++++++++++++-----------------
features/change_organization_name.feature | 11 ++++++-----
features/chat.feature | 44 ++++++++++++++++++++++----------------------
features/clickable_images.feature | 12 ++++++------
features/comment.feature | 47 +++++++++++++++++++++++++----------------------
features/comment_reply.feature | 10 +++++-----
features/contact.feature | 9 ++++-----
features/create_community.feature | 20 ++++++++++----------
features/delete_profile.feature | 20 ++++++++++++--------
features/edit_article.feature | 78 +++++++++++++++++++++++++++++++++++++++---------------------------------------
features/edit_block_of_links.feature | 2 +-
features/edit_environment_templates.feature | 62 +++++++++++++++++++++++++++++---------------------------------
features/edit_language_block.feature | 12 ++++++------
features/edit_profile.feature | 44 ++++++++++++++++++++++----------------------
features/environment_name.feature | 1 +
features/events.feature | 8 ++++----
features/export_users.feature | 6 ++----
features/featured_products_block.feature | 4 ++--
features/forum.feature | 24 ++++++++++++------------
features/gallery_navigation.feature | 20 ++++++++++++++------
features/http_caching.feature | 6 +++---
features/internationalization.feature | 1 +
features/invitation.feature | 48 +++++++++++++++++++++++++++++++-----------------
features/language_redirection.feature | 6 +++---
features/location.feature | 9 +++++----
features/login.feature | 73 +++++++++++++++++++++++++++++++++++++++++++------------------------------
features/manage_categories.feature | 7 +++----
features/manage_enterprises.feature | 6 ++++--
features/manage_inputs.feature | 46 +++++++++++++++++++++++-----------------------
features/manage_product_price_details.feature | 26 ++++++++++++++------------
features/manage_products.feature | 115 +++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------
features/my_network_block.feature | 20 ++++++++++----------
features/new_content_on_cms.feature | 14 +++++++-------
features/organization_custom_fields.feature | 6 +++---
features/plugins.feature | 16 ++++++++--------
features/plugins/README | 2 ++
features/private_profile.feature | 2 +-
features/profile_domain.feature | 58 ++++++++++++++++++++++++++++++++--------------------------
features/profile_search.feature | 13 ++++++-------
features/publish_article.feature | 42 +++++++++++++++++++++---------------------
features/register_enterprise.feature | 24 +++++++++++-------------
features/search.feature | 21 ++++++++++-----------
features/search_communities.feature | 78 +++---------------------------------------------------------------------------
features/search_contents.feature | 90 ++++++++++++------------------------------------------------------------------------------
features/search_enterprises.feature | 113 ++++++-----------------------------------------------------------------------------------------------------------
features/search_people.feature | 72 +++---------------------------------------------------------------------
features/search_products.feature | 133 +++++++++----------------------------------------------------------------------------------------------------------------------------
features/send_email_to_environment_members.feature | 20 ++++++--------------
features/send_email_to_organization_members.feature | 10 +++++-----
features/session_and_cookies_handling.feature | 3 +++
features/signup.feature | 13 ++++++++-----
features/step_definitions/admin_categories_steps.rb | 4 ++++
features/step_definitions/chat_steps.rb | 3 +++
features/step_definitions/create_community_steps.rb | 8 ++++----
features/step_definitions/custom_web_steps.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++
features/step_definitions/custom_webrat_steps.rb | 48 ------------------------------------------------
features/step_definitions/http_caching_steps.rb | 6 +++---
features/step_definitions/internationalization_steps.rb | 7 ++++---
features/step_definitions/invitation_steps.rb | 9 ++-------
features/step_definitions/mezuro_steps.rb | 14 --------------
features/step_definitions/noosfero_steps.rb | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------
features/step_definitions/selenium_steps.rb | 133 -------------------------------------------------------------------------------------------------------------------------------------
features/step_definitions/web_steps.rb | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
features/step_definitions/webrat_steps.rb | 239 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
features/suggest_article.feature | 6 +++---
features/support/env.rb | 82 +++++++++++++++++++++++++++++++++++++++++++---------------------------------------
features/support/fixtures.rb | 6 ------
features/support/paths.rb | 65 +++++++++++++++++++++++++++++++++++------------------------------
features/support/selenium.rb | 28 +++++++++++++++-------------
features/support/version_check.rb | 29 -----------------------------
features/unblock_button.feature | 6 +++---
features/upload_files.feature | 4 ++--
gitignore.example | 3 +--
lib/acts_as_faceted.rb | 222 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
lib/acts_as_searchable.rb | 87 ---------------------------------------------------------------------------------------
lib/noosfero.rb | 16 +++++++++-------
lib/noosfero/core_ext/active_record.rb | 13 +++++++++++++
lib/noosfero/core_ext/string.rb | 40 ++++++++++++++++++++++++++++++++++++++++
lib/noosfero/plugin.rb | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
lib/noosfero/plugin/manager.rb | 24 ++++++++++++++++++++++++
lib/set_profile_region_from_city_state.rb | 19 ++++++++++++-------
lib/tasks/cucumber.rake | 35 ++++++++++++++++++++---------------
lib/tasks/multitenancy.rake | 16 ----------------
lib/tasks/plugins_tests.rake | 48 +++++++++++++++++++++++++++++++++++-------------
lib/tasks/release.rake | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
plugins/bsc/features/bsc.feature | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/bsc/features/contract.feature | 21 +++++++++++++++++++++
plugins/bsc/test/features/bsc.feature | 164 --------------------------------------------------------------------------------------------------------------------------------------------------------------------
plugins/bsc/test/features/contract.feature | 21 ---------------------
plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb | 1 +
plugins/custom_forms/lib/custom_forms_plugin/field.rb | 2 +-
plugins/custom_forms/lib/custom_forms_plugin/form.rb | 2 +-
plugins/custom_forms/lib/custom_forms_plugin/helper.rb | 19 +++++++++++--------
plugins/custom_forms/public/field.js | 1 -
plugins/custom_forms/public/style.css | 3 +++
plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb | 31 +++++++++++++++++++++++++++++++
plugins/custom_forms/test/unit/custom_forms_plugin/field_test.rb | 11 +++++++++++
plugins/custom_forms/test/unit/custom_forms_plugin/form_test.rb | 11 +++++++++++
plugins/custom_forms/views/custom_forms_plugin_myprofile/_empty_option.html.erb | 2 +-
plugins/display_content/README | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/controllers/display_content_plugin_admin_controller.rb | 9 +++++++++
plugins/display_content/controllers/display_content_plugin_module.rb | 32 ++++++++++++++++++++++++++++++++
plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb | 9 +++++++++
plugins/display_content/lib/display_content_block.rb | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/lib/display_content_plugin.rb | 32 ++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree | 1 +
plugins/display_content/public/javascripts/jstree-v.pre1.0/README.txt | 10 ++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_dump.sql | 20 ++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_inc/__mysql_errors.log | 0
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_inc/class._database.php | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_inc/class._database_i.php | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_inc/class.tree.php | 602 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_install.txt | 6 ++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/config.php | 14 ++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/file.png | Bin 0 -> 392 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/folder.png | Bin 0 -> 583 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/index.html | 461 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/root.png | Bin 0 -> 628 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/server.php | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/!style.css | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_drive.png | Bin 0 -> 628 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_html_data.html | 2 ++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_json_data.json | 4 ++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_search_data.json | 6 ++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_search_result.json | 1 +
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_xml_flat.xml | 12 ++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_xml_nest.xml | 18 ++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/checkbox.html | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/contextmenu.html | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/cookies.html | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/core.html | 689 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/crrm.html | 316 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/dnd.html | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/hotkeys.html | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/html_data.html | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/index.html | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/json_data.html | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/languages.html | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/logo.png | Bin 0 -> 6217 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/search.html | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/sort.html | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/!script.js | 2232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/!style.css | 511 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/clipboard.swf | Bin 0 -> 1361 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/help.png | Bin 0 -> 786 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/magnifier.png | Bin 0 -> 615 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/page_white_code.png | Bin 0 -> 603 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/page_white_copy.png | Bin 0 -> 309 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/printer.png | Bin 0 -> 731 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/wrapping.png | Bin 0 -> 631 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/themeroller.html | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/themes.html | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/types.html | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/ui.html | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/unique.html | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/xml_data.html | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_lib/jquery-1.8.3.js | 9472 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_lib/jquery.cookie.js | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_lib/jquery.hotkeys.js | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/_lib/jquery.js | 2 ++
plugins/display_content/public/javascripts/jstree-v.pre1.0/jquery.jstree.js | 4561 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/bg.jpg | Bin 0 -> 331 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/d.png | Bin 0 -> 7765 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/dot_for_ie.gif | Bin 0 -> 43 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/style.css | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/throbber.gif | Bin 0 -> 1849 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/d.gif | Bin 0 -> 3003 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/d.png | Bin 0 -> 7535 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/dot_for_ie.gif | Bin 0 -> 43 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/style.css | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/throbber.gif | Bin 0 -> 1849 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/d.gif | Bin 0 -> 2872 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/d.png | Bin 0 -> 7459 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/dots.gif | Bin 0 -> 132 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/style.css | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/throbber.gif | Bin 0 -> 1849 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default/d.gif | Bin 0 -> 2944 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default/d.png | Bin 0 -> 7635 bytes
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default/style.css | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default/throbber.gif | Bin 0 -> 1849 bytes
plugins/display_content/public/style.css | 7 +++++++
plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/test/test_helper.rb | 1 +
plugins/display_content/test/unit/display_content_block_test.rb | 675 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/display_content/test/unit/display_content_plugin_test.rb | 23 +++++++++++++++++++++++
plugins/display_content/views/box_organizer/_display_content_block.rhtml | 35 +++++++++++++++++++++++++++++++++++
plugins/display_content/views/environment_design | 1 +
plugins/display_content/views/profile_design | 1 +
plugins/ldap/README | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/ldap/controllers/ldap_plugin_admin_controller.rb | 18 ++++++++++++++++++
plugins/ldap/dependencies.rb | 1 +
plugins/ldap/fixtures/ldap.yml.dist | 15 +++++++++++++++
plugins/ldap/lib/ext/environment.rb | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/ldap/lib/ldap_authentication.rb | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/ldap/lib/ldap_plugin.rb | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/ldap/test/functional/account_controller_plugin_test.rb | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/ldap/test/functional/ldap_plugin_admin_controller_test.rb | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/ldap/test/test_helper.rb | 23 +++++++++++++++++++++++
plugins/ldap/test/unit/ext/environment_test.rb | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/ldap/test/unit/ldap_authentication_test.rb | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/ldap/test/unit/ldap_plugin_test.rb | 15 +++++++++++++++
plugins/ldap/views/ldap_plugin_admin/index.html.erb | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/AUTHORS | 6 +++++-
plugins/mezuro/README | 64 +++++++++++++++++++++++++++++++++++++++++++++++-----------------
plugins/mezuro/SERVICE | 1 -
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb | 187 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb | 120 ------------------------------------------------------------------------------------------------------------------------
plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb | 29 +++++++++++++++++++++++++++++
plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/controllers/profile/mezuro_plugin_module_result_controller.rb | 21 +++++++++++++++++++++
plugins/mezuro/controllers/profile/mezuro_plugin_processing_controller.rb | 34 ++++++++++++++++++++++++++++++++++
plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb | 36 ++++++++++++++++++++++++++++++++++++
plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/features/configuration.feature | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/features/project.feature | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/features/reading.feature | 243 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/features/reading_group.feature | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/features/repository.feature | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/features/step_definitions/mezuro_steps.rb | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/features/support/hooks.rb | 12 ++++++++++++
plugins/mezuro/lib/kalibro/base_tool.rb | 17 +++++++++++------
plugins/mezuro/lib/kalibro/compound_metric.rb | 5 -----
plugins/mezuro/lib/kalibro/compound_metric_with_error.rb | 13 -------------
plugins/mezuro/lib/kalibro/configuration.rb | 33 ++++++++-------------------------
plugins/mezuro/lib/kalibro/date_metric_result.rb | 16 ++++++++++++++++
plugins/mezuro/lib/kalibro/date_module_result.rb | 17 +++++++++++++++++
plugins/mezuro/lib/kalibro/error.rb | 21 ---------------------
plugins/mezuro/lib/kalibro/errors/record_not_found.rb | 2 ++
plugins/mezuro/lib/kalibro/errors/standard.rb | 4 ++++
plugins/mezuro/lib/kalibro/metric.rb | 14 +++++++++++++-
plugins/mezuro/lib/kalibro/metric_configuration.rb | 67 +++++++++++++++++--------------------------------------------------
plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb | 38 ++++++++++++++++++++++++++++++++++++++
plugins/mezuro/lib/kalibro/metric_result.rb | 56 +++++++++++++++++++++++++++++++++-----------------------
plugins/mezuro/lib/kalibro/model.rb | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
plugins/mezuro/lib/kalibro/module.rb | 13 -------------
plugins/mezuro/lib/kalibro/module_node.rb | 21 ---------------------
plugins/mezuro/lib/kalibro/module_result.rb | 73 +++++++++++++++++++++++++++++--------------------------------------------
plugins/mezuro/lib/kalibro/native_metric.rb | 17 -----------------
plugins/mezuro/lib/kalibro/process_time.rb | 9 +++++++++
plugins/mezuro/lib/kalibro/processing.rb | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/lib/kalibro/project.rb | 50 ++++++++------------------------------------------
plugins/mezuro/lib/kalibro/project_result.rb | 100 ----------------------------------------------------------------------------------------------------
plugins/mezuro/lib/kalibro/range.rb | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
plugins/mezuro/lib/kalibro/range_snapshot.rb | 17 +++++++++++++++++
plugins/mezuro/lib/kalibro/reading.rb | 34 ++++++++++++++++++++++++++++++++++
plugins/mezuro/lib/kalibro/reading_group.rb | 30 ++++++++++++++++++++++++++++++
plugins/mezuro/lib/kalibro/repository.rb | 37 +++++++++++++++++++++++++++++++++++--
plugins/mezuro/lib/kalibro/throwable.rb | 21 +++++++++++++++++++++
plugins/mezuro/lib/mezuro_plugin.rb | 16 +++++++++++++++-
plugins/mezuro/lib/mezuro_plugin/configuration_content.rb | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb | 44 ++++++++++++++++++++++++--------------------
plugins/mezuro/lib/mezuro_plugin/helpers/module_result_helper.rb | 7 +++++++
plugins/mezuro/lib/mezuro_plugin/project_content.rb | 96 ++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
plugins/mezuro/lib/mezuro_plugin/reading_group_content.rb | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/licenses.yaml.example | 69 ---------------------------------------------------------------------
plugins/mezuro/licenses.yml.example | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/public/icons/mezuro.png | Bin 0 -> 3907 bytes
plugins/mezuro/public/javascripts/colorPicker/LICENSE | 22 ----------------------
plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.js | 328 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.min.js | 26 --------------------------
plugins/mezuro/public/javascripts/processing.js | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/public/javascripts/project_content.js | 135 ---------------------------------------------------------------------------------------------------------------------------------------
plugins/mezuro/public/javascripts/validations.js | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
plugins/mezuro/public/style.css | 5 +++++
plugins/mezuro/script/install/install-rvm.sh | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/script/tests/delete_all_kalibro_entries.sh | 5 +++++
plugins/mezuro/script/tests/kalibro_scripts.conf | 6 ++++++
plugins/mezuro/script/tests/prepare_kalibro_query_file.sh | 20 ++++++++++++++++++++
plugins/mezuro/script/tests/run_acceptance_tests.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/service.yaml.example | 2 --
plugins/mezuro/service.yml.example | 1 +
plugins/mezuro/test/features/adding_metric_configuration.feature | 67 -------------------------------------------------------------------
plugins/mezuro/test/features/adding_ranges.feature | 42 ------------------------------------------
plugins/mezuro/test/features/creating_configuration.feature | 40 ----------------------------------------
plugins/mezuro/test/features/creating_project.feature | 55 -------------------------------------------------------
plugins/mezuro/test/features/echo_port_test.rb | 90 ------------------------------------------------------------------------------------------
plugins/mezuro/test/features/editing_configuration.feature | 49 -------------------------------------------------
plugins/mezuro/test/features/removing_metric_configuration.feature | 32 --------------------------------
plugins/mezuro/test/fixtures/base_tool_fixtures.rb | 14 +++++++++-----
plugins/mezuro/test/fixtures/compound_metric_fixtures.rb | 11 -----------
plugins/mezuro/test/fixtures/compound_metric_with_error_fixtures.rb | 20 --------------------
plugins/mezuro/test/fixtures/configuration_content_fixtures.rb | 23 +++++++++++++++++++++++
plugins/mezuro/test/fixtures/configuration_fixtures.rb | 22 +++++++++++-----------
plugins/mezuro/test/fixtures/date_metric_result_fixtures.rb | 33 +++++++++++++++++++++++++++++++++
plugins/mezuro/test/fixtures/date_module_result_fixtures.rb | 24 ++++++++++++++++++++++++
plugins/mezuro/test/fixtures/error_fixtures.rb | 20 --------------------
plugins/mezuro/test/fixtures/metric_configuration_fixtures.rb | 55 +++++++++++++++++++++++++++++++++----------------------
plugins/mezuro/test/fixtures/metric_configuration_snapshot_fixtures.rb | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/fixtures/metric_fixtures.rb | 27 +++++++++++++++++++++++++++
plugins/mezuro/test/fixtures/metric_result_fixtures.rb | 51 ++++++++++++++++++++++++++++++---------------------
plugins/mezuro/test/fixtures/module_node_fixtures.rb | 47 -----------------------------------------------
plugins/mezuro/test/fixtures/module_result_fixtures.rb | 40 ++++++++++++++++++++++++++++------------
plugins/mezuro/test/fixtures/native_metric_fixtures.rb | 19 -------------------
plugins/mezuro/test/fixtures/process_time_fixtures.rb | 11 +++++++++++
plugins/mezuro/test/fixtures/processing_fixtures.rb | 30 ++++++++++++++++++++++++++++++
plugins/mezuro/test/fixtures/project_content_fixtures.rb | 9 +++++++++
plugins/mezuro/test/fixtures/project_fixtures.rb | 32 ++++++--------------------------
plugins/mezuro/test/fixtures/project_result_fixtures.rb | 35 -----------------------------------
plugins/mezuro/test/fixtures/range_fixtures.rb | 20 +++++++++-----------
plugins/mezuro/test/fixtures/range_snapshot_fixtures.rb | 19 +++++++++++++++++++
plugins/mezuro/test/fixtures/reading_fixtures.rb | 16 ++++++++++++++++
plugins/mezuro/test/fixtures/reading_group_content_fixtures.rb | 9 +++++++++
plugins/mezuro/test/fixtures/reading_group_fixtures.rb | 15 +++++++++++++++
plugins/mezuro/test/fixtures/repository_fixtures.rb | 19 ++++++++++++++++++-
plugins/mezuro/test/fixtures/stack_trace_element_fixtures.rb | 10 +++++-----
plugins/mezuro/test/fixtures/throwable_fixtures.rb | 19 +++++++++++++++++++
plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb | 228 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb | 141 ---------------------------------------------------------------------------------------------------------------------------------------------
plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/functional/profile/mezuro_plugin_processing_controller_test.rb | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/base_tool_test.rb | 17 ++++-------------
plugins/mezuro/test/unit/kalibro/compound_metric_test.rb | 20 --------------------
plugins/mezuro/test/unit/kalibro/compound_metric_with_error_test.rb | 20 --------------------
plugins/mezuro/test/unit/kalibro/configuration_test.rb | 54 +++++++++++++++++++++++++++++-------------------------
plugins/mezuro/test/unit/kalibro/date_metric_result_test.rb | 20 ++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/date_module_result_test.rb | 20 ++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/error_test.rb | 20 --------------------
plugins/mezuro/test/unit/kalibro/metric_configuration_snapshot_test.rb | 24 ++++++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/metric_configuration_test.rb | 68 +++++++++++++++++++++++++-------------------------------------------
plugins/mezuro/test/unit/kalibro/metric_result_test.rb | 41 +++++++++++++++++++++++++++++++----------
plugins/mezuro/test/unit/kalibro/metric_test.rb | 29 +++++++++++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/module_node_test.rb | 19 -------------------
plugins/mezuro/test/unit/kalibro/module_result_test.rb | 40 ++++++++++++++++++++++++++--------------
plugins/mezuro/test/unit/kalibro/module_test.rb | 12 +-----------
plugins/mezuro/test/unit/kalibro/native_metric_test.rb | 20 --------------------
plugins/mezuro/test/unit/kalibro/process_time_test.rb | 25 +++++++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/processing_test.rb | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/project_result_test.rb | 88 ----------------------------------------------------------------------------------------
plugins/mezuro/test/unit/kalibro/project_test.rb | 95 ++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------
plugins/mezuro/test/unit/kalibro/range_snapshot_test.rb | 32 ++++++++++++++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/range_test.rb | 45 ++++++++++++++++++++++++++++++---------------
plugins/mezuro/test/unit/kalibro/reading_group_test.rb | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/reading_test.rb | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/unit/kalibro/repository_test.rb | 43 +++++++++++++++++++++++++++++++++++++++++--
plugins/mezuro/test/unit/kalibro/throwable_test.rb | 20 ++++++++++++++++++++
plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb | 65 +++++++++++++++++++++++++++++++++++++++--------------------------
plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
plugins/mezuro/test/unit/mezuro_plugin/helpers/module_result_helper_test.rb | 15 +++++++++++++++
plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb | 114 ++++++++++++++++++++++++++----------------------------------------------------------------------------------------
plugins/mezuro/test/unit/mezuro_plugin/reading_group_content_test.rb | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/test/unit/mezuro_plugin_test.rb | 8 --------
plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb | 25 ++++++++-----------------
plugins/mezuro/views/cms/mezuro_plugin/_mezuro_content_form.html.erb | 4 ++++
plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb | 44 ++------------------------------------------
plugins/mezuro/views/cms/mezuro_plugin/_reading_group_content.html.erb | 11 +++++++++++
plugins/mezuro/views/content_viewer/_module_result.rhtml | 52 ----------------------------------------------------
plugins/mezuro/views/content_viewer/_project_error.rhtml | 12 ------------
plugins/mezuro/views/content_viewer/_project_result.rhtml | 39 ---------------------------------------
plugins/mezuro/views/content_viewer/_score_history.rhtml | 2 --
plugins/mezuro/views/content_viewer/_source_tree.rhtml | 45 ---------------------------------------------
plugins/mezuro/views/content_viewer/show_configuration.rhtml | 56 +++++++++++++++++++++++++++++++++++++-------------------
plugins/mezuro/views/content_viewer/show_project.rhtml | 69 +++++++++++++++++++++++++++++++--------------------------------------
plugins/mezuro/views/content_viewer/show_reading_group.rhtml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb | 19 +++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb | 2 ++
plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb | 12 ++++++++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml | 26 ++++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml | 15 +++++++++++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb | 18 ++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb | 16 ++++++++++++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb | 18 ++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb | 7 +++++++
plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb | 7 +++++++
plugins/mezuro/views/mezuro_plugin_module_result/_error_page.html.erb | 2 ++
plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml | 41 +++++++++++++++++++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml | 24 ++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_module_result/_score_history.rhtml | 1 +
plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml | 34 ++++++++++++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb | 4 ----
plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb | 2 ++
plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb | 12 ------------
plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb | 3 ---
plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb | 17 -----------------
plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb | 61 -------------------------------------------------------------
plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb | 16 ----------------
plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb | 18 ------------------
plugins/mezuro/views/mezuro_plugin_myprofile/create_range.rjs | 2 --
plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb | 81 ---------------------------------------------------------------------------------
plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb | 89 -----------------------------------------------------------------------------------------
plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs | 2 --
plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb | 44 --------------------------------------------
plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb | 51 ---------------------------------------------------
plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs | 2 --
plugins/mezuro/views/mezuro_plugin_myprofile/update_range.rjs | 1 -
plugins/mezuro/views/mezuro_plugin_processing/_error_page.html.erb | 2 ++
plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml | 36 ++++++++++++++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_processing/_processing_error.rhtml | 12 ++++++++++++
plugins/mezuro/views/mezuro_plugin_profile/_error_page.html.erb | 2 ++
plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb | 2 --
plugins/mezuro/views/mezuro_plugin_range/_edit.html.erb | 4 ++++
plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb | 2 ++
plugins/mezuro/views/mezuro_plugin_range/_form.html.erb | 37 +++++++++++++++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_range/_new.html.erb | 3 +++
plugins/mezuro/views/mezuro_plugin_range/_range.html.erb | 24 ++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb | 31 +++++++++++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_range/create.rjs | 6 ++++++
plugins/mezuro/views/mezuro_plugin_range/edit.rjs | 3 +++
plugins/mezuro/views/mezuro_plugin_range/new.rjs | 3 +++
plugins/mezuro/views/mezuro_plugin_range/update.rjs | 5 +++++
plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb | 13 +++++++++++++
plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb | 10 ++++++++++
plugins/mezuro/views/mezuro_plugin_reading/new.html.erb | 9 +++++++++
plugins/mezuro/views/mezuro_plugin_repository/_error_page.html.erb | 2 ++
plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb | 23 +++++++++++++++++++++++
plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb | 7 +++++++
plugins/mezuro/views/mezuro_plugin_repository/new.html.erb | 6 ++++++
plugins/mezuro/views/mezuro_plugin_repository/show.html.erb | 45 +++++++++++++++++++++++++++++++++++++++++++++
plugins/pg_search/README | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/pg_search/db/migrate/20130320010063_create_indexes_for_search.rb | 16 ++++++++++++++++
plugins/pg_search/dependencies.rb | 1 +
plugins/pg_search/lib/ext/active_record.rb | 15 +++++++++++++++
plugins/pg_search/lib/pg_search_plugin.rb | 18 ++++++++++++++++++
plugins/pg_search/test/unit/pg_search_plugin_test.rb | 32 ++++++++++++++++++++++++++++++++
plugins/send_email/doc/send_email.textile | 21 ++++++++++++++++-----
plugins/send_email/features/send_email_plugin.feature | 38 ++++++++++++++++++++++++++++++++++++++
plugins/send_email/lib/send_email_plugin.rb | 2 +-
plugins/send_email/test/features/send_email_plugin.feature | 41 -----------------------------------------
plugins/send_email/test/unit/send_email_plugin_test.rb | 2 +-
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb | 49 ++++++++++++++++++++++++++++++++++++-------------
plugins/shopping_cart/lib/shopping_cart_plugin.rb | 4 ----
plugins/shopping_cart/public/cart.js | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------
plugins/shopping_cart/public/style.css | 2 +-
plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb | 6 ++++++
plugins/shopping_cart/views/cart.html.erb | 21 +++++++++++++++++----
plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb | 2 +-
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb | 2 +-
plugins/solr/INSTALL | 19 +++++++++++++++++++
plugins/solr/README | 6 ++++++
plugins/solr/after_enable.rb | 5 +++++
plugins/solr/config/solr.yml.dist | 26 ++++++++++++++++++++++++++
plugins/solr/dependencies.rb | 4 ++++
plugins/solr/features/.search_products.feature.swp | Bin 0 -> 20480 bytes
plugins/solr/features/search_communities.feature | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/features/search_contents.feature | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/features/search_enterprises.feature | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/features/search_people.feature | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/features/search_products.feature | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/features/step_definitions/solr_steps.rb | 18 ++++++++++++++++++
plugins/solr/lib/.solr_plugin.rb.swp | Bin 0 -> 12288 bytes
plugins/solr/lib/acts_as_faceted.rb | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/lib/acts_as_searchable.rb | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/lib/ext/article.rb | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/lib/ext/category.rb | 24 ++++++++++++++++++++++++
plugins/solr/lib/ext/certifier.rb | 6 ++++++
plugins/solr/lib/ext/comment.rb | 10 ++++++++++
plugins/solr/lib/ext/enterprise.rb | 7 +++++++
plugins/solr/lib/ext/environment.rb | 5 +++++
plugins/solr/lib/ext/facets_browse.rb | 26 ++++++++++++++++++++++++++
plugins/solr/lib/ext/product.rb | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/lib/ext/product_category.rb | 6 ++++++
plugins/solr/lib/ext/profile.rb | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/lib/ext/qualifier.rb | 6 ++++++
plugins/solr/lib/solr_plugin.rb | 38 ++++++++++++++++++++++++++++++++++++++
plugins/solr/lib/solr_plugin/.search_helper.rb.swp | Bin 0 -> 24576 bytes
plugins/solr/lib/solr_plugin/search_helper.rb | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/public/style.css | 21 +++++++++++++++++++++
plugins/solr/test/functional/.search_controller_test.rb.swp | Bin 0 -> 57344 bytes
plugins/solr/test/functional/search_controller_test.rb | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/test_helper.rb | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/acts_as_faceted_test.rb | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/acts_as_searchable_test.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/article_test.rb | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/category_test.rb | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/certifier_test.rb | 19 +++++++++++++++++++
plugins/solr/test/unit/comment_test.rb | 32 ++++++++++++++++++++++++++++++++
plugins/solr/test/unit/enterprise_test.rb | 47 +++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/environment_test.rb | 29 +++++++++++++++++++++++++++++
plugins/solr/test/unit/event_test.rb | 23 +++++++++++++++++++++++
plugins/solr/test/unit/product_category_test.rb | 19 +++++++++++++++++++
plugins/solr/test/unit/product_test.rb | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/profile_test.rb | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/qualifier_test.rb | 18 ++++++++++++++++++
plugins/solr/test/unit/search_helper_test.rb | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/test/unit/text_article_test.rb | 17 +++++++++++++++++
plugins/solr/test/unit/textile_article_test.rb | 10 ++++++++++
plugins/solr/test/unit/tiny_mce_article_test.rb | 23 +++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/.gitignore | 33 +++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/.travis.yml | 13 +++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/Gemfile | 13 +++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/LICENSE | 22 ++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/README.markdown | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/Rakefile | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN | 21 +++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/VERSION | 1 +
plugins/solr/vendor/plugins/acts_as_solr_reloaded/acts_as_solr_reloaded.gemspec | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr.yml | 22 ++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/dynamic_attributes_migration_generator.rb | 7 +++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/templates/migration.rb | 17 +++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/local_migration/local_migration_generator.rb | 7 +++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/local_migration/templates/migration.rb | 16 ++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/init.rb | 1 +
plugins/solr/vendor/plugins/acts_as_solr_reloaded/install.rb | 5 +++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb | 25 +++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb | 390 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/deprecation.rb | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/dynamic_attribute.rb | 3 +++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/lazy_document.rb | 18 ++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/local.rb | 4 ++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/mongo_mapper.rb | 24 ++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb | 29 +++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/search_results.rb | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/solr_fixtures.rb | 13 +++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb | 10 ++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr_reloaded.rb | 1 +
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr.rb | 27 +++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/connection.rb | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/document.rb | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/exception.rb | 13 +++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/field.rb | 44 ++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer.rb | 19 +++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/array_mapper.rb | 26 ++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/delimited_file_source.rb | 38 ++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/hpricot_mapper.rb | 27 +++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/mapper.rb | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/solr_source.rb | 41 +++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/xpath_mapper.rb | 35 +++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/indexer.rb | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request.rb | 26 ++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/base.rb | 36 ++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/commit.rb | 29 +++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/delete.rb | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/dismax.rb | 37 +++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/index_info.rb | 22 ++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/json_update.rb | 23 +++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/modify_document.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/optimize.rb | 19 +++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/ping.rb | 36 ++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/select.rb | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/spellcheck.rb | 30 ++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/standard.rb | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/update.rb | 23 +++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response.rb | 27 +++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/add_document.rb | 17 +++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/base.rb | 42 ++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/commit.rb | 15 +++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/delete.rb | 13 +++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/dismax.rb | 8 ++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/index_info.rb | 26 ++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/modify_document.rb | 17 +++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/optimize.rb | 14 ++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ping.rb | 26 ++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ruby.rb | 42 ++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/select.rb | 17 +++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/spellcheck.rb | 20 ++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/standard.rb | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/xml.rb | 39 +++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/util.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb | 43 +++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/database.rake | 16 ++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/test.rake | 5 +++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/rails/init.rb | 1 +
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/admin-extra.html | 31 +++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/elevate.xml | 36 ++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.aff | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.dic | 62120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/mapping-ISOLatin1Accent.txt | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.en.txt | 19 +++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.pt.txt | 19 +++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.aff | 1004 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.dic | 32083 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/schema.xml | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/scripts.conf | 24 ++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/solrconfig.xml | 1594 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/spellings.en.txt | 2 ++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.en.txt | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.pt.txt | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/synonyms.en.txt | 31 +++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example.xsl | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_atom.xsl | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_rss.xsl | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/luke.xsl | 337 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb | 6 ++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/config/solr.yml | 2 ++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/connections/mysql/connection.rb | 8 ++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/connections/sqlite/connection.rb | 5 +++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/001_create_books.rb | 15 +++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/002_create_movies.rb | 12 ++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/003_create_categories.rb | 11 +++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/004_create_electronics.rb | 16 ++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/005_create_authors.rb | 12 ++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/006_create_postings.rb | 9 +++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/007_create_posts.rb | 13 +++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/008_create_gadgets.rb | 11 +++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/009_create_dynamic_attributes.rb | 15 +++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/010_create_advertises.rb | 13 +++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/011_create_locals.rb | 15 +++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/advertises.yml | 12 ++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/authors.yml | 9 +++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/books.yml | 13 +++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/categories.yml | 7 +++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/db_definitions/mysql.sql | 41 +++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/dynamic_attributes.yml | 11 +++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/electronics.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/movies.yml | 9 +++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/postings.yml | 10 ++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/acts_as_solr_test.rb | 496 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/association_indexing_test.rb | 37 +++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/faceted_search_test.rb | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/multi_solr_search_test.rb | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/advertise.rb | 6 ++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/author.rb | 10 ++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/book.rb | 10 ++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/category.rb | 8 ++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/document.rb | 6 ++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/dynamic_attribute.rb | 7 +++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/electronic.rb | 25 +++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/gadget.rb | 9 +++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/local.rb | 7 +++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/movie.rb | 17 +++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/novel.rb | 2 ++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/post.rb | 3 +++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/posting.rb | 11 +++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/acts_methods_shoulda.rb | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/class_methods_shoulda.rb | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/common_methods_shoulda.rb | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/instance_methods_shoulda.rb | 365 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/lazy_document_shoulda.rb | 34 ++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/parser_instance.rb | 19 +++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/parser_methods_shoulda.rb | 344 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/solr_add_document_shoulda.rb | 15 +++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/solr_instance.rb | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb | 30 ++++++++++++++++++++++++++++++
plugins/solr/views/facets_browse.html.erb | 8 ++++++++
plugins/solr/views/search/.communities.rhtml.swp | Bin 0 -> 12288 bytes
plugins/solr/views/search/.people.rhtml.swp | Bin 0 -> 12288 bytes
plugins/solr/views/search/_facets.html.erb | 10 ++++++++++
plugins/solr/views/search/_facets_menu.html.erb | 36 ++++++++++++++++++++++++++++++++++++
plugins/solr/views/search/_facets_unselect_menu.rhtml | 7 +++++++
plugins/solr/views/search/_results.html.erb | 7 +++++++
plugins/solr/views/search/_results_header.html.erb | 22 ++++++++++++++++++++++
plugins/solr/views/search/_search_form_extra_fields.html.erb | 9 +++++++++
plugins/solr/views/search/articles.html.erb | 1 +
plugins/solr/views/search/communities.html.erb | 1 +
plugins/solr/views/search/enterprises.html.erb | 1 +
plugins/solr/views/search/facets_browse.html.erb | 10 ++++++++++
plugins/solr/views/search/people.html.erb | 1 +
plugins/solr/views/search/products.html.erb | 1 +
plugins/solr/views/search/search_page.html.erb | 24 ++++++++++++++++++++++++
plugins/spaminator/lib/spaminator_plugin/spaminator.rb | 10 ++++++----
plugins/work_assignment/lib/work_assignment_plugin/helper.rb | 8 ++++----
po/es/noosfero.po | 4 +---
po/pt/noosfero.po | 13 ++++++++-----
public/javascripts/application.js | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
public/javascripts/catalog.js | 68 +++++++++++++++++++++++++-------------------------------------------
public/javascripts/chat.js | 4 ++--
public/javascripts/comment_form.js | 23 +++++++++++++++++++++++
public/stylesheets/application.css | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------
public/stylesheets/search.css | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
script/cucumber | 13 +++----------
script/development | 2 --
script/noosfero-plugins | 22 ++++++++++++++++++----
script/production | 3 ---
script/quick-start | 9 ---------
script/sample-profiles | 61 ++++++++++++++++++++++++++++++++++++++++++-------------------
test/factories.rb | 3 ---
test/functional/account_controller_test.rb | 21 +++++++++++++++------
test/functional/application_controller_test.rb | 6 ++++++
test/functional/catalog_controller_test.rb | 24 +++++++++++++++++-------
test/functional/cms_controller_test.rb | 26 ++++++++++++++++++++++++--
test/functional/content_viewer_controller_test.rb | 8 ++++----
test/functional/enterprise_registration_controller_test.rb | 21 +++++++++++++++++++--
test/functional/environment_design_controller_test.rb | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
test/functional/memberships_controller_test.rb | 16 ++++++++++++++++
test/functional/profile_design_controller_test.rb | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
test/functional/profile_search_controller_test.rb | 12 +++++-------
test/functional/region_validators_controller_test.rb | 1 -
test/functional/search_controller_test.rb | 401 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
test/functional/users_controller_test.rb | 1 +
test/integration/assigning_validator_organizations_to_regions_test.rb | 1 -
test/integration/blocks_test.rb | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
test/mocks/test/testing_extra_data_for_index.rb | 5 -----
test/test_helper.rb | 16 ----------------
test/test_solr_helper.rb | 50 --------------------------------------------------
test/unit/abuse_complaint_test.rb | 12 ++++++++++++
test/unit/acts_as_faceted_test.rb | 161 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
test/unit/acts_as_searchable_test.rb | 46 ----------------------------------------------
test/unit/application_helper_test.rb | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
test/unit/article_test.rb | 140 ++++++++++++++++----------------------------------------------------------------------------------------------------------------------------
test/unit/block_helper_test.rb | 13 +++++++++++++
test/unit/category_test.rb | 39 ---------------------------------------
test/unit/certifier_test.rb | 8 --------
test/unit/comment_test.rb | 21 ---------------------
test/unit/content_viewer_helper_test.rb | 3 +--
test/unit/dates_helper_test.rb | 22 +++++++++++++++++++++-
test/unit/enterprise_test.rb | 55 ++++++++-----------------------------------------------
test/unit/environment_test.rb | 19 -------------------
test/unit/event_test.rb | 22 ++++++++--------------
test/unit/external_feed_test.rb | 14 ++++++++++++++
test/unit/forum_helper_test.rb | 4 ++--
test/unit/organization_mailing_test.rb | 6 ++++++
test/unit/plugin_manager_test.rb | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
test/unit/plugin_test.rb | 472 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
test/unit/product_category_test.rb | 8 --------
test/unit/product_test.rb | 218 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
test/unit/profile_test.rb | 149 +++--------------------------------------------------------------------------------------------------------------------------------------------------
test/unit/qualifier_test.rb | 8 --------
test/unit/region_test.rb | 26 --------------------------
test/unit/search_helper_test.rb | 155 +++--------------------------------------------------------------------------------------------------------------------------------------------------------
test/unit/set_profile_region_from_city_state_test.rb | 5 -----
test/unit/tags_block_test.rb | 17 +++++++++++++++--
test/unit/text_article_test.rb | 7 -------
test/unit/textile_article_test.rb | 5 -----
test/unit/tiny_mce_article_test.rb | 12 ------------
test/unit/user_test.rb | 17 ++++++++++++++++-
vendor/plugins/acts_as_solr_reloaded/.gitignore | 33 ---------------------------------
vendor/plugins/acts_as_solr_reloaded/.travis.yml | 13 -------------
vendor/plugins/acts_as_solr_reloaded/Gemfile | 13 -------------
vendor/plugins/acts_as_solr_reloaded/LICENSE | 22 ----------------------
vendor/plugins/acts_as_solr_reloaded/README.markdown | 128 --------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/Rakefile | 71 -----------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN | 21 ---------------------
vendor/plugins/acts_as_solr_reloaded/VERSION | 1 -
vendor/plugins/acts_as_solr_reloaded/acts_as_solr_reloaded.gemspec | 205 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/config/solr.yml | 22 ----------------------
vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb | 49 -------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/dynamic_attributes_migration_generator.rb | 7 -------
vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/templates/migration.rb | 17 -----------------
vendor/plugins/acts_as_solr_reloaded/generators/local_migration/local_migration_generator.rb | 7 -------
vendor/plugins/acts_as_solr_reloaded/generators/local_migration/templates/migration.rb | 16 ----------------
vendor/plugins/acts_as_solr_reloaded/init.rb | 1 -
vendor/plugins/acts_as_solr_reloaded/install.rb | 5 -----
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb | 25 -------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb | 390 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb | 282 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb | 77 -----------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/deprecation.rb | 61 -------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/dynamic_attribute.rb | 3 ---
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb | 194 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/lazy_document.rb | 18 ------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/local.rb | 4 ----
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/mongo_mapper.rb | 24 ------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb | 273 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb | 29 -----------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/search_results.rb | 136 ----------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/solr_fixtures.rb | 13 -------------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb | 10 ----------
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr_reloaded.rb | 1 -
vendor/plugins/acts_as_solr_reloaded/lib/solr.rb | 27 ---------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/connection.rb | 180 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/document.rb | 85 -------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/exception.rb | 13 -------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/field.rb | 44 --------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/importer.rb | 19 -------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/array_mapper.rb | 26 --------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/delimited_file_source.rb | 38 --------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/hpricot_mapper.rb | 27 ---------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/mapper.rb | 51 ---------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/solr_source.rb | 41 -----------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/xpath_mapper.rb | 35 -----------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/indexer.rb | 52 ----------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request.rb | 26 --------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb | 68 --------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/base.rb | 36 ------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/commit.rb | 29 -----------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/delete.rb | 48 ------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/dismax.rb | 37 -------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/index_info.rb | 22 ----------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/json_update.rb | 23 -----------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/modify_document.rb | 46 ----------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/optimize.rb | 19 -------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/ping.rb | 36 ------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/select.rb | 54 ------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/spellcheck.rb | 30 ------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/standard.rb | 408 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/update.rb | 23 -----------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response.rb | 27 ---------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/add_document.rb | 17 -----------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/base.rb | 42 ------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/commit.rb | 15 ---------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/delete.rb | 13 -------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/dismax.rb | 8 --------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/index_info.rb | 26 --------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/modify_document.rb | 17 -----------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/optimize.rb | 14 --------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ping.rb | 26 --------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ruby.rb | 42 ------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/select.rb | 17 -----------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/spellcheck.rb | 20 --------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/standard.rb | 64 ----------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/response/xml.rb | 39 ---------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/util.rb | 46 ----------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb | 43 -------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/tasks/database.rake | 16 ----------------
vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake | 209 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/lib/tasks/test.rake | 5 -----
vendor/plugins/acts_as_solr_reloaded/rails/init.rb | 1 -
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/admin-extra.html | 31 -------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/elevate.xml | 36 ------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.aff | 201 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.dic | 62120 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/mapping-ISOLatin1Accent.txt | 246 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.en.txt | 19 -------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.pt.txt | 19 -------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.aff | 1004 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.dic | 32083 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/schema.xml | 200 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/scripts.conf | 24 ------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/solrconfig.xml | 1594 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/spellings.en.txt | 2 --
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.en.txt | 58 ----------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.pt.txt | 128 --------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/synonyms.en.txt | 31 -------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example.xsl | 132 ------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_atom.xsl | 67 -------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_rss.xsl | 66 ------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/luke.xsl | 337 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb | 6 ------
vendor/plugins/acts_as_solr_reloaded/test/config/solr.yml | 2 --
vendor/plugins/acts_as_solr_reloaded/test/db/connections/mysql/connection.rb | 8 --------
vendor/plugins/acts_as_solr_reloaded/test/db/connections/sqlite/connection.rb | 5 -----
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/001_create_books.rb | 15 ---------------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/002_create_movies.rb | 12 ------------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/003_create_categories.rb | 11 -----------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/004_create_electronics.rb | 16 ----------------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/005_create_authors.rb | 12 ------------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/006_create_postings.rb | 9 ---------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/007_create_posts.rb | 13 -------------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/008_create_gadgets.rb | 11 -----------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/009_create_dynamic_attributes.rb | 15 ---------------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/010_create_advertises.rb | 13 -------------
vendor/plugins/acts_as_solr_reloaded/test/db/migrate/011_create_locals.rb | 15 ---------------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/advertises.yml | 12 ------------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/authors.yml | 9 ---------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/books.yml | 13 -------------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/categories.yml | 7 -------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/db_definitions/mysql.sql | 41 -----------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/dynamic_attributes.yml | 11 -----------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/electronics.yml | 49 -------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/locals.yml | 9 ---------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/movies.yml | 9 ---------
vendor/plugins/acts_as_solr_reloaded/test/fixtures/postings.yml | 10 ----------
vendor/plugins/acts_as_solr_reloaded/test/functional/acts_as_solr_test.rb | 496 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/functional/association_indexing_test.rb | 37 -------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/functional/faceted_search_test.rb | 162 ------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/functional/multi_solr_search_test.rb | 55 -------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/models/advertise.rb | 6 ------
vendor/plugins/acts_as_solr_reloaded/test/models/author.rb | 10 ----------
vendor/plugins/acts_as_solr_reloaded/test/models/book.rb | 10 ----------
vendor/plugins/acts_as_solr_reloaded/test/models/category.rb | 8 --------
vendor/plugins/acts_as_solr_reloaded/test/models/document.rb | 6 ------
vendor/plugins/acts_as_solr_reloaded/test/models/dynamic_attribute.rb | 7 -------
vendor/plugins/acts_as_solr_reloaded/test/models/electronic.rb | 25 -------------------------
vendor/plugins/acts_as_solr_reloaded/test/models/gadget.rb | 9 ---------
vendor/plugins/acts_as_solr_reloaded/test/models/local.rb | 7 -------
vendor/plugins/acts_as_solr_reloaded/test/models/movie.rb | 17 -----------------
vendor/plugins/acts_as_solr_reloaded/test/models/novel.rb | 2 --
vendor/plugins/acts_as_solr_reloaded/test/models/post.rb | 3 ---
vendor/plugins/acts_as_solr_reloaded/test/models/posting.rb | 11 -----------
vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb | 84 ------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/acts_methods_shoulda.rb | 125 -----------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/class_methods_shoulda.rb | 85 -------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/common_methods_shoulda.rb | 99 ---------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/instance_methods_shoulda.rb | 365 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/lazy_document_shoulda.rb | 34 ----------------------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/parser_instance.rb | 19 -------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/parser_methods_shoulda.rb | 344 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/solr_add_document_shoulda.rb | 15 ---------------
vendor/plugins/acts_as_solr_reloaded/test/unit/solr_instance.rb | 70 ----------------------------------------------------------------------
vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb | 30 ------------------------------
vendor/plugins/delayed_job/README.textile | 1 -
1039 files changed, 144546 insertions(+), 114933 deletions(-)
create mode 100644 app/helpers/layout_helper.rb
delete mode 100644 app/views/box_organizer/_block_types.rhtml
create mode 100644 app/views/layouts/_user.html.erb
delete mode 100644 app/views/search/_article.rhtml
delete mode 100644 app/views/search/_blog.rhtml
create mode 100644 app/views/search/_compact_profile.html.erb
delete mode 120000 app/views/search/_content.rhtml
delete mode 100644 app/views/search/_event.rhtml
delete mode 100644 app/views/search/_facets_menu.rhtml
delete mode 100644 app/views/search/_facets_unselect_menu.rhtml
delete mode 100644 app/views/search/_folder.rhtml
delete mode 100644 app/views/search/_forum.rhtml
create mode 100644 app/views/search/_full_article.html.erb
create mode 100644 app/views/search/_full_blog.html.erb
create mode 100644 app/views/search/_full_enterprise.html.erb
create mode 100644 app/views/search/_full_event.html.erb
create mode 100644 app/views/search/_full_folder.html.erb
create mode 100644 app/views/search/_full_forum.html.erb
create mode 100644 app/views/search/_full_gallery.html.erb
create mode 100644 app/views/search/_full_product.rhtml
create mode 100644 app/views/search/_full_text_article.html.erb
create mode 100644 app/views/search/_full_uploaded_file.html.erb
delete mode 100644 app/views/search/_gallery.rhtml
create mode 100644 app/views/search/_image.html.erb
delete mode 100644 app/views/search/_image.rhtml
delete mode 100644 app/views/search/_product.rhtml
delete mode 100644 app/views/search/_profile.rhtml
create mode 100644 app/views/search/_search_form_extra_fields.html.erb
delete mode 100644 app/views/search/_text_article.rhtml
delete mode 100644 app/views/search/_uploaded_file.rhtml
create mode 120000 app/views/search/articles.html.erb
delete mode 100644 app/views/search/articles.rhtml
delete mode 120000 app/views/search/category_index.rhtml
create mode 100644 app/views/search/category_index.rhtml
create mode 120000 app/views/search/communities.html.erb
delete mode 100644 app/views/search/communities.rhtml
delete mode 120000 app/views/search/contents.rhtml
create mode 120000 app/views/search/enterprises.html.erb
delete mode 100644 app/views/search/enterprises.rhtml
create mode 100644 app/views/search/events.html.erb
delete mode 100644 app/views/search/events.rhtml
delete mode 100644 app/views/search/facets_browse.rhtml
create mode 120000 app/views/search/people.html.erb
delete mode 100644 app/views/search/people.rhtml
create mode 120000 app/views/search/products.html.erb
delete mode 100644 app/views/search/products.rhtml
create mode 100644 app/views/search/search_page.html.erb
delete mode 100644 app/views/users/_user_csv.rhtml
delete mode 100644 app/views/users/index_csv.rhtml
delete mode 100644 config/solr.yml.dist
create mode 100644 db/migrate/20130117132943_remove_index_articles_on_name.rb
create mode 100644 db/migrate/20130304200849_add_default_value_to_product_highlighted.rb
create mode 100644 db/migrate/20130429214630_destroy_inconsistent_abuse_complaints.rb
create mode 100644 db/migrate/20130605135210_change_article_published_at_from_date_to_datetime.rb
create mode 100644 db/migrate/20130606110602_change_article_versions_published_at_from_date_to_datetime.rb
delete mode 100644 debian/solr.yml
create mode 100644 features/plugins/README
create mode 100644 features/step_definitions/admin_categories_steps.rb
create mode 100644 features/step_definitions/chat_steps.rb
create mode 100644 features/step_definitions/custom_web_steps.rb
delete mode 100644 features/step_definitions/custom_webrat_steps.rb
delete mode 100644 features/step_definitions/mezuro_steps.rb
delete mode 100644 features/step_definitions/selenium_steps.rb
create mode 100644 features/step_definitions/web_steps.rb
delete mode 100644 features/step_definitions/webrat_steps.rb
delete mode 100644 features/support/fixtures.rb
delete mode 100644 features/support/version_check.rb
delete mode 100644 lib/acts_as_faceted.rb
delete mode 100644 lib/acts_as_searchable.rb
create mode 100644 plugins/bsc/features/bsc.feature
create mode 100644 plugins/bsc/features/contract.feature
delete mode 100644 plugins/bsc/test/features/bsc.feature
delete mode 100644 plugins/bsc/test/features/contract.feature
create mode 100644 plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb
create mode 100644 plugins/display_content/README
create mode 100644 plugins/display_content/controllers/display_content_plugin_admin_controller.rb
create mode 100644 plugins/display_content/controllers/display_content_plugin_module.rb
create mode 100644 plugins/display_content/controllers/display_content_plugin_myprofile_controller.rb
create mode 100644 plugins/display_content/lib/display_content_block.rb
create mode 100644 plugins/display_content/lib/display_content_plugin.rb
create mode 120000 plugins/display_content/public/javascripts/jstree
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/README.txt
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_dump.sql
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_inc/__mysql_errors.log
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_inc/class._database.php
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_inc/class._database_i.php
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_inc/class.tree.php
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/_install.txt
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/config.php
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/file.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/folder.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/index.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/root.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_demo/server.php
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/!style.css
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_drive.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_html_data.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_json_data.json
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_search_data.json
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_search_result.json
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_xml_flat.xml
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/_xml_nest.xml
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/checkbox.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/contextmenu.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/cookies.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/core.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/crrm.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/dnd.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/hotkeys.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/html_data.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/index.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/json_data.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/languages.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/logo.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/search.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/sort.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/!script.js
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/!style.css
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/clipboard.swf
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/help.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/magnifier.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/page_white_code.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/page_white_copy.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/printer.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/syntax/wrapping.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/themeroller.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/themes.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/types.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/ui.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/unique.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_docs/xml_data.html
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_lib/jquery-1.8.3.js
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_lib/jquery.cookie.js
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_lib/jquery.hotkeys.js
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/_lib/jquery.js
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/jquery.jstree.js
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/bg.jpg
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/d.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/dot_for_ie.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/style.css
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/apple/throbber.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/d.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/d.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/dot_for_ie.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/style.css
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/classic/throbber.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/d.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/d.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/dots.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/style.css
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default-rtl/throbber.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default/d.gif
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default/d.png
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default/style.css
create mode 100644 plugins/display_content/public/javascripts/jstree-v.pre1.0/themes/default/throbber.gif
create mode 100644 plugins/display_content/public/style.css
create mode 100644 plugins/display_content/test/functional/display_content_plugin_admin_controller_test.rb
create mode 100644 plugins/display_content/test/functional/display_content_plugin_myprofile_controller_test.rb
create mode 100644 plugins/display_content/test/test_helper.rb
create mode 100644 plugins/display_content/test/unit/display_content_block_test.rb
create mode 100644 plugins/display_content/test/unit/display_content_plugin_test.rb
create mode 100644 plugins/display_content/views/box_organizer/_display_content_block.rhtml
create mode 120000 plugins/display_content/views/environment_design
create mode 120000 plugins/display_content/views/profile_design
create mode 100644 plugins/ldap/README
create mode 100644 plugins/ldap/controllers/ldap_plugin_admin_controller.rb
create mode 100644 plugins/ldap/dependencies.rb
create mode 100644 plugins/ldap/fixtures/ldap.yml.dist
create mode 100644 plugins/ldap/lib/ext/environment.rb
create mode 100644 plugins/ldap/lib/ldap_authentication.rb
create mode 100644 plugins/ldap/lib/ldap_plugin.rb
create mode 100644 plugins/ldap/test/functional/account_controller_plugin_test.rb
create mode 100644 plugins/ldap/test/functional/ldap_plugin_admin_controller_test.rb
create mode 100644 plugins/ldap/test/test_helper.rb
create mode 100644 plugins/ldap/test/unit/ext/environment_test.rb
create mode 100644 plugins/ldap/test/unit/ldap_authentication_test.rb
create mode 100644 plugins/ldap/test/unit/ldap_plugin_test.rb
create mode 100644 plugins/ldap/views/ldap_plugin_admin/index.html.erb
delete mode 100644 plugins/mezuro/SERVICE
delete mode 100644 plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
delete mode 100644 plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
create mode 100644 plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
create mode 100644 plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb
create mode 100644 plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
create mode 100644 plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb
create mode 100644 plugins/mezuro/controllers/profile/mezuro_plugin_module_result_controller.rb
create mode 100644 plugins/mezuro/controllers/profile/mezuro_plugin_processing_controller.rb
create mode 100644 plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb
create mode 100644 plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb
create mode 100644 plugins/mezuro/features/configuration.feature
create mode 100644 plugins/mezuro/features/project.feature
create mode 100644 plugins/mezuro/features/reading.feature
create mode 100644 plugins/mezuro/features/reading_group.feature
create mode 100644 plugins/mezuro/features/repository.feature
create mode 100644 plugins/mezuro/features/step_definitions/mezuro_steps.rb
create mode 100644 plugins/mezuro/features/support/hooks.rb
delete mode 100644 plugins/mezuro/lib/kalibro/compound_metric.rb
delete mode 100644 plugins/mezuro/lib/kalibro/compound_metric_with_error.rb
create mode 100644 plugins/mezuro/lib/kalibro/date_metric_result.rb
create mode 100644 plugins/mezuro/lib/kalibro/date_module_result.rb
delete mode 100644 plugins/mezuro/lib/kalibro/error.rb
create mode 100644 plugins/mezuro/lib/kalibro/errors/record_not_found.rb
create mode 100644 plugins/mezuro/lib/kalibro/errors/standard.rb
create mode 100644 plugins/mezuro/lib/kalibro/metric_configuration_snapshot.rb
delete mode 100644 plugins/mezuro/lib/kalibro/module_node.rb
delete mode 100644 plugins/mezuro/lib/kalibro/native_metric.rb
create mode 100644 plugins/mezuro/lib/kalibro/process_time.rb
create mode 100644 plugins/mezuro/lib/kalibro/processing.rb
delete mode 100644 plugins/mezuro/lib/kalibro/project_result.rb
create mode 100644 plugins/mezuro/lib/kalibro/range_snapshot.rb
create mode 100644 plugins/mezuro/lib/kalibro/reading.rb
create mode 100644 plugins/mezuro/lib/kalibro/reading_group.rb
create mode 100644 plugins/mezuro/lib/kalibro/throwable.rb
create mode 100644 plugins/mezuro/lib/mezuro_plugin/helpers/module_result_helper.rb
create mode 100644 plugins/mezuro/lib/mezuro_plugin/reading_group_content.rb
delete mode 100644 plugins/mezuro/licenses.yaml.example
create mode 100644 plugins/mezuro/licenses.yml.example
create mode 100644 plugins/mezuro/public/icons/mezuro.png
delete mode 100644 plugins/mezuro/public/javascripts/colorPicker/LICENSE
delete mode 100644 plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.js
delete mode 100644 plugins/mezuro/public/javascripts/colorPicker/jquery.colorPicker.min.js
create mode 100644 plugins/mezuro/public/javascripts/processing.js
delete mode 100644 plugins/mezuro/public/javascripts/project_content.js
create mode 100644 plugins/mezuro/script/install/install-rvm.sh
create mode 100755 plugins/mezuro/script/tests/delete_all_kalibro_entries.sh
create mode 100644 plugins/mezuro/script/tests/kalibro_scripts.conf
create mode 100755 plugins/mezuro/script/tests/prepare_kalibro_query_file.sh
create mode 100755 plugins/mezuro/script/tests/run_acceptance_tests.sh
delete mode 100644 plugins/mezuro/service.yaml.example
create mode 100644 plugins/mezuro/service.yml.example
delete mode 100644 plugins/mezuro/test/features/adding_metric_configuration.feature
delete mode 100644 plugins/mezuro/test/features/adding_ranges.feature
delete mode 100644 plugins/mezuro/test/features/creating_configuration.feature
delete mode 100644 plugins/mezuro/test/features/creating_project.feature
delete mode 100644 plugins/mezuro/test/features/echo_port_test.rb
delete mode 100644 plugins/mezuro/test/features/editing_configuration.feature
delete mode 100644 plugins/mezuro/test/features/removing_metric_configuration.feature
delete mode 100644 plugins/mezuro/test/fixtures/compound_metric_fixtures.rb
delete mode 100644 plugins/mezuro/test/fixtures/compound_metric_with_error_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/configuration_content_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/date_metric_result_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/date_module_result_fixtures.rb
delete mode 100644 plugins/mezuro/test/fixtures/error_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/metric_configuration_snapshot_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/metric_fixtures.rb
delete mode 100644 plugins/mezuro/test/fixtures/module_node_fixtures.rb
delete mode 100644 plugins/mezuro/test/fixtures/native_metric_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/process_time_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/processing_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/project_content_fixtures.rb
delete mode 100644 plugins/mezuro/test/fixtures/project_result_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/range_snapshot_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/reading_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/reading_group_content_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/reading_group_fixtures.rb
create mode 100644 plugins/mezuro/test/fixtures/throwable_fixtures.rb
delete mode 100644 plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
delete mode 100644 plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
create mode 100644 plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
create mode 100644 plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb
create mode 100644 plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb
create mode 100644 plugins/mezuro/test/functional/profile/mezuro_plugin_module_result_controller_test.rb
create mode 100644 plugins/mezuro/test/functional/profile/mezuro_plugin_processing_controller_test.rb
create mode 100644 plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb
delete mode 100644 plugins/mezuro/test/unit/kalibro/compound_metric_test.rb
delete mode 100644 plugins/mezuro/test/unit/kalibro/compound_metric_with_error_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/date_metric_result_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/date_module_result_test.rb
delete mode 100644 plugins/mezuro/test/unit/kalibro/error_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/metric_configuration_snapshot_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/metric_test.rb
delete mode 100644 plugins/mezuro/test/unit/kalibro/module_node_test.rb
delete mode 100644 plugins/mezuro/test/unit/kalibro/native_metric_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/process_time_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/processing_test.rb
delete mode 100644 plugins/mezuro/test/unit/kalibro/project_result_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/range_snapshot_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/reading_group_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/reading_test.rb
create mode 100644 plugins/mezuro/test/unit/kalibro/throwable_test.rb
create mode 100644 plugins/mezuro/test/unit/mezuro_plugin/helpers/module_result_helper_test.rb
create mode 100644 plugins/mezuro/test/unit/mezuro_plugin/reading_group_content_test.rb
create mode 100644 plugins/mezuro/views/cms/mezuro_plugin/_mezuro_content_form.html.erb
create mode 100644 plugins/mezuro/views/cms/mezuro_plugin/_reading_group_content.html.erb
delete mode 100644 plugins/mezuro/views/content_viewer/_module_result.rhtml
delete mode 100644 plugins/mezuro/views/content_viewer/_project_error.rhtml
delete mode 100644 plugins/mezuro/views/content_viewer/_project_result.rhtml
delete mode 100644 plugins/mezuro/views/content_viewer/_score_history.rhtml
delete mode 100644 plugins/mezuro/views/content_viewer/_source_tree.rhtml
create mode 100644 plugins/mezuro/views/content_viewer/show_reading_group.rhtml
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_compound_metric_configuration_form.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_form.rhtml
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/_native_metric_configuration_view.rhtml
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/choose_metric.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_error_page.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_metric_results.rhtml
create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_module_result.rhtml
create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_score_history.rhtml
create mode 100644 plugins/mezuro/views/mezuro_plugin_module_result/_source_tree.rhtml
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_range.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/choose_base_tool.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/choose_metric.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/create_range.rjs
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/edit_range.rjs
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/new_range.rjs
delete mode 100644 plugins/mezuro/views/mezuro_plugin_myprofile/update_range.rjs
create mode 100644 plugins/mezuro/views/mezuro_plugin_processing/_error_page.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml
create mode 100644 plugins/mezuro/views/mezuro_plugin_processing/_processing_error.rhtml
create mode 100644 plugins/mezuro/views/mezuro_plugin_profile/_error_page.html.erb
delete mode 100644 plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_edit.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_form.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_new.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/_ranges.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/create.rjs
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/edit.rjs
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/new.rjs
create mode 100644 plugins/mezuro/views/mezuro_plugin_range/update.rjs
create mode 100644 plugins/mezuro/views/mezuro_plugin_reading/_form.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_reading/new.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/_error_page.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/_form.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/new.html.erb
create mode 100644 plugins/mezuro/views/mezuro_plugin_repository/show.html.erb
create mode 100644 plugins/pg_search/README
create mode 100644 plugins/pg_search/db/migrate/20130320010063_create_indexes_for_search.rb
create mode 100644 plugins/pg_search/dependencies.rb
create mode 100644 plugins/pg_search/lib/ext/active_record.rb
create mode 100644 plugins/pg_search/lib/pg_search_plugin.rb
create mode 100644 plugins/pg_search/test/unit/pg_search_plugin_test.rb
create mode 100644 plugins/send_email/features/send_email_plugin.feature
delete mode 100644 plugins/send_email/test/features/send_email_plugin.feature
create mode 100644 plugins/solr/INSTALL
create mode 100644 plugins/solr/README
create mode 100644 plugins/solr/after_enable.rb
create mode 100644 plugins/solr/config/solr.yml.dist
create mode 100644 plugins/solr/dependencies.rb
create mode 100644 plugins/solr/features/.search_products.feature.swp
create mode 100644 plugins/solr/features/search_communities.feature
create mode 100644 plugins/solr/features/search_contents.feature
create mode 100644 plugins/solr/features/search_enterprises.feature
create mode 100644 plugins/solr/features/search_people.feature
create mode 100644 plugins/solr/features/search_products.feature
create mode 100644 plugins/solr/features/step_definitions/solr_steps.rb
create mode 100644 plugins/solr/lib/.solr_plugin.rb.swp
create mode 100644 plugins/solr/lib/acts_as_faceted.rb
create mode 100644 plugins/solr/lib/acts_as_searchable.rb
create mode 100644 plugins/solr/lib/ext/article.rb
create mode 100644 plugins/solr/lib/ext/category.rb
create mode 100644 plugins/solr/lib/ext/certifier.rb
create mode 100644 plugins/solr/lib/ext/comment.rb
create mode 100644 plugins/solr/lib/ext/enterprise.rb
create mode 100644 plugins/solr/lib/ext/environment.rb
create mode 100644 plugins/solr/lib/ext/facets_browse.rb
create mode 100644 plugins/solr/lib/ext/product.rb
create mode 100644 plugins/solr/lib/ext/product_category.rb
create mode 100644 plugins/solr/lib/ext/profile.rb
create mode 100644 plugins/solr/lib/ext/qualifier.rb
create mode 100644 plugins/solr/lib/solr_plugin.rb
create mode 100644 plugins/solr/lib/solr_plugin/.search_helper.rb.swp
create mode 100644 plugins/solr/lib/solr_plugin/search_helper.rb
create mode 100644 plugins/solr/public/style.css
create mode 100644 plugins/solr/test/functional/.search_controller_test.rb.swp
create mode 100644 plugins/solr/test/functional/search_controller_test.rb
create mode 100644 plugins/solr/test/test_helper.rb
create mode 100644 plugins/solr/test/unit/acts_as_faceted_test.rb
create mode 100644 plugins/solr/test/unit/acts_as_searchable_test.rb
create mode 100644 plugins/solr/test/unit/article_test.rb
create mode 100644 plugins/solr/test/unit/category_test.rb
create mode 100644 plugins/solr/test/unit/certifier_test.rb
create mode 100644 plugins/solr/test/unit/comment_test.rb
create mode 100644 plugins/solr/test/unit/enterprise_test.rb
create mode 100644 plugins/solr/test/unit/environment_test.rb
create mode 100644 plugins/solr/test/unit/event_test.rb
create mode 100644 plugins/solr/test/unit/product_category_test.rb
create mode 100644 plugins/solr/test/unit/product_test.rb
create mode 100644 plugins/solr/test/unit/profile_test.rb
create mode 100644 plugins/solr/test/unit/qualifier_test.rb
create mode 100644 plugins/solr/test/unit/search_helper_test.rb
create mode 100644 plugins/solr/test/unit/text_article_test.rb
create mode 100644 plugins/solr/test/unit/textile_article_test.rb
create mode 100644 plugins/solr/test/unit/tiny_mce_article_test.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/.gitignore
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/.travis.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/Gemfile
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/LICENSE
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/README.markdown
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/Rakefile
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/VERSION
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/acts_as_solr_reloaded.gemspec
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/dynamic_attributes_migration_generator.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/templates/migration.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/local_migration/local_migration_generator.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/local_migration/templates/migration.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/init.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/install.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/deprecation.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/dynamic_attribute.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/lazy_document.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/local.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/mongo_mapper.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/search_results.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/solr_fixtures.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr_reloaded.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/connection.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/document.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/exception.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/field.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/array_mapper.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/delimited_file_source.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/hpricot_mapper.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/mapper.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/solr_source.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/xpath_mapper.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/indexer.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/base.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/commit.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/delete.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/dismax.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/index_info.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/json_update.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/modify_document.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/optimize.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/ping.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/select.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/spellcheck.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/standard.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/update.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/add_document.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/base.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/commit.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/delete.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/dismax.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/index_info.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/modify_document.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/optimize.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ping.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ruby.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/select.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/spellcheck.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/standard.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/xml.rb
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/util.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/database.rake
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/test.rake
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/rails/init.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/admin-extra.html
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/elevate.xml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.aff
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.dic
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/mapping-ISOLatin1Accent.txt
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.en.txt
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.pt.txt
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.aff
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.dic
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/schema.xml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/scripts.conf
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/solrconfig.xml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/spellings.en.txt
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.en.txt
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.pt.txt
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/synonyms.en.txt
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example.xsl
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_atom.xsl
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_rss.xsl
create mode 100755 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/luke.xsl
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/config/solr.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/connections/mysql/connection.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/connections/sqlite/connection.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/001_create_books.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/002_create_movies.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/003_create_categories.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/004_create_electronics.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/005_create_authors.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/006_create_postings.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/007_create_posts.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/008_create_gadgets.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/009_create_dynamic_attributes.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/010_create_advertises.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/011_create_locals.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/advertises.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/authors.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/books.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/categories.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/db_definitions/mysql.sql
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/dynamic_attributes.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/electronics.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/movies.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/postings.yml
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/acts_as_solr_test.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/association_indexing_test.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/faceted_search_test.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/multi_solr_search_test.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/advertise.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/author.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/book.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/category.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/document.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/dynamic_attribute.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/electronic.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/gadget.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/local.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/movie.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/novel.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/post.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/posting.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/acts_methods_shoulda.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/class_methods_shoulda.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/common_methods_shoulda.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/instance_methods_shoulda.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/lazy_document_shoulda.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/parser_instance.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/parser_methods_shoulda.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/solr_add_document_shoulda.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/solr_instance.rb
create mode 100644 plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb
create mode 100644 plugins/solr/views/facets_browse.html.erb
create mode 100644 plugins/solr/views/search/.communities.rhtml.swp
create mode 100644 plugins/solr/views/search/.people.rhtml.swp
create mode 100644 plugins/solr/views/search/_facets.html.erb
create mode 100644 plugins/solr/views/search/_facets_menu.html.erb
create mode 100644 plugins/solr/views/search/_facets_unselect_menu.rhtml
create mode 100644 plugins/solr/views/search/_results.html.erb
create mode 100644 plugins/solr/views/search/_results_header.html.erb
create mode 100644 plugins/solr/views/search/_search_form_extra_fields.html.erb
create mode 120000 plugins/solr/views/search/articles.html.erb
create mode 120000 plugins/solr/views/search/communities.html.erb
create mode 120000 plugins/solr/views/search/enterprises.html.erb
create mode 100644 plugins/solr/views/search/facets_browse.html.erb
create mode 120000 plugins/solr/views/search/people.html.erb
create mode 120000 plugins/solr/views/search/products.html.erb
create mode 100644 plugins/solr/views/search/search_page.html.erb
create mode 100644 public/javascripts/comment_form.js
create mode 100644 test/integration/blocks_test.rb
delete mode 100644 test/mocks/test/testing_extra_data_for_index.rb
delete mode 100644 test/test_solr_helper.rb
delete mode 100644 test/unit/acts_as_faceted_test.rb
delete mode 100644 test/unit/acts_as_searchable_test.rb
create mode 100644 test/unit/block_helper_test.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/.gitignore
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/.travis.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/Gemfile
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/LICENSE
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/README.markdown
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/Rakefile
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/VERSION
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/acts_as_solr_reloaded.gemspec
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/config/solr.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/dynamic_attributes_migration_generator.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/templates/migration.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/generators/local_migration/local_migration_generator.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/generators/local_migration/templates/migration.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/init.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/install.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/deprecation.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/dynamic_attribute.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/lazy_document.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/local.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/mongo_mapper.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/search_results.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/solr_fixtures.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr_reloaded.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/connection.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/document.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/exception.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/field.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/importer.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/array_mapper.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/delimited_file_source.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/hpricot_mapper.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/mapper.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/solr_source.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/xpath_mapper.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/indexer.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/request.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/base.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/commit.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/delete.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/dismax.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/index_info.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/json_update.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/modify_document.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/optimize.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/ping.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/select.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/spellcheck.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/standard.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/request/update.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/response.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/add_document.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/base.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/commit.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/delete.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/dismax.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/index_info.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/modify_document.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/optimize.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ping.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ruby.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/select.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/spellcheck.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/standard.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/response/xml.rb
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/lib/solr/util.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/tasks/database.rake
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/lib/tasks/test.rake
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/rails/init.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/admin-extra.html
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/elevate.xml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.aff
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.dic
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/mapping-ISOLatin1Accent.txt
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.en.txt
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.pt.txt
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.aff
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.dic
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/schema.xml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/scripts.conf
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/solrconfig.xml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/spellings.en.txt
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.en.txt
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.pt.txt
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/synonyms.en.txt
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example.xsl
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_atom.xsl
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_rss.xsl
delete mode 100755 vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/luke.xsl
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/config/solr.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/connections/mysql/connection.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/connections/sqlite/connection.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/001_create_books.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/002_create_movies.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/003_create_categories.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/004_create_electronics.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/005_create_authors.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/006_create_postings.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/007_create_posts.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/008_create_gadgets.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/009_create_dynamic_attributes.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/010_create_advertises.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/db/migrate/011_create_locals.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/advertises.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/authors.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/books.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/categories.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/db_definitions/mysql.sql
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/dynamic_attributes.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/electronics.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/locals.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/movies.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/fixtures/postings.yml
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/functional/acts_as_solr_test.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/functional/association_indexing_test.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/functional/faceted_search_test.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/functional/multi_solr_search_test.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/advertise.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/author.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/book.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/category.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/document.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/dynamic_attribute.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/electronic.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/gadget.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/local.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/movie.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/novel.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/post.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/models/posting.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/acts_methods_shoulda.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/class_methods_shoulda.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/common_methods_shoulda.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/instance_methods_shoulda.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/lazy_document_shoulda.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/parser_instance.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/parser_methods_shoulda.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/solr_add_document_shoulda.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/solr_instance.rb
delete mode 100644 vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb
diff --git a/AUTHORS b/AUTHORS
index b9d5763..926fefa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,16 +13,30 @@ Alessandro Palmeira + Caio Salgado
Alessandro Palmeira + Caio Salgado
Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva
Alessandro Palmeira + Carlos Morais
+Alessandro Palmeira + Daniel Alves
+Alessandro Palmeira + Daniel Alves + Diego Araújo
+Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas
+Alessandro Palmeira + Diego Araujo
Alessandro Palmeira + Diego Araújo
+Alessandro Palmeira + Diego Araujo + Daniela Feitosa
+Alessandro Palmeira + Diego Araujo
Alessandro Palmeira + Diego Araújo
+Alessandro Palmeira + Diego Araujo + Eduardo Morais
+Alessandro Palmeira + Diego Araújo + João M. M. da Silva
+Alessandro Palmeira + Diego Araújo + João M. M. da Silva
+Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles
Alessandro Palmeira + Diego Araújo + Pedro Leal
Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva
Alessandro Palmeira + Diego Araujo + Rafael Manzo
+Alessandro Palmeira + Eduardo Morais
+Alessandro Palmeira + Guilherme Rojas
Alessandro Palmeira + Jefferson Fernandes
Alessandro Palmeira + João M. M. da Silva
+Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo
Alessandro Palmeira + João M. M. da Silva + Renan Teruo
Alessandro Palmeira + João M. M. Silva
Alessandro Palmeira + Paulo Meirelles
+Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva
Alessandro Palmeira + Rafael Manzo
Antonio Terceiro + Carlos Morais
Antonio Terceiro + Paulo Meirelles
@@ -32,6 +46,7 @@ Braulio Bhavamitra
Bráulio Bhavamitra
Caio
Caio + Diego + Pedro + João
+Caio Formiga
Caio, Pedro
Caio Salgado + Alessandro Palmeira
Caio Salgado
@@ -57,26 +72,42 @@ Carlos Morais + Diego Araújo
Carlos Morais + Eduardo Morais
Carlos Morais + Paulo Meirelles
Carlos Morais + Pedro Leal
+Daniel Alves + Diego Araújo
+Daniel Alves + Diego Araújo
+Daniel Alves + Diego Araújo + Guilherme Rojas
+Daniel Alves + Diego Araújo + Guilherme Rojas
+Daniel Alves + Diego Araújo + Guilherme Rojas
+Daniel Alves + Guilherme Rojas
+Daniel Alves + Rafael Manzo
Daniela Soares Feitosa
Daniel Cunha
diegoamc
Diego Araújo + Alessandro Palmeira
+Diego Araújo + Alessandro Palmeira + João M. M. da Silva
+Diego Araújo + Alessandro Palmeira + Rafael Manzo
Diego Araujo + Caio Salgado
+Diego Araújo + Daniel Alves + Rafael Manzo
Diego Araújo
+Diego Araújo + Eduardo Morais + Paulo Meirelles
+Diego Araújo + Guilherme Rojas
Diego Araújo + Jefferson Fernandes
Diego Araujo + Jefferson Fernandes
Diego Araújo + João Machini
Diego Araújo + João Machini
+Diego Araújo + João M. M. da Silva + Alessandro Palmeira
Diego Araújo + João M. M. da Silva
Diego Araújo + João M. M. da Silva + João Machini
Diego Araújo + João M. M. da Silva + Pedro Leal
Diego Araújo + Paulo Meirelles
Diego Araújo + Pedro Leal
+Diego Araujo + Rafael Manzo
Diego Araújo + Rafael Manzo
Diego Araújo + Renan Teruo + Alessandro Palmeira
Diego Araújo + Renan Teruo
+Diego Araujo + Rodrigo Souto + Rafael Manzo
Diego + Jefferson
Diego Martinez
+Diego Martinez
Diego + Renan
Fernanda Lopes
Grazieno Pellegrino
@@ -89,6 +120,7 @@ João da Silva
João Marco Maciel da Silva + Rafael Manzo + Renan Teruo
João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado
João M. M. da Silva + Alessandro Palmeira + Diego Araújo
+Joao M. M. da Silva + Alessandro Palmeira
João M. M. da Silva + Alessandro Palmeira
João M. M. da Silva + Alessandro Palmeira + João Machini
João M. M. da Silva + Caio Salgado + Alessandro Palmeira
@@ -120,21 +152,30 @@ Larissa Reis
Leandro Nunes dos Santos
Leandro Nunes dos Santos
LinguÃgil 2010
+Lucas Melo
Luis David Aguilar Carlos
MartÃn Olivera
Moises Machado
Nanda Lopes
+Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva
Paulo Meirelles + Alessandro Palmeira
Paulo Meirelles + Carlos Morais
Paulo Meirelles + Diego Araújo
Paulo Meirelles + João M. M. da Silva
Paulo Meirelles
+Paulo Meirelles + Rafael Manzo
Rafael Gomes
+Rafael Manzo + Alessandro Palmeira
+Rafael Manzo + Daniel Alves
+Rafael Manzo + Diego Araújo
Rafael Manzo + João M. M. Silva
+Rafael Manzo + Paulo Meirelles
Rafael Martins
Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes
Rafael Reggiani Manzo + Diego Araujo
Rafael Reggiani Manzo + Diego Araujo
+Rafael Reggiani Manzo + Diego Araújo
+Rafael Reggiani Manzo + João M. M. da Silva
Rafael Reggiani Manzo
Raphaël Rousseau
Raquel Lira
@@ -146,8 +187,11 @@ Renan Teruo + Paulo Meirelles
Renan Teruo + Rafael Manzo
Rodrigo Souto
Ronny Kursawe
+root
Samuel R. C. Vale
Valessio Brito
+vfcosta
+Visita
Yann Lugrin
Ideas, specifications and incentive
diff --git a/Gemfile b/Gemfile
index bf53e96..2092c52 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,21 @@
-source :rubygems
-gem 'cucumber', '0.4.0'
-gem 'webrat', '0.5.1'
-gem 'rspec', '1.2.9'
-gem 'rspec-rails', '1.2.9'
-gem 'Selenium', '>= 1.1.14'
-gem 'selenium-client', '>= 1.2.17'
-gem 'database_cleaner'
+source "https://rubygems.org"
+
gem 'exception_notification', '1.0.20090728'
gem 'system_timer'
+group :test do
+ gem 'rspec', '1.2.9'
+ gem 'rspec-rails', '1.2.9'
+end
+
+group :cucumber do
+ gem 'rake', '0.8.7'
+ gem 'cucumber-rails', '0.3.2'
+ gem 'capybara', '1.1.1'
+ gem 'cucumber', '1.1.0'
+ gem 'database_cleaner'
+end
+
def program(name)
unless system("which #{name} > /dev/null")
puts "W: Program #{name} is needed, but was not found in your PATH"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0a42c0b..281190d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,44 +1,66 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- Selenium (1.1.14)
- builder (3.0.0)
- cucumber (0.4.0)
+ builder (3.1.4)
+ capybara (1.1.1)
+ mime-types (>= 1.16)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ selenium-webdriver (~> 2.0)
+ xpath (~> 0.1.4)
+ childprocess (0.3.6)
+ ffi (~> 1.0, >= 1.0.6)
+ cucumber (1.1.0)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
- polyglot (>= 0.2.9)
- term-ansicolor (>= 1.0.3)
- treetop (>= 1.4.2)
- database_cleaner (0.7.0)
+ gherkin (~> 2.5.0)
+ json (>= 1.4.6)
+ term-ansicolor (>= 1.0.6)
+ cucumber-rails (0.3.2)
+ cucumber (>= 0.8.0)
+ database_cleaner (0.9.1)
diff-lcs (1.1.3)
exception_notification (1.0.20090728)
- nokogiri (1.5.0)
- polyglot (0.3.3)
- rack (1.3.5)
+ ffi (1.2.0)
+ gherkin (2.5.4)
+ json (>= 1.4.6)
+ json (1.7.5)
+ libwebsocket (0.1.6.1)
+ websocket
+ mime-types (1.19)
+ multi_json (1.3.7)
+ nokogiri (1.5.5)
+ rack (1.1.0)
+ rack-test (0.6.2)
+ rack (>= 1.0)
+ rake (0.8.7)
rspec (1.2.9)
rspec-rails (1.2.9)
rack (>= 1.0.0)
rspec (>= 1.2.9)
- selenium-client (1.2.18)
+ rubyzip (0.9.9)
+ selenium-webdriver (2.26.0)
+ childprocess (>= 0.2.5)
+ libwebsocket (~> 0.1.3)
+ multi_json (~> 1.0)
+ rubyzip
system_timer (1.2.4)
term-ansicolor (1.0.7)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- webrat (0.5.1)
- nokogiri (>= 1.2.0)
- rack (>= 1.0)
+ websocket (1.0.4)
+ xpath (0.1.4)
+ nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
- Selenium (>= 1.1.14)
- cucumber (= 0.4.0)
+ capybara (= 1.1.1)
+ cucumber (= 1.1.0)
+ cucumber-rails (= 0.3.2)
database_cleaner
exception_notification (= 1.0.20090728)
+ rake (= 0.8.7)
rspec (= 1.2.9)
rspec-rails (= 1.2.9)
- selenium-client (>= 1.2.17)
system_timer
- webrat (= 0.5.1)
diff --git a/INSTALL b/INSTALL
index 7af4cf3..f893636 100644
--- a/INSTALL
+++ b/INSTALL
@@ -33,7 +33,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or
Debian-based systems, all of these packages are available through the Debian
archive. You can install them with the following command:
- # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby openjdk-6-jre libdaemons-ruby thin tango-icon-theme libhpricot-ruby
+ # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin tango-icon-theme libhpricot-ruby
On other systems, they may or may not be available through your regular package
management system. Below are the links to their homepages.
@@ -43,7 +43,6 @@ management system. Below are the links to their homepages.
* po4a: http://po4a.alioth.debian.org/
* Ruby-sqlite3: http://rubyforge.org/projects/sqlite-ruby
* rcov: http://eigenclass.org/hiki/rcov
-* Solr: http://lucene.apache.org/solr
* RMagick: http://rmagick.rubyforge.org/
* RedCloth: http://redcloth.org/
* will_paginate: http://github.com/mislav/will_paginate/wikis
@@ -111,9 +110,6 @@ $ tar -zxvf noosfero-0.39.0.tar.gz
$ ln -s noosfero-0.39.0 current
$ cd current
-Copy config/solr.yml.dist to config/solr.yml. You will
-probably not need to customize this configuration, but have a look at it.
-
Create the thin configuration file:
$ thin -C config/thin.yml -e production config
@@ -195,10 +191,6 @@ Compile the translations:
$ RAILS_ENV=production rake noosfero:translations:compile
-Run Solr:
-
-$ rake solr:start
-
Now we must create some initial data. To create your default environment
(the first one), run the command below:
diff --git a/INSTALL.chat b/INSTALL.chat
index 8753a29..f6210a3 100644
--- a/INSTALL.chat
+++ b/INSTALL.chat
@@ -6,15 +6,13 @@ To configure XMPP/BOSH in Noosfero you need:
* SystemTimer - http://ph7spot.com/musings/system-timer
* Pidgin data files - http://www.pidgin.im/
-If you use Debian Lenny:
+If you use Debian Wheezy:
-# apt-get install librestclient-ruby (from backports)
-# apt-get install pidgin-data
-# apt-get install ruby1.8-dev
+# apt-get install librestclient-ruby pidgin-data ruby1.8-dev
# gem install SystemTimer
-Take a look at util/chat directory to see samples of config file to configure a
-XMPP/BOSH server with ejabberd, postgresql and apache2.
+The samples of config file to configure a XMPP/BOSH server with
+ejabberd, postgresql and apache2 can be found at util/chat directory.
== XMPP/Chat Server Setup
@@ -22,8 +20,7 @@ This is a step-by-step guide to get a XMPP service working, in a Debian system.
1. Install the required packages
-# apt-get -t lenny-backports install ejabberd
-# apt-get install odbc-postgresql
+# apt-get install ejabberd odbc-postgresql
2. Ejabberd configuration
@@ -108,7 +105,7 @@ Unused modules can be disabled, for example:
* web_admin
* mod_pubsub
* mod_irc
- * mod_offine
+ * mod_offline
* mod_admin_extra
* mod_register
@@ -132,7 +129,7 @@ This will create a new schema inside the noosfero database, called 'ejabberd'.
Note 'noosfero' user should have permission to create Postgresql schemas. Also,
there should be at least one domain with 'is_default = true' in 'domains'
-table, otherwise people couldn't see your friends online.
+table, otherwise people won't be able to see their friends online.
4. ODBC configuration
@@ -168,9 +165,12 @@ Debug = 0
CommLog = 1
UsageCount = 3
- * testing all:
+ 4.1 testing all:
-# isql 'PostgreSQLEjabberdNoosfero' DBUSER
+# isql 'PostgreSQLEjabberdNoosfero'
+
+If the configuration was done right, the message "Connected!"
+will be displayed.
5. Enabling kernel polling and SMP in /etc/default/ejabberd
diff --git a/RELEASING b/RELEASING
index 2d45c61..e83c379 100644
--- a/RELEASING
+++ b/RELEASING
@@ -19,11 +19,12 @@ To prepare a release of noosfero, you must follow the steps below:
* Finish all requirements and bugs assigned to the to-be-released version
* Make sure all tests pass
-* Change the version in lib/noosfero.rb and debian/changelog to the
- to-be-released version (e.g. 0.2.0, 0.3.1)
* Write release notes at the version's wiki topic
-* Generate packages with rake noosfero:release . Your tarball and deb
- pkg will be under the pkg/ directory. This task will create a git tag too.
+* Generate packages with rake noosfero:release[(stable|test)] . This task will:
+ * Update the version in lib/noosfero.rb and debian/changelog.
+ * Create the tarbal and the deb pkg under pkg/ directory.
+ * Create a git tag and push it.
+ * Upload the pkg to the configured repository (if configured) on ~/.dput.cf.
* Test that the tarball and deb package are ok
* Go to the version's wiki topic and edit it to reflect the new reality
* Edit the topic WebPreferences and update DEBIAN_REPOSITORY_TOPICS setting
diff --git a/Rakefile b/Rakefile
index 6d7ea85..9852627 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,10 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-ACTS_AS_SEARCHABLE_ENABLED = false if Rake.application.top_level_tasks.detect{|t| t == 'db:data:minimal'}
-
+# rails tasks
require 'tasks/rails'
+
+# plugins' tasks
+plugins_tasks = Dir.glob("config/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort +
+ Dir.glob("config/plugins/*/vendor/plugins/*/{tasks,lib/tasks,rails/tasks}/**/*.rake").sort
+plugins_tasks.each{ |ext| load ext }
diff --git a/app/controllers/admin/environment_design_controller.rb b/app/controllers/admin/environment_design_controller.rb
index ab139e2..c310a67 100644
--- a/app/controllers/admin/environment_design_controller.rb
+++ b/app/controllers/admin/environment_design_controller.rb
@@ -3,7 +3,8 @@ class EnvironmentDesignController < BoxOrganizerController
protect 'edit_environment_design', :environment
def available_blocks
- @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ]
+ @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+ @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
end
end
diff --git a/app/controllers/admin/region_validators_controller.rb b/app/controllers/admin/region_validators_controller.rb
index 4388a7f..801e03b 100644
--- a/app/controllers/admin/region_validators_controller.rb
+++ b/app/controllers/admin/region_validators_controller.rb
@@ -33,7 +33,7 @@ class RegionValidatorsController < AdminController
def load_region_and_search
@region = environment.regions.find(params[:id])
if params[:search]
- @search = @region.search_possible_validators(params[:search])
+ @search = find_by_contents(:organizations, Organization, params[:search])[:results].reject {|item| @region.validator_ids.include?(item.id) }
end
end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 489ca10..e71c17b 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -1,3 +1,5 @@
+require 'csv'
+
class UsersController < AdminController
protect 'manage_environment_users', :environment
@@ -15,8 +17,16 @@ class UsersController < AdminController
:disposition => "attachment; filename=users.xml"
end
format.csv do
- @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
- render :template => "users/index_csv.rhtml", :content_type => 'text/csv', :layout => false
+ # using a direct connection with the dbms to optimize
+ command = User.send(:sanitize_sql, ["SELECT profiles.name, users.email FROM profiles
+ INNER JOIN users ON profiles.user_id=users.id
+ WHERE profiles.environment_id = ?", environment.id])
+ users = User.connection.execute(command)
+ csv_content = "name;email\n"
+ users.each { |u|
+ CSV.generate_row([u['name'], u['email']], 2, csv_content, fs=';')
+ }
+ render :text => csv_content, :content_type => 'text/csv', :layout => false
end
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7d51312..d962e60 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -154,4 +154,18 @@ class ApplicationController < ActionController::Base
end
end
+ def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
+ scope = scope.send(options[:filter]) if options[:filter]
+
+ @plugins.first(:find_by_contents, asset, scope, query, paginate_options, options) ||
+ fallback_find_by_contents(asset, scope, query, paginate_options, options)
+ end
+
+ private
+
+ def fallback_find_by_contents(asset, scope, query, paginate_options, options)
+ return {:results => scope.paginate(paginate_options)} if query.blank?
+ {:results => scope.like_search(query).paginate(paginate_options)}
+ end
+
end
diff --git a/app/controllers/box_organizer_controller.rb b/app/controllers/box_organizer_controller.rb
index 254582f..ab17ee8 100644
--- a/app/controllers/box_organizer_controller.rb
+++ b/app/controllers/box_organizer_controller.rb
@@ -68,8 +68,8 @@ class BoxOrganizerController < ApplicationController
raise ArgumentError.new("Type %s is not allowed. Go away." % type)
end
else
- @center_block_types = Box.acceptable_center_blocks & available_blocks
- @side_block_types = Box.acceptable_side_blocks & available_blocks
+ @center_block_types = (Box.acceptable_center_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => 1)
+ @side_block_types = (Box.acceptable_side_blocks & available_blocks) + plugins.dispatch(:extra_blocks, :type => boxes_holder.class, :position => [2,3])
@boxes = boxes_holder.boxes
render :action => 'add_block', :layout => false
end
diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index 46f57dd..9614822 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -270,7 +270,7 @@ class CmsController < MyProfileController
def search
query = params[:q]
- results = profile.files.published.find_by_contents(query)[:results]
+ results = find_by_contents(:uploaded_files, profile.files.published, query)[:results]
render :text => article_list_to_json(results), :content_type => 'application/json'
end
diff --git a/app/controllers/my_profile/profile_design_controller.rb b/app/controllers/my_profile/profile_design_controller.rb
index 84cb852..69b7a62 100644
--- a/app/controllers/my_profile/profile_design_controller.rb
+++ b/app/controllers/my_profile/profile_design_controller.rb
@@ -7,17 +7,25 @@ class ProfileDesignController < BoxOrganizerController
def available_blocks
blocks = [ ArticleBlock, TagsBlock, RecentDocumentsBlock, ProfileInfoBlock, LinkListBlock, MyNetworkBlock, FeedReaderBlock, ProfileImageBlock, LocationBlock, SlideshowBlock, ProfileSearchBlock, HighlightsBlock ]
+ blocks += plugins.dispatch(:extra_blocks)
+
# blocks exclusive for organizations
if profile.has_members?
blocks << MembersBlock
end
- # blocks exclusive to person
+ # blocks exclusive to people
if profile.person?
blocks << FriendsBlock
blocks << FavoriteEnterprisesBlock
blocks << CommunitiesBlock
blocks << EnterprisesBlock
+ blocks += plugins.dispatch(:extra_blocks, :type => Person)
+ end
+
+ # blocks exclusive to communities
+ if profile.community?
+ blocks += plugins.dispatch(:extra_blocks, :type => Community)
end
# blocks exclusive for enterprises
@@ -26,6 +34,7 @@ class ProfileDesignController < BoxOrganizerController
blocks << HighlightsBlock
blocks << FeaturedProductsBlock
blocks << FansBlock
+ blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
end
# product block exclusive for enterprises in environments that permits it
@@ -33,7 +42,7 @@ class ProfileDesignController < BoxOrganizerController
blocks << ProductsBlock
end
- # block exclusive to profile has blog
+ # block exclusive to profiles that have blog
if profile.has_blog?
blocks << BlogArchivesBlock
end
diff --git a/app/controllers/my_profile/profile_members_controller.rb b/app/controllers/my_profile/profile_members_controller.rb
index 413ac62..654ce5b 100644
--- a/app/controllers/my_profile/profile_members_controller.rb
+++ b/app/controllers/my_profile/profile_members_controller.rb
@@ -32,7 +32,6 @@ class ProfileMembersController < MyProfileController
def last_admin
@roles = [Profile::Roles.admin(environment.id)]
- @pre_population = [].to_json
end
def add_role
diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index fa24323..4ac1540 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -71,10 +71,6 @@ class AccountController < ApplicationController
@block_bot = !!session[:may_be_a_bot]
@invitation_code = params[:invitation_code]
begin
- if params[:user]
- params[:user].delete(:password_confirmation_clear)
- params[:user].delete(:password_clear)
- end
@user = User.new(params[:user])
@user.terms_of_use = environment.terms_of_use
@user.environment = environment
diff --git a/app/controllers/public/catalog_controller.rb b/app/controllers/public/catalog_controller.rb
index 5cde9e3..cd75f73 100644
--- a/app/controllers/public/catalog_controller.rb
+++ b/app/controllers/public/catalog_controller.rb
@@ -7,7 +7,7 @@ class CatalogController < PublicController
def index
@category = params[:level] ? ProductCategory.find(params[:level]) : nil
@products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])
- @categories = ProductCategory.on_level(params[:level])
+ @categories = ProductCategory.on_level(params[:level]).order(:name)
end
protected
diff --git a/app/controllers/public/profile_search_controller.rb b/app/controllers/public/profile_search_controller.rb
index d6b1209..39515e0 100644
--- a/app/controllers/public/profile_search_controller.rb
+++ b/app/controllers/public/profile_search_controller.rb
@@ -11,7 +11,7 @@ class ProfileSearchController < PublicController
if params[:where] == 'environment'
redirect_to :controller => 'search', :query => @q
else
- @results = profile.articles.published.find_by_contents(@q, {:per_page => 10, :page => params[:page]})[:results]
+ @results = find_by_contents(:articles, profile.articles.published, @q, {:per_page => 10, :page => params[:page]})[:results]
end
end
end
diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 689bf65..8ce8bd7 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -4,10 +4,11 @@ class SearchController < PublicController
include SearchHelper
include ActionView::Helpers::NumberHelper
- before_filter :redirect_asset_param, :except => [:facets_browse, :assets]
+ before_filter :redirect_asset_param, :except => :assets
before_filter :load_category
before_filter :load_search_assets
before_filter :load_query
+ before_filter :load_filter
# Backwards compatibility with old URLs
def redirect_asset_param
@@ -17,25 +18,51 @@ class SearchController < PublicController
no_design_blocks
- def facets_browse
- @asset = params[:asset]
- @asset_class = asset_class(@asset)
+ def index
+ @searches = {}
+ @order = []
+ @names = {}
+ @results_only = true
- @facets_only = true
- send(@asset)
+ @enabled_searches.select { |key,description| @searching[key] }.each do |key, description|
+ load_query
+ @asset = key
+ send(key)
+ @order << key
+ @names[key] = getterm(description)
+ end
+ @asset = nil
- @facet = @asset_class.map_facets_for(environment).find { |facet| facet[:id] == params[:facet_id] }
- raise 'Facet not found' if @facet.nil?
+ if @searches.keys.size == 1
+ @asset = @searches.keys.first
+ render :action => @asset
+ end
+ end
- render :layout => false
+ # view the summary of one category
+ def category_index
+ @searches = {}
+ @order = []
+ @names = {}
+ limit = MULTIPLE_SEARCH_LIMIT
+ [
+ [ :people, _('People'), :recent_people ],
+ [ :enterprises, _('Enterprises'), :recent_enterprises ],
+ [ :products, _('Products'), :recent_products ],
+ [ :events, _('Upcoming events'), :upcoming_events ],
+ [ :communities, _('Communities'), :recent_communities ],
+ [ :articles, _('Contents'), :recent_articles ]
+ ].each do |asset, name, filter|
+ @order << asset
+ @searches[asset]= {:results => @category.send(filter, limit)}
+ raise "No total_entries for: #{asset}" unless @searches[asset][:results].respond_to?(:total_entries)
+ @names[asset] = name
+ end
end
def articles
- if !@empty_query
- full_text_search ['public:true']
- else
- @results[@asset] = @environment.articles.public.send(@filter).paginate(paginate_options)
- end
+ @scope = @environment.articles.public
+ full_text_search
end
def contents
@@ -43,49 +70,23 @@ class SearchController < PublicController
end
def people
- if !@empty_query
- full_text_search ['public:true']
- else
- @results[@asset] = visible_profiles(Person).send(@filter).paginate(paginate_options)
- end
+ @scope = visible_profiles(Person)
+ full_text_search
end
def products
- public_filters = ['public:true', 'enabled:true']
- if !@empty_query
- full_text_search public_filters
- else
- @one_page = true
- @geosearch = logged_in? && current_user.person.lat && current_user.person.lng
-
- extra_limit = LIST_SEARCH_LIMIT*5
- sql_options = {:limit => LIST_SEARCH_LIMIT, :order => 'random()'}
- if @geosearch
- full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
- :alternate_query => "{!boost b=recip(geodist(),#{"%e" % (1.to_f/DistBoost)},1,1)}",
- :radius => DistFilt, :latitude => current_user.person.lat, :longitude => current_user.person.lng
- else
- full_text_search public_filters, :sql_options => sql_options, :extra_limit => extra_limit,
- :boost_functions => ['recip(ms(NOW/HOUR,updated_at),1.3e-10,1,1)']
- end
- end
+ @scope = @environment.products
+ full_text_search
end
def enterprises
- if !@empty_query
- full_text_search ['public:true']
- else
- @filter_title = _('Enterprises from network')
- @results[@asset] = visible_profiles(Enterprise, [{:products => :product_category}]).paginate(paginate_options)
- end
+ @scope = visible_profiles(Enterprise, [{:products => :product_category}])
+ full_text_search
end
def communities
- if !@empty_query
- full_text_search ['public:true']
- else
- @results[@asset] = visible_profiles(Community).send(@filter).paginate(paginate_options)
- end
+ @scope = visible_profiles(Community)
+ full_text_search
end
def events
@@ -93,7 +94,7 @@ class SearchController < PublicController
month = (params[:month] ? params[:month].to_i : Date.today.month)
day = (params[:day] ? params[:day].to_i : Date.today.day)
date = build_date(params[:year], params[:month], params[:day])
- date_range = (date - 1.month)..(date + 1.month).at_end_of_month
+ date_range = (date - 1.month).at_beginning_of_month..(date + 1.month).at_end_of_month
@selected_day = nil
@events_of_the_day = []
@@ -104,64 +105,21 @@ class SearchController < PublicController
environment.events.by_day(@selected_day)
end
- if !@empty_query
- full_text_search
- else
- @results[@asset] = date_range ? environment.events.by_range(date_range) : environment.events
- end
+ @scope = date_range && params[:action] == 'events' ? environment.events.by_range(date_range) : environment.events
+ full_text_search
- events = @results[@asset]
+ events = @searches[@asset][:results]
@calendar = populate_calendar(date, events)
@previous_calendar = populate_calendar(date - 1.month, events)
@next_calendar = populate_calendar(date + 1.month, events)
end
- def index
- @results = {}
- @order = []
- @names = {}
- @results_only = true
-
- @enabled_searches.select { |key,description| @searching[key] }.each do |key, description|
- load_query
- @asset = key
- send(key)
- @order << key
- @names[key] = getterm(description)
- end
- @asset = nil
- @facets = {}
-
- render :action => @results.keys.first if @results.keys.size == 1
- end
-
# keep old URLs workings
def assets
params[:action] = params[:asset].is_a?(Array) ? :index : params.delete(:asset)
redirect_to params
end
- # view the summary of one category
- def category_index
- @results = {}
- @order = []
- @names = {}
- limit = MULTIPLE_SEARCH_LIMIT
- [
- [ :people, _('People'), :recent_people ],
- [ :enterprises, _('Enterprises'), :recent_enterprises ],
- [ :products, _('Products'), :recent_products ],
- [ :events, _('Upcoming events'), :upcoming_events ],
- [ :communities, _('Communities'), :recent_communities ],
- [ :articles, _('Contents'), :recent_articles ]
- ].each do |asset, name, filter|
- @order << asset
- @results[asset] = @category.send(filter, limit)
- raise "No total_entries for: #{asset}" unless @results[asset].respond_to?(:total_entries)
- @names[asset] = name
- end
- end
-
def tags
@tags_cache_key = "tags_env_#{environment.id.to_s}"
if is_cache_expired?(@tags_cache_key)
@@ -173,7 +131,7 @@ class SearchController < PublicController
@tag = params[:tag]
@tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
if is_cache_expired?(@tag_cache_key)
- @results[@asset] = environment.articles.find_tagged_with(@tag).paginate(paginate_options)
+ @searches[@asset] = {:results => environment.articles.find_tagged_with(@tag).paginate(paginate_options)}
end
end
@@ -187,11 +145,9 @@ class SearchController < PublicController
protected
def load_query
- @asset = params[:action].to_sym
+ @asset = (params[:asset] || params[:action]).to_sym
@order ||= [@asset]
- @results ||= {}
- @filter = filter
- @filter_title = filter_description(@asset, @filter)
+ @searches ||= {}
@query = params[:query] || ''
@empty_query = @category.nil? && @query.blank?
@@ -211,42 +167,13 @@ class SearchController < PublicController
end
end
- FILTERS = %w(
- more_recent
- more_active
- more_popular
- more_comments
- )
- def filter
- if FILTERS.include?(params[:filter])
- params[:filter]
- else
- 'more_recent'
- end
- end
-
- def filter_description(asset, filter)
- {
- 'articles_more_recent' => _('More recent contents from network'),
- 'articles_more_popular' => _('More viewed contents from network'),
- 'articles_more_comments' => _('Most commented contents from network'),
- 'people_more_recent' => _('More recent people from network'),
- 'people_more_active' => _('More active people from network'),
- 'people_more_popular' => _('More popular people from network'),
- 'communities_more_recent' => _('More recent communities from network'),
- 'communities_more_active' => _('More active communities from network'),
- 'communities_more_popular' => _('More popular communities from network'),
- 'products_more_recent' => _('Highlights'),
- }[asset.to_s + '_' + filter]
- end
-
def load_search_assets
- if Searches.keys.include?(params[:action].to_sym) and environment.enabled?("disable_asset_#{params[:action]}")
+ if SEARCHES.keys.include?(params[:action].to_sym) && environment.enabled?("disable_asset_#{params[:action]}")
render_not_found
return
end
- @enabled_searches = Searches.select {|key, name| environment.disabled?("disable_asset_#{params[:action]}") }
+ @enabled_searches = SEARCHES.select {|key, name| environment.disabled?("disable_asset_#{key}") }
@searching = {}
@titles = {}
@enabled_searches.each do |key, name|
@@ -256,13 +183,19 @@ class SearchController < PublicController
@names = @titles if @names.nil?
end
+ def load_filter
+ @filter = 'more_recent'
+ if SEARCHES.keys.include?(@asset.to_sym)
+ available_filters = asset_class(@asset)::SEARCH_FILTERS
+ @filter = params[:filter] if available_filters.include?(params[:filter])
+ end
+ end
+
def limit
- if map_search?
+ if map_search?(@searches)
MAP_SEARCH_LIMIT
elsif !multiple_search?
- if [:people, :communities].include? @asset
- BLOCKS_SEARCH_LIMIT
- elsif @asset == :enterprises and @empty_query
+ if [:people, :communities, :enterprises].include? @asset
BLOCKS_SEARCH_LIMIT
else
LIST_SEARCH_LIMIT
@@ -273,41 +206,12 @@ class SearchController < PublicController
end
def paginate_options(page = params[:page])
- page = 1 if multiple_search? or params[:display] == 'map'
+ page = 1 if multiple_search?(@searches) || params[:display] == 'map'
{ :per_page => limit, :page => page }
end
- def full_text_search(filters = [], options = {})
- paginate_options = paginate_options(params[:page])
- asset_class = asset_class(@asset)
- solr_options = options
- pg_options = paginate_options(params[:page])
-
- if !multiple_search?
- if !@results_only and asset_class.respond_to? :facets
- solr_options.merge! asset_class.facets_find_options(params[:facet])
- solr_options[:all_facets] = true
- end
- solr_options[:filter_queries] ||= []
- solr_options[:filter_queries] += filters
- solr_options[:filter_queries] << "environment_id:#{environment.id}"
- solr_options[:filter_queries] << asset_class.facet_category_query.call(@category) if @category
-
- solr_options[:boost_functions] ||= []
- params[:order_by] = nil if params[:order_by] == 'none'
- if params[:order_by]
- order = SortOptions[@asset][params[:order_by].to_sym]
- raise "Unknown order by" if order.nil?
- order[:solr_opts].each do |opt, value|
- solr_options[opt] = value.is_a?(Proc) ? instance_eval(&value) : value
- end
- end
- end
-
- ret = asset_class.find_by_contents(@query, paginate_options, solr_options)
- @results[@asset] = ret[:results]
- @facets = ret[:facets]
- @all_facets = ret[:all_facets]
+ def full_text_search
+ @searches[@asset] = find_by_contents(@asset, @scope, @query, paginate_options, {:category => @category, :filter => @filter})
end
private
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2c3b35a..6c33b9e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -30,6 +30,12 @@ module ApplicationHelper
include AccountHelper
+ include BlogHelper
+
+ include ContentViewerHelper
+
+ include LayoutHelper
+
def locale
(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
end
@@ -260,14 +266,17 @@ module ApplicationHelper
end
def button_bar(options = {}, &block)
- concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)))
+ options[:class].nil? ?
+ options[:class]='button-bar' :
+ options[:class]+=' button-bar'
+ concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), options))
end
VIEW_EXTENSIONS = %w[.rhtml .html.erb]
- def partial_for_class_in_view_path(klass, view_path, suffix = nil)
+ def partial_for_class_in_view_path(klass, view_path, prefix = nil, suffix = nil)
return nil if klass.nil?
- name = [klass.name.underscore, suffix].compact.map(&:to_s).join('_')
+ name = [prefix, klass.name.underscore, suffix].compact.map(&:to_s).join('_')
search_name = String.new(name)
if search_name.include?("/")
@@ -282,14 +291,14 @@ module ApplicationHelper
return name if File.exists?(File.join(path))
end
- partial_for_class_in_view_path(klass.superclass, view_path, suffix)
+ partial_for_class_in_view_path(klass.superclass, view_path, prefix, suffix)
end
- def partial_for_class(klass, suffix=nil)
+ def partial_for_class(klass, prefix=nil, suffix=nil)
raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
name = klass.name.underscore
@controller.view_paths.each do |view_path|
- partial = partial_for_class_in_view_path(klass, view_path, suffix)
+ partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
return partial if partial
end
@@ -352,10 +361,6 @@ module ApplicationHelper
end
end
- def theme_stylesheet_path
- theme_path + '/style.css'
- end
-
def current_theme
@current_theme ||=
begin
@@ -493,23 +498,24 @@ module ApplicationHelper
def profile_cat_icons( profile )
if profile.class == Enterprise
- icons =
- profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }.
- compact.uniq.map{ |c|
- cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
- cat_icon = "/images/icons-cat/#{cat_name}.png"
- if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
- cat_icon = '/images/icons-cat/undefined.png'
- end
- content_tag 'span',
- content_tag( 'span', c ),
- :title => c,
- :class => 'product-cat-icon cat_icon_' + cat_name,
- :style => "background-image:url(#{cat_icon})"
- }.join "\n"
- content_tag 'div',
- content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
- :class => 'product-category-icons'
+ icons = profile.product_categories.map{ |c| c.size > 1 ? c[1] : nil }.
+ compact.uniq.map do |c|
+ cat_name = c.gsub( /[-_\s,.;'"]+/, '_' )
+ cat_icon = "/images/icons-cat/#{cat_name}.png"
+ if ! File.exists? RAILS_ROOT.to_s() + '/public/' + cat_icon
+ cat_icon = '/images/icons-cat/undefined.png'
+ end
+ content_tag('span',
+ content_tag( 'span', c ),
+ :title => c,
+ :class => 'product-cat-icon cat_icon_' + cat_name,
+ :style => "background-image:url(#{cat_icon})"
+ )
+ end.join("\n").html_safe
+ content_tag('div',
+ content_tag( 'span', _('Principal Product Categories'), :class => 'header' ) +"\n"+ icons,
+ :class => 'product-category-icons'
+ )
else
''
end
@@ -633,10 +639,10 @@ module ApplicationHelper
# FIXME
([toplevel] + toplevel.children_for_menu).each do |cat|
if cat.top_level?
- result << ''
+ result << '
'.html_safe
result << icon_button( :down, _('open'), '#', :onclick => 'open_close_cat(this); return false' )
result << content_tag('h5', toplevel.name)
- result << '
'
+ result << ''.html_safe
else
checkbox_id = "#{object_name}_#{cat.full_name.downcase.gsub(/\s+|\//, '_')}"
result << content_tag('li', labelled_check_box(
@@ -647,7 +653,7 @@ module ApplicationHelper
:class => ( object.category_ids.include?(cat.id) ? 'cat_checked' : '' ) ) + "\n"
end
end
- result << ' '
+ result << '
'.html_safe
end
content_tag('div', result)
@@ -787,10 +793,10 @@ module ApplicationHelper
:class => 'lineitem' + (line_item+=1).to_s() ) +"\n"
if line_item == line_size
line_item = 0
- html += " \n"
+ html += " \n".html_safe
end
}
- html += " \n" if line_size == 0 || ( values.size % line_size ) > 0
+ html += " \n".html_safe if line_size == 0 || ( values.size % line_size ) > 0
column = object.class.columns_hash[method.to_s]
text =
( column ?
@@ -873,14 +879,6 @@ module ApplicationHelper
content_tag('div', labelled_check_box(_('Public'), 'profile_data[fields_privacy]['+name+']', 'public', profile.public_fields.include?(name)), :class => 'field-privacy-selector')
end
- def template_stylesheet_path
- if profile.nil?
- "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
- else
- "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
- end
- end
-
def login_url
options = Noosfero.url_options.merge({ :controller => 'account', :action => 'login' })
url_for(options)
@@ -919,18 +917,6 @@ module ApplicationHelper
end
end
- def icon_theme_stylesheet_path
- icon_themes = []
- theme_icon_themes = theme_option(:icon_theme) || []
- for icon_theme in theme_icon_themes do
- theme_path = "/designs/icons/#{icon_theme}/style.css"
- if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
- icon_themes << theme_path
- end
- end
- icon_themes
- end
-
def page_title
(@page ? @page.title + ' - ' : '') +
(profile ? profile.short_name + ' - ' : '') +
@@ -942,42 +928,13 @@ module ApplicationHelper
(@category ? " - #{@category.full_name}" : '')
end
- def noosfero_javascript
- render :file => 'layouts/_javascript'
- end
-
- def noosfero_stylesheets
- [
- 'application',
- 'search',
- 'thickbox',
- 'lightbox',
- 'colorpicker',
- 'colorbox',
- pngfix_stylesheet_path,
- ] +
- tokeninput_stylesheets
- end
-
# DEPRECATED. Do not use this·
def import_controller_stylesheets(options = {})
stylesheet_import( "controller_"+ @controller.controller_name(), options )
end
- def pngfix_stylesheet_path
- 'iepngfix/iepngfix.css'
- end
-
- def tokeninput_stylesheets
- ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
- end
-
- def noosfero_layout_features
- render :file => 'shared/noosfero_layout_features'
- end
-
def link_to_email(email)
- javascript_tag('var array = ' + email.split('@').to_json + '; document.write("" + array.join("@") + " ")')
+ javascript_tag('var array = ' + email.split('@').to_json + '; document.write("" + array.join("@") + " ")'.html_safe)
end
def stylesheet(*args)
@@ -987,13 +944,43 @@ module ApplicationHelper
def article_to_html(article, options = {})
options.merge!(:page => params[:npage])
content = article.to_html(options)
- content = content.kind_of?(Proc) ? self.instance_eval(&content) : content
+ content = content.kind_of?(Proc) ? self.instance_eval(&content).html_safe : content.html_safe
@plugins && @plugins.each do |plugin|
content = plugin.parse_content(content)
end
content
end
+ # Please, use link_to by default!
+ # This method was created to work around to inexplicable
+ # chain of problems when display_short_format was called
+ # from Article model for an ArticleBlock.
+ def reference_to_article(text, article, anchor=nil)
+ if article.profile.domains.empty?
+ href = "/#{article.url[:profile]}/"
+ else
+ href = "http://#{article.profile.domains.first.name}/"
+ end
+ href += article.url[:page].join('/')
+ href += '#' + anchor if anchor
+ content_tag('a', text, :href => href)
+ end
+
+ def display_short_format(article, options={})
+ options[:comments_link] ||= true
+ options[:read_more_link] ||= true
+ html = content_tag('div',
+ article.lead +
+ content_tag('div',
+ (options[:comments_link] ? link_to_comments(article) : '') +
+ (options[:read_more_link] ? reference_to_article( _('Read more'), article) : ''),
+ :class => 'read-more'
+ ),
+ :class => 'short-post'
+ )
+ html
+ end
+
def colorpicker_field(object_name, method, options = {})
text_field(object_name, method, options.merge(:class => 'colorpicker_field'))
end
@@ -1003,7 +990,7 @@ module ApplicationHelper
end
def ui_icon(icon_class, extra_class = '')
- ""
+ "".html_safe
end
def ui_button(label, url, html_options = {})
@@ -1018,10 +1005,6 @@ module ApplicationHelper
theme_option(:jquery_theme) || 'smoothness_mod'
end
- def jquery_ui_theme_stylesheet_path
- 'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom'
- end
-
def ui_error(message)
content_tag('div', ui_icon('ui-icon-alert') + message, :class => 'alert fg-state-error ui-state-error')
end
@@ -1035,13 +1018,13 @@ module ApplicationHelper
end
def collapsed_item_icon
- " "
+ " ".html_safe
end
def expanded_item_icon
- " "
+ " ".html_safe
end
def leaf_item_icon
- " "
+ " ".html_safe
end
def display_category_menu(block, categories, root = true)
@@ -1300,9 +1283,7 @@ module ApplicationHelper
titles = tabs.inject(''){ |result, tab| result << content_tag(:li, link_to(tab[:title], '#'+tab[:id]), :class => 'tab') }
contents = tabs.inject(''){ |result, tab| result << content_tag(:div, tab[:content], :id => tab[:id]) }
- content_tag :div, :class => 'ui-tabs' do
- content_tag(:ul, titles) + contents
- end
+ content_tag(:div, content_tag(:ul, titles) + raw(contents), :class => 'ui-tabs')
end
def jquery_token_input_messages_json(hintText = _('Type in an keyword'), noResultsText = _('No results'), searchingText = _('Searching...'))
@@ -1331,11 +1312,12 @@ module ApplicationHelper
end
def template_options(klass, field_name)
- return '' if klass.templates.count == 0
- return hidden_field_tag("#{field_name}[template_id]", klass.templates.first.id) if klass.templates.count == 1
+ templates = klass.templates(environment)
+ return '' if templates.count == 0
+ return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1
counter = 0
- radios = klass.templates.map do |template|
+ radios = templates.map do |template|
counter += 1
content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, counter==1))
end.join("\n")
@@ -1425,4 +1407,14 @@ module ApplicationHelper
@no_design_blocks = true
end
+ def default_folder_for_image_upload(profile)
+ default_folder = profile.folders.find_by_type('Gallery')
+ default_folder = profile.folders.find_by_type('Folder') if default_folder.nil?
+ default_folder
+ end
+
+ def content_id_to_str(content)
+ content.nil? ? '' : content.id.to_s
+ end
+
end
diff --git a/app/helpers/block_helper.rb b/app/helpers/block_helper.rb
index 8fbe47f..2d0ea06 100644
--- a/app/helpers/block_helper.rb
+++ b/app/helpers/block_helper.rb
@@ -3,7 +3,24 @@ module BlockHelper
def block_title(title)
tag_class = 'block-title'
tag_class += ' empty' if title.empty?
- content_tag 'h3', content_tag('span', title), :class => tag_class
+ content_tag 'h3', content_tag('span', h(title)), :class => tag_class
+ end
+
+ def highlights_block_config_image_fields(block, image={})
+ "
+
+
+ #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
+
+ #{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}
+ #{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}
+
+ #{
+ content_tag('span', _('Title')) +
+ text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
+ }
+
+ "
end
end
diff --git a/app/helpers/blog_helper.rb b/app/helpers/blog_helper.rb
index 407d399..09d8e42 100644
--- a/app/helpers/blog_helper.rb
+++ b/app/helpers/blog_helper.rb
@@ -18,8 +18,9 @@ module BlogHelper
pagination = will_paginate(articles, {
:param_name => 'npage',
:previous_label => _('« Newer posts'),
- :next_label => _('Older posts »')
- })
+ :next_label => _('Older posts »'),
+ :params => {:action=>"view_page", :page=>articles.first.parent.path.split('/'), :controller=>"content_viewer"}
+ }) if articles.present?
content = []
artic_len = articles.length
articles.each_with_index{ |art,i|
@@ -31,7 +32,7 @@ module BlogHelper
css_add << position + '-inner'
content << content_tag('div',
content_tag('div',
- display_post(art, format) + ' ',
+ display_post(art, format).html_safe + ' '.html_safe,
:class => 'blog-post ' + css_add.join(' '),
:id => "post-#{art.id}"), :class => position
)
@@ -46,18 +47,6 @@ module BlogHelper
article_title(article, :no_comments => no_comments) + html
end
- def display_short_format(article)
- html = content_tag('div',
- article.lead +
- content_tag('div',
- link_to_comments(article) +
- link_to( _('Read more'), article.url),
- :class => 'read-more'),
- :class => 'short-post'
- )
- html
- end
-
def display_full_format(article)
html = article_to_html(article)
html = content_tag('p', html) if ! html.include?('
')
diff --git a/app/helpers/catalog_helper.rb b/app/helpers/catalog_helper.rb
index 99ef1b4..b6c3da1 100644
--- a/app/helpers/catalog_helper.rb
+++ b/app/helpers/catalog_helper.rb
@@ -21,7 +21,7 @@ module CatalogHelper
def category_sub_links(category)
sub_categories = []
- category.children.each do |sub_category|
+ category.children.order(:name).each do |sub_category|
sub_categories << category_link(sub_category, true)
end
content_tag('ul', sub_categories) if sub_categories.size > 1
diff --git a/app/helpers/content_viewer_helper.rb b/app/helpers/content_viewer_helper.rb
index 8de2b05..33c4e93 100644
--- a/app/helpers/content_viewer_helper.rb
+++ b/app/helpers/content_viewer_helper.rb
@@ -39,7 +39,7 @@ module ContentViewerHelper
def link_to_comments(article, args = {})
return '' unless article.accept_comments?
- link_to(number_of_comments(article), article.url.merge(:anchor => 'comments_list') )
+ reference_to_article number_of_comments(article), article, 'comments_list'
end
def article_translations(article)
@@ -48,7 +48,7 @@ module ContentViewerHelper
{ article.environment.locales[translation.language] => { :href => url_for(translation.url) } }
end
content_tag(:div, link_to(_('Translations'), '#',
- :onclick => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
+ :onmouseover => "toggleSubmenu(this, '#{_('Translations')}', #{links.to_json}); return false",
:class => 'article-translations-menu simplemenu-trigger up'),
:class => 'article-translations')
end
diff --git a/app/helpers/dates_helper.rb b/app/helpers/dates_helper.rb
index 46ea061..57dc611 100644
--- a/app/helpers/dates_helper.rb
+++ b/app/helpers/dates_helper.rb
@@ -23,11 +23,13 @@ module DatesHelper
end
# formats a date for displaying.
- def show_date(date, use_numbers = false)
+ def show_date(date, use_numbers = false, year=true)
if date && use_numbers
- _('%{month}/%{day}/%{year}') % { :day => date.day, :month => date.month, :year => date.year }
+ date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
+ date_format % { :day => date.day, :month => date.month, :year => date.year }
elsif date
- _('%{month} %{day}, %{year}') % { :day => date.day, :month => month_name(date.month), :year => date.year }
+ date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
+ date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
else
''
end
@@ -46,7 +48,27 @@ module DatesHelper
if (date1 == date2) || (date2.nil?)
show_date(date1, use_numbers)
else
- _('from %{date1} to %{date2}') % {:date1 => show_date(date1, use_numbers), :date2 => show_date(date2, use_numbers)}
+ if date1.year == date2.year
+ if date1.month == date2.month
+ _('from %{month} %{day1} to %{day2}, %{year}') % {
+ :day1 => date1.day,
+ :day2 => date2.day,
+ :month => use_numbers ? date1.month : month_name(date1.month),
+ :year => date1.year
+ }
+ else
+ _('from %{date1} to %{date2}, %{year}') % {
+ :date1 => show_date(date1, use_numbers, false),
+ :date2 => show_date(date2, use_numbers, false),
+ :year => date1.year
+ }
+ end
+ else
+ _('from %{date1} to %{date2}') % {
+ :date1 => show_date(date1, use_numbers),
+ :date2 => show_date(date2, use_numbers)
+ }
+ end
end
end
diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb
index 7060678..e319ace 100644
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -142,38 +142,6 @@ module FormsHelper
content_tag('table',rows.join("\n"))
end
- def select_folder(label_text, field_id, collection, default_value=nil, html_options = {}, js_options = {})
- root = profile ? profile.identifier : _("root")
- labelled_form_field(
- label_text,
- select_tag(
- field_id,
- options_for_select(
- [[root, '']] +
- collection.collect {|f| [ root + '/' + f.full_name, f.id ] },
- default_value
- ),
- html_options.merge(js_options)
- )
- )
- end
-
- def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
- result = labelled_form_field(
- label_text,
- select_tag(
- field_id,
- options_for_select(
- [[profile.identifier, '']] +
- profile.folders.collect {|f| [ profile.identifier + '/' + f.full_name, f.id ] },
- default_value
- ),
- html_options.merge(js_options)
- )
- )
- return result
- end
-
def date_field(name, value, format = '%Y-%m-%d', datepicker_options = {}, html_options = {})
datepicker_options[:disabled] ||= false
datepicker_options[:alt_field] ||= ''
@@ -276,7 +244,7 @@ module FormsHelper
yearSuffix: #{datepicker_options[:year_suffix].to_json}
})
- "
+ ".html_safe
result
end
@@ -295,23 +263,28 @@ module FormsHelper
field_id,
options_for_select(
[[root, '']] +
- collection.collect {|f| [ root + '/' + f.full_name, f.id ] },
- default_value
+ collection.collect {|f| [ root + '/' + f.full_name, f.id.to_s ] },
+ default_value.to_s
),
html_options.merge(js_options)
)
)
end
- def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {})
+ def select_profile_folder(label_text, field_id, profile, default_value='', html_options = {}, js_options = {}, find_options = {})
+ if find_options.empty?
+ folders = profile.folders
+ else
+ folders = profile.folders.where(find_options)
+ end
result = labelled_form_field(
label_text,
select_tag(
field_id,
options_for_select(
[[profile.identifier, '']] +
- profile.folders.collect {|f| [ profile.identifier + '/' + f.full_name, f.id ] },
- default_value
+ folders.collect {|f| [ profile.identifier + '/' + f.full_name, f.id.to_s ] },
+ default_value.to_s
),
html_options.merge(js_options)
)
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
new file mode 100644
index 0000000..ba1e851
--- /dev/null
+++ b/app/helpers/layout_helper.rb
@@ -0,0 +1,94 @@
+module LayoutHelper
+
+ def body_classes
+ # Identify the current controller and action for the CSS:
+ " controller-#{@controller.controller_name}" +
+ " action-#{@controller.controller_name}-#{@controller.action_name}" +
+ " template-#{profile.nil? ? "default" : profile.layout_template}" +
+ (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
+ end
+
+ def noosfero_javascript
+ plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
+
+ output = ''
+ output += render :file => 'layouts/_javascript'
+ output += javascript_tag 'render_all_jquery_ui_widgets()'
+ unless plugins_javascripts.empty?
+ output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
+ end
+ output
+ end
+
+ def noosfero_stylesheets
+ standard_stylesheets = [
+ 'application',
+ 'search',
+ 'thickbox',
+ 'lightbox',
+ 'colorpicker',
+ 'colorbox',
+ pngfix_stylesheet_path,
+ ] + tokeninput_stylesheets
+ plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
+
+ output = ''
+ output += stylesheet_link_tag standard_stylesheets, :cache => 'cache'
+ output += stylesheet_link_tag template_stylesheet_path
+ output += stylesheet_link_tag icon_theme_stylesheet_path
+ output += stylesheet_link_tag jquery_ui_theme_stylesheet_path
+ unless plugins_stylesheets.empty?
+ output += stylesheet_link_tag plugins_stylesheets, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
+ end
+ output += stylesheet_link_tag theme_stylesheet_path
+ output
+ end
+
+ def pngfix_stylesheet_path
+ 'iepngfix/iepngfix.css'
+ end
+
+ def tokeninput_stylesheets
+ ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
+ end
+
+ def noosfero_layout_features
+ render :file => 'shared/noosfero_layout_features'
+ end
+
+ def template_stylesheet_path
+ if profile.nil?
+ "/designs/templates/#{environment.layout_template}/stylesheets/style.css"
+ else
+ "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
+ end
+ end
+
+ def icon_theme_stylesheet_path
+ icon_themes = []
+ theme_icon_themes = theme_option(:icon_theme) || []
+ for icon_theme in theme_icon_themes do
+ theme_path = "/designs/icons/#{icon_theme}/style.css"
+ if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
+ icon_themes << theme_path
+ end
+ end
+ icon_themes
+ end
+
+ def jquery_ui_theme_stylesheet_path
+ 'jquery.ui/' + jquery_theme + '/jquery-ui-1.8.2.custom'
+ end
+
+ def theme_stylesheet_path
+ theme_path + '/style.css'
+ end
+
+ def addthis_javascript
+ if NOOSFERO_CONF['addthis_enabled']
+ ''
+ end
+ end
+
+end
+
diff --git a/app/helpers/profile_editor_helper.rb b/app/helpers/profile_editor_helper.rb
index 7cb999e..9479418 100644
--- a/app/helpers/profile_editor_helper.rb
+++ b/app/helpers/profile_editor_helper.rb
@@ -136,7 +136,7 @@ module ProfileEditorHelper
concat(
content_tag(
'div',
- capture(&block) + ' ',
+ capture(&block) + content_tag('br', '', :style => 'clear: left'),
:class => 'control-panel')
)
end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index faec914..1f1114e 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -2,12 +2,10 @@ module SearchHelper
MAP_SEARCH_LIMIT = 2000
LIST_SEARCH_LIMIT = 20
- BLOCKS_SEARCH_LIMIT = 18
+ BLOCKS_SEARCH_LIMIT = 24
MULTIPLE_SEARCH_LIMIT = 8
- DistFilt = 200
- DistBoost = 50
- Searches = ActiveSupport::OrderedHash[
+ SEARCHES = ActiveSupport::OrderedHash[
:articles, _('Contents'),
:enterprises, _('Enterprises'),
:people, _('People'),
@@ -16,46 +14,31 @@ module SearchHelper
:events, _('Events'),
]
- SortOptions = {
- :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
- :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
- :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
- :solr_opts => {:sort => "geodist() asc",
- :latitude => proc{ current_user.person.lat }, :longitude => proc{ current_user.person.lng }}},
- ],
- :events => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
- ],
- :articles => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
- :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
- ],
- :enterprises => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
- ],
- :people => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
- ],
- :communities => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
- :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
- ],
+ FILTER_TRANSLATION = {
+ 'more_popular' => _('More popular'),
+ 'more_active' => _('More active'),
+ 'more_recent' => _('More recent'),
+ 'more_comments' => _('More comments')
}
# FIXME remove it after search_controler refactored
include EventsHelper
- def multiple_search?
- ['index', 'category_index'].include?(params[:action]) or @results.size > 1
+ def multiple_search?(searches=nil)
+ ['index', 'category_index'].include?(params[:action]) || (searches && searches.size > 1)
end
- def map_search?
- !@empty_query and !multiple_search? and params[:display] == 'map'
+ def map_search?(searches=nil)
+ !multiple_search?(searches) && params[:display] == 'map'
+ end
+
+ def asset_class(asset)
+ asset.to_s.singularize.camelize.constantize
end
def search_page_title(title, category = nil)
title = "" + title
- title += '' + category.name + ' ' if category
+ title += ' - ' + category.name + ' ' if category
title + " "
end
@@ -66,8 +49,12 @@ module SearchHelper
:align => 'center', :class => 'search-category-context') if category
end
- def display_results(map_capable = false)
- if map_capable and map_search?
+ def display?(asset, mode)
+ defined?(asset_class(asset)::SEARCH_DISPLAYS) && asset_class(asset)::SEARCH_DISPLAYS.include?(mode.to_s)
+ end
+
+ def display_results(searches=nil, asset=nil)
+ if display?(asset, :map) && map_search?(searches)
partial = 'google_maps'
klass = 'map'
else
@@ -78,10 +65,13 @@ module SearchHelper
content_tag('div', render(:partial => partial), :class => "map-or-list-search-results #{klass}")
end
- def display_map_list_button
- button(:search, params[:display] == 'map' ? _('Display in list') : _('Display in map'),
- params.merge(:display => (params[:display] == 'map' ? 'list' : 'map')),
- :class => "map-toggle-button" )
+ def display_filter(asset, display)
+ asset = :articles if asset == :tag
+ if display?(asset, display)
+ display
+ else
+ asset_class(asset).default_search_display
+ end
end
def city_with_state(city)
@@ -97,120 +87,50 @@ module SearchHelper
end
end
- def facets_menu(asset, _facets)
- @asset_class = asset_class(asset)
- @facets = _facets
- render(:partial => 'facets_menu')
- end
-
- def facets_unselect_menu(asset)
- @asset_class = asset_class(asset)
- render(:partial => 'facets_unselect_menu')
- end
-
- def facet_javascript(input_id, facet, array)
- array = [] if array.nil?
- hintText = _('Type in an option')
- text_field_tag('facet['+input_id+']', '', :id => input_id) +
- javascript_tag("jQuery.TokenList(jQuery('##{input_id}'), #{array.to_json},
- {searchDelay: 0, permanentDropdown: true, theme: 'facet', dontAdd: true, preventDuplicates: true,
- #{jquery_token_input_messages_json(hintText)}});")
- end
-
- def facet_link_html(facet, params, value, label, count)
- params = params ? params.dup : {}
- has_extra = label.kind_of?(Array)
- link_label = has_extra ? label[0] : label
- id = facet[:solr_field].to_s
- params[:facet] ||= {}
- params[:facet][id] ||= {}
- params[:page] = {} if params[:page]
-
- selected = facet[:label_id].nil? ? params[:facet][id] == value : params[:facet][id][facet[:label_id]].to_a.include?(value)
-
- if count > 0
- url = params.merge(:facet => params[:facet].merge(
- id => facet[:label_id].nil? ? value : params[:facet][id].merge( facet[:label_id] => params[:facet][id][facet[:label_id]].to_a | [value] )
- ))
- else
- # preserve others filters and change this filter
- url = params.merge(:facet => params[:facet].merge(
- id => facet[:label_id].nil? ? value : { facet[:label_id] => value }
- ))
+ def display_selector(asset, display, float = 'right')
+ display = nil if display.blank?
+ display ||= asset_class(asset).default_search_display
+ if [display?(asset, :map), display?(asset, :compact), display?(asset, :full)].select {|option| option}.count > 1
+ compact_link = display?(asset, :compact) ? (display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))) : nil
+ map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil
+ full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil
+ content_tag('div',
+ content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | ').html_safe,
+ :class => 'search-customize-options'
+ )
end
-
- content_tag 'div', link_to(link_label, url, :class => 'facet-result-link-label') +
- content_tag('span', (has_extra ? label[1] : ''), :class => 'facet-result-extra-label') +
- (count > 0 ? content_tag('span', " (#{count})", :class => 'facet-result-count') : ''),
- :class => 'facet-menu-item' + (selected ? ' facet-result-link-selected' : '')
end
- def facet_selecteds_html_for(environment, klass, params)
- def name_with_extra(klass, facet, value)
- name = klass.facet_result_name(facet, value)
- name = name[0] + name[1] if name.kind_of?(Array)
- name
- end
-
- ret = []
- params = params.dup
- params[:facet].each do |id, value|
- facet = klass.facet_by_id(id.to_sym)
- next unless facet
- if value.kind_of?(Hash)
- label_hash = facet[:label].call(environment)
- value.each do |label_id, value|
- facet[:label_id] = label_id
- facet[:label] = label_hash[label_id]
- value.to_a.each do |value|
- ret << [facet[:label], name_with_extra(klass, facet, value),
- params.merge(:facet => params[:facet].merge(id => params[:facet][id].merge(label_id => params[:facet][id][label_id].to_a.reject{ |v| v == value })))]
- end
- end
- else
- ret << [klass.facet_label(facet), name_with_extra(klass, facet, value),
- params.merge(:facet => params[:facet].reject{ |k,v| k == id })]
- end
+ def filter_selector(asset, filter, float = 'right')
+ klass = asset_class(asset)
+ if klass::SEARCH_FILTERS.count > 1
+ options = options_for_select(klass::SEARCH_FILTERS.map {|f| [FILTER_TRANSLATION[f], f]}, filter)
+ url_params = url_for(params.merge(:filter => 'FILTER'))
+ onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
+ select_field = select_tag(:filter, options, :onchange => onchange)
+ content_tag('div',
+ content_tag('strong', _('Filter')) + ': ' + select_field,
+ :class => "search-customize-options"
+ )
end
-
- ret.map do |label, name, url|
- content_tag('div', content_tag('span', label, :class => 'facet-selected-label') +
- content_tag('span', name, :class => 'facet-selected-name') +
- link_to('', url, :class => 'facet-selected-remove', :title => 'remove facet'), :class => 'facet-selected')
- end.join
- end
-
- def order_by(asset)
- options = SortOptions[asset].map do |name, options|
- next if options[:if] and ! instance_eval(&options[:if])
- [_(options[:label]), name.to_s]
- end.compact
-
- content_tag('div', _('Sort results by ') +
- select_tag(asset.to_s + '[order]', options_for_select(options, params[:order_by] || 'none'),
- {:onchange => "window.location = jQuery.param.querystring(window.location.href, { 'order_by' : this.options[this.selectedIndex].value})"}),
- :class => "search-ordering")
- end
-
- def label_total_found(asset, total_found)
- labels = {
- :products => _("%s products offers found"),
- :articles => _("%s articles found"),
- :events => _("%s events found"),
- :people => _("%s people found"),
- :enterprises => _("%s enterprises found"),
- :communities => _("%s communities found"),
- }
- content_tag('span', labels[asset] % total_found,
- :class => "total-pages-found") if labels[asset]
- end
-
- def asset_class(asset)
- asset.to_s.singularize.camelize.constantize
end
- def asset_table(asset)
- asset_class(asset).table_name
+ def filter_title(asset, filter)
+ {
+ 'articles_more_recent' => _('More recent contents from network'),
+ 'articles_more_popular' => _('More viewed contents from network'),
+ 'articles_more_comments' => _('Most commented contents from network'),
+ 'people_more_recent' => _('More recent people from network'),
+ 'people_more_active' => _('More active people from network'),
+ 'people_more_popular' => _('More popular people from network'),
+ 'communities_more_recent' => _('More recent communities from network'),
+ 'communities_more_active' => _('More active communities from network'),
+ 'communities_more_popular' => _('More popular communities from network'),
+ 'enterprises_more_recent' => _('More recent enterprises from network'),
+ 'enterprises_more_active' => _('More active enterprises from network'),
+ 'enterprises_more_popular' => _('More popular enterprises from network'),
+ 'products_more_recent' => _('Highlights'),
+ }[asset.to_s + '_' + filter].to_s
end
end
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index a0096e3..b7bc195 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -29,10 +29,8 @@ module TagsHelper
# (pt_BR only).
def tag_cloud(tags, tagname_option, url, options = {})
- return content_tag('em', _('No tags yet.')) +
- ' (' +
- _('What are tags?') + ') ' if tags.empty?
+ return content_tag('em', _('No tags yet.') + ' ') +
+ link_to(content_tag(:span, _('What are tags?')),_('http://en.wikipedia.org/wiki/Tag_%28metadata%29')) if tags.empty?
max_size = options[:max_size] || Cloud::MAX_SIZE
min_size = options[:min_size] || Cloud::MIN_SIZE
@@ -68,7 +66,7 @@ module TagsHelper
:title => n_( 'one item', '%d items', count ) % count
end
- end.join("\n")
+ end.join("\n").html_safe
end
end
diff --git a/app/models/approve_comment.rb b/app/models/approve_comment.rb
index 361de45..c45e761 100644
--- a/app/models/approve_comment.rb
+++ b/app/models/approve_comment.rb
@@ -43,7 +43,7 @@ class ApproveComment < Task
def information
if article
- {:message => _('%{requestor} commented on the the article: %{linked_subject}.') % {:requestor => requestor_name} }
+ {:message => _('%{requestor} commented on the the article: %{linked_subject}.') % {:requestor => requestor_name, :linked_subject => linked_subject} }
else
{:message => _("The article was removed.")}
end
diff --git a/app/models/article.rb b/app/models/article.rb
index ba9687b..74af28c 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -2,7 +2,28 @@ require 'hpricot'
class Article < ActiveRecord::Base
-include ActionController::UrlWriter
+ SEARCHABLE_FIELDS = {
+ :name => 10,
+ :abstract => 3,
+ :body => 2,
+ :slug => 1,
+ :filename => 1,
+ }
+
+ SEARCH_FILTERS = %w[
+ more_recent
+ more_popular
+ more_comments
+ ]
+
+ SEARCH_DISPLAYS = %w[full]
+
+ def self.default_search_display
+ 'full'
+ end
+
+ #FIXME This is necessary because html is being generated on the model...
+ include ActionView::Helpers::TagHelper
# use for internationalizable human type names in search facets
# reimplement on subclasses
@@ -147,7 +168,6 @@ include ActionController::UrlWriter
else
ArticleCategorization.add_category_to_article(c, self)
self.categories(reload)
- self.solr_save
end
end
@@ -165,7 +185,6 @@ include ActionController::UrlWriter
ArticleCategorization.add_category_to_article(item, self)
end
self.categories(true)
- self.solr_save
pending_categorizations.clear
end
@@ -201,20 +220,12 @@ include ActionController::UrlWriter
named_scope :public,
:conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ?", true, true, true, true ]
- named_scope :more_recent,
- :conditions => [ "advertise = ? AND published = ? AND profiles.visible = ? AND profiles.public_profile = ? AND
- ((articles.type != ?) OR articles.type is NULL)",
- true, true, true, true, 'RssFeed'
- ],
- :order => 'articles.published_at desc, articles.id desc'
-
# retrives the most commented articles, sorted by the comment count (largest
# first)
def self.most_commented(limit)
paginate(:order => 'comments_count DESC', :page => 1, :per_page => limit)
end
- named_scope :more_popular, :order => 'hits DESC'
named_scope :relevant_as_recent, :conditions => ["(articles.type != 'UploadedFile' and articles.type != 'RssFeed' and articles.type != 'Blog') OR articles.type is NULL"]
def self.recent(limit = nil, extra_conditions = {}, pagination = true)
@@ -239,8 +250,13 @@ include ActionController::UrlWriter
# The implementation in this class just provides the +body+ attribute as the
# HTML. Other article types can override this method to provide customized
# views of themselves.
+ # (To override short format representation, override the lead method)
def to_html(options = {})
- body || ''
+ if options[:format] == 'short'
+ display_short_format(self)
+ else
+ body || ''
+ end
end
include ApplicationHelper
@@ -429,8 +445,8 @@ include ActionController::UrlWriter
named_scope :images, :conditions => { :is_image => true }
named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
+ named_scope :more_popular, :order => 'hits DESC'
named_scope :more_comments, :order => "comments_count DESC"
- named_scope :more_views, :order => "hits DESC"
named_scope :more_recent, :order => "created_at DESC"
def self.display_filter(user, profile)
@@ -596,7 +612,7 @@ include ActionController::UrlWriter
end
def lead
- abstract.blank? ? first_paragraph : abstract
+ abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
end
def short_lead
@@ -627,7 +643,7 @@ include ActionController::UrlWriter
end
- def more_views_label
+ def more_popular_label
amount = self.hits
{
0 => _('no views'),
@@ -655,98 +671,7 @@ include ActionController::UrlWriter
img.nil? ? '' : img.attributes['src']
end
- private
-
- # FIXME: workaround for development env.
- # Subclasses aren't (re)loaded, and acts_as_solr
- # depends on subclasses method to search
- # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
- UploadedFile
- TextArticle
- TinyMceArticle
- TextileArticle
- Folder
- EnterpriseHomepage
- Gallery
- Blog
- Forum
- Event
-
- def self.f_type_proc(klass)
- klass.constantize.type_name
- end
-
- def self.f_profile_type_proc(klass)
- klass.constantize.type_name
- end
-
- def f_type
- #join common types
- case self.class.name
- when 'TinyMceArticle', 'TextileArticle'
- TextArticle.name
- else
- self.class.name
- end
- end
-
- def f_profile_type
- self.profile.class.name
- end
-
- def f_published_at
- self.published_at
- end
-
- def f_category
- self.categories.collect(&:name)
- end
-
delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
- def name_sortable # give a different name for solr
- name
- end
-
- def public
- self.public?
- end
-
- def category_filter
- categories_including_virtual_ids
- end
-
- public
-
- acts_as_faceted :fields => {
- :f_type => {:label => _('Type'), :proc => proc{|klass| f_type_proc(klass)}},
- :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
- '[NOW-1YEARS TO NOW/DAY]' => _("In the last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("In the last month"), '[NOW-7DAYS TO NOW/DAY]' => _("In the last week"), '[NOW-1DAYS TO NOW/DAY]' => _("In the last day")},
- :queries_order => ['[NOW-1DAYS TO NOW/DAY]', '[NOW-7DAYS TO NOW/DAY]', '[NOW-1MONTHS TO NOW/DAY]', '[NOW-1YEARS TO NOW/DAY]', '[* TO NOW-1YEARS/DAY]']},
- :f_profile_type => {:label => _('Profile'), :proc => proc{|klass| f_profile_type_proc(klass)}},
- :f_category => {:label => _('Categories')},
- }, :category_query => proc { |c| "category_filter:\"#{c.id}\"" },
- :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
-
- acts_as_searchable :fields => facets_fields_for_solr + [
- # searched fields
- {:name => {:type => :text, :boost => 2.0}},
- {:slug => :text}, {:body => :text},
- {:abstract => :text}, {:filename => :text},
- # filtered fields
- {:public => :boolean}, {:environment_id => :integer},
- {:profile_id => :integer}, :language,
- {:category_filter => :integer},
- # ordered/query-boosted fields
- {:name_sortable => :string}, :last_changed_by_id, :published_at, :is_image,
- :updated_at, :created_at,
- ], :include => [
- {:profile => {:fields => [:name, :identifier, :address, :nickname, :region_id, :lat, :lng]}},
- {:comments => {:fields => [:title, :body, :author_name, :author_email]}},
- {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
- ], :facets => facets_option_for_solr,
- :boost => proc { |a| 10 if a.profile && a.profile.enabled },
- :if => proc{ |a| ! ['RssFeed'].include?(a.class.name) }
- handle_asynchronously :solr_save
private
diff --git a/app/models/article_block.rb b/app/models/article_block.rb
index bb802be..e30a9c8 100644
--- a/app/models/article_block.rb
+++ b/app/models/article_block.rb
@@ -12,7 +12,11 @@ class ArticleBlock < Block
block = self
lambda do
block_title(block.title) +
- (block.article ? article_to_html(block.article, :gallery_view => false) : _('Article not selected yet.'))
+ (block.article ? article_to_html(block.article,
+ :gallery_view => false,
+ :inside_block => block, # For Blogs and folders
+ :format => block.visualization_format # For Articles and contents
+ ).html_safe : _('Article not selected yet.'))
end
end
@@ -49,4 +53,14 @@ class ArticleBlock < Block
self.box.owner.kind_of?(Environment) ? self.box.owner.portal_community.articles : self.box.owner.articles
end
+ def posts_per_page
+ self.settings[:posts_per_page] or 1
+ end
+
+ def posts_per_page= value
+ value = value.to_i
+ self.settings[:posts_per_page] = value if value > 0
+ end
+
+ settings_items :visualization_format, :type => :string, :default => 'short'
end
diff --git a/app/models/blog.rb b/app/models/blog.rb
index 88d2189..71e0501 100644
--- a/app/models/blog.rb
+++ b/app/models/blog.rb
@@ -24,8 +24,9 @@ class Blog < Folder
# FIXME isn't this too much including just to be able to generate some HTML?
include ActionView::Helpers::TagHelper
def to_html(options = {})
+ me = self
lambda do
- render :file => 'content_viewer/blog_page'
+ render :file => 'content_viewer/blog_page', :locals => { :blog=>me, :inside_block=>options[:inside_block] }
end
end
diff --git a/app/models/category.rb b/app/models/category.rb
index edb1379..04f8d98 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1,5 +1,12 @@
class Category < ActiveRecord::Base
+ SEARCHABLE_FIELDS = {
+ :name => 10,
+ :acronym => 5,
+ :abbreviation => 5,
+ :slug => 1,
+ }
+
validates_exclusion_of :slug, :in => [ 'index' ], :message => N_('%{fn} cannot be like that.').fix_i18n
validates_presence_of :name, :environment_id
validates_uniqueness_of :slug,:scope => [ :environment_id, :parent_id ], :message => N_('%{fn} is already being used by another category.').fix_i18n
@@ -100,23 +107,4 @@ class Category < ActiveRecord::Base
self.children.find(:all, :conditions => {:display_in_menu => true}).empty?
end
- private
- def name_sortable # give a different name for solr
- name
- end
- public
-
- acts_as_searchable :fields => [
- # searched fields
- {:name => {:type => :text, :boost => 2.0}},
- {:path => :text}, {:slug => :text},
- {:abbreviation => :text}, {:acronym => :text},
- # filtered fields
- :parent_id,
- # ordered/query-boosted fields
- {:name_sortable => :string},
- ]
- after_save_reindex [:articles, :profiles], :with => :delayed_job
- handle_asynchronously :solr_save
-
end
diff --git a/app/models/certifier.rb b/app/models/certifier.rb
index a5e0974..1292322 100644
--- a/app/models/certifier.rb
+++ b/app/models/certifier.rb
@@ -1,5 +1,11 @@
class Certifier < ActiveRecord::Base
+ SEARCHABLE_FIELDS = {
+ :name => 10,
+ :description => 3,
+ :link => 1,
+ }
+
belongs_to :environment
has_many :qualifier_certifiers, :dependent => :destroy
@@ -24,6 +30,4 @@ class Certifier < ActiveRecord::Base
self.name.downcase.transliterate <=> b.name.downcase.transliterate
end
- after_save_reindex [:products], :with => :delayed_job
-
end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 0671597..2c5ad4b 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,11 @@
class Comment < ActiveRecord::Base
+ SEARCHABLE_FIELDS = {
+ :title => 10,
+ :name => 4,
+ :body => 2,
+ }
+
validates_presence_of :body
belongs_to :source, :counter_cache => true, :polymorphic => true
@@ -85,12 +91,6 @@ class Comment < ActiveRecord::Base
self.article.profile.notification_emails - [self.author_email || self.email]
end
- after_save :notify_article
- after_destroy :notify_article
- def notify_article
- article.comments_updated if article.kind_of?(Article)
- end
-
after_create :new_follower
def new_follower
if source.kind_of?(Article)
diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 5001a69..89e3962 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -2,6 +2,8 @@
# only enterprises can offer products and services.
class Enterprise < Organization
+ SEARCH_DISPLAYS += %w[map full]
+
def self.type_name
_('Enterprise')
end
@@ -14,8 +16,6 @@ class Enterprise < Organization
has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
- after_save_reindex [:products], :with => :delayed_job
- extra_data_for_index :product_categories
def product_categories
products.includes(:product_category).map{|p| p.category_full_name}.compact
end
@@ -182,7 +182,15 @@ class Enterprise < Organization
end
def activities
- Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY action_tracker.updated_at DESC")
+ Scrap.find_by_sql("SELECT id, updated_at, 'Scrap' AS klass FROM scraps WHERE scraps.receiver_id = #{self.id} AND scraps.scrap_id IS NULL UNION SELECT id, updated_at, 'ActionTracker::Record' AS klass FROM action_tracker WHERE action_tracker.target_id = #{self.id} UNION SELECT action_tracker.id, action_tracker.updated_at, 'ActionTracker::Record' AS klass FROM action_tracker INNER JOIN articles ON action_tracker.target_id = articles.id WHERE articles.profile_id = #{self.id} AND action_tracker.target_type = 'Article' ORDER BY updated_at DESC")
+ end
+
+ def catalog_url
+ { :profile => identifier, :controller => 'catalog'}
+ end
+
+ def more_recent_label
+ ''
end
end
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 77c3f2c..129a831 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -268,8 +268,6 @@ class Environment < ActiveRecord::Base
settings_items :search_hints, :type => Hash, :default => {}
- settings_items :top_level_category_as_facet_ids, :type => Array, :default => []
-
def news_amount_by_folder=(amount)
settings[:news_amount_by_folder] = amount.to_i
end
@@ -618,12 +616,10 @@ class Environment < ActiveRecord::Base
end
def top_url
- protocol = 'http'
- result = "#{protocol}://#{default_hostname}"
- if Noosfero.url_options.has_key?(:port)
- result << ':' << Noosfero.url_options[:port].to_s
- end
- result
+ url = 'http://'
+ url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
+ url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
+ url
end
def to_s
diff --git a/app/models/event.rb b/app/models/event.rb
index a2f24e4..712a4cd 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -14,7 +14,6 @@ class Event < Article
maybe_add_http(self.setting[:link])
end
- xss_terminate :only => [ :link ], :on => 'validation'
xss_terminate :only => [ :body, :link, :address ], :with => 'white_list', :on => 'validation'
def initialize(*args)
@@ -104,18 +103,30 @@ class Event < Article
}
}
+ # TODO: some good soul, please clean this ugly hack:
if self.body
html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
end
}
if self.body
- result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
+ if options[:format] == 'short'
+ result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
+ else
+ result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
+ end
end
result
end
+ def lead
+ content_tag('div',
+ show_period(start_date, end_date),
+ :class => 'event-dates'
+ ) + super
+ end
+
def event?
true
end
diff --git a/app/models/external_feed.rb b/app/models/external_feed.rb
index 15ead62..dab7caf 100644
--- a/app/models/external_feed.rb
+++ b/app/models/external_feed.rb
@@ -11,6 +11,15 @@ class ExternalFeed < ActiveRecord::Base
}
def add_item(title, link, date, content)
+ doc = Hpricot(content)
+ doc.search('*').each do |p|
+ if p.instance_of? Hpricot::Elem
+ p.remove_attribute 'style'
+ p.remove_attribute 'class'
+ end
+ end
+ content = doc.to_s
+
article = TinyMceArticle.new(:name => title, :profile => blog.profile, :body => content, :published_at => date, :source => link, :profile => blog.profile, :parent => blog)
unless blog.children.exists?(:slug => article.slug)
article.save!
diff --git a/app/models/feed_reader_block.rb b/app/models/feed_reader_block.rb
index 3ab06ff..142aedf 100644
--- a/app/models/feed_reader_block.rb
+++ b/app/models/feed_reader_block.rb
@@ -47,11 +47,11 @@ class FeedReaderBlock < Block
def formatted_feed_content
if error_message.blank?
- "\n" +
- self.feed_items[0..(limit-1)].map{ |item| "#{item[:title]} " }.join("\n") +
- " "
+ "\n".html_safe +
+ self.feed_items[0..(limit-1)].map{ |item| "#{item[:title]} " }.join("\n").html_safe +
+ " ".html_safe
else
- '' + error_message + '
'
+ "#{error_message}
".html_safe
end
end
diff --git a/app/models/license.rb b/app/models/license.rb
index 9b57d08..3db2dba 100644
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -1,4 +1,10 @@
class License < ActiveRecord::Base
+
+ SEARCHABLE_FIELDS = {
+ :name => 10,
+ :url => 5,
+ }
+
belongs_to :environment
has_many :content, :class_name => 'Article', :foreign_key => 'license_id'
diff --git a/app/models/link_list_block.rb b/app/models/link_list_block.rb
index 586f844..39267e6 100644
--- a/app/models/link_list_block.rb
+++ b/app/models/link_list_block.rb
@@ -80,7 +80,7 @@ class LinkListBlock < Block
def icons_options
ICONS.map do |i|
- " "
+ " ".html_safe
end
end
diff --git a/app/models/national_region.rb b/app/models/national_region.rb
index 557a12f..e06e4ba 100644
--- a/app/models/national_region.rb
+++ b/app/models/national_region.rb
@@ -1,5 +1,10 @@
class NationalRegion < ActiveRecord::Base
+ SEARCHABLE_FIELDS = {
+ :name => 1,
+ :national_region_code => 1,
+ }
+
def self.search_city(city_name, like = false, state = nil)
operator = "="
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 2282071..b00f295 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -1,6 +1,11 @@
# Represents any organization of the system
class Organization < Profile
+ SEARCH_FILTERS += %w[
+ more_popular
+ more_active
+ ]
+
settings_items :closed, :type => :boolean, :default => false
def closed?
closed
diff --git a/app/models/organization_mailing.rb b/app/models/organization_mailing.rb
index 9cf9d86..ddd9fb3 100644
--- a/app/models/organization_mailing.rb
+++ b/app/models/organization_mailing.rb
@@ -5,7 +5,7 @@ class OrganizationMailing < Mailing
end
def recipients(offset=0, limit=100)
- source.members.all(:order => self.id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+ source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
end
def each_recipient
diff --git a/app/models/person.rb b/app/models/person.rb
index e0808c7..aad72bc 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -1,6 +1,11 @@
# A person is the profile of an user holding all relationships with the rest of the system
class Person < Profile
+ SEARCH_FILTERS += %w[
+ more_popular
+ more_active
+ ]
+
def self.type_name
_('Person')
end
diff --git a/app/models/product.rb b/app/models/product.rb
index 032c626..4c6bdee 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -1,5 +1,20 @@
class Product < ActiveRecord::Base
+ SEARCHABLE_FIELDS = {
+ :name => 10,
+ :description => 1,
+ }
+
+ SEARCH_FILTERS = %w[
+ more_recent
+ ]
+
+ SEARCH_DISPLAYS = %w[map full]
+
+ def self.default_search_display
+ 'full'
+ end
+
belongs_to :enterprise
has_one :region, :through => :enterprise
validates_presence_of :enterprise
@@ -173,7 +188,7 @@ class Product < ActiveRecord::Base
def price_described?
return false if price.blank? or price == 0
- (price - total_production_cost).zero?
+ (price - total_production_cost.to_f).zero?
end
def update_price_details(price_details)
@@ -215,89 +230,6 @@ class Product < ActiveRecord::Base
end
end
- private
- def f_category
- self.product_category.name
- end
- def f_region
- self.enterprise.region.id if self.enterprise.region
- end
- def self.f_region_proc(id)
- c = Region.find(id)
- s = c.parent
- if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
- [c.name, ', ' + s.acronym]
- else
- c.name
- end
- end
- def self.f_qualifier_proc(ids)
- array = ids.split
- qualifier = Qualifier.find_by_id array[0]
- certifier = Certifier.find_by_id array[1]
- certifier ? [qualifier.name, _(' cert. ') + certifier.name] : qualifier.name
- end
- def f_qualifier
- product_qualifiers.map do |pq|
- "#{pq.qualifier_id} #{pq.certifier_id}"
- end
- end
-
- alias_method :name_sortable, :name
delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :enterprise
- def name_sortable # give a different name for solr
- name
- end
- def public
- self.public?
- end
- def price_sortable
- (price.nil? or price.zero?) ? nil : price
- end
- def category_filter
- enterprise.categories_including_virtual_ids << product_category_id
- end
- public
-
- acts_as_faceted :fields => {
- :f_category => {:label => _('Related products')},
- :f_region => {:label => _('City'), :proc => proc { |id| f_region_proc(id) }},
- :f_qualifier => {:label => _('Qualifiers'), :proc => proc { |id| f_qualifier_proc(id) }},
- }, :category_query => proc { |c| "category_filter:#{c.id}" },
- :order => [:f_category, :f_region, :f_qualifier]
-
- Boosts = [
- [:image, 0.55, proc{ |p| p.image ? 1 : 0}],
- [:qualifiers, 0.45, proc{ |p| p.product_qualifiers.count > 0 ? 1 : 0}],
- [:open_price, 0.45, proc{ |p| p.price_described? ? 1 : 0}],
- [:solidarity, 0.45, proc{ |p| p.percentage_from_solidarity_economy[0].to_f/100 }],
- [:available, 0.35, proc{ |p| p.available ? 1 : 0}],
- [:price, 0.35, proc{ |p| (!p.price.nil? and p.price > 0) ? 1 : 0}],
- [:new_product, 0.35, proc{ |p| (p.updated_at.to_i - p.created_at.to_i) < 24*3600 ? 1 : 0}],
- [:description, 0.3, proc{ |p| !p.description.blank? ? 1 : 0}],
- [:enabled, 0.2, proc{ |p| p.enterprise.enabled ? 1 : 0}],
- ]
-
- acts_as_searchable :fields => facets_fields_for_solr + [
- # searched fields
- {:name => {:type => :text, :boost => 2.0}},
- {:description => :text}, {:category_full_name => :text},
- # filtered fields
- {:public => :boolean}, {:environment_id => :integer},
- {:enabled => :boolean}, {:category_filter => :integer},
- # ordered/query-boosted fields
- {:price_sortable => :decimal}, {:name_sortable => :string},
- {:lat => :float}, {:lng => :float},
- :updated_at, :created_at,
- ], :include => [
- {:product_category => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
- {:region => {:fields => [:name, :path, :slug, :lat, :lng]}},
- {:enterprise => {:fields => [:name, :identifier, :address, :nickname, :lat, :lng]}},
- {:qualifiers => {:fields => [:name]}},
- {:certifiers => {:fields => [:name]}},
- ], :facets => facets_option_for_solr,
- :boost => proc{ |p| boost = 1; Boosts.each{ |b| boost = boost * (1 - ((1 - b[2].call(p)) * b[1])) }; boost}
- handle_asynchronously :solr_save
- after_save_reindex [:enterprise], :with => :delayed_job
end
diff --git a/app/models/product_category.rb b/app/models/product_category.rb
index 37ef4c5..c3c1553 100644
--- a/app/models/product_category.rb
+++ b/app/models/product_category.rb
@@ -11,6 +11,4 @@ class ProductCategory < Category
top_category ? top_category.children : top_level_for(env).select{|c|c.kind_of?(ProductCategory)}
end
- after_save_reindex [:products], :with => :delayed_job
-
end
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 4a11192..3c3085a 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -3,10 +3,20 @@
# which by default is the one returned by Environment:default.
class Profile < ActiveRecord::Base
- # use for internationalizable human type names in search facets
- # reimplement on subclasses
- def self.type_name
- _('Profile')
+ SEARCHABLE_FIELDS = {
+ :name => 10,
+ :identifier => 5,
+ :nickname => 2,
+ }
+
+ SEARCH_FILTERS = %w[
+ more_recent
+ ]
+
+ SEARCH_DISPLAYS = %w[compact]
+
+ def self.default_search_display
+ 'compact'
end
module Roles
@@ -68,7 +78,7 @@ class Profile < ActiveRecord::Base
#FIXME: these will work only if the subclass is already loaded
named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
- named_scope :templates, :conditions => {:is_template => true}
+ named_scope :templates, lambda { |environment| { :conditions => {:is_template => true, :environment_id => environment.id} } }
def members
scopes = plugins.dispatch_scopes(:organization_members, self)
@@ -127,18 +137,6 @@ class Profile < ActiveRecord::Base
scrap.nil? ? Scrap.all_scraps(self) : Scrap.all_scraps(self).find(scrap)
end
- class_inheritable_accessor :extra_index_methods
- self.extra_index_methods = []
-
- def extra_data_for_index
- self.class.extra_index_methods.map { |meth| meth.to_proc.call(self) }.flatten
- end
-
- def self.extra_data_for_index(sym = nil, &block)
- self.extra_index_methods.push(sym) if sym
- self.extra_index_methods.push(block) if block_given?
- end
-
acts_as_having_settings :field => :data
def settings
@@ -211,7 +209,7 @@ class Profile < ActiveRecord::Base
has_many :profile_categorizations_including_virtual, :class_name => 'ProfileCategorization'
has_many :categories_including_virtual, :through => :profile_categorizations_including_virtual, :source => :category
- has_many :abuse_complaints, :foreign_key => 'requestor_id'
+ has_many :abuse_complaints, :foreign_key => 'requestor_id', :dependent => :destroy
def top_level_categorization
ret = {}
@@ -262,7 +260,6 @@ class Profile < ActiveRecord::Base
else
ProfileCategorization.add_category_to_profile(c, self)
self.categories(true)
- self.solr_save
end
self.categories(reload)
end
@@ -894,86 +891,6 @@ private :generate_url, :url_options
self.active_fields
end
- private
- def self.f_categories_label_proc(environment)
- ids = environment.top_level_category_as_facet_ids
- r = Category.find(ids)
- map = {}
- ids.map{ |id| map[id.to_s] = r.detect{|c| c.id == id}.name }
- map
- end
- def self.f_categories_proc(facet, id)
- id = id.to_i
- return if id.zero?
- c = Category.find(id)
- c.name if c.top_ancestor.id == facet[:label_id].to_i or facet[:label_id] == 0
- end
- def f_categories
- category_ids - [region_id]
- end
-
- def f_region
- self.region_id
- end
- def self.f_region_proc(id)
- c = Region.find(id)
- s = c.parent
- if c and c.kind_of?(City) and s and s.kind_of?(State) and s.acronym
- [c.name, ', ' + s.acronym]
- else
- c.name
- end
- end
-
- def self.f_enabled_proc(enabled)
- enabled = enabled == "true" ? true : false
- enabled ? s_('facets|Enabled') : s_('facets|Not enabled')
- end
- def f_enabled
- self.enabled
- end
-
- def name_sortable # give a different name for solr
- name
- end
- def public
- self.public?
- end
- def category_filter
- categories_including_virtual_ids
- end
- public
-
- acts_as_faceted :fields => {
- :f_enabled => {:label => _('Situation'), :type_if => proc { |klass| klass.kind_of?(Enterprise) },
- :proc => proc { |id| f_enabled_proc(id) }},
- :f_region => {:label => _('City'), :proc => proc { |id| f_region_proc(id) }},
- :f_categories => {:multi => true, :proc => proc {|facet, id| f_categories_proc(facet, id)},
- :label => proc { |env| f_categories_label_proc(env) }, :label_abbrev => proc{ |env| f_categories_label_abbrev_proc(env) }},
- }, :category_query => proc { |c| "category_filter:#{c.id}" },
- :order => [:f_region, :f_categories, :f_enabled]
-
- acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,
- # searched fields
- {:name => {:type => :text, :boost => 2.0}},
- {:identifier => :text}, {:nickname => :text},
- # filtered fields
- {:public => :boolean}, {:environment_id => :integer},
- {:category_filter => :integer},
- # ordered/query-boosted fields
- {:name_sortable => :string}, {:user_id => :integer},
- :enabled, :active, :validated, :public_profile,
- {:lat => :float}, {:lng => :float},
- :updated_at, :created_at,
- ],
- :include => [
- {:region => {:fields => [:name, :path, :slug, :lat, :lng]}},
- {:categories => {:fields => [:name, :path, :slug, :lat, :lng, :acronym, :abbreviation]}},
- ], :facets => facets_option_for_solr,
- :boost => proc{ |p| 10 if p.enabled }
- after_save_reindex [:articles], :with => :delayed_job
- handle_asynchronously :solr_save
-
def control_panel_settings_button
{:title => _('Profile Info and settings'), :icon => 'edit-profile'}
end
diff --git a/app/models/profile_list_block.rb b/app/models/profile_list_block.rb
index ad1371e..d5f8e91 100644
--- a/app/models/profile_list_block.rb
+++ b/app/models/profile_list_block.rb
@@ -49,13 +49,12 @@ class ProfileListBlock < Block
send(:profile_image_link, item, :minor )
}.join("\n ")
if list.empty?
- list = ''+ _('None') +'
'
+ list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
else
list = content_tag 'ul', nl +' '+ list + nl
end
block_title(title) + nl +
- '' +
- nl + list + nl + '
'
+ content_tag('div', nl + list + nl + content_tag('br', '', :style => 'clear:both'))
end
end
diff --git a/app/models/qualifier.rb b/app/models/qualifier.rb
index 378527b..6ae55d0 100644
--- a/app/models/qualifier.rb
+++ b/app/models/qualifier.rb
@@ -1,5 +1,9 @@
class Qualifier < ActiveRecord::Base
+ SEARCHABLE_FIELDS = {
+ :name => 1,
+ }
+
belongs_to :environment
has_many :qualifier_certifiers, :dependent => :destroy
@@ -15,6 +19,4 @@ class Qualifier < ActiveRecord::Base
self.name.downcase.transliterate <=> b.name.downcase.transliterate
end
- after_save_reindex [:products], :with => :delayed_job
-
end
diff --git a/app/models/raw_html_block.rb b/app/models/raw_html_block.rb
index 91de1d4..a403b51 100644
--- a/app/models/raw_html_block.rb
+++ b/app/models/raw_html_block.rb
@@ -7,7 +7,7 @@ class RawHTMLBlock < Block
settings_items :html, :type => :text
def content(args={})
- (title.blank? ? '' : block_title(title)) + html.to_s
+ (title.blank? ? '' : block_title(title)).html_safe + html.to_s.html_safe
end
end
diff --git a/app/models/region.rb b/app/models/region.rb
index cd9a64b..4aad293 100644
--- a/app/models/region.rb
+++ b/app/models/region.rb
@@ -4,12 +4,6 @@ class Region < Category
require_dependency 'enterprise' # enterprises can also be validators
- # searches for organizations that could become validators for this region.
- # search is passed as is to find_by_contents on Organization.
- def search_possible_validators(search)
- Organization.find_by_contents(search)[:results].docs.reject {|item| self.validator_ids.include?(item.id) }
- end
-
def has_validator?
validators.count > 0
end
diff --git a/app/models/scrap.rb b/app/models/scrap.rb
index 4fc3ac5..85d100a 100644
--- a/app/models/scrap.rb
+++ b/app/models/scrap.rb
@@ -1,4 +1,7 @@
class Scrap < ActiveRecord::Base
+ SEARCHABLE_FIELDS = {
+ :content => 1,
+ }
validates_presence_of :content
validates_presence_of :sender_id, :receiver_id
diff --git a/app/models/spammer_logger.rb b/app/models/spammer_logger.rb
index 671c6cd..5ab87e4 100644
--- a/app/models/spammer_logger.rb
+++ b/app/models/spammer_logger.rb
@@ -5,10 +5,10 @@ class SpammerLogger < Logger
def self.log(spammer_ip, object=nil)
if object
if object.kind_of?(Comment)
- @logger << "[#{Time.now.strftime("%F %T %z")}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
+ @logger << "[#{Time.now.strftime('%F %T %z')}] Comment-id: #{object.id} IP: #{spammer_ip}\n"
end
else
- @logger << "[#{Time.now.strftime("%F %T %z")}] IP: #{spammer_ip}\n"
+ @logger << "[#{Time.now.strftime('%F %T %z')}] IP: #{spammer_ip}\n"
end
end
diff --git a/app/models/tags_block.rb b/app/models/tags_block.rb
index c034dc6..8446b11 100644
--- a/app/models/tags_block.rb
+++ b/app/models/tags_block.rb
@@ -20,7 +20,8 @@ class TagsBlock < Block
end
def content(args={})
- tags = owner.article_tags
+ is_env = owner.class == Environment
+ tags = is_env ? owner.tag_counts : owner.article_tags
return '' if tags.empty?
if limit
@@ -29,18 +30,28 @@ class TagsBlock < Block
tags_tmp.map{ |k,v| tags[k] = v }
end
+ url = is_env ? {:host=>owner.default_hostname, :controller=>'search', :action => 'tag'} :
+ owner.public_profile_url.merge(:controller => 'profile', :action => 'tags')
+ tagname_option = is_env ? :tag : :id
+
block_title(title) +
- "\n\n"+
- tag_cloud( tags, :id,
- owner.public_profile_url.merge(:controller => 'profile', :action => 'tags'),
- :max_size => 16, :min_size => 9 ) +
- "\n
\n";
+ "\n\n".html_safe+
+ tag_cloud( tags, tagname_option, url, :max_size => 16, :min_size => 9 ) +
+ "\n
\n".html_safe
end
def footer
- owner_id = owner.identifier
- lambda do
- link_to s_('tags|View all'), :profile => owner_id, :controller => 'profile', :action => 'tags'
+ if owner.class == Environment
+ lambda do
+ link_to s_('tags|View all'),
+ :controller => 'search', :action => 'tags'
+ end
+ else
+ owner_id = owner.identifier
+ lambda do
+ link_to s_('tags|View all'),
+ :profile => owner_id, :controller => 'profile', :action => 'tags'
+ end
end
end
diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb
index caa30b6..5be009e 100644
--- a/app/models/uploaded_file.rb
+++ b/app/models/uploaded_file.rb
@@ -113,7 +113,7 @@ class UploadedFile < Article
content_tag(
'div',
- link_to_previous + content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images] + link_to_next,
+ link_to_previous + (content_tag('span', _('image %d of %d'), :class => 'total-of-images') % [current_index + 1, total_of_images]).html_safe + link_to_next,
:class => 'gallery-navigation'
)
end.to_s +
diff --git a/app/models/user.rb b/app/models/user.rb
index 888f068..fd5d7aa 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
# FIXME ugly workaround
def self.human_attribute_name(attrib)
case attrib.to_sym
- when :login: return _('Username')
+ when :login: return [_('Username'), _('Email')].join(' / ')
when :email: return _('e-Mail')
else _(self.superclass.human_attribute_name(attrib))
end
@@ -116,10 +116,11 @@ class User < ActiveRecord::Base
validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('%{fn} must be checked in order to signup.').fix_i18n
- # Authenticates a user by their login name and unencrypted password. Returns the user or nil.
+ # Authenticates a user by their login name or email and unencrypted password. Returns the user or nil.
def self.authenticate(login, password, environment = nil)
environment ||= Environment.default
- u = first :conditions => ['login = ? AND environment_id = ? AND activated_at IS NOT NULL', login, environment.id] # need to get the salt
+ u = self.first :conditions => ['(login = ? OR email = ?) AND environment_id = ? AND activated_at IS NOT NULL',
+ login, login, environment.id] # need to get the salt
u && u.authenticated?(password) ? u : nil
end
@@ -293,7 +294,8 @@ class User < ActiveRecord::Base
'email_domain' => self.enable_email ? self.email_domain : nil,
'friends_list' => friends_list,
'enterprises' => enterprises,
- 'amount_of_friends' => friends_list.count
+ 'amount_of_friends' => friends_list.count,
+ 'chat_enabled' => person.environment.enabled?('xmpp_chat')
}
end
diff --git a/app/views/account/_signup_form.rhtml b/app/views/account/_signup_form.rhtml
index 0457663..ee58cfa 100644
--- a/app/views/account/_signup_form.rhtml
+++ b/app/views/account/_signup_form.rhtml
@@ -32,7 +32,8 @@
<%= environment.default_hostname %>/
<%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
diff --git a/app/views/account/forgot_password.rhtml b/app/views/account/forgot_password.rhtml
index 537c9f4..1e3748d 100644
--- a/app/views/account/forgot_password.rhtml
+++ b/app/views/account/forgot_password.rhtml
@@ -5,7 +5,7 @@
<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
<%= f.text_field :login,
- :onchange => 'this.value = convToValidLogin( this.value )' %>
+ :onchange => 'this.value = convToValidUsername( this.value )' %>
<%= f.text_field :email %>
diff --git a/app/views/admin_panel/site_info.rhtml b/app/views/admin_panel/site_info.rhtml
index b8df356..4ab7f2f 100644
--- a/app/views/admin_panel/site_info.rhtml
+++ b/app/views/admin_panel/site_info.rhtml
@@ -4,7 +4,7 @@
<%= render :file => 'shared/tiny_mce' %>
-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
+<% labelled_form_for :environment, @environment do |f| %>
<% tabs = [] %>
<% tabs << {:title => _('Site info'), :id => 'site-info',
:content => (render :partial => 'site_info', :locals => {:f => f})} %>
diff --git a/app/views/box_organizer/_article_block.rhtml b/app/views/box_organizer/_article_block.rhtml
index 5de82d8..9b26c5c 100644
--- a/app/views/box_organizer/_article_block.rhtml
+++ b/app/views/box_organizer/_article_block.rhtml
@@ -1,10 +1,41 @@
-
+
<% if @block.box.owner.kind_of?(Environment) and @block.box.owner.portal_community.nil? %>
-
<% else %>
- <% articles = @block.available_articles.select {|article| !article.folder? } %>
- <%= select_tag('block[article_id]', options_for_select_with_title(articles.map {|item| [item.path, item.id]}, @block.article ? @block.article.id : nil)) %>
+ <%
+ articles = @block.available_articles.select {|a| !a.folder? || a.blog? }
+ first_text = articles[articles.find_index{|a| a.kind_of? TextArticle}||-1]
+ selected = @block.article || first_text
+ %>
+ <%= select_tag(
+ 'block[article_id]',
+ options_for_select_with_title(articles.map {|item| [item.path, item.id]}, selected.id),
+ :onchange => 'this.changedTo(this.value)'
+ )%>
+
+ <%= labelled_form_field(
+ _('Number of posts:'),
+ text_field_tag('block[posts_per_page]', @block.posts_per_page)
+ )%>
+
+ <%= labelled_form_field(
+ _('How to display this content:'),
+ select_tag(
+ 'block[visualization_format]',
+ options_for_select([[_('Lead'), 'short'], [_('Full post'), 'full']], @block.visualization_format)
+ )
+ )%>
+ <% blogs = @block.available_articles.select{|a|a.blog?} %>
+
<% end %>
diff --git a/app/views/box_organizer/_block_types.rhtml b/app/views/box_organizer/_block_types.rhtml
deleted file mode 100644
index 4b1c354..0000000
--- a/app/views/box_organizer/_block_types.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<% block_types.in_groups_of(2) do |block1, block2| %>
-
- <%= labelled_radio_button(block1.description, :type, block1.name) %>
-
- <% if block2 %>
-
- <%= labelled_radio_button(block2.description, :type, block2.name) %>
-
- <% end %>
-<% end %>
diff --git a/app/views/box_organizer/_highlights_block.rhtml b/app/views/box_organizer/_highlights_block.rhtml
index 90be8b3..548686a 100644
--- a/app/views/box_organizer/_highlights_block.rhtml
+++ b/app/views/box_organizer/_highlights_block.rhtml
@@ -1,28 +1,14 @@
<%= _('Highlights') %>
-
-
- <%= _('Image') %> <%= _('Address') %> <%= _('Position') %> <%= _('Title') %>
+
+
+ <%= _('Image') %> <%= _('Address') %> <%= _('Position') %>
<% for image in @block.images do %>
-
-
- <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i), :style => "width: 100px" %>
-
- <%= text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 10 %>
- <%= text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 3 %>
- <%= text_field_tag 'block[images][][title]', image[:title], :class => 'highlight-title', :size => 10 %>
-
+ <%= highlights_block_config_image_fields @block, image %>
<% end %>
-
-
+
<%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page|
- page.insert_html :bottom, 'highlights', content_tag('tr',
- content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name), :style => "width: 100px")) +
- content_tag('td', text_field_tag('block[images][][address]', nil, :class => 'highlight-address', :size => 10)) +
- content_tag('td', text_field_tag('block[images][][position]', nil, :class => 'highlight-position', :size => 3)) +
- content_tag('td', text_field_tag('block[images][][title]', nil, :class => 'highlight-position', :size => 10))
- ) +
- javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
+ page.insert_html :bottom, 'highlights-data-table', highlights_block_config_image_fields(@block)
end %>
<%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
diff --git a/app/views/box_organizer/add_block.rhtml b/app/views/box_organizer/add_block.rhtml
index dbb2391..70370cf 100644
--- a/app/views/box_organizer/add_block.rhtml
+++ b/app/views/box_organizer/add_block.rhtml
@@ -1,35 +1,41 @@
-
+
<% form_tag do %>
<%= _('In what area do you want to put your new block?') %>
+
<% @boxes.each do |box| %>
- <%= labelled_radio_button(_("Area %d") % box.position, :box_id, box.id, box.central?, { :class => 'box-position', 'data-position' => box.position }) %>
+ <% name = box.central? ? _('Main area') : _('Area %d') % box.position %>
+ <%= labelled_radio_button(name, :box_id, box.id, box.central?, { 'data-position' => box.position }) %>
<% end %>
+
<%= _('Select the type of block you want to add to your page.') %>
-
- <%= render :partial => 'block_types', :locals => { :block_types => @center_block_types } %>
+
+ <% @center_block_types.each do |block| %>
+
+ <%= labelled_radio_button(block.description, :type, block.name) %>
+
+ <% end %>
-
- <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
+
+ <% @side_block_types.each do |block| %>
+
+ <%= labelled_radio_button(block.description, :type, block.name) %>
+
+ <% end %>
diff --git a/app/views/box_organizer/edit.rhtml b/app/views/box_organizer/edit.rhtml
index 61cf156..bc11bed 100644
--- a/app/views/box_organizer/edit.rhtml
+++ b/app/views/box_organizer/edit.rhtml
@@ -1,5 +1,5 @@
-
-
<%= _('Editing block') %>
+
+
<%= _('Editing block') %>
<% form_tag(:action => 'save', :id => @block.id) do %>
diff --git a/app/views/box_organizer/index.rhtml b/app/views/box_organizer/index.rhtml
index 9a53b74..d66e1e1 100644
--- a/app/views/box_organizer/index.rhtml
+++ b/app/views/box_organizer/index.rhtml
@@ -1,6 +1,6 @@
<%= _('Editing sideboxes')%>
-<% button_bar do %>
+<% button_bar :class=>'design-menu' do %>
<%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
<%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
<% end %>
diff --git a/app/views/catalog/index.rhtml b/app/views/catalog/index.rhtml
index bdfec1c..f5baa9f 100644
--- a/app/views/catalog/index.rhtml
+++ b/app/views/catalog/index.rhtml
@@ -7,13 +7,17 @@
@@ -64,20 +68,20 @@
<% if product.description %>
- <%= _('description') %>
-
+
<%= _('description') %>
+
-
<%= txt2html(product.description || '') %>
+
<%= product.description %>
<% end %>
<% if product.price_described? %>
- <%= _('price composition') %>
-
+
<%= _('price composition') %>
+
-
+
<% product.inputs.relevant_to_price.each do |i| %>
<% @favorite_enterprises.each do |enterprise| %>-
- <%= link_to_profile profile_image(enterprise) + '
diff --git a/app/views/layouts/_user.html.erb b/app/views/layouts/_user.html.erb
new file mode 100644
index 0000000..9734998
--- /dev/null
+++ b/app/views/layouts/_user.html.erb
@@ -0,0 +1,24 @@
+
+
+ <%= usermenu_logged_in %>
+
+
+
+ <%= _("%s") % thickbox_inline_popup_link('' + _('Login') + '', login_url, 'inlineLoginBox', :id => 'link_login') %>
+ <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
+
+
+ <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+
+
+ <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+ <%= _("or %s") % link_to('' + _('Sign up') + '', :controller => 'account', :action => 'signup')%>
+ <% end %>
+
+
+
+
diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml
index b70d450..c48727b 100644
--- a/app/views/layouts/application-ng.rhtml
+++ b/app/views/layouts/application-ng.rhtml
@@ -8,23 +8,10 @@
<%= noosfero_javascript %>
- <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %>
- <%= stylesheet_link_tag template_stylesheet_path %>
- <%= stylesheet_link_tag icon_theme_stylesheet_path %>
- <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
- <%
- plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
- %>
- <%= stylesheet_link_tag(plugins_stylesheets, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_stylesheets.to_s)) unless plugins_stylesheets.empty? %>
- <%= stylesheet_link_tag theme_stylesheet_path %>
+ <%= noosfero_stylesheets %>
<%# Add custom tags/styles/etc via content_for %>
<%= yield :head %>
- <%= javascript_tag('render_all_jquery_ui_widgets()') %>
- <%
- plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
- %>
- <%= javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %>
<%=
@plugins.dispatch(:head_ending).collect do |content|
content.respond_to?(:call) ? content.call : content
@@ -35,15 +22,9 @@
DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
- " >
-
+
<%= _("Go to the content") %>
+
<%=
@plugins.dispatch(:body_beginning).collect do |content|
content.respond_to?(:call) ? content.call : content
@@ -55,31 +36,7 @@
<%= theme_header %>
-
-
- <%= usermenu_logged_in %>
-
-
-
- <%= _("%s") % thickbox_inline_popup_link('' + _('Login') + '', login_url, 'inlineLoginBox', :id => 'link_login') %>
- <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_eval(&content) }.join("") %>
-
-
- <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-
-
- <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
- <%= _("or %s") % link_to('' + _('Sign up') + '', :controller => 'account', :action => 'signup')%>
- <% end %>
-
-
-
-
-
+ <%= render :partial => 'layouts/user' %>
<%= noosfero_layout_features %>
<%= theme_javascript_ng %>
+ <%= addthis_javascript %>
diff --git a/app/views/map_balloon/product.rhtml b/app/views/map_balloon/product.rhtml
index c3a2f1e..57e4b7f 100644
--- a/app/views/map_balloon/product.rhtml
+++ b/app/views/map_balloon/product.rhtml
@@ -1,3 +1,3 @@
- <%= render :partial => 'search/product', :locals => {:product => @product} %>
+ <%= render :partial => 'search/full_product', :locals => {:product => @product} %>
diff --git a/app/views/profile/_profile_wall.rhtml b/app/views/profile/_profile_wall.rhtml
index f0601f9..25727a4 100644
--- a/app/views/profile/_profile_wall.rhtml
+++ b/app/views/profile/_profile_wall.rhtml
@@ -1,7 +1,7 @@
<%= flash[:error] %>
- <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''" do %>
+ <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "$('leave_scrap_content').value=''", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
<%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2 %>
<%= submit_button :new, _('Share') %>
<% end %>
diff --git a/app/views/profile_members/_manage_roles.html.erb b/app/views/profile_members/_manage_roles.html.erb
index 49d756d..4d04d89 100644
--- a/app/views/profile_members/_manage_roles.html.erb
+++ b/app/views/profile_members/_manage_roles.html.erb
@@ -13,11 +13,11 @@
<% @roles.each do |role| %>
<% search_url = url_for(:action => 'search_user', :profile => profile.identifier, :role => role.id) %>
- <% @pre_population ||= profile.members_by_role_to_json(role) %>
+ <% pre_population = params[:action] == 'last_admin' ? [].to_json : profile.members_by_role_to_json(role) %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
' + enterprise.name, + <%= link_to_profile profile_image(enterprise) + '
'.html_safe + enterprise.name, enterprise.identifier, :class => 'profile-link' %> <%# profile_image_link enterprise, :portrait, 'div' %>
<%= theme_site_title %>
@@ -103,5 +60,6 @@<%= _("%s's wall") % @profile.name %>
jsTree v.1.0
+DEMO
+Creating a tree, binding events, using the instance
+Here is how you create an instance, bind an event and then get the instance.
++-
+ Root node 1
+
+ -
+ Root node 2
+
+
++-
+ Child node 1
+
+ -
+ Child node 2
+
+
+Doing something when the tree is loaded
+You can use a few events to do that.
++-
+ Root node 1
+
+ -
+ Root node 2
+
+
++-
+ Child node 1
+
+ -
+ Child node 2
+
+
+Doing something when a node is clicked
++-
+ Root node 1
+
+ -
+ Root node 2
+
+
++-
+ Child node 1
+
+ -
+ Child node 2
+
+
+Using CSS to make nodes wrap
++-
+ Root node 1
+
+ -
+ Root node 2
+
+
++-
+ Child node 1 with a long text which would normally just cause a scrollbar, but with this line of CSS it will actually wrap, this is not really throughly tested but it works
+
+ -
+ Child node 2
+
+
+Using CSS to make the nodes bigger
++-
+ Root node 1
+
+ -
+ Root node 2
+
+
++-
+ Child node 1 with a long text which would normally just cause a scrollbar, but with this line of CSS it will actually wrap, this is not really throughly tested but it works
+
+ -
+ Child node 2
+
+
+PHP & mySQL demo + event order
+Here is a PHP & mySQL enabled demo. You can use the classes/DB structure included, but those are not thoroughly tested and not officially a part of jstree. In the log window you can also see all function calls as they happen on the instance.
+