diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index b44c59a..8db114a 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1901,7 +1901,7 @@ function install_already_done_error() { global $base_url; drupal_set_title(t('Drupal already installed')); - return t('', array('@base-url' => $base_url)); + return t('', array('@base-url' => $base_url)); } /** diff --git a/core/modules/ckeditor/ckeditor.admin.inc b/core/modules/ckeditor/ckeditor.admin.inc index 764d557..2fb5905 100644 --- a/core/modules/ckeditor/ckeditor.admin.inc +++ b/core/modules/ckeditor/ckeditor.admin.inc @@ -9,29 +9,36 @@ use Drupal\Core\Template\Attribute; /** - * Preprocess variables for theme_ckeditor_settings_toolbar(). + * Prepares variables for CKEditor settings toolbar templates. + * + * Default template: ckeditor-settings-toolbar.html.twig. + * + * @param array $variables + * An associative array containing: + * - editor: An editor object. + * - plugins: A list of plugins. */ function template_preprocess_ckeditor_settings_toolbar(&$variables) { // Simplify the language direction information for toolbar buttons. $language_interface = language(Language::TYPE_INTERFACE); - $variables['language_direction'] = $language_interface->direction ? 'rtl' : 'ltr'; + $language_direction = $language_interface->direction ? 'rtl' : 'ltr'; // Create lists of active and disabled buttons. $editor = $variables['editor']; $plugins = $variables['plugins']; $buttons = array(); - $variables['multiple_buttons'] = array(); + $multiple_buttons = array(); foreach ($plugins as $plugin_buttons) { foreach ($plugin_buttons as $button_name => $button) { $button['name'] = $button_name; if (!empty($button['multiple'])) { - $variables['multiple_buttons'][$button_name] = $button; + $multiple_buttons[$button_name] = $button; } $buttons[$button_name] = $button; } } $button_groups = array(); - $variables['active_buttons'] = array(); + $active_buttons = array(); foreach ($editor->settings['toolbar']['rows'] as $row_number => $row) { $button_groups[$row_number] = array(); foreach ($row as $group) { @@ -39,7 +46,7 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) { if (isset($buttons[$button_name])) { // Save a reference to the button's configured toolbar group. $buttons[$button_name]['group'] = $group['name']; - $variables['active_buttons'][$row_number][] = $buttons[$button_name]; + $active_buttons[$row_number][] = $buttons[$button_name]; if (empty($buttons[$button_name]['multiple'])) { unset($buttons[$button_name]); } @@ -51,15 +58,9 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) { } } } - $variables['disabled_buttons'] = array_diff_key($buttons, $variables['multiple_buttons']); - $variables['button_groups'] = $button_groups; -} + $disabled_buttons = array_diff_key($buttons, $multiple_buttons); -/** - * Displays the toolbar configuration for CKEditor. - */ -function theme_ckeditor_settings_toolbar($variables) { - $rtl = $variables['language_direction'] === 'rtl' ? '_rtl' : ''; + $rtl = $language_direction === 'rtl' ? '_rtl' : ''; $build_button_item = function($button, $rtl) { // Value of the button item. @@ -70,12 +71,13 @@ function theme_ckeditor_settings_toolbar($variables) { $value = $button['image_alternative']; } elseif (isset($button['image'])) { - $image = array( + $value = array( '#theme' => 'image', '#uri' => $button['image' . $rtl], '#title' => $button['label'], + '#prefix' => '', + '#suffix' => '', ); - $value = '' . drupal_render($image) . ''; } else { $value = '?'; @@ -83,119 +85,55 @@ function theme_ckeditor_settings_toolbar($variables) { // Set additional attribute on the button if it can occur multiple times. if (!empty($button['multiple'])) { - $button['attributes']['class'][] = 'ckeditor-multiple-button'; + $button['attributes']['class'][] = 'ckeditor-multiple-button'; + } + + // Build the button attributes. + $attributes = array( + 'data-drupal-ckeditor-button-name' => $button['name'], + 'class' => array('ckeditor-button'), + ); + if (!empty($button['attributes'])) { + $attributes = array_merge($attributes, $button['attributes']); } // Build the button item. $button_item = array( 'value' => $value, - 'data-drupal-ckeditor-button-name' => $button['name'], - 'class' => array('ckeditor-button'), + 'attributes' => new Attribute($attributes), ); // If this button has group information, add it to the attributes. if (!empty($button['group'])) { $button_item['group'] = $button['group']; } - if (!empty($button['attributes'])) { - $button_item = array_merge($button_item, $button['attributes']); - } return $button_item; }; - // Assemble items to be added to active button rows. - $active_buttons = array(); - foreach ($variables['active_buttons'] as $row_number => $row_buttons) { - foreach ($row_buttons as $button) { - $active_buttons[$row_number][] = $build_button_item($button, $rtl); - } - } // Assemble list of disabled buttons (which are always a single row). - $disabled_buttons = array(); - foreach ($variables['disabled_buttons'] as $button) { - $disabled_buttons[] = $build_button_item($button, $rtl); - } - // Assemble list of multiple buttons that may be added multiple times. - $multiple_buttons = array(); - foreach ($variables['multiple_buttons'] as $button) { - $multiple_buttons[] = $build_button_item($button, $rtl); - } - - $print_buttons = function($buttons) { - $output = ''; - foreach ($buttons as $button) { - unset($button['group']); - $value = $button['value']; - unset($button['value']); - $attributes = (string) new Attribute($button); - $output .= '' . $value . ''; - } - return $output; - }; - - $print_button_group = function($buttons, $group_name, $print_buttons) { - $group = drupal_html_class($group_name); - - $output = ''; - $output .= "
  • "; - $output .= "

    {$group_name}

    "; - $output .= "
    • "; - - return $output; - }; - - // We don't use theme_item_list() below in case there are no buttons in the - // active or disabled list, as theme_item_list() will not print an empty UL. - $output = ''; - $output .= '
    '; - $output .= '' . t('Toolbar configuration') . ''; - $output .= '
    '; - - $output .= '
    ' . t('Move a button into the Active toolbar to enable it, or into the list of Available buttons to disable it. Buttons may be moved with the mouse or keyboard arrow keys. Toolbar group names are provided to support screen reader users. Empty toolbar groups will be removed upon save.') . '
    '; - - $output .= '
    '; - // Available buttons. - $output .= '
    '; - $output .= ''; - $output .= '
      '; - $output .= $print_buttons($disabled_buttons); - $output .= '
    '; - $output .= '
    '; - // Dividers. - $output .= '
    '; - $output .= ''; - $output .= '
      '; - $output .= $print_buttons($multiple_buttons); - $output .= '
    '; - $output .= '
    '; - $output .= '
    '; - // Active toolbar. - $output .= '
    '; - $output .= '
    '; - $output .= '
    '; - - $output .= '
    '; - $output .= '
    '; - - return $output; } diff --git a/core/modules/ckeditor/ckeditor.module b/core/modules/ckeditor/ckeditor.module index a33ecf2..51de74a 100644 --- a/core/modules/ckeditor/ckeditor.module +++ b/core/modules/ckeditor/ckeditor.module @@ -147,6 +147,7 @@ function ckeditor_theme() { 'ckeditor_settings_toolbar' => array( 'file' => 'ckeditor.admin.inc', 'variables' => array('editor' => NULL, 'plugins' => NULL), + 'template' => 'ckeditor-settings-toolbar', ), ); } diff --git a/core/modules/ckeditor/templates/ckeditor-settings-toolbar.html.twig b/core/modules/ckeditor/templates/ckeditor-settings-toolbar.html.twig new file mode 100644 index 0000000..18d3558 --- /dev/null +++ b/core/modules/ckeditor/templates/ckeditor-settings-toolbar.html.twig @@ -0,0 +1,74 @@ +{# +/** + * @file + * Default theme implementation for the CKEditor settings toolbar. + * + * Available variables: + * - multiple_buttons: A list of buttons that may be added multiple times. + * - disabled_buttons: A list of disabled buttons. + * - active_buttons: A list of active button rows. + * + * @see template_preprocess_ckeditor_settings_toolbar() + * + * @ingroup themeable + */ +#} +{% spaceless %} +
    + {{ 'Toolbar configuration'|t }} +
    +
    + {%- trans -%} + Move a button into the Active toolbar to enable it, or into the list of Available buttons to disable it. Buttons may be moved with the mouse or keyboard arrow keys. Toolbar group names are provided to support screen reader users. Empty toolbar groups will be removed upon save. + {%- endtrans -%} +
    +
    + {# Available buttons. #} +
    + +
      + {% for disabled_button in disabled_buttons %} + {{ disabled_button.value }} + {% endfor %} +
    +
    + {# Dividers. #} +
    + +
      + {% for multiple_button in multiple_buttons %} + {{ multiple_button.value }} + {% endfor %} +
    +
    +
    + {# Active toolbar. #} +
    + +
    +
    +
    +
    +
    +{% endspaceless %} diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module index 018aff6..cfa935b 100644 --- a/core/modules/rdf/rdf.module +++ b/core/modules/rdf/rdf.module @@ -16,7 +16,7 @@ function rdf_help($path, $arg) { case 'admin/help#rdf': $output = ''; $output .= '

    ' . t('About') . '

    '; - $output .= '

    ' . t('The RDF module enriches your content with metadata to let other applications (e.g., search engines, aggregators, and so on) better understand its relationships and attributes. This semantically enriched, machine-readable output for Drupal sites uses the RDFa specification, which allows RDF data to be embedded in HTML markup. Other modules can define mappings of their data to RDF terms, and the RDF module makes this RDF data available to the theme. The core Drupal modules define RDF mappings for their data model, and the core Drupal themes output this RDF metadata information along with the human-readable visual information. For more information, see the online documentation for the RDF module.', array('!rdfa' => 'http://www.w3.org/TR/xhtml-rdfa-primer/', '!rdf' => 'https://drupal.org/documentation/modules/rdf')) . '

    '; + $output .= '

    ' . t('The RDF module enriches your content with metadata to let other applications (e.g., search engines, aggregators, and so on) better understand its relationships and attributes. This semantically enriched, machine-readable output for Drupal sites uses the RDFa specification which allows RDF data to be embedded in HTML markup. Other modules can define mappings of their data to RDF terms, and the RDF module makes this RDF data available to the theme. The core Drupal modules define RDF mappings for their data model, and the core Drupal themes output this RDF metadata information along with the human-readable visual information. For more information, see the online handbook entry for RDF module.', array('@rdfa' => 'http://www.w3.org/TR/xhtml-rdfa-primer/', '@rdf' => 'http://drupal.org/documentation/modules/rdf')) . '

    '; return $output; } } diff --git a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php index 5499c94..b58939e 100644 --- a/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php +++ b/core/modules/system/lib/Drupal/system/Plugin/ImageToolkit/GDToolkit.php @@ -326,8 +326,13 @@ public function createTmp(ImageInterface $image, $width, $height) { * {@inheritdoc} */ public static function isAvailable() { - // GD2 support is available. - return function_exists('imagegd2'); + if ($check = get_extension_funcs('gd')) { + if (in_array('imagegd2', $check)) { + // GD2 support is available. + return TRUE; + } + } + return FALSE; } /** diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php index 805ee22..89b9645 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php @@ -44,8 +44,14 @@ public static function getInfo() { } protected function checkRequirements() { - // GD2 support is available. - if (!function_exists('imagegd2')) { + $gd_available = FALSE; + if ($check = get_extension_funcs('gd')) { + if (in_array('imagegd2', $check)) { + // GD2 support is available. + $gd_available = TRUE; + } + } + if (!$gd_available) { return array( 'Image manipulations for the GD toolkit cannot run because the GD toolkit is not available.', );