Commit c26bf7ba authored by webchick's avatar webchick

Issue #2151089 by longwave, joelpittet, c4rl, IshaDakota, pplantinga, gnuget,...

Issue #2151089 by longwave, joelpittet, c4rl, IshaDakota, pplantinga, gnuget, jeanfei, sbudker1, Cottser: Convert theme_admin_block() to Twig.
parent 10af33ad
......@@ -137,12 +137,10 @@ public function overview() {
);
if (!empty($block['content']['#content'])) {
$block['show'] = TRUE;
// Prepare for sorting as in function _menu_tree_check_access().
// The weight is offset so it is always positive, with a uniform 5-digits.
$blocks[(50000 + $item['weight']) . ' ' . $item['title'] . ' ' . $item['mlid']] = $block;
}
// Prepare for sorting as in function _menu_tree_check_access().
// The weight is offset so it is always positive, with a uniform 5-digits.
$blocks[(50000 + $item['weight']) . ' ' . $item['title'] . ' ' . $item['mlid']] = $block;
}
}
}
......
......@@ -82,44 +82,6 @@ function _system_is_incompatible(&$incompatible, $files, Extension $file) {
}
}
/**
* Returns HTML for an administrative block for display.
*
* @param $variables
* An associative array containing:
* - block: An array containing information about the block:
* - show: A Boolean whether to output the block. Defaults to FALSE.
* - title: The block's title.
* - content: (optional) Formatted content for the block.
* - description: (optional) Description of the block. Only output if
* 'content' is not set.
*
* @ingroup themeable
*/
function theme_admin_block($variables) {
$block = $variables['block'];
$output = '';
// Don't display the block if it has no content to display.
if (empty($block['show'])) {
return $output;
}
$output .= '<div class="admin-panel">';
if (!empty($block['title'])) {
$output .= '<h3>' . $block['title'] . '</h3>';
}
if (!empty($block['content'])) {
$output .= '<div class="body">' . render($block['content']) . '</div>';
}
else {
$output .= '<div class="description">' . $block['description'] . '</div>';
}
$output .= '</div>';
return $output;
}
/**
* Prepares variables for administrative content block templates.
*
......@@ -231,7 +193,6 @@ function theme_system_admin_index($variables) {
$block['title'] = $module;
$block['content'] = drupal_render($admin_block_content);
$block['description'] = t($description);
$block['show'] = TRUE;
$admin_block = array(
'#theme' => 'admin_block',
......
......@@ -200,6 +200,7 @@ function system_theme() {
'admin_block' => array(
'variables' => array('block' => NULL),
'file' => 'system.admin.inc',
'template' => 'admin-block',
),
'admin_block_content' => array(
'variables' => array('content' => NULL),
......
{#
/**
* @file
* Default theme implementation for an administrative block.
*
* Available variables:
* - block: An array of information about the block, including:
* - show: A flag indicating if the block should be displayed.
* - title: The block title.
* - content: (optional) The content of the block.
* - description: (optional) A description of the block.
* (Description should only be output if content is not available).
*
* @ingroup themeable
*/
#}
<div class="admin-panel">
{% if block.title %}
<h3>{{ block.title }}</h3>
{% endif %}
{% if block.content %}
<div class="body">{{ block.content }}</div>
{% elseif block.description %}
<div class="description">{{ block.description }}</div>
{% endif %}
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment