diff --git a/core/modules/block/block.js b/core/modules/block/block.js index f8c2112..e0e508b 100644 --- a/core/modules/block/block.js +++ b/core/modules/block/block.js @@ -44,15 +44,15 @@ Drupal.behaviors.blockSettingsSummary = { $('#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() })); + 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()); + visibility.push('' + $(panes[i]).find('a strong').text() + ': ' + $(panes[i]).find('a .summary').text()); } return visibility.join(', '); }); diff --git a/core/modules/contact/contact.js b/core/modules/contact/contact.js index 49b4aba..40eb521 100644 --- a/core/modules/contact/contact.js +++ b/core/modules/contact/contact.js @@ -9,20 +9,20 @@ Drupal.behaviors.contactDetailsSummaries = { var basic = []; var title = $(context).find('#edit-label').val(); var recipients = $(context).find('#edit-recipients').val(); - basic.push(Drupal.t('Title: @title', {'@title' : title ? title : Drupal.t('Empty') })); - basic.push(Drupal.t('Recipients: @recipients', {'@recipients' : recipients ? recipients : Drupal.t('Empty') })); + basic.push(Drupal.t('Title: @title', {'@title' : title ? title : Drupal.t('Empty') })); + basic.push(Drupal.t('Recipients: @recipients', {'@recipients' : recipients ? recipients : Drupal.t('Empty') })); return basic.join(', '); }); $(context).find('#edit-email').drupalSetSummary(function (context) { var email = $(context).find('#edit-reply').val(); - return Drupal.t('Auto-reply: @text', {'@text': email ? email.substring(0, 100) + '...' : Drupal.t('Empty')}); + return Drupal.t('Auto-reply: @text', {'@text': email ? email.substring(0, 100) + '...' : Drupal.t('Empty')}); }); $(context).find('#edit-category').drupalSetSummary(function (context) { var category = []; var weight = $(context).find('#edit-weight').val(); - var isDefault = $(context).find('#edit-selected').val(); - category.push(Drupal.t('Weight: @weight', {'@weight' : weight })); - category.push(Drupal.t('Default category: @default', {'@default' : isDefault ? Drupal.t('Yes') : Drupal.t('No') })); + var isDefault = $(context).find('#edit-selected').attr('checked'); + category.push(Drupal.t('Weight: @weight', {'@weight' : weight })); + category.push(Drupal.t('Default category: @default', {'@default' : isDefault ? Drupal.t('Yes') : Drupal.t('No') })); return category.join(', '); }); diff --git a/core/modules/menu/menu.js b/core/modules/menu/menu.js index 67eda35..646e018 100644 --- a/core/modules/menu/menu.js +++ b/core/modules/menu/menu.js @@ -17,7 +17,7 @@ Drupal.behaviors.menuDetailsSummaries = { // Meta summeries for higher level form structure. $(context).find('#edit-basic').drupalSetSummary(function (context) { var title = $(context).find('#edit-label').val(); - return Drupal.t('Title: @title', {'@title' : title ? title : Drupal.t('Empty') }); + return Drupal.t('Title: @title', {'@title' : title ? title : Drupal.t('Empty') }); }); $(context).find('#edit-items').drupalSetSummary(function (context) { var links = $(context).find('.form-checkbox').length; diff --git a/core/modules/overlay/overlay-child-rtl.css b/core/modules/overlay/overlay-child-rtl.css index ef92595..f10e678 100644 --- a/core/modules/overlay/overlay-child-rtl.css +++ b/core/modules/overlay/overlay-child-rtl.css @@ -32,6 +32,6 @@ html { * Summary and detail interactions. */ #overlay form > div > details > .details-wrapper { - padding-left: 0; - padding-right: 50px; + margin-left: 0; + margin-right: 50px; } diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css index 2cd19fa..25d9a52 100644 --- a/core/modules/overlay/overlay-child.css +++ b/core/modules/overlay/overlay-child.css @@ -174,21 +174,28 @@ summary::-webkit-details-marker { } #overlay form > div > details > summary a { background: transparent url(images/pencil_sprite.png) no-repeat; + background-position: 0 -31px; padding: 0 30px; + color: #919191; } -#overlay form > div > details > .details-wrapper { - padding-left: 50px; /* LTR */ +#overlay form > div > details > summary .summary { + display: block; + padding: 10px 30px; + color: #919191; } -#overlay form > div > details[open] > .details-wrapper, -#overlay form > div > details[open] > summary { - background-color: #f5f5f5; +#overlay form > div > details[open] > summary a { + color: #0074bd; +} +#overlay form > div > details > .details-wrapper { + margin-left: 50px; /* LTR */ + padding-left: 0; + border-bottom: 1px solid #cdcdcd; } #overlay form > div > details[open] > summary .summary { display: none; } #overlay form > div > details[open] > summary a { - background-position: 0 -31px; - color: #555; + background-position: 0 0; } #overlay .form-actions { margin-top: 2em;