commit 2abec9e165e995effd6af08ccacd3283bc1a07ac Author: Joel Pittet Date: Thu Sep 24 02:43:42 2015 +0200 test diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index 57b985f..fd818da3 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -185,88 +185,48 @@ function template_preprocess_status_report(&$variables) { * - description: (optional) A description of the module. * - version: (optional) The version of the module. * - links: (optional) Administration links provided by the module. - * - #requires: (optional) A list of modules that the project requires. - * - #required_by: (optional) A list of modules that require the project. + * - requires: (optional) A list of modules that the project requires. + * - required_by: (optional) A list of modules that require the project. */ function template_preprocess_system_modules_details(&$variables) { $form = $variables['form']; - - $header = [ + $variables['header'] = [ 'installed' => $form['#header'][0]['data'], 'name' => $form['#header'][1]['data'], 'description' => $form['#header'][2]['data'], ]; - $modules = []; + $variables['modules'] = []; // Iterate through all the modules, which are children of this element. foreach (Element::children($form) as $key) { // Stick the key into $module for easier access. $module = $form[$key]; - $item = []; - unset($module['enable']['#title']); // Add the checkbox to allow installing new modules and to show the // installation status of the module. - $item['checkbox'] = $module['enable']; + $module['checkbox'] = $module['enable']; // Add the module label and expand/collapse functionality. $id = Html::getUniqueId('module-' . $key); - $item['id'] = $id; - $item['enable_id'] = $module['enable']['#id']; - $item['name'] = $module['name']; - - // Build out the description content for the module details. - $item['description'] = $module['description']; - - $item['machine_name'] = [ - '#prefix' => '', - '#plain_text' => $key, - '#suffix' => ' $renderer->render($module['version'])]); + $module['id'] = $id; + $module['enable_id'] = $module['enable']['#id']; + $module['machine_name'] = $key; + if (empty($module['version']['#markup'])) { + unset($module['version']); } - $module['#requires'] = array_filter($module['#requires']); - $module['#required_by'] = array_filter($module['#required_by']); - - $requires = !empty($module['#requires']); - $required_by = !empty($module['#required_by']); - - if ($requires) { - $requires = [ - '#theme' => 'item_list', - '#items' => $module['#requires'], - '#context' => ['list_style' => 'comma-list'], - ]; - $item['requires'] = t('Requires: @module-list', ['@module-list' => $renderer->render($requires)]); - } - if ($required_by) { - $required_by = [ - '#theme' => 'item_list', - '#items' => $module['#required_by'], - '#context' => ['list_style' => 'comma-list'], - ]; - $item['required_by'] = t('Required by: @module-list', ['@module-list' => $renderer->render($required_by)]); - } + $module['requires'] = array_filter($module['#requires']); + $module['required_by'] = array_filter($module['#required_by']); $links = []; foreach (['help', 'permissions', 'configure'] as $link_type) { $links[] = $module['links'][$link_type]; } - if ($links) { - $item['links'] = $links; - } + $module['links'] = $links; - $item['attributes'] = new Attribute($module['#attributes']); - $modules[] = $item; + $module['attributes'] = new Attribute($module['#attributes']); + $variables['modules'][] = $module; } - - $variables['header'] = $header; - $variables['modules'] = $modules; } /** @@ -298,8 +258,8 @@ function theme_system_modules_uninstall($variables) { $disabled_header = ''; $disabled_reasons = ''; // Add the modules requiring the module in question as a validation reason. - if (!empty($form['modules'][$module]['#required_by'])) { - $form['modules'][$module]['#validation_reasons'][] = \Drupal::translation()->translate('Required by: @modules', array('@modules' => implode(', ',$form['modules'][$module]['#required_by']))); + if (!empty($form['modules'][$module]['required_by'])) { + $form['modules'][$module]['#validation_reasons'][] = \Drupal::translation()->translate('Required by: @modules', array('@modules' => implode(', ',$form['modules'][$module]['required_by']))); } if (!empty($form['modules'][$module]['#validation_reasons'])) { $disabled_reasons = [ diff --git a/core/modules/system/templates/system-modules-details.html.twig b/core/modules/system/templates/system-modules-details.html.twig index c842c36..8e02684 100644 --- a/core/modules/system/templates/system-modules-details.html.twig +++ b/core/modules/system/templates/system-modules-details.html.twig @@ -59,13 +59,15 @@
-
Machine name: {{ module.machine_name }}
-
{{ module.version }}
+
{{ 'Machine name:'|t }} {{ module.machine_name }}
+ {% if module.version %} +
{{ 'Version:'|t }} {{ module.version }}
+ {% endif %} {% if module.requires %} -
{{ module.requires }}
+
{{ 'Requires:'|t }} {{ module.requires|safe_join(', ') }}
{% endif %} {% if module.required_by %} -
{{ module.required_by }}
+
{{ 'Required by:'|t }} {{ module.required_by|safe_join(', ') }}
{% endif %} {% if module.links %}