diff --git a/core/misc/collapse.js b/core/misc/collapse.js index 77eb9ff..e7555a0 100644 --- a/core/misc/collapse.js +++ b/core/misc/collapse.js @@ -119,7 +119,7 @@ $.extend(CollapsibleDetails.prototype, { */ onSummaryUpdated: function () { var text = $.trim(this.$node.drupalGetSummary()); - this.$summary.html(text ? ' (' + text + ')' : ''); + this.$summary.html(text ? text : ''); }, /** * Toggle the visibility of a details element using smooth animations. @@ -171,9 +171,10 @@ $.extend(CollapsibleDetails.prototype, { Drupal.behaviors.collapse = { attach: function (context, settings) { - if (isDetailsSupported) { + // Details element does not support summaries. + /*if (isDetailsSupported) { return; - } + }*/ var $collapsibleDetails = $(context).find('details').once('collapse'); if ($collapsibleDetails.length) { for (var i = 0; i < $collapsibleDetails.length; i++) { diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php index 10bc52e..773777b 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php @@ -44,14 +44,13 @@ public function blockAccess() { /** * Overrides \Drupal\block\BlockBase::blockForm(). */ - public function blockForm($form, &$form_state) { - $form['block_count'] = array( + public function blockForm(&$form, &$form_state) { + $form['basic']['block_count'] = array( '#type' => 'select', '#title' => t('Number of news items in block'), '#default_value' => $this->configuration['block_count'], '#options' => drupal_map_assoc(range(2, 20)), ); - return $form; } /** diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorFeedBlock.php index afcef0e..b4f08b1 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorFeedBlock.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorFeedBlock.php @@ -44,14 +44,13 @@ public function blockAccess() { /** * Overrides \Drupal\block\BlockBase::blockForm(). */ - public function blockForm($form, &$form_state) { - $form['block_count'] = array( + public function blockForm(&$form, &$form_state) { + $form['basic']['block_count'] = array( '#type' => 'select', '#title' => t('Number of news items in block'), '#default_value' => $this->configuration['block_count'], '#options' => drupal_map_assoc(range(2, 20)), ); - return $form; } /** diff --git a/core/modules/block/block.js b/core/modules/block/block.js index 3084fb3..f8c2112 100644 --- a/core/modules/block/block.js +++ b/core/modules/block/block.js @@ -39,6 +39,23 @@ Drupal.behaviors.blockSettingsSummary = { return Drupal.t('Restricted to certain pages'); } }); + + // Meta summeries for higher level form structure. + $('#edit-basic').drupalSetSummary(function (context) { + var basic = []; + var title = $(context).find('#edit-label').val(); + basic.push(Drupal.t('Title: @title', {'@title' : title ? title : Drupal.t('Empty') })); + basic.push(Drupal.t('Region: @region', {'@region' : $(context).find('#edit-region option:selected').text() })); + return basic.join(', '); + }); + $('#edit-display').drupalSetSummary(function (context) { + var visibility = []; + var panes = $(context).find('.vertical-tab-button'); + for (var i = 0, il = panes.length; i < il; i += 1) { + visibility.push($(panes[i]).find('a strong').text() + ': ' + $(panes[i]).find('a .summary').text()); + } + return visibility.join(', '); + }); } }; diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php index 9219264..3a52538 100644 --- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php +++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php @@ -45,21 +45,20 @@ public function getConfig() { * * Adds body and description fields to the block configuration form. */ - public function blockForm($form, &$form_state) { + public function blockForm(&$form, &$form_state) { $options = array(); $view_modes = entity_get_view_modes('custom_block'); foreach ($view_modes as $view_mode => $detail) { $options[$view_mode] = $detail['label']; } - $form['custom_block']['view_mode'] = array( + $form['basic']['custom_block']['view_mode'] = array( '#type' => 'select', '#options' => $options, '#title' => t('View mode'), '#description' => t('Output the block in this view mode.'), '#default_value' => $this->configuration['view_mode'] ); - $form['title']['#description'] = t('The title of the block as shown to the user.'); - return $form; + $form['basic']['title']['#description'] = t('The title of the block as shown to the user.'); } /** diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/Drupal/block/BlockBase.php index 9c90a5a..94aec91 100644 --- a/core/modules/block/lib/Drupal/block/BlockBase.php +++ b/core/modules/block/lib/Drupal/block/BlockBase.php @@ -233,13 +233,19 @@ public function form($form, &$form_state) { '#value' => $definition['module'], ); - $form['label'] = array( + $form['basic'] = array( + '#type' => 'details', + '#title' => t('Basic information'), + '#group' => 'sections', + '#tree' => FALSE, + ); + $form['basic']['label'] = array( '#type' => 'textfield', '#title' => t('Title'), '#maxlength' => 255, '#default_value' => !$entity->isNew() ? $entity->label() : $definition['admin_label'], ); - $form['machine_name'] = array( + $form['basic']['machine_name'] = array( '#type' => 'machine_name', '#title' => t('Machine name'), '#maxlength' => 64, @@ -248,13 +254,14 @@ public function form($form, &$form_state) { '#machine_name' => array( 'exists' => 'block_load', 'replace_pattern' => '[^a-z0-9_.]+', + 'source' => array('basic', 'label'), ), '#required' => TRUE, '#disabled' => !$entity->isNew(), ); // Region settings. - $form['region'] = array( + $form['basic']['region'] = array( '#type' => 'select', '#title' => t('Region'), '#description' => t('Select the region where this block should be displayed.'), @@ -264,7 +271,14 @@ public function form($form, &$form_state) { ); // Visibility settings. - $form['visibility'] = array( + $form['display'] = array( + '#type' => 'details', + '#title' => t('Block visibility'), + '#group' => 'sections', + '#tree' => FALSE, + '#collapsed' => TRUE, + ); + $form['display']['visibility'] = array( '#type' => 'vertical_tabs', '#title' => t('Visibility settings'), '#attached' => array( @@ -275,7 +289,7 @@ public function form($form, &$form_state) { ); // Per-path visibility. - $form['visibility']['path'] = array( + $form['display']['visibility']['path'] = array( '#type' => 'details', '#title' => t('Pages'), '#collapsed' => TRUE, @@ -289,11 +303,11 @@ public function form($form, &$form_state) { $visibility = $entity->get('visibility'); $access = user_access('use PHP for settings'); if (!empty($visibility['path']['visibility']) && $visibility['path']['visibility'] == BLOCK_VISIBILITY_PHP && !$access) { - $form['visibility']['path']['visibility'] = array( + $form['display']['visibility']['path']['visibility'] = array( '#type' => 'value', '#value' => BLOCK_VISIBILITY_PHP, ); - $form['visibility']['path']['pages'] = array( + $form['display']['visibility']['path']['pages'] = array( '#type' => 'value', '#value' => !empty($visibility['path']['pages']) ? $visibility['path']['pages'] : '', ); @@ -313,13 +327,13 @@ public function form($form, &$form_state) { else { $title = t('Pages'); } - $form['visibility']['path']['visibility'] = array( + $form['display']['visibility']['path']['visibility'] = array( '#type' => 'radios', '#title' => t('Show block on specific pages'), '#options' => $options, '#default_value' => !empty($visibility['path']['visibility']) ? $visibility['path']['visibility'] : BLOCK_VISIBILITY_NOTLISTED, ); - $form['visibility']['path']['pages'] = array( + $form['display']['visibility']['path']['pages'] = array( '#type' => 'textarea', '#title' => '' . $title . '', '#default_value' => !empty($visibility['path']['pages']) ? $visibility['path']['pages'] : '', @@ -338,7 +352,7 @@ public function form($form, &$form_state) { // by CMI translation implementation. $langcodes_options[$language->langcode] = $language->name; } - $form['visibility']['language'] = array( + $form['display']['visibility']['language'] = array( '#type' => 'details', '#title' => t('Languages'), '#collapsed' => TRUE, @@ -353,14 +367,14 @@ public function form($form, &$form_state) { foreach ($configurable_language_types as $type_key) { $language_type_options[$type_key] = $language_types[$type_key]['name']; } - $form['visibility']['language']['language_type'] = array( + $form['display']['visibility']['language']['language_type'] = array( '#type' => 'radios', '#title' => t('Language type'), '#options' => $language_type_options, '#default_value' => !empty($visibility['language']['language_type']) ? $visibility['language']['language_type'] : $configurable_language_types[0], '#access' => count($language_type_options) > 1, ); - $form['visibility']['language']['langcodes'] = array( + $form['display']['visibility']['language']['langcodes'] = array( '#type' => 'checkboxes', '#title' => t('Show this block only for specific languages'), '#default_value' => !empty($visibility['language']['langcodes']) ? $visibility['language']['langcodes'] : array(), @@ -371,14 +385,14 @@ public function form($form, &$form_state) { // Per-role visibility. $role_options = array_map('check_plain', user_role_names()); - $form['visibility']['role'] = array( + $form['display']['visibility']['role'] = array( '#type' => 'details', '#title' => t('Roles'), '#collapsed' => TRUE, '#group' => 'visibility', '#weight' => 10, ); - $form['visibility']['role']['roles'] = array( + $form['display']['visibility']['role']['roles'] = array( '#type' => 'checkboxes', '#title' => t('Show block for specific roles'), '#default_value' => !empty($visibility['role']['roles']) ? $visibility['role']['roles'] : array(), @@ -387,7 +401,7 @@ public function form($form, &$form_state) { ); // Add plugin-specific settings for this block type. - $form['settings'] = $this->blockForm(array(), $form_state); + $this->blockForm($form, $form_state); return $form; } @@ -402,14 +416,9 @@ public function form($form, &$form_state) { * @param array $form_state * An array containing the current state of the configuration form. * - * @return array $form - * The renderable form array representing the entire configuration form. - * * @see \Drupal\block\BlockBase::form() */ - public function blockForm($form, &$form_state) { - return array(); - } + public function blockForm(&$form, &$form_state) {} /** * Implements \Drupal\block\BlockInterface::validate(). diff --git a/core/modules/book/lib/Drupal/book/Plugin/block/block/BookNavigationBlock.php b/core/modules/book/lib/Drupal/book/Plugin/block/block/BookNavigationBlock.php index 165c798..a7afcfd 100644 --- a/core/modules/book/lib/Drupal/book/Plugin/block/block/BookNavigationBlock.php +++ b/core/modules/book/lib/Drupal/book/Plugin/block/block/BookNavigationBlock.php @@ -35,20 +35,18 @@ public function settings() { /** * Overrides \Drupal\block\BlockBase::blockForm() */ - function blockForm($form, &$form_state) { + function blockForm(&$form, &$form_state) { $options = array( 'all pages' => t('Show block on all pages'), 'book pages' => t('Show block only on book pages'), ); - $form['book_block_mode'] = array( + $form['basic']['book_block_mode'] = array( '#type' => 'radios', '#title' => t('Book navigation block display'), '#options' => $options, '#default_value' => $this->configuration['block_mode'], '#description' => t("If Show block on all pages is selected, the block will contain the automatically generated menus for all of the site's books. If Show block only on book pages is selected, the block will contain only the one menu corresponding to the current page's book. In this case, if the current page is not in a book, no block will be displayed. The Page specific visibility settings or other visibility settings can be used in addition to selectively display this block."), - ); - - return $form; + ); } /** diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/block/block/RecentCommentsBlock.php b/core/modules/comment/lib/Drupal/comment/Plugin/block/block/RecentCommentsBlock.php index bd7b49b..1f5b68b 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/block/block/RecentCommentsBlock.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/block/block/RecentCommentsBlock.php @@ -41,14 +41,13 @@ public function blockAccess() { /** * Overrides \Drupal\block\BlockBase::blockForm(). */ - public function blockForm($form, &$form_state) { - $form['block_count'] = array( + public function blockForm(&$form, &$form_state) { + $form['basic']['block_count'] = array( '#type' => 'select', '#title' => t('Number of recent comments'), '#default_value' => $this->configuration['block_count'], '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 30)), ); - return $form; } /** diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/block/block/ForumBlockBase.php b/core/modules/forum/lib/Drupal/forum/Plugin/block/block/ForumBlockBase.php index 1ff05f3..335f39a 100644 --- a/core/modules/forum/lib/Drupal/forum/Plugin/block/block/ForumBlockBase.php +++ b/core/modules/forum/lib/Drupal/forum/Plugin/block/block/ForumBlockBase.php @@ -37,14 +37,13 @@ public function blockAccess() { /** * Overrides \Drupal\block\BlockBase::blockForm(). */ - public function blockForm($form, &$form_state) { - $form['block_count'] = array( + public function blockForm(&$form, &$form_state) { + $form['basic']['block_count'] = array( '#type' => 'select', '#title' => t('Number of topics'), '#default_value' => $this->configuration['block_count'], '#options' => drupal_map_assoc(range(2, 20)), ); - return $form; } /** diff --git a/core/modules/node/lib/Drupal/node/Plugin/block/block/RecentContentBlock.php b/core/modules/node/lib/Drupal/node/Plugin/block/block/RecentContentBlock.php index 083a096..bd6d559 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/block/block/RecentContentBlock.php +++ b/core/modules/node/lib/Drupal/node/Plugin/block/block/RecentContentBlock.php @@ -41,14 +41,13 @@ public function blockAccess() { /** * Overrides \Drupal\block\BlockBase::blockForm(). */ - public function blockForm($form, &$form_state) { - $form['block_count'] = array( + public function blockForm(&$form, &$form_state) { + $form['basic']['block_count'] = array( '#type' => 'select', '#title' => t('Number of recent content items to display'), '#default_value' => $this->configuration['block_count'], '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 25, 30)), ); - return $form; } /** diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 0b7262c..c363c25 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -1995,14 +1995,14 @@ function theme_node_recent_content($variables) { function node_form_block_form_alter(&$form, &$form_state) { $block = $form_state['entity']; $visibility = $block->get('visibility'); - $form['visibility']['node_type'] = array( + $form['display']['visibility']['node_type'] = array( '#type' => 'details', '#title' => t('Content types'), '#collapsed' => TRUE, '#group' => 'visibility', '#weight' => 5, ); - $form['visibility']['node_type']['types'] = array( + $form['display']['visibility']['node_type']['types'] = array( '#type' => 'checkboxes', '#title' => t('Show block for specific content types'), '#default_value' => !empty($visibility['node_type']['types']) ? $visibility['node_type']['types'] : array(), diff --git a/core/modules/overlay/images/pencil_sprite.png b/core/modules/overlay/images/pencil_sprite.png new file mode 100644 index 0000000..c8a00da --- /dev/null +++ b/core/modules/overlay/images/pencil_sprite.png @@ -0,0 +1,6 @@ +PNG + + IHDR/JsBIT|d pHYs  ~tEXtSoftwareAdobe Fireworks CS6輲tEXtCreation Time2/14/13IDATH핻n@F6T$\rؼlh˔vȊ"rʑ(V B#Є,xQ`{׳[P/439XL +{ Ol{r ~{pz`͹"@tDqq`2L$i|w_}Ƀ+I~'<88yx5_N><狊`/\_Zz div > details > .details-wrapper { + padding-left: 0; + padding-right: 50px; +} diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css index ecfa4cb..eeaaa76 100644 --- a/core/modules/overlay/overlay-child.css +++ b/core/modules/overlay/overlay-child.css @@ -166,3 +166,39 @@ .overlay-disable-message-focused #overlay-dismiss-message { float: right; } + +/** + * Summary and detail interactions. + */ +summary::-webkit-details-marker { + display: none; +} +#overlay form > div > details { + margin: 0 -1.5em; + border: none; +} +#overlay form > div > details > summary { + background-color: #fff; + padding: 10px 20px; +} +#overlay form > div > details > summary a { + background: transparent url(images/pencil_sprite.png) no-repeat; + padding: 0 30px; +} +#overlay form > div > details > .details-wrapper { + padding-left: 50px; /* LTR */ +} +#overlay form > div > details[open] > .details-wrapper, +#overlay form > div > details[open] > summary { + background-color: #f5f5f5; +} +#overlay form > div > details[open] > summary .summary { + display: none; +} +#overlay form > div > details[open] > summary a { + background-position: 0 -31px; + color: #555; +} +#overlay .form-actions { + margin-top: 2em; +} diff --git a/core/modules/statistics/lib/Drupal/statistics/Plugin/block/block/StatisticsPopularBlock.php b/core/modules/statistics/lib/Drupal/statistics/Plugin/block/block/StatisticsPopularBlock.php index 7417bd8..668f40d 100644 --- a/core/modules/statistics/lib/Drupal/statistics/Plugin/block/block/StatisticsPopularBlock.php +++ b/core/modules/statistics/lib/Drupal/statistics/Plugin/block/block/StatisticsPopularBlock.php @@ -79,31 +79,30 @@ public function blockAccess() { /** * Overrides \Drupal\block\BlockBase::blockForm(). */ - public function blockForm($form, &$form_state) { + public function blockForm(&$form, &$form_state) { // Popular content block settings. $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40)); - $form['statistics_block_top_day_num'] = array( + $form['basic']['statistics_block_top_day_num'] = array( '#type' => 'select', '#title' => t("Number of day's top views to display"), '#default_value' => $this->configuration['top_day_num'], '#options' => $numbers, '#description' => t('How many content items to display in "day" list.'), ); - $form['statistics_block_top_all_num'] = array( + $form['basic']['statistics_block_top_all_num'] = array( '#type' => 'select', '#title' => t('Number of all time views to display'), '#default_value' => $this->configuration['top_all_num'], '#options' => $numbers, '#description' => t('How many content items to display in "all time" list.'), ); - $form['statistics_block_top_last_num'] = array( + $form['basic']['statistics_block_top_last_num'] = array( '#type' => 'select', '#title' => t('Number of most recent views to display'), '#default_value' => $this->configuration['top_last_num'], '#options' => $numbers, '#description' => t('How many content items to display in "recently viewed" list.'), ); - return $form; } /** diff --git a/core/modules/system/system.theme.css b/core/modules/system/system.theme.css index 680d15e..3e82e9e 100644 --- a/core/modules/system/system.theme.css +++ b/core/modules/system/system.theme.css @@ -226,21 +226,6 @@ summary { padding-left: 0.5em; padding-right: 0.5em; } -.collapse-processed > summary:before { - background: url(../../misc/menu-expanded.png) 0px 100% no-repeat; /* LTR */ - content: ""; - float: left; - height: 1em; - width: 1em; -} -.collapse-processed:not([open]) > summary:before { - background-position: 25% 35%; /* LTR */ - -moz-transform: rotate(-90deg); - -ms-transform: rotate(-90deg); - -o-transform: rotate(-90deg); - -webkit-transform: rotate(-90deg); - transform: rotate(-90deg); -} /** * TableDrag behavior. diff --git a/core/modules/user/lib/Drupal/user/Plugin/block/block/UserOnlineBlock.php b/core/modules/user/lib/Drupal/user/Plugin/block/block/UserOnlineBlock.php index d88568a..82a7510 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/block/block/UserOnlineBlock.php +++ b/core/modules/user/lib/Drupal/user/Plugin/block/block/UserOnlineBlock.php @@ -48,23 +48,22 @@ public function blockAccess() { /** * Overrides \Drupal\block\BlockBase::blockForm(). */ - public function blockForm($form, &$form_state) { + public function blockForm(&$form, &$form_state) { $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval'); - $form['user_block_seconds_online'] = array( + $form['basic']['user_block_seconds_online'] = array( '#type' => 'select', '#title' => t('User activity'), '#default_value' => $this->configuration['seconds_online'], '#options' => $period, '#description' => t('A user is considered online for this long after they have last viewed a page.') ); - $form['user_block_max_list_count'] = array( + $form['basic']['user_block_max_list_count'] = array( '#type' => 'select', '#title' => t('User list length'), '#default_value' => $this->configuration['max_list_count'], '#options' => drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), '#description' => t('Maximum number of currently online users to display.') ); - return $form; } /** diff --git a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php index 4dbb64d..fbafa3f 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php +++ b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsBlock.php @@ -66,8 +66,8 @@ public function form($form, &$form_state) { $form = parent::form($form, $form_state); // Set the default label to '' so the views internal title is used. - $form['label']['#default_value'] = ''; - $form['label']['#access'] = FALSE; + $form['basic']['label']['#default_value'] = ''; + $form['basic']['label']['#access'] = FALSE; return $form; } diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 72ce5e6..1465feb 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -23,7 +23,9 @@ hr { summary, legend { font-weight: bold; - text-transform: uppercase; +} +summary .summary { + font-weight: normal; } h1, h2,