Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663

This commit is contained in:
Greg Anderson 2015-10-08 11:40:12 -07:00
parent eb34d130a8
commit f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions

View file

@ -145,9 +145,6 @@
.toolbar-icon-help-main.is-active:before {
background-image: url(../../../misc/icons/000000/questionmark-disc.svg);
}
.toolbar .toolbar-bar .toolbar-icon:before {
min-height: 3em;
}
@media only screen and (min-width: 16.5em) {
.toolbar .toolbar-bar .toolbar-tab > .toolbar-icon {
@ -261,20 +258,18 @@
* Orientation toggle.
*/
.toolbar .toolbar-toggle-orientation button {
height: 16px;
height: 39px;
padding: 0;
text-indent: -999em;
width: 20px;
width: 39px;
}
.toolbar .toolbar-toggle-orientation button:before {
left: 0; /* LTR */
}
[dir="rtl"] .toolbar .toolbar-toggle-orientation button:before {
left: auto;
left: 0;
right: 0;
margin: 0 auto;
}
[dir="rtl"] .toolbar .toolbar-toggle-orientation .toolbar-icon {
padding-right: 0;
padding: 0;
}
/**
* In order to support a hover effect on the SVG images, while also supporting
@ -299,7 +294,7 @@
.toolbar .toolbar-toggle-orientation [value="horizontal"]:before {
background-image: url(../../../misc/icons/bebebe/push-up.svg);
}
.toolbar .toolbar-toggle-orientation [value="horizontal"]:hover:before {
.toolbar .toolbar-toggle-orientation [value="horizontal"]:hover:before,
.toolbar .toolbar-toggle-orientation [value="horizontal"]:focus:before {
background-image: url(../../../misc/icons/787878/push-up.svg);
}

View file

@ -146,7 +146,8 @@
*/
.toolbar .toolbar-toggle-orientation {
background-color: #f5f5f5;
padding: 0.6667em;
padding: 0;
height: 100%;
}
.toolbar .toolbar-tray-horizontal .toolbar-toggle-orientation {
border-left: 1px solid #c9c9c9; /* LTR */
@ -157,7 +158,6 @@
}
.toolbar .toolbar-toggle-orientation > .toolbar-lining {
float: right; /* LTR */
padding: 0.1667em;
}
[dir="rtl"] .toolbar .toolbar-toggle-orientation > .toolbar-lining {
float: left;

View file

@ -157,15 +157,15 @@
}
}
// Bind event handlers.
$(document)
.on('click.toolbar', '.toolbar-box', toggleClickHandler)
.on('click.toolbar', '.toolbar-box a', linkClickHandler);
// Return the jQuery object.
return this.each(function (selector) {
var $menu = $(this).once('toolbar-menu');
if ($menu.length) {
// Bind event handlers.
$menu
.on('click.toolbar', '.toolbar-box', toggleClickHandler)
.on('click.toolbar', '.toolbar-box a', linkClickHandler);
$menu.addClass('root');
initItems($menu);
markListLevels($menu);

View file

@ -291,12 +291,13 @@ class ToolbarAdminMenuTest extends WebTestBase {
$this->assertTrue($original_subtree_hash, 'A valid hash value for the admin menu subtrees was created.');
$this->drupalLogout();
// Translate the string 'Menus' in the xx language. This string appears in
// a link in the admin menu subtrees. Changing the string should create a
// new menu hash if the toolbar subtrees cache is properly cleared.
// Translate the string 'Search and metadata' in the xx language. This
// string appears in a link in the admin menu subtrees. Changing the string
// should create a new menu hash if the toolbar subtrees cache is correctly
// invalidated.
$this->drupalLogin($translate_user);
$search = array(
'string' => 'Menus',
'string' => 'Search and metadata',
'langcode' => $langcode,
'translation' => 'untranslated',
);

View file

@ -28,7 +28,7 @@ class ToolbarMenuTranslationTest extends WebTestBase {
*
* @var array
*/
public static $modules = array('toolbar', 'toolbar_test', 'locale');
public static $modules = array('toolbar', 'toolbar_test', 'locale', 'locale_test');
protected function setUp() {
parent::setUp();

View file

@ -11,6 +11,11 @@
* - title: The menu link title.
* - url: The menu link url, instance of \Drupal\Core\Url
* - localized_options: Menu link localized options.
* - is_expanded: TRUE if the link has visible children within the current
* menu tree.
* - is_collapsed: TRUE if the link has children within the current menu tree
* that are not currently visible.
* - in_active_trail: TRUE if the link is in the active trail.
*
* @ingroup themeable
*/
@ -31,14 +36,22 @@
{% else %}
<ul class="toolbar-menu">
{% endif %}
{% for item in items %}
<li{{ item.attributes }}>
{{ link(item.title, item.url) }}
{% if item.below %}
{{ menus.menu_links(item.below, attributes, menu_level + 1) }}
{% endif %}
</li>
{% endfor %}
{% for item in items %}
{%
set classes = [
'menu-item',
item.is_expanded ? 'menu-item--expanded',
item.is_collapsed ? 'menu-item--collapsed',
item.in_active_trail ? 'menu-item--active-trail',
]
%}
<li{{ item.attributes.addClass(classes) }}>
{{ link(item.title, item.url) }}
{% if item.below %}
{{ menus.menu_links(item.below, attributes, menu_level + 1) }}
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
{% endmacro %}

View file

@ -22,7 +22,7 @@ function toolbar_help($route_name, RouteMatchInterface $route_match) {
switch ($route_name) {
case 'help.page.toolbar':
$output = '<h3>' . t('About') . '</h3>';
$output .= '<p>' . t('The Toolbar module provides a toolbar for site administrators, which displays tabs and trays provided by the Toolbar module itself and other modules. For more information, see the <a href="!toolbar_docs">online documentation for the Toolbar module</a>.', array('!toolbar_docs' => 'https://www.drupal.org/documentation/modules/toolbar')) . '</p>';
$output .= '<p>' . t('The Toolbar module provides a toolbar for site administrators, which displays tabs and trays provided by the Toolbar module itself and other modules. For more information, see the <a href=":toolbar_docs">online documentation for the Toolbar module</a>.', array(':toolbar_docs' => 'https://www.drupal.org/documentation/modules/toolbar')) . '</p>';
$output .= '<h4>' . t('Terminology') . '</h4>';
$output .= '<dl>';
$output .= '<dt>' . t('Tabs') . '</dt>';