diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/locale/locale.test | 2 | ||||
| -rw-r--r-- | modules/toolbar/toolbar.tpl.php | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/modules/locale/locale.test b/modules/locale/locale.test index bb6a2de86..75e96a0b7 100644 --- a/modules/locale/locale.test +++ b/modules/locale/locale.test @@ -237,7 +237,7 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase { $this->clickLink(t('edit')); // We save the lid from the path. $matches = array(); - preg_match('!admin/config/regional/translate/edit/(\d)+!', $this->getUrl(), $matches); + preg_match('!admin/config/regional/translate/edit/(\d+)!', $this->getUrl(), $matches); $lid = $matches[1]; // No t() here, it's surely not translated yet. $this->assertText($name, t('name found on edit screen.')); diff --git a/modules/toolbar/toolbar.tpl.php b/modules/toolbar/toolbar.tpl.php index 64576ceaf..41e7696d2 100644 --- a/modules/toolbar/toolbar.tpl.php +++ b/modules/toolbar/toolbar.tpl.php @@ -6,15 +6,23 @@ * Default template for admin toolbar. * * Available variables: + * - $classes: String of classes that can be used to style contextually through + * CSS. It can be manipulated through the variable $classes_array from + * preprocess functions. The default value has the following: + * - toolbar: The current template type, i.e., "theming hook". * - $toolbar['toolbar_user']: User account / logout links. * - $toolbar['toolbar_menu']: Top level management menu links. * - $toolbar['toolbar_drawer']: A place for extended toolbar content. * + * Other variables: + * - $classes_array: Array of html class attribute values. It is flattened + * into a string within the variable $classes. + * * @see template_preprocess() - * @see template_preprocess_admin_toolbar() + * @see template_preprocess_toolbar() */ ?> -<div id="toolbar" class="clearfix"> +<div id="toolbar" class="<?php print $classes; ?> clearfix"> <div class="toolbar-menu clearfix"> <?php if ($toolbar['toolbar_drawer']):?> <span class="toggle toggle-active"><?php print t('Open'); ?></span> |