Merge ksenzee/views3ui github master branch into 7.x-3.x
authorMarco Villegas
Fri, 25 Feb 2011 23:09:26 +0000 (18:09 -0500)
committerMarco Villegas
Fri, 25 Feb 2011 23:09:26 +0000 (18:09 -0500)
Conflifts have been solved trusting completely on github branch, but at
the same time removing the $Id$ CVS keyword that do not make sense any
more.

Conflicts:
README.txt
css/views-admin.css
css/views-list-rtl.css
css/views-list.css
css/views.css
docs/docs.php
handlers/views_handler_area.inc
handlers/views_handler_area_text.inc
handlers/views_handler_argument.inc
handlers/views_handler_argument_date.inc
handlers/views_handler_argument_formula.inc
handlers/views_handler_argument_group_by_numeric.inc
handlers/views_handler_argument_many_to_one.inc
handlers/views_handler_argument_null.inc
handlers/views_handler_argument_numeric.inc
handlers/views_handler_argument_string.inc
handlers/views_handler_field.inc
handlers/views_handler_field_boolean.inc
handlers/views_handler_field_counter.inc
handlers/views_handler_field_custom.inc
handlers/views_handler_field_date.inc
handlers/views_handler_field_group_by_numeric.inc
handlers/views_handler_field_markup.inc
handlers/views_handler_field_math.inc
handlers/views_handler_field_numeric.inc
handlers/views_handler_field_prerender_list.inc
handlers/views_handler_field_url.inc
handlers/views_handler_filter.inc
handlers/views_handler_filter_boolean_operator.inc
handlers/views_handler_filter_boolean_operator_string.inc
handlers/views_handler_filter_date.inc
handlers/views_handler_filter_equality.inc
handlers/views_handler_filter_group_by_numeric.inc
handlers/views_handler_filter_in_operator.inc
handlers/views_handler_filter_many_to_one.inc
handlers/views_handler_filter_numeric.inc
handlers/views_handler_filter_string.inc
handlers/views_handler_relationship.inc
handlers/views_handler_sort.inc
handlers/views_handler_sort_date.inc
handlers/views_handler_sort_group_by_numeric.inc
handlers/views_handler_sort_menu_hierarchy.inc
handlers/views_handler_sort_random.inc
help/about.html
help/analyze-theme.html
help/api-default-views.html
help/api-example.html
help/api-handlers.html
help/api-plugins.html
help/api-tables.html
help/api-upgrading.html
help/api.html
help/argument.html
help/display-attachment.html
help/display-block.html
help/display-default.html
help/display-feed.html
help/display-page.html
help/display.html
help/embed.html
help/example-author-block.html
help/example-recent-stories.html
help/example-user-feed.html
help/example-users-by-role.html
help/field.html
help/filter.html
help/getting-started.html
help/menu.html
help/new.html
help/overrides.html
help/path.html
help/relationship.html
help/sort.html
help/style-comment-rss.html
help/style-fields.html
help/style-grid.html
help/style-list.html
help/style-node-rss.html
help/style-node.html
help/style-row.html
help/style-rss.html
help/style-summary-unformatted.html
help/style-summary.html
help/style-table.html
help/style-unformatted.html
help/style.html
help/theme-css.html
help/updating.html
help/upgrading.html
help/using-theme.html
help/view-type.html
help/views.help.ini
images/sprites.png
includes/admin.inc
includes/ajax.inc
includes/analyze.inc
includes/base.inc
includes/cache.inc
includes/convert.inc
includes/form.inc
includes/handlers.inc
includes/plugins.inc
includes/tabs.inc
includes/view.inc
js/ajax.js
js/ajax_view.js
js/base.js
js/tabs.js
modules/aggregator.views.inc
modules/aggregator/views_handler_argument_aggregator_category_cid.inc
modules/aggregator/views_handler_argument_aggregator_fid.inc
modules/aggregator/views_handler_argument_aggregator_iid.inc
modules/aggregator/views_handler_field_aggregator_category.inc
modules/aggregator/views_handler_field_aggregator_title_link.inc
modules/aggregator/views_handler_field_aggregator_xss.inc
modules/aggregator/views_handler_filter_aggregator_category_cid.inc
modules/aggregator/views_plugin_row_aggregator_rss.inc
modules/book.views.inc
modules/book.views_convert.inc
modules/comment.views.inc
modules/comment.views_convert.inc
modules/comment.views_default.inc
modules/comment/views_handler_argument_comment_user_uid.inc
modules/comment/views_handler_field_comment.inc
modules/comment/views_handler_field_comment_depth.inc
modules/comment/views_handler_field_comment_link.inc
modules/comment/views_handler_field_comment_link_delete.inc
modules/comment/views_handler_field_comment_link_edit.inc
modules/comment/views_handler_field_comment_link_reply.inc
modules/comment/views_handler_field_comment_node_link.inc
modules/comment/views_handler_field_comment_username.inc
modules/comment/views_handler_field_last_comment_timestamp.inc
modules/comment/views_handler_field_ncs_last_comment_name.inc
modules/comment/views_handler_field_ncs_last_updated.inc
modules/comment/views_handler_field_node_comment.inc
modules/comment/views_handler_field_node_new_comments.inc
modules/comment/views_handler_filter_comment_user_uid.inc
modules/comment/views_handler_filter_ncs_last_updated.inc
modules/comment/views_handler_filter_node_comment.inc
modules/comment/views_handler_sort_comment_thread.inc
modules/comment/views_handler_sort_ncs_last_comment_name.inc
modules/comment/views_handler_sort_ncs_last_updated.inc
modules/comment/views_plugin_row_comment_rss.inc
modules/comment/views_plugin_row_comment_view.inc
modules/contact.views.inc
modules/contact/views_handler_field_contact_link.inc
modules/field.views.inc
modules/field/views_handler_field_field.inc
modules/field/views_handler_filter_field_list.inc
modules/filter.views.inc
modules/filter/views_handler_field_filter_format_name.inc
modules/locale.views.inc
modules/locale/views_handler_argument_locale_group.inc
modules/locale/views_handler_argument_locale_language.inc
modules/locale/views_handler_field_locale_group.inc
modules/locale/views_handler_field_locale_language.inc
modules/locale/views_handler_field_locale_link_edit.inc
modules/locale/views_handler_filter_locale_group.inc
modules/locale/views_handler_filter_locale_language.inc
modules/locale/views_handler_filter_locale_version.inc
modules/node.views.inc
modules/node.views_convert.inc
modules/node.views_default.inc
modules/node/views_handler_argument_dates_various.inc
modules/node/views_handler_argument_node_language.inc
modules/node/views_handler_argument_node_nid.inc
modules/node/views_handler_argument_node_type.inc
modules/node/views_handler_argument_node_vid.inc
modules/node/views_handler_field_history_user_timestamp.inc
modules/node/views_handler_field_node.inc
modules/node/views_handler_field_node_link.inc
modules/node/views_handler_field_node_link_delete.inc
modules/node/views_handler_field_node_link_edit.inc
modules/node/views_handler_field_node_path.inc
modules/node/views_handler_field_node_revision.inc
modules/node/views_handler_field_node_revision_link_delete.inc
modules/node/views_handler_field_node_revision_link_revert.inc
modules/node/views_handler_field_node_type.inc
modules/node/views_handler_filter_history_user_timestamp.inc
modules/node/views_handler_filter_node_access.inc
modules/node/views_handler_filter_node_status.inc
modules/node/views_handler_filter_node_type.inc
modules/node/views_plugin_argument_default_node.inc
modules/node/views_plugin_argument_validate_node.inc
modules/node/views_plugin_row_node_rss.inc
modules/node/views_plugin_row_node_view.inc
modules/poll.views.inc
modules/profile.views.inc
modules/profile.views_convert.inc
modules/profile/views_handler_field_profile_date.inc
modules/profile/views_handler_field_profile_list.inc
modules/profile/views_handler_filter_profile_selection.inc
modules/search.views.inc
modules/search.views_convert.inc
modules/search.views_default.inc
modules/search/views_handler_argument_search.inc
modules/search/views_handler_field_search_score.inc
modules/search/views_handler_filter_search.inc
modules/search/views_handler_sort_search_score.inc
modules/search/views_plugin_row_search_view.inc
modules/statistics.views.inc
modules/statistics.views_convert.inc
modules/statistics.views_default.inc
modules/statistics/views_handler_field_accesslog_path.inc
modules/system.views.inc
modules/system/views_handler_argument_file_fid.inc
modules/system/views_handler_field_file.inc
modules/system/views_handler_field_file_extension.inc
modules/system/views_handler_field_file_filemime.inc
modules/system/views_handler_field_file_status.inc
modules/system/views_handler_field_file_uri.inc
modules/system/views_handler_filter_file_status.inc
modules/system/views_handler_filter_system_type.inc
modules/taxonomy.views.inc
modules/taxonomy.views_convert.inc
modules/taxonomy.views_default.inc
modules/taxonomy/views_handler_argument_taxonomy.inc
modules/taxonomy/views_handler_argument_term_node_tid.inc
modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
modules/taxonomy/views_handler_argument_vocabulary_vid.inc
modules/taxonomy/views_handler_field_taxonomy.inc
modules/taxonomy/views_handler_field_term_link_edit.inc
modules/taxonomy/views_handler_field_term_node_tid.inc
modules/taxonomy/views_handler_filter_term_node_tid.inc
modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
modules/taxonomy/views_handler_filter_vocabulary_vid.inc
modules/taxonomy/views_handler_relationship_node_term_data.inc
modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
modules/translation.views.inc
modules/translation/views_handler_argument_node_tnid.inc
modules/translation/views_handler_field_node_language.inc
modules/translation/views_handler_field_node_link_translate.inc
modules/translation/views_handler_field_node_translation_link.inc
modules/translation/views_handler_filter_node_language.inc
modules/translation/views_handler_filter_node_tnid.inc
modules/translation/views_handler_filter_node_tnid_child.inc
modules/translation/views_handler_relationship_translation.inc
modules/upload.views.inc
modules/upload.views_convert.inc
modules/upload/views_handler_field_upload_description.inc
modules/upload/views_handler_field_upload_fid.inc
modules/upload/views_handler_filter_upload_fid.inc
modules/user.views.inc
modules/user.views_convert.inc
modules/user/views_handler_argument_user_uid.inc
modules/user/views_handler_argument_users_roles_rid.inc
modules/user/views_handler_field_user.inc
modules/user/views_handler_field_user_language.inc
modules/user/views_handler_field_user_link.inc
modules/user/views_handler_field_user_link_cancel.inc
modules/user/views_handler_field_user_link_delete.inc
modules/user/views_handler_field_user_link_edit.inc
modules/user/views_handler_field_user_mail.inc
modules/user/views_handler_field_user_name.inc
modules/user/views_handler_field_user_picture.inc
modules/user/views_handler_field_user_roles.inc
modules/user/views_handler_filter_user_current.inc
modules/user/views_handler_filter_user_name.inc
modules/user/views_handler_filter_user_roles.inc
modules/user/views_plugin_argument_default_current_user.inc
modules/user/views_plugin_argument_default_user.inc
modules/user/views_plugin_argument_validate_user.inc
modules/views.views.inc
plugins/views_plugin_access.inc
plugins/views_plugin_access_none.inc
plugins/views_plugin_access_perm.inc
plugins/views_plugin_access_role.inc
plugins/views_plugin_argument_default.inc
plugins/views_plugin_argument_default_fixed.inc
plugins/views_plugin_argument_default_php.inc
plugins/views_plugin_argument_validate.inc
plugins/views_plugin_argument_validate_numeric.inc
plugins/views_plugin_argument_validate_php.inc
plugins/views_plugin_cache.inc
plugins/views_plugin_cache_none.inc
plugins/views_plugin_cache_time.inc
plugins/views_plugin_display.inc
plugins/views_plugin_display_attachment.inc
plugins/views_plugin_display_block.inc
plugins/views_plugin_display_default.inc
plugins/views_plugin_display_feed.inc
plugins/views_plugin_display_page.inc
plugins/views_plugin_exposed_form.inc
plugins/views_plugin_exposed_form_basic.inc
plugins/views_plugin_exposed_form_input_required.inc
plugins/views_plugin_localization.inc
plugins/views_plugin_localization_core.inc
plugins/views_plugin_localization_none.inc
plugins/views_plugin_pager.inc
plugins/views_plugin_pager_full.inc
plugins/views_plugin_pager_mini.inc
plugins/views_plugin_pager_none.inc
plugins/views_plugin_pager_some.inc
plugins/views_plugin_query.inc
plugins/views_plugin_query_default.inc
plugins/views_plugin_row.inc
plugins/views_plugin_row_fields.inc
plugins/views_plugin_style.inc
plugins/views_plugin_style_default.inc
plugins/views_plugin_style_grid.inc
plugins/views_plugin_style_jump_menu.inc
plugins/views_plugin_style_list.inc
plugins/views_plugin_style_rss.inc
plugins/views_plugin_style_summary.inc
plugins/views_plugin_style_summary_jump_menu.inc
plugins/views_plugin_style_summary_unformatted.inc
plugins/views_plugin_style_table.inc
tests/handlers/views_handler_area_text.test
tests/handlers/views_handler_argument_null.test
tests/handlers/views_handler_field_boolean.test
tests/handlers/views_handler_field_counter.test
tests/handlers/views_handler_field_custom.test
tests/handlers/views_handler_field_date.test
tests/handlers/views_handler_field_file_size.test
tests/handlers/views_handler_field_math.test
tests/handlers/views_handler_field_url.test
tests/handlers/views_handler_field_xss.test
tests/handlers/views_handler_filter_date.test
tests/handlers/views_handler_filter_equality.test
tests/handlers/views_handler_filter_in_operator.test
tests/handlers/views_handler_filter_numeric.test
tests/handlers/views_handler_filter_string.test
tests/handlers/views_handler_sort.test
tests/handlers/views_handler_sort_date.test
tests/handlers/views_handler_sort_random.test
tests/templates/views-view--frontpage.tpl.php
tests/test_plugins/views_test_plugin_access_test_dynamic.inc
tests/test_plugins/views_test_plugin_access_test_static.inc
tests/user/views_user_argument_default.test
tests/user/views_user_argument_validate.test
tests/views_access.test
tests/views_analyze.test
tests/views_argument_default.test
tests/views_argument_validator.test
tests/views_basic.test
tests/views_cache.test
tests/views_exposed_form.test
tests/views_glossary.test
tests/views_groupby.test
tests/views_handlers.test
tests/views_module.test
tests/views_pager.test
tests/views_plugin_localization_test.inc
tests/views_query.test
tests/views_test.info
tests/views_test.install
tests/views_test.module
tests/views_test.views_default.inc
tests/views_translatable.test
tests/views_view.test
theme/theme.inc
theme/views-exposed-form.tpl.php
theme/views-more.tpl.php
theme/views-ui-edit-item.tpl.php
theme/views-ui-edit-tab.tpl.php
theme/views-ui-edit-view.tpl.php
theme/views-ui-list-views.tpl.php
theme/views-view-field.tpl.php
theme/views-view-fields.tpl.php
theme/views-view-grid.tpl.php
theme/views-view-list.tpl.php
theme/views-view-row-comment.tpl.php
theme/views-view-row-node.tpl.php
theme/views-view-row-rss.tpl.php
theme/views-view-rss.tpl.php
theme/views-view-summary-unformatted.tpl.php
theme/views-view-summary.tpl.php
theme/views-view-table.tpl.php
theme/views-view-unformatted.tpl.php
theme/views-view.tpl.php
views.drush.inc
views.info
views.install
views.module
views_export/views_export.css
views_export/views_export.info
views_export/views_export.module
views_ui.info
views_ui.module

143 files changed:
1  2 
css/views-admin.css
docs/docs.php
handlers/views_handler_area.inc
handlers/views_handler_argument.inc
handlers/views_handler_argument_date.inc
handlers/views_handler_argument_formula.inc
handlers/views_handler_argument_many_to_one.inc
handlers/views_handler_argument_null.inc
handlers/views_handler_argument_numeric.inc
handlers/views_handler_argument_string.inc
handlers/views_handler_field.inc
handlers/views_handler_field_boolean.inc
handlers/views_handler_field_counter.inc
handlers/views_handler_field_custom.inc
handlers/views_handler_field_date.inc
handlers/views_handler_field_numeric.inc
handlers/views_handler_field_prerender_list.inc
handlers/views_handler_field_url.inc
handlers/views_handler_filter.inc
handlers/views_handler_filter_boolean_operator.inc
handlers/views_handler_filter_date.inc
handlers/views_handler_filter_equality.inc
handlers/views_handler_filter_in_operator.inc
handlers/views_handler_filter_numeric.inc
handlers/views_handler_filter_string.inc
handlers/views_handler_relationship.inc
handlers/views_handler_sort.inc
help/api-tables.html
help/api-upgrading.html
help/example-author-block.html
includes/admin.inc
includes/ajax.inc
includes/cache.inc
includes/convert.inc
includes/handlers.inc
includes/plugins.inc
includes/view.inc
js/ajax.js
js/ajax_view.js
js/base.js
js/tabs.js
modules/aggregator/views_handler_field_aggregator_category.inc
modules/aggregator/views_handler_field_aggregator_title_link.inc
modules/aggregator/views_handler_filter_aggregator_category_cid.inc
modules/book.views_convert.inc
modules/comment.views.inc
modules/comment.views_convert.inc
modules/comment.views_default.inc
modules/comment/views_handler_argument_comment_user_uid.inc
modules/comment/views_handler_field_comment.inc
modules/comment/views_handler_field_comment_link.inc
modules/comment/views_handler_field_comment_link_edit.inc
modules/comment/views_handler_field_comment_node_link.inc
modules/comment/views_handler_field_comment_username.inc
modules/comment/views_handler_field_node_new_comments.inc
modules/contact/views_handler_field_contact_link.inc
modules/field/views_handler_field_field.inc
modules/filter.views.inc
modules/locale/views_handler_field_locale_link_edit.inc
modules/node.views.inc
modules/node.views_default.inc
modules/node/views_handler_argument_node_type.inc
modules/node/views_handler_field_history_user_timestamp.inc
modules/node/views_handler_field_node.inc
modules/node/views_handler_field_node_link.inc
modules/node/views_handler_field_node_revision.inc
modules/node/views_handler_field_node_type.inc
modules/node/views_handler_filter_history_user_timestamp.inc
modules/node/views_handler_filter_node_status.inc
modules/node/views_handler_filter_node_type.inc
modules/node/views_plugin_argument_validate_node.inc
modules/node/views_plugin_row_node_rss.inc
modules/node/views_plugin_row_node_view.inc
modules/profile.views.inc
modules/search.views_convert.inc
modules/search.views_default.inc
modules/search/views_handler_argument_search.inc
modules/search/views_handler_field_search_score.inc
modules/search/views_handler_filter_search.inc
modules/statistics.views.inc
modules/statistics.views_default.inc
modules/statistics/views_handler_field_accesslog_path.inc
modules/system.views.inc
modules/system/views_handler_field_file.inc
modules/system/views_handler_field_file_filemime.inc
modules/system/views_handler_field_file_uri.inc
modules/taxonomy.views.inc
modules/taxonomy.views_default.inc
modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
modules/taxonomy/views_handler_field_taxonomy.inc
modules/taxonomy/views_handler_field_term_link_edit.inc
modules/taxonomy/views_handler_field_term_node_tid.inc
modules/taxonomy/views_handler_filter_term_node_tid.inc
modules/taxonomy/views_handler_relationship_node_term_data.inc
modules/translation.views.inc
modules/translation/views_handler_filter_node_tnid.inc
modules/upload.views.inc
modules/user.views.inc
modules/user/views_handler_field_user.inc
modules/user/views_handler_field_user_link.inc
modules/user/views_handler_field_user_mail.inc
modules/user/views_handler_field_user_name.inc
modules/user/views_handler_filter_user_name.inc
modules/user/views_plugin_argument_validate_user.inc
modules/views.views.inc
plugins/views_plugin_argument_default_fixed.inc
plugins/views_plugin_argument_validate.inc
plugins/views_plugin_display.inc
plugins/views_plugin_display_attachment.inc
plugins/views_plugin_display_block.inc
plugins/views_plugin_display_feed.inc
plugins/views_plugin_display_page.inc
plugins/views_plugin_exposed_form.inc
plugins/views_plugin_exposed_form_basic.inc
plugins/views_plugin_exposed_form_input_required.inc
plugins/views_plugin_pager_full.inc
tests/handlers/views_handler_filter_date.test
tests/templates/views-view--frontpage.tpl.php
tests/test_plugins/views_test_plugin_access_test_dynamic.inc
tests/user/views_user_argument_default.test
tests/views_access.test
tests/views_analyze.test
tests/views_argument_default.test
tests/views_argument_validator.test
tests/views_cache.test
tests/views_exposed_form.test
tests/views_groupby.test
tests/views_handlers.test
tests/views_pager.test
tests/views_query.test
tests/views_test.views_default.inc
tests/views_translatable.test
tests/views_view.test
theme/theme.inc
theme/views-ui-edit-view.tpl.php
theme/views-view.tpl.php
views.info
views.install
views.module
views_export/views_export.module
views_ui.info
views_ui.module

- /*
-  * Summary pad
-  */
- /* set up some defaults so weird themes don't override us too badly. */
- .views-tabset {
-   color: #494949;
-   background-color: white;
- }
- .views-tabset a:visited,
- .views-tabset a:hover,
- .views-tabset a {
-   color: #027AC6;
- }
- .views-tabset .views-tab fieldset {
-   margin-top: 0;
- }
- /*
-  * First column: display drawers
 -/* $Id: views-admin.css,v 1.14.4.12 2010/12/24 13:42:00 dereine Exp $ */
 -
+ /**
+  * The .css file is intended to only contain positioning and size declarations
+  * For example: display, position, float, clear, and overflow.
   */
- .views-tabset .views-tabs {
-   background: #F6F6F6;
-   border-top: #D6DBDE 1px solid;
-   border-bottom: #D6DBDE 1px solid;
-   border-left: #D6DBDE 1px solid;
-   float: left;
-   width: 117px;
-   margin-right: 0;
- }
- * html .views-tabset .views-tabs {
-   width: 114px;
-   position: relative;
-   left: 4px;
- }
- .views-tabset .views-tabs ul {
-   list-style-type: none !important;
-   list-style-image: none !important;
-   padding: 0;
-   margin: 0;
-   position: relative;
- }
- .views-tabset .views-tabs ul li {
-   background: #efefef;
-   list-style-type: none;
-   list-style-image: none;
-   line-height: 100%;
-   border-bottom: #D6DBDE 1px solid;
-   margin: 0;
-   padding: 0;
-   position: relative;
- }
- .views-tabset .views-tabs ul li.active {
-   background: #fff url(../images/arrow-active.png) no-repeat right;
-   position: relative;
-   width: 118px;
-   margin-right: -1px;
- }
- .views-tabset .views-tabs ul li a {
-   display: block;
-   font-size: 90%;
-   color: #777;
-   font-weight: normal;
-   padding: 0.5em;
- }
- .views-tabset .views-tabs ul li a:hover {
-   background-color: #f6f6f6;
-   text-decoration: none;
- }
- .views-tabset .views-tabs ul li.active a {
-   color: #000;
-   font-weight: bold;
- }
- .views-tabset .views-tabs ul li.active a:hover {
-   color: #000;
-   background: #fff url(../images/arrow-active.png) no-repeat right;
- }
- .views-tabset .extra {
-   text-align: center;
-   margin-right: 0;
- }
- .views-tabset .extra input {
-   margin-top: 0;
-   margin-right: 0;
-   font-size: 10px;
-   white-space: normal;
- }
- /*
-  * Three columns with setting-summaries
-  */
- .views-tabset .views-display {
-   border: #D6DBDE 1px solid;
-   margin-left: 118px; /* 118 -1 causes borders to overlap */
-   min-height: 302px;
-   _height: 300px; /*stupid IE hack */
- }
- * html .views-tabset .views-display {
-   margin-left: 114px;
- }
- div.views-display-deleted,
- div.views-display-deleted div.top,
- div.views-display-deleted div.tab-section {
-   background-color: #eee;
- }
- .views-display {
-   background: #fff;
- }
- .views-display div {
-   font-size: 8pt;
-   line-height: 12pt;
- }
- .views-display .top {
-   padding: 0.5em 0em 0em 1em;
-   background: #fff;
- }
- .views-display .top .display-title {
-   font-weight: bold;
- }
- .views-display .top .display-description {
-   margin-left: 1em;
-   font-style: italic;
-   overflow: hide;
-   white-space: nowrap;
-   font-size: 90%;
- }
- .views-display .tab-section {
-   width: 32.5%;
-   padding: 0;
-   margin: 0;
-   float: left;
-   min-height: 273px;
-   _height: 274px;
- }
- .views-display .tab-section .inside {
-   margin: 0.5em 0.5em 0.5em 1em;
- }
  
- .views-display .tab-section .inside .views-category {
-   margin-bottom: 1em;
-   background: #f6f6f6;
-   border: 1px #efefef solid;
- }
- .views-display .tab-section .inside .views-category-content {
-   padding: 0em 0em 0.5em 1em;
- }
+ /* @group Inline lists */
  
- .views-display .tab-section .inside .views-category-title {
-   padding: .1em .1em .1em .3em;
-   margin: 0 0 .1em 0;
-   font-size: 9pt;
-   font-weight: bold;
-   background-color: #efefef;
-   border-bottom: 1px #efefef solid;
+ .horizontal > * {
+   clear: none;
+   float: left; /* LTR */
  }
  
- .views-display .tab-section .links {
+ .horizontal.right {
    float: right;
-   font-size: 6pt;
-   position: relative;
-   display: inline;
- }
- .views-display .tab-section .links a {
-   font-size: 6pt;
-   font-style: italic;
- }
- .views-display .form-submit,
- #views-ajax-pad .form-submit {
-   margin: 0;
  }
  
- .views-display .middle {
-   width: 34%;
+ .horizontal label {
+   position: absolute;
  }
  
- .views-basic-info {
-   margin: 0.5em 0em 0 0;
-   padding: 0.5em;
- }
- /*
-  * AJAX pad, the bottom part where settings are edited.
-  */
- #views-ajax-pad {
-   background: transparent;
-   margin-top: 0px;
- }
- #views-ajax-pad > div.ajax-progress {
-   display: none;
+ .horizontal .form-item > [class] {
+   margin-top: 25px;
  }
  
- #views-ajax-title {
-   background: #f6f6f6;
-   color: #000;
-   border-left: #D6DBDE 1px solid;
-   border-right: #D6DBDE 1px solid;
-   margin: 0 0 0 118px;
-   padding: 1em 1em 0em 1em;
-   font-weight: bold;
- }
- #views-ajax-pad .message {
-   background: #f6f6f6;
-   color: #000;
-   margin-left: 118px;
-   border: #D6DBDE 1px solid;
-   border-top: 0;
-   /* padding: 3em 0em; */
-   text-align: center;
-   font-style: italic;
- }
- #views-ajax-pad form {
-   background: #fff;
-   color: #000;
-   margin-left: 118px;
-   border: #D6DBDE 1px solid;
-   padding-top: 3px;
-   border-top: 0;
-   float: none;
- }
- #views-ajax-pad .views-messages {
-   background: transparent;
-   margin-left: 118px;
-   padding: 5px;
-   border: #D6DBDE 1px solid;
-   border-top: 0;
- }
- #views-ajax-pad .form-buttons {
-   margin: 0;
-   padding: 0.5em 1em;
-   background: #f6f6f6;
-   clear: left;
- }
- #views-ajax-pad .clear {
-   clear: left;
- }
- #views-ajax-pad .form-buttons .form-submit {
-   font-size: 10px;
- }
- #views-ajax-pad .form-item {
-   margin: 0.5em;
-   padding: 0em 0.5em;
- }
- /* These put checkboxes closer together */
- #views-ajax-pad .form-checkboxes .form-item,
- #views-ajax-pad .form-checkboxes .description,
- #views-ajax-pad .form-checkboxes input,
- #views-ajax-pad .form-radios .form-item,
- #views-ajax-pad .form-radios label,
- #views-ajax-pad .form-radios input {
+ .horizontal .form-item > [class] + [class] {
    margin-top: 0;
-   margin-bottom: 0;
  }
  
- #views-ajax-pad .form-item .form-checkboxes,
- #views-ajax-pad .form-checkboxes input,
- #views-ajax-pad .form-checkboxes label,
- #views-ajax-pad .form-item .form-checkboxes .form-item,
- #views-ajax-pad .form-item .form-radios,
- #views-ajax-pad .form-radios input,
- #views-ajax-pad .form-radios label,
- #views-ajax-pad .form-item .form-radios .form-item {
-   padding-left: 0;
-   margin-left: 0;
- }
- #views-ajax-pad .form-checkboxes .description,
- #views-ajax-pad .form-radios .description {
-   margin-left: 2em;
- }
- #views-ajax-pad {
-   display: none;
- }
- html.js #views-ajax-pad {
-   display: block;
- }
+ /* @end */
+  
+ /* @group Columns */
  
- .views-override,
- .views-expose {
-   padding: 0.5em 1em 0em 1em;
- }
- #views-ajax-pad .views-override .form-submit,
- #views-ajax-pad .views-expose .form-submit {
-   float: right;
-   margin: 0 .5em 0 1em;
- }
- #views-ajax-pad .views-expose .description,
- #views-ajax-pad .views-override .description {
-   margin-bottom: .25em;
- }
- /*
-  * Some column widths for use within the ajax pad
-  */
- #views-ajax-pad .views-left-10 {
-   float: left;
-   width: 10%;
- }
- #views-ajax-pad .views-left-20 {
-   float: left;
-   width: 20%;
- }
- #views-ajax-pad .views-left-25 {
+ .views-left-25 {
    float: left;
    width: 25%;
  }
diff --cc docs/docs.php
Simple merge
Simple merge
Simple merge
@@@ -166,5 -170,4 +169,4 @@@ class views_handler_argument_many_to_on
    function title_query() {
      return $this->value;
    }
--}
++}
@@@ -288,5 -297,4 +296,4 @@@ class views_handler_argument_string ext
      return $this->case_transform(parent::summary_name($data), 'case');
    }
  
--}
++}
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -34,5 -35,4 +34,4 @@@ class views_handler_filter_equality ext
        }
      }
    }
--}
++}
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -3064,56 -3560,213 +3559,213 @@@ function views_ui_rearrange_filter_form
      $new_fields[$field] = $old_fields[$field];
    }
  
-   // Save if the actual update button was clicked.
-   if (!empty($form_state['clicked_button']['#group'])) {
-     if ($form_state['clicked_button']['#group'] == 'add') {
-       // Add a new group
-       $groups['groups'][] = 'AND';
-     }
-     else {
-       // Renumber groups above the removed one down.
-       foreach (array_keys($groups['groups']) as $group_id) {
-         if ($group_id >= $form_state['clicked_button']['#group']) {
-           $old_group = $group_id + 1;
-           if (isset($groups['groups'][$old_group])) {
-             $groups['groups'][$group_id] = $groups['groups'][$old_group];
-             if (isset($remember_groups[$old_group])) {
-               foreach ($remember_groups[$old_group] as $id) {
-                 $new_fields[$id]['group'] = $group_id;
-               }
-             }
-           }
-           else {
-             // If this is the last one, just unset it.
-             unset($groups['groups'][$group_id]);
-           }
-         }
-       }
-     }
-     // Update our cache with values so that cancel still works the way
-     // people expect.
-     $form_state['view']->form_cache = array(
-       'key' => 'rearrange-filter',
-       'groups' => $groups,
-       'handlers' => $new_fields,
-     );
+   // If the #group property is set on the clicked button, that means we are
+   // either adding or removing a group, not actually updating the filters.
+   if (!empty($form_state['clicked_button']['#group'])) {
+     if ($form_state['clicked_button']['#group'] == 'add') {
 -      // Add a new group.
++      // Add a new group
+       $groups['groups'][] = 'AND';
+     }
+     else {
+       // Renumber groups above the removed one down.
+       foreach (array_keys($groups['groups']) as $group_id) {
+         if ($group_id >= $form_state['clicked_button']['#group']) {
+           $old_group = $group_id + 1;
+           if (isset($groups['groups'][$old_group])) {
+             $groups['groups'][$group_id] = $groups['groups'][$old_group];
+             if (isset($remember_groups[$old_group])) {
+               foreach ($remember_groups[$old_group] as $id) {
+                 $new_fields[$id]['group'] = $group_id;
+               }
+             }
+           }
+           else {
+             // If this is the last one, just unset it.
+             unset($groups['groups'][$group_id]);
+           }
+         }
+       }
+     }
+     // Update our cache with values so that cancel still works the way
+     // people expect.
+     $form_state['view']->form_cache = array(
+       'key' => 'rearrange-filter',
+       'groups' => $groups,
+       'handlers' => $new_fields,
+     );
+     // Return to this form except on actual Update.
+     views_ui_add_form_to_stack('rearrange-filter', $form_state['view'], $form_state['display_id'], array($form_state['type']));
+   }
+   else {
+     // The actual update button was clicked. Remove the empty groups, and
+     // renumber them sequentially.
+     ksort($remember_groups);
+     $groups['groups'] = array_values(array_intersect_key($groups['groups'], $remember_groups));
+     // Change the 'group' key on each field to match. Here, $mapping is an
+     // array whose keys are the old group numbers and whose values are the new
+     // (sequentially numbered) ones.
+     $mapping = array_flip(array_keys($remember_groups));
+     foreach ($new_fields as &$new_field) {
+       $new_field['group'] = $mapping[$new_field['group']];
+     }
+     // Write the changed handler values.
+     $display->handler->set_option($types[$form_state['type']]['plural'], $new_fields);
+     $display->handler->set_option('filter_groups', $groups);
+     if (isset($form_state['view']->form_cache)) {
+       unset($form_state['view']->form_cache);
+     }
+   }
+   // Store in cache.
+   views_ui_cache_set($form_state['view']);
+ }
+ /**
+  * Form to delete multiple items at once.
+  *
+  * @todo: All this relationship stuff is there three times. This should be abstracted out.
+  */
+ function views_ui_item_delete_form($form, &$form_state) {
+   $view = &$form_state['view'];
+   $display_id = $form_state['display_id'];
+   $type = $form_state['type'];
+   $types = views_object_types();
+   if (!$view->set_display($display_id)) {
+     views_ajax_error(t('Invalid display id @display', array('@display' => $display_id)));
+   }
+   $display = &$view->display[$display_id];
+   $form['#title'] = t('Delete @type', array('@type' => $types[$type]['ltitle']));
+   $form['#section'] = $display_id . 'delete-item';
+   if ($display->handler->defaultable_sections($types[$type]['plural'])) {
+     $form_state['section'] = $types[$type]['plural'];
+     views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
+   }
+   $count = 0;
+   // Get relationship labels
+   $relationships = array();
+   foreach ($display->handler->get_handlers('relationship') as $id => $handler) {
+     $relationships[$id] = $handler->label();
+     $handlers = $display->handler->get_option('relationships');
+     if ($handlers) {
+       foreach ($handlers as $id => $info) {
+         $handler = $display->handler->get_handler('relationship', $id);
+         $relationships[$id] = $handler->label();
+       }
+     }
+   }
+   // Filters can now be grouped so we do a little bit extra:
+   $groups = array();
+   $grouping = FALSE;
+   if ($type == 'filter') {
+     $group_info = $view->display_handler->get_option('filter_groups');
+     if (!empty($group_info['groups']) && count($group_info['groups']) > 1) {
+       $grouping = TRUE;
+       $groups = array(0 => array());
+     }
+   }
+   foreach ($display->handler->get_option($types[$type]['plural']) as $id => $field) {
+     $form['fields'][$id] = array('#tree' => TRUE);
+     $handler = $display->handler->get_handler($type, $id);
+     if ($handler) {
+       $name = $handler->ui_name() . ' ' . $handler->admin_summary();
+       if (!empty($field['relationship']) && !empty($relationships[$field['relationship']])) {
+         $name = '(' . $relationships[$field['relationship']] . ') ' . $name;
+       }
+       $form['fields'][$id]['name'] = array(
+         '#markup' => $name,
+       );
+     }
+     else {
+       $form['fields'][$id]['name'] = array('#markup' => t('Broken field @id', array('@id' => $id)));
+     }
+     $form['fields'][$id]['removed'] = array(
+       '#type' => 'checkbox',
+       '#id' => 'views-removed-' . $id,
+       '#attributes' => array('class' => array('views-remove-checkbox')),
+       '#default_value' => 0,
+     );
+   }
+   $name = NULL;
+   if (isset($form_state['update_name'])) {
+     $name = $form_state['update_name'];
+   }
+   views_ui_standard_form_buttons($form, $form_state, 'views_ui_item_delete_form');
+   return $form;
+ }
+ /**
+  * Submit handler for delete form
+  */
+ function views_ui_item_delete_form_submit($form, &$form_state) {
+   $types = views_object_types();
+   $display = &$form_state['view']->display[$form_state['display_id']];
+   $old_fields = $display->handler->get_option($types[$form_state['type']]['plural']);
+   $new_fields = $order = array();
+   // Make an array with the weights
+   foreach ($form_state['values'] as $field => $info) {
+     // add each value that is a field, but only if
+     // it has had its 'removed' checkbox checked.
+     if (is_array($info) && empty($info['removed'])) {
+       $order[$field] = $field;
+     }
+   }
+   // Sort the array
+   asort($order);
+   // Create a new list of fields in the new order.
+   foreach (array_keys($order) as $field) {
+     $new_fields[$field] = $old_fields[$field];
+   }
+   $display->handler->set_option($types[$form_state['type']]['plural'], $new_fields);
+   // Store in cache
+   views_ui_cache_set($form_state['view']);
+ }
  
-     // Return to this form except on actual Update.
-     views_ui_add_form_to_stack('rearrange-filter', $form_state['view'], $form_state['display_id'], array($form_state['type']));
-   }
-   else {
-     // Actually write changed handler values.
-     $display->handler->set_option($types[$form_state['type']]['plural'], $new_fields);
-     $display->handler->set_option('filter_groups', $groups);
-     if (isset($form_state['view']->form_cache)) {
-       unset($form_state['view']->form_cache);
+ /**
+  * Turn the rearrange form into a proper table
+  */
+ function theme_views_ui_item_delete_form($variables) {
+   $form = $variables['form'];
+   $rows = array();
+   foreach (element_children($form['fields']) as $id) {
+     if (isset($form['fields'][$id]['name'])) {
+       $row = array();
+       $row[] = drupal_render($form['fields'][$id]['name']);
+       $row[] = drupal_render($form['fields'][$id]['removed']) . l('<span>' . t('Remove') . '</span>', 'javascript:void()', array('attributes' => array('id' => 'views-remove-link-' . $id, 'class' => array('views-hidden', 'views-button-remove', 'views-remove-link'), 'alt' => t('Remove this item'), 'title' => t('Remove this item')), 'html' => TRUE));
+       $rows[] = array('data' => $row, 'class' => array('draggable'), 'id' => 'views-row-' . $id);
      }
    }
+   if (empty($rows)) {
+     $rows[] = array(array('data' => t('No fields available.'), 'colspan' => '2'));
+   }
  
-   // Store in cache
-   views_ui_cache_set($form_state['view']);
+   $header = array('', t('Remove'));
+   $output = drupal_render($form['override']);
+   $output .= '<div class="scroll">';
+   $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'arrange')));
+   $output .= '</div>';
+   $output .= drupal_render_children($form);
+   return $output;
  }
  
  /**
   * Form to add_item items in the views UI.
   */
Simple merge
Simple merge
Simple merge
@@@ -1425,53 -1388,5 +1387,4 @@@ class views_join 
  
  /**
   * @}
-- */
--
- // Declare API compatibility on behalf of core modules:
- /**
-  * Implements hook_views_api().
-  *
-  * This one is used as the base to reduce errors when updating.
-  */
- function views_views_api() {
-   return array(
-     // in your modules do *not* use views_api_version()!!!
-     'api' => views_api_version(),
-     'path' => drupal_get_path('module', 'views') . '/modules',
-   );
- }
- function aggregator_views_api() { return views_views_api(); }
- function book_views_api() { return views_views_api(); }
- function comment_views_api() { return views_views_api(); }
- function locale_views_api() { return views_views_api(); }
- function field_views_api() { return views_views_api(); }
- function filter_views_api() { return views_views_api(); }
- function node_views_api() { return views_views_api(); }
- function poll_views_api() { return views_views_api(); }
- function profile_views_api() { return views_views_api(); }
- function search_views_api() { return views_views_api(); }
- function statistics_views_api() { return views_views_api(); }
- function system_views_api() { return views_views_api(); }
- function taxonomy_views_api() { return views_views_api(); }
- function translation_views_api() { return views_views_api(); }
- function upload_views_api() { return views_views_api(); }
- function user_views_api() { return views_views_api(); }
- function contact_views_api() { return views_views_api(); }
++ */
@@@ -487,5 -492,22 +491,22 @@@ class views_plugin extends views_objec
     *   plugin.
     */
    function validate() { return array(); }
- }
  
+   /**
+    * Returns the summary of the settings in the display.
+    */
+   function summary_title() {
+     return t('Settings');
+   }
+   /**
+    * Return the human readable name of the display.
+    *
+    * This appears on the ui beside each plugin and beside the settings link.
+    */
+   function plugin_title() {
+     if (isset($this->definition['short title'])) {
+       return check_plain($this->definition['short title']);
+     }
+     return check_plain($this->definition['title']);
+   }
 -}
++}
Simple merge
diff --cc js/ajax.js
Simple merge
diff --cc js/ajax_view.js
@@@ -1,4 -1,5 +1,3 @@@
 -// $Id: ajax_view.js,v 1.19.4.5 2011/01/12 17:55:20 dereine Exp $
 -
  /**
   * @file ajaxView.js
   *
diff --cc js/base.js
Simple merge
diff --cc js/tabs.js
@@@ -1,4 -1,5 +1,3 @@@
 -// $Id: tabs.js,v 1.4.4.4 2010/03/20 23:16:37 dereine Exp $
 -
  /**
   * @file tabs.js
   * jQuery UI Tabs (Tabs 3)
@@@ -1,5 -1,6 +1,4 @@@
  <?php
 -// $Id: views_handler_filter_aggregator_category_cid.inc,v 1.2.4.1 2009/11/02 22:01:26 merlinofchaos Exp $
 -
  /**
   * Filter by aggregator category cid
   */
@@@ -1,5 -1,6 +1,4 @@@
  <?php
 -// $Id: book.views_convert.inc,v 1.3.4.1 2009/11/02 22:01:26 merlinofchaos Exp $
 -
  /**
   * @file
   * Field conversion for fields handled by this module.
Simple merge
@@@ -1,5 -1,6 +1,4 @@@
  <?php
 -//$Id: comment.views_convert.inc,v 1.4.4.1 2009/11/02 22:01:26 merlinofchaos Exp $
 -
  /**
   * @file
   * Field conversion for fields handled by this module.
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -37,5 -40,4 +39,4 @@@ class views_handler_field_node_type ext
    function render($values) {
      return $this->render_link($this->render_name($values->{$this->field_alias}, $values), $values);
    }
--}
++}
@@@ -129,5 -130,4 +129,4 @@@ class views_plugin_argument_validate_no
          return empty($test);
      }
    }
--}
++}
Simple merge
@@@ -1,5 -1,6 +1,4 @@@
  <?php
 -// $Id: search.views_convert.inc,v 1.2.4.1 2009/11/02 22:01:26 merlinofchaos Exp $
 -
  /**
   * @file
   * Field conversion for fields handled by this module.
Simple merge
@@@ -1,5 -1,6 +1,4 @@@
  <?php
 -// $Id: views_handler_field_search_score.inc,v 1.2.6.2 2011/02/05 00:44:01 merlinofchaos Exp $
 -
  /**
   * Field handler to provide simple renderer that allows linking to a node.
   */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -34,5 -35,4 +34,4 @@@ class views_handler_filter_node_tnid ex
      // Select for source translations (tnid = nid). Conditionally, also accept either untranslated nodes (tnid = 0).
      $this->query->add_where($this->options['group'], "$table.tnid = $table.nid" . ($this->operator ? " OR $table.tnid = 0" : ''));
    }
--}
++}
Simple merge
Simple merge
Simple merge
@@@ -2643,5 -2628,4 +2627,4 @@@ class views_plugin_display extends view
  
  /**
   * @}
-- */
++ */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -102,5 -103,4 +102,4 @@@ class ViewsArgumentDefaultTest extends 
  
      return $view;
    }
--}
++}
Simple merge
Simple merge
Simple merge
@@@ -298,6 -299,4 +298,4 @@@ class ViewsQueryGroupByTest extends Vie
  
      return $view;
    }
--}
++}
Simple merge
@@@ -423,5 -422,4 +421,4 @@@ class ViewsPagerTest extends DrupalWebT
      $output = $view->render();
      $this->assertEqual(preg_match('/<ul class="pager">/', $output), 0, t('The pager is not rendered.'));
    }
--}
++}
Simple merge
@@@ -139,5 -140,4 +139,4 @@@ function views_test_views_default_views
    $views[$view->name] = $view;
  
    return $views;
--}
++}
Simple merge
Simple merge
diff --cc theme/theme.inc
Simple merge
Simple merge
Simple merge
diff --cc views.info
Simple merge
diff --cc views.install
Simple merge
diff --cc views.module
Simple merge
@@@ -208,9 -209,9 +208,7 @@@ function views_export_export_form_submi
  
    $types = system_element_info();
  
-   $info  = '; $Id$'."\n";
-   $info .= "\n";
-   $info .= strtr("name = @module Export Module\n", array('@module' => $form_state['values']['name']));
 -  $info  = '; $Id: views_export.module,v 1.9.4.5 2010/12/01 20:29:24 dereine Exp $'."\n";
 -  $info .= "\n";
 -  $info .= strtr("name = @module Export Module\n", array('@module' => $form_state['values']['name']));
++  $info = strtr("name = @module Export Module\n", array('@module' => $form_state['values']['name']));
    $info .= strtr("description = Exports some views of @module\n", array('@module' => $form_state['values']['name']));
    $info .= "dependencies[] = views\n";
    $info .= "core = 6.x\n";
diff --cc views_ui.info
Simple merge
diff --cc views_ui.module
Simple merge