Kris Vanderwater authored Feb 25, 2011 and Earl Miles committed Feb 26, 2011

give context views the ability to consume other contexts in the view as arguments.  This is done through a relationship plugin that builds relationships to contexts based upon the argument settings of a context view. #1066074

Kris Vanderwater authored Feb 25, 2011 and Earl Miles committed Feb 26, 2011

fixes exposed filters in context views and allows the page path to be passed along in a similar fashion to content panes

     Conflicts:
         CHANGELOG.txt
         css/modal.css
         ctools.module
         ctools_plugin_example/plugins/access/arg_length.inc
         ctools_plugin_example/plugins/access/example_role.inc
         help/export.html
         includes/ajax.inc
         includes/cleanstring.inc
         includes/content.inc
         includes/content.menu.inc
         includes/context-task-handler.inc
         includes/context.inc
         includes/context.theme.inc
         includes/css.inc
         includes/export.inc
         includes/modal.inc
         includes/object-cache.inc
         includes/plugins.inc
         includes/wizard.inc
         js/ajax-responder.js
         js/collapsible-div.js
         js/dependent.js
         js/dimensions.js
         js/mc.js
         js/modal.js
         page_manager/page_manager.admin.inc
         page_manager/page_manager.module
         page_manager/plugins/tasks/page.inc
         page_manager/plugins/tasks/search.inc
         page_manager/plugins/tasks/user_view.inc
         plugins/access/context_exists.inc
         plugins/access/node_language.inc
         plugins/access/perm.inc
         plugins/access/php.inc
         plugins/access/role.inc
         plugins/access/site_language.inc
         plugins/access/term.inc
         plugins/access/term_vocabulary.inc
         plugins/content_types/block/block.inc
         plugins/content_types/custom/custom.inc
         plugins/content_types/node/node.inc
         plugins/content_types/node_context/node_comment_form.inc
         plugins/content_types/node_context/node_comments.inc
         plugins/content_types/node_context/node_content.inc
         plugins/content_types/page/page_breadcrumb.inc
         plugins/content_types/page/page_footer_message.inc
         plugins/content_types/page/page_help.inc
         plugins/content_types/page/page_messages.inc
         plugins/content_types/page/page_mission.inc
         plugins/content_types/page/page_slogan.inc
         plugins/content_types/page/page_tabs.inc
         plugins/content_types/page/page_title.inc
         plugins/content_types/search/search_result.inc
         plugins/contexts/node_edit_form.inc
         plugins/contexts/term.inc
         plugins/contexts/terms.inc
         plugins/contexts/user.inc
         plugins/relationships/book_parent.inc
         views_content/plugins/content_types/views.inc
         views_content/plugins/content_types/views_panes.inc
         views_content/views_content.module

Added support for context keyword substitutions on override paths in content panes provided by views_content.

forward with the 7.x port!

Committing in a collection of ongoing port work from #589636, so that we can stop trying to track it all in patches.

Will make merging in changes (with an outside dvcs) from the 6--1 branch easier, anyway.

- php potx-cli.php --mode=multiple
- msgcat views_content-plugins-content_types.pot views_content-plugins-views.pot views_content.pot --use-first --no-wrap -o views_content.combined.pot
- msgcat page_manager-plugins-tasks.pot page_manager-theme.pot page_manager.pot --use-first --no-wrap -o page_manager.combined.pot
- msgcat ctools.pot includes.pot plugins-access.pot plugins-arguments.pot plugins-content_types-block.pot plugins-content_types-custom.pot plugins-content_types-form.pot plugins-content_types-node.pot plugins-content_types-node_context.pot plugins-content_types-node_form.pot plugins-content_types-term_context.pot plugins-content_types-user_context.pot plugins-content_types-vocabulary_context.pot plugins-contexts.pot plugins-relationships.pot --use-first --no-wrap -o ctools.combined.pot