diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 6fcc2d2..ca66c11 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -2158,7 +2158,7 @@ function install_display_requirements($install_state, $requirements) { // and indicating a desire to continue anyway. See drupal_requirements_url(). if ($severity == REQUIREMENT_ERROR || ($severity == REQUIREMENT_WARNING && empty($install_state['parameters']['continue']))) { if ($install_state['interactive']) { - $build['report']['#theme'] = 'status_report'; + $build['report']['#type'] = 'status_report'; $build['report']['#requirements'] = $requirements; if ($severity == REQUIREMENT_WARNING) { $build['#title'] = t('Requirements review'); diff --git a/core/lib/Drupal/Core/Render/Element/StatusReport.php b/core/lib/Drupal/Core/Render/Element/StatusReport.php new file mode 100644 index 0000000..520dfb1 --- /dev/null +++ b/core/lib/Drupal/Core/Render/Element/StatusReport.php @@ -0,0 +1,91 @@ + 'status_report_grouped', + '#priorities' => [ + 'error', + 'warning', + 'checked', + 'ok', + ], + '#pre_render' => [ + [$class, 'preRenderGroupRequirements'], + ], + ]; + } + + /** + * #pre_render callback to group requirements. + */ + public static function preRenderGroupRequirements($element) { + $severities = static::getSeverities(); + $grouped_requirements = []; + foreach ($element['#requirements'] as $key => $requirement) { + $severity = $severities[REQUIREMENT_INFO]; + if (isset($requirement['severity'])) { + $requirement_severity = (int) $requirement['severity'] === REQUIREMENT_OK ? REQUIREMENT_INFO : (int) $requirement['severity']; + $severity = $severities[$requirement_severity]; + } + elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') { + $severity = $severities[REQUIREMENT_OK]; + } + + $grouped_requirements[$severity['status']]['title'] = $severity['title']; + $grouped_requirements[$severity['status']]['type'] = $severity['status']; + $grouped_requirements[$severity['status']]['items'][$key] = $requirement; + } + + // Order the grouped requirements by a set order. + $order = array_flip($element['#priorities']); + uksort($grouped_requirements, function ($a, $b) use ($order) { + return $order[$a] > $order[$b]; + }); + + $element['#grouped_requirements'] = $grouped_requirements; + + return $element; + } + + /** + * Gets the severities. + * + * @return array + */ + public static function getSeverities() { + return [ + REQUIREMENT_INFO => [ + 'title' => t('Checked'), + 'status' => 'checked', + ], + REQUIREMENT_OK => [ + 'title' => t('OK'), + 'status' => 'ok', + ], + REQUIREMENT_WARNING => [ + 'title' => t('Warnings found'), + 'status' => 'warning', + ], + REQUIREMENT_ERROR => [ + 'title' => t('Errors found'), + 'status' => 'error', + ], + ]; + } + +} diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php b/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php index fb13642..26987b4 100644 --- a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php +++ b/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php @@ -35,7 +35,7 @@ public function testEnable() { // No pending updates should be available. $this->drupalGet('admin/reports/status'); - $requirement_value = $this->cssSelect("tr.system-status-report__entry th:contains('Entity/field definitions') + td"); + $requirement_value = $this->cssSelect("details.system-status-report__entry summary:contains('Entity/field definitions') + div"); $this->assertEqual(t('Up to date'), trim((string) $requirement_value[0])); $this->drupalGet('admin/config/regional/content-language'); @@ -53,7 +53,7 @@ public function testEnable() { // No pending updates should be available. $this->drupalGet('admin/reports/status'); - $requirement_value = $this->cssSelect("tr.system-status-report__entry th:contains('Entity/field definitions') + td"); + $requirement_value = $this->cssSelect("details.system-status-report__entry summary:contains('Entity/field definitions') + div"); $this->assertEqual(t('Up to date'), trim((string) $requirement_value[0])); // Create a node type and check the content translation settings are now diff --git a/core/modules/system/css/components/system-status-counter.css b/core/modules/system/css/components/system-status-counter.css new file mode 100644 index 0000000..1f568f0 --- /dev/null +++ b/core/modules/system/css/components/system-status-counter.css @@ -0,0 +1,30 @@ +/** + * @file + * Styles for the system status counter component. + */ + +.system-status-counter__status-icon { + display: inline-block; + height: 25px; + width: 25px; + vertical-align: middle; +} +.system-status-counter__status-icon:before { + content: ""; + background-size: 16px; + background-position: center 2px; + background-repeat: no-repeat; + width: 100%; + height: 100%; + display: block; +} + +.system-status-counter__status-icon--error:before { + background-image: url(../../../../misc/icons/e32700/error.svg); +} +.system-status-counter__status-icon--warning:before { + background-image: url(../../../../misc/icons/e29700/warning.svg); +} +.system-status-counter__status-icon--checked:before { + background-image: url(../../../../misc/icons/73b355/check.svg); +} diff --git a/core/modules/system/css/components/system-status-report-counters.css b/core/modules/system/css/components/system-status-report-counters.css new file mode 100644 index 0000000..1a4e240 --- /dev/null +++ b/core/modules/system/css/components/system-status-report-counters.css @@ -0,0 +1,27 @@ +/** + * @file + * Styles for the system status report counters. + */ + +.system-status-report-counters__item { + width: 100%; + padding: .5em 0; + text-align: center; + white-space: nowrap; + background-color: rgba(0, 0, 0, 0.063); + margin-bottom: .5em; +} + +@media screen and (min-width: 60em) { + .system-status-report-counters { + flex-wrap: wrap; + display: flex; + justify-content: space-between; + } + .system-status-report-counters__item--half-width { + width: 49%; + } + .system-status-report-counters__item--third-width { + width: 33%; + } +} diff --git a/core/modules/system/css/components/system-status-report-general-info.css b/core/modules/system/css/components/system-status-report-general-info.css new file mode 100644 index 0000000..8334d4d --- /dev/null +++ b/core/modules/system/css/components/system-status-report-general-info.css @@ -0,0 +1,14 @@ +/** + * @file + * Default styles for the System Status general info. + */ + +.system-status-general-info__item { + border: 1px solid #ccc; + margin-top: 1em; + padding: 0 1em 1em; +} + +.system-status-general-info__item-title { + border-bottom: 1px solid #ccc; +} diff --git a/core/modules/system/css/system.admin.css b/core/modules/system/css/system.admin.css index 6bfd6f8..10b3ee4 100644 --- a/core/modules/system/css/system.admin.css +++ b/core/modules/system/css/system.admin.css @@ -204,10 +204,11 @@ small .admin-link:after { .system-status-report__status-title { position: relative; vertical-align: top; - width: 25%; + width: 100%; padding: 10px 6px 10px 40px; /* LTR */ box-sizing: border-box; font-weight: normal; + background-color: transparent; } [dir="rtl"] .system-status-report__status-title { padding: 10px 40px 10px 6px; @@ -232,6 +233,9 @@ small .admin-link:after { .system-status-report__status-icon--warning:before { background-image: url(../../../misc/icons/e29700/warning.svg); } +.system-status-report__entry__value { + padding: 1em .5em; +} /** * Appearance page. diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php index f378631..fdedcc6 100644 --- a/core/modules/system/src/Controller/DbUpdateController.php +++ b/core/modules/system/src/Controller/DbUpdateController.php @@ -522,7 +522,7 @@ public function requirements($severity, array $requirements, Request $request) { $try_again_url = Url::fromUri($request->getUriForPath(''))->setOptions(['query' => $options])->toString(TRUE)->getGeneratedUrl(); $build['status_report'] = array( - '#theme' => 'status_report', + '#type' => 'status_report', '#requirements' => $requirements, '#suffix' => $this->t('Check the messages and try again.', array(':url' => $try_again_url)) ); diff --git a/core/modules/system/src/Controller/SystemInfoController.php b/core/modules/system/src/Controller/SystemInfoController.php index aa9f140..829d1fe 100644 --- a/core/modules/system/src/Controller/SystemInfoController.php +++ b/core/modules/system/src/Controller/SystemInfoController.php @@ -47,7 +47,7 @@ public function __construct(SystemManager $systemManager) { */ public function status() { $requirements = $this->systemManager->listRequirements(); - return array('#theme' => 'status_report', '#requirements' => $requirements); + return ['#type' => 'status_report_page', '#requirements' => $requirements]; } /** diff --git a/core/modules/system/src/Element/StatusReportPage.php b/core/modules/system/src/Element/StatusReportPage.php new file mode 100644 index 0000000..5d2f985 --- /dev/null +++ b/core/modules/system/src/Element/StatusReportPage.php @@ -0,0 +1,139 @@ + 'status_report_page', + '#pre_render' => [ + [$class, 'preRenderCounters'], + [$class, 'preRenderGeneralInfo'], + [$class, 'preRenderRequirements'], + ], + ]; + } + + /** + * #pre_render callback to get general info out of requirements. + */ + public static function preRenderGeneralInfo($element) { + $element['#general_info'] = [ + '#theme' => 'status_report_general_info', + ]; + // Loop through requirements and pull out items. + foreach ($element['#requirements'] as $key => $requirement) { + switch ($key) { + case 'cron': + foreach ($requirement['description'] as &$description_elements) { + foreach ($description_elements as &$description_element) { + if (isset($description_element['#url']) && $description_element['#url']->getRouteName() == 'system.run_cron') { + $description_element['#attributes']['class'][] = 'button'; + $description_element['#attributes']['class'][] = 'button--small'; + $description_element['#attributes']['class'][] = 'button--primary'; + $description_element['#attributes']['class'][] = 'system-status-general-info__run-cron'; + } + } + } + $element['#general_info']['#' . $key] = $requirement; + unset($element['#requirements'][$key]); + break; + + case 'drupal': + case 'webserver': + case 'database_system': + case 'database_system_version': + case 'php': + case 'php_memory_limit': + $element['#general_info']['#' . $key] = $requirement; + unset($element['#requirements'][$key]); + break; + } + } + + return $element; + } + + /** + * #pre_render callback to create counter elements. + */ + public static function preRenderCounters($element) { + // Count number of items with different severity for summary. + $counters = [ + 'error' => [ + 'amount' => 0, + 'text' => t('Error'), + 'text_plural' => t('Errors'), + ], + 'warning' => [ + 'amount' => 0, + 'text' => t('Warning'), + 'text_plural' => t('Warnings'), + ], + 'checked' => [ + 'amount' => 0, + 'text' => t('Checked'), + 'text_plural' => t('Checked'), + ], + ]; + + $severities = StatusReport::getSeverities(); + foreach ($element['#requirements'] as $key => &$requirement) { + $severity = $severities[REQUIREMENT_INFO]; + if (isset($requirement['severity'])) { + $severity = $severities[(int) $requirement['severity']]; + } + elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') { + $severity = $severities[REQUIREMENT_OK]; + } + + if (isset($counters[$severity['status']])) { + $counters[$severity['status']]['amount']++; + } + } + + foreach ($counters as $key => $counter) { + if ($counter['amount'] === 0) { + continue; + } + + $text = new PluralTranslatableMarkup($counter['amount'], $counter['text'], $counter['text_plural']); + + $element['#counters'][$key] = [ + '#theme' => 'status_report_counter', + '#amount' => $counter['amount'], + '#text' => $text, + '#severity' => $key, + ]; + } + + return $element; + } + + /** + * #pre_render callback to create status report requirements. + */ + public static function preRenderRequirements($element) { + $element['#requirements'] = [ + '#type' => 'status_report', + '#requirements' => $element['#requirements'], + ]; + + return $element; + } + +} diff --git a/core/modules/system/src/SystemManager.php b/core/modules/system/src/SystemManager.php index e5d3a18..b9fcebb 100644 --- a/core/modules/system/src/SystemManager.php +++ b/core/modules/system/src/SystemManager.php @@ -110,7 +110,7 @@ public function listRequirements() { // Check run-time requirements and status information. $requirements = $this->moduleHandler->invokeAll('requirements', array('runtime')); - usort($requirements, function($a, $b) { + uasort($requirements, function($a, $b) { if (!isset($a['weight'])) { if (!isset($b['weight'])) { return strcasecmp($a['title'], $b['title']); diff --git a/core/modules/system/src/Tests/System/CronRunTest.php b/core/modules/system/src/Tests/System/CronRunTest.php index ec35b72..26a56a3 100644 --- a/core/modules/system/src/Tests/System/CronRunTest.php +++ b/core/modules/system/src/Tests/System/CronRunTest.php @@ -121,7 +121,7 @@ public function testManualCron() { $this->assertResponse(403); $this->drupalGet('admin/reports/status'); - $this->clickLink(t('run cron manually')); + $this->clickLink(t('Run cron')); $this->assertResponse(200); $this->assertText(t('Cron ran successfully.')); } diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index f9c49c7..94f6302 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -106,66 +106,6 @@ function template_preprocess_system_admin_index(&$variables) { } /** - * Prepares variables for status report template. - * - * Default template: status-report.html.twig. - * - * This theme function is dependent on install.inc being loaded, because - * that's where the constants are defined. - * - * @param $variables - * An associative array containing: - * - requirements: An array of requirements/status items. Each requirement - * is an associative array containing the following elements: - * - title: The name of the requirement. - * - value: (optional) The current value (version, time, level, etc). - * - description: (optional) The description of the requirement. - * - severity: (optional) The requirement's result/severity level, one of: - * - REQUIREMENT_INFO: Status information. - * - REQUIREMENT_OK: The requirement is satisfied. - * - REQUIREMENT_WARNING: The requirement failed with a warning. - * - REQUIREMENT_ERROR: The requirement failed with an error. - */ -function template_preprocess_status_report(&$variables) { - $severities = array( - REQUIREMENT_INFO => array( - 'title' => t('Info'), - 'status' => 'info', - ), - REQUIREMENT_OK => array( - 'title' => t('OK'), - 'status' => 'ok', - ), - REQUIREMENT_WARNING => array( - 'title' => t('Warning'), - 'status' => 'warning', - ), - REQUIREMENT_ERROR => array( - 'title' => t('Error'), - 'status' => 'error', - ), - ); - - foreach ($variables['requirements'] as $i => $requirement) { - // Always use the explicit requirement severity, if defined. Otherwise, - // default to REQUIREMENT_OK in the installer to visually confirm that - // installation requirements are met. And default to REQUIREMENT_INFO to - // denote neutral information without special visualization. - if (isset($requirement['severity'])) { - $severity = $severities[(int) $requirement['severity']]; - } - elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') { - $severity = $severities[REQUIREMENT_OK]; - } - else { - $severity = $severities[REQUIREMENT_INFO]; - } - $variables['requirements'][$i]['severity_title'] = $severity['title']; - $variables['requirements'][$i]['severity_status'] = $severity['status']; - } -} - -/** * Prepares variables for the module details templates. * * Default template: system-modules-details.html.twig. diff --git a/core/modules/system/system.install b/core/modules/system/system.install index ca9781c..8c88f05 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -535,14 +535,19 @@ function system_requirements($phase) { ], ]; } - $cron_url = \Drupal::url('system.cron', ['key' => \Drupal::state()->get('system.cron_key'), ['absolute' => TRUE]]); $requirements['cron']['description'][] = [ [ - '#markup' => t('You can run cron manually.', [':cron' => \Drupal::url('system.run_cron')]), + '#type' => 'link', + '#prefix' => '(', + '#title' => t('more information'), + '#suffix' => ')', + '#url' => Url::fromRoute('system.cron_settings'), ], [ - '#prefix' => '
', - '#markup' => t('To run cron from outside the site, go to @cron', [':url' => $cron_url, '@cron' => $cron_url]), + '#prefix' => '
', + '#type' => 'link', + '#title' => t('Run cron'), + '#url' => Url::fromRoute('system.run_cron'), ], ]; } diff --git a/core/modules/system/system.libraries.yml b/core/modules/system/system.libraries.yml index 206ae4f..98eb283 100644 --- a/core/modules/system/system.libraries.yml +++ b/core/modules/system/system.libraries.yml @@ -19,6 +19,9 @@ base: css/components/reset-appearance.module.css: { weight: -10 } css/components/resize.module.css: { weight: -10 } css/components/sticky-header.module.css: { weight: -10 } + css/components/system-status-counter.css: { weight: -10 } + css/components/system-status-report-counters.css: { weight: -10 } + css/components/system-status-report-general-info.css: { weight: -10 } css/components/tabledrag.module.css: { weight: -10 } css/components/tablesort.module.css: { weight: -10 } css/components/tree-child.module.css: { weight: -10 } diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 6581e60..a637443 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -197,9 +197,38 @@ function system_theme() { 'render element' => 'form', 'file' => 'system.admin.inc', ), + 'status_report_page' => array( + 'variables' => array( + 'counters' => array(), + 'general_info' => array(), + 'requirements' => NULL, + ), + ), 'status_report' => array( - 'variables' => array('requirements' => NULL), - 'file' => 'system.admin.inc', + 'variables' => array( + 'grouped_requirements' => NULL, + 'requirements' => NULL, + ), + ), + 'status_report_grouped' => array( + 'variables' => array( + 'grouped_requirements' => NULL, + 'requirements' => NULL, + ), + ), + 'status_report_counter' => array( + 'variables' => array('amount' => NULL, 'text' => NULL, 'severity' => NULL), + ), + 'status_report_general_info' => array( + 'variables' => array( + 'drupal' => array(), + 'cron' => array(), + 'database_system' => array(), + 'database_system_version' => array(), + 'php' => array(), + 'php_memory_limit' => array(), + 'webserver' => array(), + ), ), 'admin_page' => array( 'variables' => array('blocks' => NULL), diff --git a/core/modules/system/templates/status-report-counter.html.twig b/core/modules/system/templates/status-report-counter.html.twig new file mode 100644 index 0000000..8489e49 --- /dev/null +++ b/core/modules/system/templates/status-report-counter.html.twig @@ -0,0 +1,16 @@ +{# +/** + * @file + * Default theme implementation for the status report counter. + * + * Available variables: + * - amount: The number shown on counter. + * - text: The text shown on counter. + * - severity: The severity of the counter. + * + * @ingroup themable + */ +#} + +{{ amount }} {{ text }} +{{ text }} Details diff --git a/core/modules/system/templates/status-report-general-info.html.twig b/core/modules/system/templates/status-report-general-info.html.twig new file mode 100644 index 0000000..d4d5054 --- /dev/null +++ b/core/modules/system/templates/status-report-general-info.html.twig @@ -0,0 +1,81 @@ +{# +/** + * @file + * Default theme implementation for the status report general info. + * + * Available variables: + * - drupal: The status of Drupal installation: + * - value: The current status of Drupal installation. + * - description: The description for current status of Drupal installation. + * - cron: The status of cron: + * - value: The current status of cron. + * - description: The description for current status of cron. + * - cron.run_cron: An array to render a button for running cron. + * - database_system: The status of database system: + * - value: The current status of database sytem. + * - description: The description for current status of cron. + * - database_system_version: The info about current database version: + * - value: The current version of database. + * - description: The description for current version of database. + * - php: The current version of PHP: + * - value: The status of currently installed PHP version. + * - description: The description for current installed PHP version. + * - php_memory_limit: The info about current PHP memory limit: + * - value: The status of currently set PHP memory limit. + * - description: The description for currently set PHP memory limit. + * - webserver: The info about currently installed web server: + * - value: The status of currently installed web server. + * - description: The description for the status of currently installed web + * server. + */ +#} + +

{{ 'General System Information'|t }}

+
+

{{ 'Drupal Version'|t }}

+ {{ drupal.value }} + {% if drupal.description %} + {{ drupal.description }} + {% endif %} +
+
+

{{ 'Last Cron Run'|t }}

+ {{ cron.value }} + {% if cron.run_cron %} + {{ cron.run_cron }} + {% endif %} + {% if cron.description %} + {{ cron.description }} + {% endif %} +
+
+

{{ 'Web Server'|t }}

+ {{ webserver.value }} + {% if webserver.description %} + {{ webserver.description }} + {% endif %} +
+
+

{{ 'PHP'|t }}

+

{{ 'Version'|t }}

{{ php.value }} + {% if php.description %} + {{ php.description }} + {% endif %} + +

{{ 'Memory limit'|t }}

{{ php_memory_limit.value }} + {% if php_memory_limit.description %} + {{ php_memory_limit.description }} + {% endif %} +
+
+

{{ 'Database'|t }}

+

{{ 'Version'|t }}

{{ database_system_version.value }} + {% if database_system_version.description %} + {{ database_system_version.description }} + {% endif %} + +

{{ 'System'|t }}

{{ database_system.value }} + {% if database_system.description %} + {{ database_system.description }} + {% endif %} +
diff --git a/core/modules/system/templates/status-report-grouped.html.twig b/core/modules/system/templates/status-report-grouped.html.twig new file mode 100644 index 0000000..bd34e5a --- /dev/null +++ b/core/modules/system/templates/status-report-grouped.html.twig @@ -0,0 +1,49 @@ +{# +/** + * @file + * Default theme implementation of grouped status report requirements. + * + * - grouped_requirements: Contains grouped requirements. + * Each group contains: + * - title: The title of the group. + * - type: The severity of the group. + * - items: The requirement instances. + * Each requirement item contains: + * - title: The title of the requirement. + * - value: (optional) The requirement's status. + * - description: (optional) The requirement's description. + * - severity_title: The title of the severity. + * - severity_status: Indicates the severity status. + */ +#} +{{ attach_library('core/drupal.collapse') }} + +
+ {% for group in grouped_requirements %} +
+

{{ group.title }}

+ {% for requirement in group.items %} +
+ {% + set summary_classes = [ + 'system-status-report__status-title', + group.type in ['warning', 'error'] ? 'system-status-report__status-icon system-status-report__status-icon--' ~ group.type + ] + %} + + {% if requirement.severity_title %} + {{ requirement.severity_title }} + {% endif %} + {{ requirement.title }} + +
+ {{ requirement.value }} + {% if requirement.description %} +
{{ requirement.description }}
+ {% endif %} +
+
+ {% endfor %} +
+ {% endfor %} +
diff --git a/core/modules/system/templates/status-report-page.html.twig b/core/modules/system/templates/status-report-page.html.twig new file mode 100644 index 0000000..ed6d1ea --- /dev/null +++ b/core/modules/system/templates/status-report-page.html.twig @@ -0,0 +1,28 @@ +{# +/** + * @file + * Default theme implementation for the status report page. + * + * Available variables: + * - counters: The list of counter elements. + * - general_info: A render array to create general info element. + * - requirements: A render array to create requirements table. + * + * @see template_preprocess_status_report() + */ +#} +{% if counters|length == 3 %} + {% set element_width_class = ' system-status-report-counters__item--third-width' %} +{% elseif counters|length == 2 %} + {% set element_width_class = ' system-status-report-counters__item--half-width' %} +{% endif %} +
+ {% for counter in counters %} +
+ {{ counter }} +
+ {% endfor %} +
+ +{{ general_info }} +{{ requirements }} diff --git a/core/modules/system/templates/status-report.html.twig b/core/modules/system/templates/status-report.html.twig index b6ad739..ca9cf2b 100644 --- a/core/modules/system/templates/status-report.html.twig +++ b/core/modules/system/templates/status-report.html.twig @@ -2,40 +2,38 @@ /** * @file * Default theme implementation for the status report. - * - * Available variables: - * - requirements: Contains multiple requirement instances. - * Each requirement contains: - * - title: The title of the requirement. - * - value: (optional) The requirement's status. - * - description: (optional) The requirement's description. - * - severity_title: The title of the severity. - * - severity_status: Indicates the severity status. - * - * @see template_preprocess_status_report() - * - * @ingroup themeable - */ -#} - - - {% for requirement in requirements %} - - {% if requirement.severity_status in ['warning', 'error'] %} - - - + {{ requirement.title }} + + {{ requirement.value }} + {% if requirement.description %} +
{{ requirement.description }}
+ {% endif %} + {% endfor %} - -
+ * + * Available variables: + * - grouped_requirements: Contains grouped requirements. + * Each group contains: + * - title: The title of the group. + * - type: The severity of the group. + * - items: The requirement instances. + * Each requirement item contains: + * - title: The title of the requirement. + * - value: (optional) The requirement's status. + * - description: (optional) The requirement's description. + * - severity_title: The title of the severity. + * - severity_status: Indicates the severity status. + * - requirements: Ungrouped requirements + * + * @ingroup themeable + */ + #} +{% for group in grouped_requirements %} +

{{ group.title }}

+ {% for requirement in group.items %} +
+ + {% if requirement.severity_title %} {{ requirement.severity_title }} - {% else %} -
- {% endif %} - {{ requirement.title }} - - {{ requirement.value }} - {% if requirement.description %} -
{{ requirement.description }}
{% endif %} -
+{% endfor %} diff --git a/core/themes/seven/css/components/system-status-counter.css b/core/themes/seven/css/components/system-status-counter.css new file mode 100644 index 0000000..c3e0f30 --- /dev/null +++ b/core/themes/seven/css/components/system-status-counter.css @@ -0,0 +1,87 @@ +/** + * @file + * Styles for the system status counter component. + */ + +.system-status-counter { + box-sizing: border-box; + overflow-y: hidden; + border: 1px solid #e6e4df; + border-radius: 3px; + display: inline-block; + width: 100%; + white-space: nowrap; + background: #FCFCFA; +} +.system-status-counter__status-icon { + display: inline-block; + height: 60px; + width: 60px; + vertical-align: middle; + border-right: 1px solid #e6e4df; /* LTR */ + border-left: 0; /* LTR */ + background-color: #faf9f5; + box-shadow: 0 1px 1px rgba(0, 0, 0, .1) inset; +} +[dir="rtl"] .system-status-counter__status-icon { + border-right: 0; + border-left: 1px solid #e6e4df; + box-shadow: 0 1px 1px rgba(0, 0, 0, .1) inset; +} +.system-status-counter__status-icon:before { + content: ""; + background-size: 25px; + background-position: 50% center; + background-repeat: no-repeat; + width: 100%; + height: 100%; + display: block; +} + +.system-status-counter__status-icon--error:before { + background-image: url(../../../stable/images/core/icons/e32700/error.svg); +} +.system-status-counter__status-icon--warning:before { + background-image: url(../../../stable/images/core/icons/e29700/warning.svg); +} +.system-status-counter__status-icon--checked:before { + background-image: url(../../../stable/images/core/icons/73b355/check.svg); +} + +.system-status-counter__status-title { + display: inline-block; + vertical-align: middle; + text-transform: uppercase; + padding: 0 6px; + font-size: 1rem; + line-height: 1em; + font-weight: bold; +} +.system-status-counter__title-count { + display: block; + margin-bottom: 2px; +} +.system-status-counter__details { + font-size: 12px; + font-weight: normal; + text-transform: none; + display: block; + line-height: 1.5; +} + +@media screen and (min-width: 61em) { + .system-status-counter__status-icon, + .system-status-counter { + height: 65px; + } + .system-status-counter__status-icon { + width: 65px; + } + .system-status-counter__status-title { + font-size: 16px; + padding: 10px 3%; + } + .system-status-counter__status-icon:before { + background-size: 35px; + } +} diff --git a/core/themes/seven/css/components/system-status-report-counters.css b/core/themes/seven/css/components/system-status-report-counters.css new file mode 100644 index 0000000..a8e6db3 --- /dev/null +++ b/core/themes/seven/css/components/system-status-report-counters.css @@ -0,0 +1,26 @@ +/** + * @file + * Styles for the system status report counters. + */ + +.system-status-report-counters__item { + margin: 10px 0; + width: 100%; +} + +@media screen and (min-width: 60em) { + .system-status-report-counters__item { + margin-bottom: 20px; + } + .system-status-report-counters { + flex-wrap: wrap; + display: flex; + justify-content: space-between; + } + .system-status-report-counters__item--half-width { + width: 49%; + } + .system-status-report-counters__item--third-width { + width: 32%; + } +} diff --git a/core/themes/seven/css/components/system-status-report-general-info.css b/core/themes/seven/css/components/system-status-report-general-info.css new file mode 100644 index 0000000..08ee977 --- /dev/null +++ b/core/themes/seven/css/components/system-status-report-general-info.css @@ -0,0 +1,161 @@ +/** + * @file + * Seven styles for the System Status general info. + */ + +.system-status-general-info { + border: 1px solid #ccc; + border-radius: 3px; +} + +.system-status-general-info__header { + background-color: #f5f5f2; + padding: 10px; + margin: 0; + overflow: hidden; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + font-size: 14px; + text-transform: uppercase; +} + +.system-status-general-info__item { + background: #fcfcfa; + border-top: 1px solid #ccc; + padding: 10px 10px 20px; + box-sizing: border-box; + overflow-x: auto; +} + +.system-status-general-info__item-icon { + display: inline-block; + height: 45px; + width: 45px; + vertical-align: top; +} +.system-status-general-info__item-icon:before { + content: ""; + background-size: 35px; + background-position: 50% center; + background-repeat: no-repeat; + width: 100%; + height: 100%; + display: block; +} +.system-status-general-info__item-icon--d8:before { + background-image: url(../../images/icons/cccccc/d8-logo.svg); +} +.system-status-general-info__item-icon--clock:before { + background-image: url(../../images/icons/cccccc/clock.svg); +} +.system-status-general-info__item-icon--server:before { + background-image: url(../../images/icons/cccccc/server.svg); +} +.system-status-general-info__item-icon--php:before { + background-image: url(../../images/icons/cccccc/php-logo.svg); + background-size: 45px; +} +.system-status-general-info__item-icon--database:before { + background-image: url(../../images/icons/cccccc/database.svg); + background-size: 30px; +} + +.system-status-general-info__item-details { + box-sizing: border-box; + display: inline-block; + width: calc(100% - 60px); + padding-left: 10px; /* LTR */ + position: relative; +} +[dir="rtl"] .system-status-general-info__item-details { + padding-right: 10px; + padding-left: 0; +} + +.system-status-general-info__item-title { + margin-bottom: 0; +} + +.system-status-general-info__sub-item-title { + margin: 0; +} + +.system-status-general-info__sub-item__title { + font-weight: bold; +} +.system-status-general-info__sub-item__value { + display: block; +} + +.system-status-general-info__run-cron { + margin: 1em 0 0; +} + +@media screen and (min-width: 48em) { + .system-status-general-info__items { + display: flex; + flex-wrap: wrap; + overflow-x: hidden; + } + + .system-status-general-info__item { + flex: 1; + flex-basis: 33%; + width: 33%; + } + .system-status-general-info__item:nth-child(2) { + flex: 2; + flex-basis: 66%; + } + .system-status-general-info__item:nth-child(2), + .system-status-general-info__item:nth-child(4), + .system-status-general-info__item:nth-child(5) { + border-left: 1px solid #ccc; /* LTR */ + } + [dir="rtl"] .system-status-general-info__item:nth-child(1), + [dir="rtl"] .system-status-general-info__item:nth-child(3) { + border-left: 1px solid #ccc; + } + [dir="rtl"] .system-status-general-info__item:nth-child(2), + [dir="rtl"] .system-status-general-info__item:nth-child(5) { + border-left: 0; + } + + .system-status-general-info__run-cron { + margin: 15px 0 5px; + } +} + +@media screen and (min-width: 60em) { + .system-status-general-info__item-icon { + width: 55px; + height: 55px; + } + .system-status-general-info__item-icon:before { + background-size: 35px; + } + .system-status-general-info__item-icon--php:before { + background-size: 55px; + } + + .system-status-general-info__run-cron { + position: absolute; + top: 1em; + right: 1em; /* LTR */ + margin-top: 0; + } + [dir="rtl"] .system-status-general-info__run-cron { + left: 1em; + right: auto; + } +} + +@media screen and (max-width: 48em) { + .system-status-general-info__header { + display: none; + } + .system-status-general-info { + border-top: 0; + margin-top: 25px; + } +} diff --git a/core/themes/seven/css/components/system-status-report.css b/core/themes/seven/css/components/system-status-report.css index aeac1d3..bfcd75c 100644 --- a/core/themes/seven/css/components/system-status-report.css +++ b/core/themes/seven/css/components/system-status-report.css @@ -3,13 +3,151 @@ * Seven styles for the System Status Report. */ +.system-status-report__requirements-group { + padding-top: 20px; +} .system-status-report__entry { + border: 0; border-top: 1px solid #ccc; - border-bottom: inherit; -} -.system-status-report__entry:first-child { - border-top: 1px solid #bebfb9; + margin: 0; + width: 100%; + overflow: auto; } -.system-status-report__entry:last-child { +.system-status-report__entry:last-of-type { border-bottom: 1px solid #bebfb9; } +.system-status-report__entry--error { + background-color: transparent; +} +.system-status-report__entry--warning { + background-color: transparent; +} + /* Account for native and poly-filled details element */ +.system-status-report__status-title { + position: relative; + padding: 1em 1em 1em 3em; /* LTR */ + box-sizing: border-box; + width: 100%; + font-weight: bold; +} +.system-status-report__status-title .details-title { + color: inherit; + text-transform: none; +} +html:not(.details) .system-status-report__status-title { + padding-left: 0; +} +.system-status-report__status-title .details-title { + padding-left: 3em; /* LTR */ +} +[dir="rtl"] .system-status-report__status-title .details-title { + padding-right: 3em; + padding-left: 0; +} +[dir="rtl"].details .system-status-report__status-title { + padding: 1em 3em 1em 1em; +} +.collapse-processed > .system-status-report__status-title:before { + float: right; /* LTR */ +} +.system-status-report__status-title::-webkit-details-marker { + float: right; /* LTR */ +} +[dir="rtl"] .collapse-processed > .system-status-report__status-title:before { + float: left; +} +[dir="rtl"] .system-status-report__status-title::-webkit-details-marker { + float: left; +} + +/* Make poly-filled details and summary elements behave correctly. */ +.system-status-report summary:first-child ~ * { + display: none; +} +.system-status-report details[open] > *, +.system-status-report details > summary:first-child { + display: block; +} + +.system-status-report__status-title .details-title:before, +.details .system-status-report__status-icon:before { + content: ""; + background-repeat: no-repeat; + background-size: contain; + background-position: top center; + height: 16px; + width: 16px; + position: absolute; + left: 10px; /* LTR */ + top: 1em; + display: inline-block; + vertical-align: top; + margin-right: 10px; /* LTR */ +} +[dir="rtl"] .system-status-report__status-title .details-title:before, +[dir="rtl"].details .system-status-report__status-title:before { + left: auto; + right: 10px; + margin-right: 0; +} +.system-status-report__status-icon--error .details-title:before, +.details .system-status-report__status-icon--error:before { + background-image: url(../../../stable/images/core/icons/e32700/error.svg); +} +.system-status-report__status-icon--warning .details-title:before, +.details .system-status-report__status-icon--warning:before { + background-image: url(../../../stable/images/core/icons/e29700/warning.svg); +} + +.system-status-report__entry__value { + box-sizing: border-box; + padding: 0 1em 1em 3em; /* LTR */ +} +[dir="rtl"] .system-status-report__entry__value { + padding-right: 3em; + padding-left: 1em; +} + +@media screen and (max-width: 48em) { + .system-status-report { + word-wrap: break-word; + } +} + +@media screen and (min-width: 48em) { + .system-status-report__entry::after { + display: table; + content: ''; + clear: both; + } + .system-status-report__status-title { + width: 18rem; + float: left; /* LTR */ + cursor: default; + } + .system-status-report__status-title:hover, + .system-status-report__status-title:focus { + text-decoration: none; + } + [dir="rtl"] .system-status-report__status-title { + float: right; + } + .system-status-report__status-title::-webkit-details-marker { + display: none; + } + .collapse-processed > .system-status-report__status-title:before { + position: relative; + top: 3px; + } + .system-status-report__entry__value { + width: calc(100% - 23em); + float: right; + display: block; + padding-left: 0; /* LTR */ + padding-top: 1em; + } + [dir="rtl"] .system-status-report__entry__value { + padding-left: 0; + padding-right: 3em; + } +} diff --git a/core/themes/seven/css/components/tables.css b/core/themes/seven/css/components/tables.css index 913e21a..816df9e 100644 --- a/core/themes/seven/css/components/tables.css +++ b/core/themes/seven/css/components/tables.css @@ -38,7 +38,6 @@ tbody tr:hover, tbody tr:focus { background: #f7fcff; } - /* See colors.css */ tbody tr.color-warning:hover, tbody tr.color-warning:focus { @@ -48,6 +47,7 @@ tbody tr.color-error:hover, tbody tr.color-error:focus { background: #fcf4f2; } + td, th { vertical-align: middle; diff --git a/core/themes/seven/css/theme/maintenance-page.css b/core/themes/seven/css/theme/maintenance-page.css index 3725ac6..bb29a22 100644 --- a/core/themes/seven/css/theme/maintenance-page.css +++ b/core/themes/seven/css/theme/maintenance-page.css @@ -2,6 +2,7 @@ * @file * Maintenance theming. */ + .maintenance-page { background-color: #e0e0d8; background-image: -webkit-radial-gradient(hsl(203, 2%, 90%), hsl(203, 2%, 95%)); @@ -51,7 +52,6 @@ .task-list { margin-left: 0; /* LTR */ list-style-type: none; - list-style-image: none; padding-left: 0; /* LTR */ padding-bottom: 1em; } @@ -142,7 +142,7 @@ } .layout-container { margin: 0 auto; - max-width: 770px; + min-height: 75%; width: 75%; border-radius: 5px; box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15); @@ -181,3 +181,21 @@ margin: 0.75em 1.9em; } } + +/** + * Status report customization for install and update page. + */ +.system-status-report__status-title { + float: none; + width: 100%; +} +.system-status-report__entry__value { + float: none; + width: 100%; + padding-left: 3em; /* LTR */ + padding-top: 0; +} +[dir="rtl"] .system-status-report__entry__value { + padding-left: 1em; + padding-right: 3em; +} diff --git a/core/themes/seven/images/icons/cccccc/clock.svg b/core/themes/seven/images/icons/cccccc/clock.svg new file mode 100644 index 0000000..e51d3e0 --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/clock.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/themes/seven/images/icons/cccccc/d8-logo.svg b/core/themes/seven/images/icons/cccccc/d8-logo.svg new file mode 100644 index 0000000..035119b --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/d8-logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/core/themes/seven/images/icons/cccccc/database.svg b/core/themes/seven/images/icons/cccccc/database.svg new file mode 100644 index 0000000..3351212 --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/database.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/core/themes/seven/images/icons/cccccc/php-logo.svg b/core/themes/seven/images/icons/cccccc/php-logo.svg new file mode 100644 index 0000000..b039d24 --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/php-logo.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/core/themes/seven/images/icons/cccccc/server.svg b/core/themes/seven/images/icons/cccccc/server.svg new file mode 100644 index 0000000..1576b39 --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/server.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/themes/seven/js/responsive-details.js b/core/themes/seven/js/responsive-details.js new file mode 100644 index 0000000..8fdb453 --- /dev/null +++ b/core/themes/seven/js/responsive-details.js @@ -0,0 +1,57 @@ +/** + * @file + * Provides responsive behaviors to HTML details elements. + */ + +(function ($, Drupal) { + + 'use strict'; + + /** + * Initializes the responsive behaviors for details elements. + * + * @type {Drupal~behavior} + * + * @prop {Drupal~behaviorAttach} attach + * Attaches the responsive behavior to status report specific details elements. + */ + Drupal.behaviors.responsiveDetails = { + attach: function (context) { + var $details = $(context).find('details').once('responsive-details'); + + if (!$details.length) { + return; + } + + function detailsToggle(matches) { + if (matches) { + $details.attr('open', true); + $summaries.attr('aria-expanded', true); + $summaries.on('click.details-open', false); + } + else { + // If user explicitly opened one, leave it alone. + var $notPressed = $details + .find('> summary[aria-pressed!=true]') + .attr('aria-expanded', false); + $notPressed + .parent('details') + .attr('open', false); + // After resize, allow user to close previously opened details. + $summaries.off('.details-open'); + } + } + + function handleDetailsMQ(event) { + detailsToggle(event.matches); + } + + var $summaries = $details.find('> summary'); + var mql = window.matchMedia('(min-width:48em)'); + mql.addListener(handleDetailsMQ); + detailsToggle(mql.matches); + } + }; + + +})(jQuery, Drupal); diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml index 369515e..3f0e43c 100644 --- a/core/themes/seven/seven.info.yml +++ b/core/themes/seven/seven.info.yml @@ -22,6 +22,12 @@ core: 8.x libraries: - seven/global-styling libraries-override: + system/base: + css: + component: + /core/themes/stable/css/system/components/system-status-counter.css: css/components/system-status-counter.css + /core/themes/stable/css/system/components/system-status-report-counters.css: css/components/system-status-report-counters.css + /core/themes/stable/css/system/components/system-status-report-general-info.css: css/components/system-status-report-general-info.css core/drupal.vertical-tabs: css: component: diff --git a/core/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml index e68b75a..424e7f5 100644 --- a/core/themes/seven/seven.libraries.yml +++ b/core/themes/seven/seven.libraries.yml @@ -27,7 +27,10 @@ global-styling: css/components/tables.css: {} css/components/search-admin-settings.css: {} css/components/tablesort-indicator.css: {} + css/components/system-status-report-general-info.css: {} css/components/system-status-report.css: {} + css/components/system-status-report-counters.css: {} + css/components/system-status-counter.css: {} css/components/tabs.css: {} css/components/views-ui.css: {} layout: @@ -74,6 +77,18 @@ drupal.nav-tabs: - core/drupal - core/jquery.once - core/drupal.debounce + - core/collapse + +drupal.responsive-detail: + version: VERSION + js: + js/responsive-details.js: {} + dependencies: + - core/matchmedia + - core/matchmedia.addListener + - core/jquery + - core/jquery.once + - core/collapse vertical-tabs: version: VERSION diff --git a/core/themes/seven/templates/status-report-counter.html.twig b/core/themes/seven/templates/status-report-counter.html.twig new file mode 100644 index 0000000..13ab8a8 --- /dev/null +++ b/core/themes/seven/templates/status-report-counter.html.twig @@ -0,0 +1,26 @@ +{# +/** + * @file + * Theme override for status report counter. + * + * Available variables: + * - amount: The number shown on counter. + * - text: The text shown on counter. + * - severity: The severity of the counter. + * + * @ingroup themable + */ +#} +{% + set classes = [ + 'system-status-counter', + 'system-status-counter--' ~ severity, + ] +%} + + + + {{ amount }} {{ text }} + {{ text }} Details + + diff --git a/core/themes/seven/templates/status-report-general-info.html.twig b/core/themes/seven/templates/status-report-general-info.html.twig new file mode 100644 index 0000000..a5d6ce7 --- /dev/null +++ b/core/themes/seven/templates/status-report-general-info.html.twig @@ -0,0 +1,99 @@ +{# +/** + * @file + * Theme override for status report general info. + * + * Available variables: + * - drupal: The status of Drupal installation: + * - value: The current status of Drupal installation. + * - description: The description for current status of Drupal installation. + * - cron: The status of cron: + * - value: The current status of cron. + * - description: The description for current status of cron. + * - cron.run_cron: An array to render a button for running cron. + * - database_system: The status of database system: + * - value: The current status of database sytem. + * - description: The description for current status of cron. + * - database_system_version: The info about current database version: + * - value: The current version of database. + * - description: The description for current version of database. + * - php: The current version of PHP: + * - value: The status of currently installed PHP version. + * - description: The description for current installed PHP version. + * - php_memory_limit: The info about current PHP memory limit: + * - value: The status of currently set PHP memory limit. + * - description: The description for currently set PHP memory limit. + * - webserver: The info about currently installed web server: + * - value: The status of currently installed web server. + * - description: The description for the status of currently installed web + * server. + */ +#} +
+

{{ 'General System Information'|t }}

+
+
+ +
+

{{ 'Drupal Version'|t }}

+ {{ drupal.value }} + {% if drupal.description %} +
{{ drupal.description }}
+ {% endif %} +
+
+
+ +
+

{{ 'Last Cron Run'|t }}

+ {{ cron.value }} + {% if cron.run_cron %} +
{{ cron.run_cron }}
+ {% endif %} + {% if cron.description %} +
{{ cron.description }}
+ {% endif %} +
+
+
+ +
+

{{ 'Web Server'|t }}

+ {{ webserver.value }} + {% if webserver.description %} +
{{ webserver.description }}
+ {% endif %} +
+
+
+ +
+

{{ 'PHP'|t }}

+

{{ 'Version'|t }}

{{ php.value }} + {% if php.description %} +
{{ php.description }}
+ {% endif %} + +

{{ 'Memory limit'|t }}

{{ php_memory_limit.value }} + {% if php_memory_limit.description %} +
{{ php_memory_limit.description }}
+ {% endif %} +
+
+
+ +
+

{{ 'Database'|t }}

+

{{ 'Version'|t }}

{{ database_system_version.value }} + {% if database_system_version.description %} +
{{ database_system_version.description }}
+ {% endif %} + +

{{ 'System'|t }}

{{ database_system.value }} + {% if database_system.description %} +
{{ database_system.description }}
+ {% endif %} +
+
+
+
diff --git a/core/themes/seven/templates/status-report-grouped.html.twig b/core/themes/seven/templates/status-report-grouped.html.twig new file mode 100644 index 0000000..c5d6303 --- /dev/null +++ b/core/themes/seven/templates/status-report-grouped.html.twig @@ -0,0 +1,50 @@ +{# +/** + * @file + * Theme override to display status report. + * + * - grouped_requirements: Contains grouped requirements. + * Each group contains: + * - title: The title of the group. + * - type: The severity of the group. + * - items: The requirement instances. + * Each requirement item contains: + * - title: The title of the requirement. + * - value: (optional) The requirement's status. + * - description: (optional) The requirement's description. + * - severity_title: The title of the severity. + * - severity_status: Indicates the severity status. + */ +#} +{{ attach_library('core/drupal.collapse') }} +{{ attach_library('seven/drupal.responsive-detail') }} + +
+ {% for group in grouped_requirements %} +
+

{{ group.title }}

+ {% for requirement in group.items %} +
+ {% + set summary_classes = [ + 'system-status-report__status-title', + group.type in ['warning', 'error'] ? 'system-status-report__status-icon system-status-report__status-icon--' ~ group.type + ] + %} + + {% if requirement.severity_title %} + {{ requirement.severity_title }} + {% endif %} + {{ requirement.title }} + +
+ {{ requirement.value }} + {% if requirement.description %} +
{{ requirement.description }}
+ {% endif %} +
+
+ {% endfor %} +
+ {% endfor %} +
diff --git a/core/themes/seven/templates/status-report-page.html.twig b/core/themes/seven/templates/status-report-page.html.twig new file mode 100644 index 0000000..27e0d15 --- /dev/null +++ b/core/themes/seven/templates/status-report-page.html.twig @@ -0,0 +1,28 @@ +{# +/** + * @file + * Theme override for the status report page. + * + * Available variables: + * - counters: The list of counter elements. + * - general_info: A render array to create general info element. + * - requirements: A render array to create requirements table. + * + * @see template_preprocess_status_report() + */ +#} +{% if counters|length == 3 %} + {% set element_width_class = ' system-status-report-counters__item--third-width' %} +{% elseif counters|length == 2 %} + {% set element_width_class = ' system-status-report-counters__item--half-width' %} +{% endif %} +
+ {% for counter in counters %} +
+ {{ counter }} +
+ {% endfor %} +
+ +{{ general_info }} +{{ requirements }} diff --git a/core/themes/stable/css/system/components/system-status-counter.css b/core/themes/stable/css/system/components/system-status-counter.css new file mode 100644 index 0000000..8d3ad76 --- /dev/null +++ b/core/themes/stable/css/system/components/system-status-counter.css @@ -0,0 +1,28 @@ +/** + * @file + * Styles for the system status counter component. + */ + +.system-status-counter__status-icon { + display: inline-block; + height: 25px; + width: 25px; + vertical-align: middle; +} +.system-status-counter__status-icon:before { + content: ""; + background-size: 20px; + background-position: center 2px; + background-repeat: no-repeat; + display: block; +} + +.system-status-counter__status-icon--error:before { + background-image: url(../../../images/core/icons/e32700/error.svg); +} +.system-status-counter__status-icon--warning:before { + background-image: url(../../../images/core/icons/e29700/warning.svg); +} +.system-status-counter__status-icon--checked:before { + background-image: url(../../../images/core/icons/73b355/check.svg); +} diff --git a/core/themes/stable/css/system/components/system-status-report-counters.css b/core/themes/stable/css/system/components/system-status-report-counters.css new file mode 100644 index 0000000..1a4e240 --- /dev/null +++ b/core/themes/stable/css/system/components/system-status-report-counters.css @@ -0,0 +1,27 @@ +/** + * @file + * Styles for the system status report counters. + */ + +.system-status-report-counters__item { + width: 100%; + padding: .5em 0; + text-align: center; + white-space: nowrap; + background-color: rgba(0, 0, 0, 0.063); + margin-bottom: .5em; +} + +@media screen and (min-width: 60em) { + .system-status-report-counters { + flex-wrap: wrap; + display: flex; + justify-content: space-between; + } + .system-status-report-counters__item--half-width { + width: 49%; + } + .system-status-report-counters__item--third-width { + width: 33%; + } +} diff --git a/core/themes/stable/css/system/components/system-status-report-general-info.css b/core/themes/stable/css/system/components/system-status-report-general-info.css new file mode 100644 index 0000000..8334d4d --- /dev/null +++ b/core/themes/stable/css/system/components/system-status-report-general-info.css @@ -0,0 +1,14 @@ +/** + * @file + * Default styles for the System Status general info. + */ + +.system-status-general-info__item { + border: 1px solid #ccc; + margin-top: 1em; + padding: 0 1em 1em; +} + +.system-status-general-info__item-title { + border-bottom: 1px solid #ccc; +} diff --git a/core/themes/stable/css/system/system.admin.css b/core/themes/stable/css/system/system.admin.css index c8e20cf..65ff65a 100644 --- a/core/themes/stable/css/system/system.admin.css +++ b/core/themes/stable/css/system/system.admin.css @@ -204,10 +204,11 @@ small .admin-link:after { .system-status-report__status-title { position: relative; vertical-align: top; - width: 25%; + width: 100%; padding: 10px 6px 10px 40px; /* LTR */ box-sizing: border-box; font-weight: normal; + background-color: transparent; } [dir="rtl"] .system-status-report__status-title { padding: 10px 40px 10px 6px; @@ -232,6 +233,9 @@ small .admin-link:after { .system-status-report__status-icon--warning:before { background-image: url(../../images/core/icons/e29700/warning.svg); } +.system-status-report__entry__value { + padding: 1em .5em; +} /** * Appearance page. diff --git a/core/themes/stable/stable.info.yml b/core/themes/stable/stable.info.yml index 7e585b1..251ecbd 100644 --- a/core/themes/stable/stable.info.yml +++ b/core/themes/stable/stable.info.yml @@ -175,6 +175,9 @@ libraries-override: css/components/reset-appearance.module.css: css/system/components/reset-appearance.module.css css/components/resize.module.css: css/system/components/resize.module.css css/components/sticky-header.module.css: css/system/components/sticky-header.module.css + css/components/system-status-counter.css: css/system/components/system-status-counter.css + css/components/system-status-report-counters.css: css/system/components/system-status-report-counters.css + css/components/system-status-report-general-info.css: css/system/components/system-status-report-general-info.css css/components/tabledrag.module.css: css/system/components/tabledrag.module.css css/components/tablesort.module.css: css/system/components/tablesort.module.css css/components/tree-child.module.css: css/system/components/tree-child.module.css diff --git a/core/themes/stable/templates/admin/status-report-counter.html.twig b/core/themes/stable/templates/admin/status-report-counter.html.twig new file mode 100644 index 0000000..b0f7bd5 --- /dev/null +++ b/core/themes/stable/templates/admin/status-report-counter.html.twig @@ -0,0 +1,15 @@ +{# +/** + * @file + * Theme override for the status report counter. + * + * Available variables: + * - amount: The number shown on counter. + * - text: The text shown on counter. + * - severity: The severity of the counter. + * + * @ingroup themable + */ +#} +{{ amount }} {{ text }} +{{ text }} Details diff --git a/core/themes/stable/templates/admin/status-report-general-info.html.twig b/core/themes/stable/templates/admin/status-report-general-info.html.twig new file mode 100644 index 0000000..c71d839 --- /dev/null +++ b/core/themes/stable/templates/admin/status-report-general-info.html.twig @@ -0,0 +1,81 @@ +{# +/** + * @file + * Theme override for the status report general info. + * + * Available variables: + * - drupal: The status of Drupal installation: + * - value: The current status of Drupal installation. + * - description: The description for current status of Drupal installation. + * - cron: The status of cron: + * - value: The current status of cron. + * - description: The description for current status of cron. + * - cron.run_cron: An array to render a button for running cron. + * - database_system: The status of database system: + * - value: The current status of database sytem. + * - description: The description for current status of cron. + * - database_system_version: The info about current database version: + * - value: The current version of database. + * - description: The description for current version of database. + * - php: The current version of PHP: + * - value: The status of currently installed PHP version. + * - description: The description for current installed PHP version. + * - php_memory_limit: The info about current PHP memory limit: + * - value: The status of currently set PHP memory limit. + * - description: The description for currently set PHP memory limit. + * - webserver: The info about currently installed web server: + * - value: The status of currently installed web server. + * - description: The description for the status of currently installed web + * server. + */ +#} + +

{{ 'General System Information'|t }}

+
+

{{ 'Drupal Version'|t }}

+ {{ drupal.value }} + {% if drupal.description %} + {{ drupal.description }} + {% endif %} +
+
+

{{ 'Last Cron Run'|t }}

+ {{ cron.value }} + {% if cron.run_cron %} + {{ cron.run_cron }} + {% endif %} + {% if cron.description %} + {{ cron.description }} + {% endif %} +
+
+

{{ 'Web Server'|t }}

+ {{ webserver.value }} + {% if webserver.description %} + {{ webserver.description }} + {% endif %} +
+
+

{{ 'PHP'|t }}

+

{{ 'Version'|t }}

{{ php.value }} + {% if php.description %} + {{ php.description }} + {% endif %} + +

{{ 'Memory limit'|t }}

{{ php_memory_limit.value }} + {% if php_memory_limit.description %} + {{ php_memory_limit.description }} + {% endif %} +
+
+

{{ 'Database'|t }}

+

{{ 'Version'|t }}

{{ database_system_version.value }} + {% if database_system_version.description %} + {{ database_system_version.description }} + {% endif %} + +

{{ 'System'|t }}

{{ database_system.value }} + {% if database_system.description %} + {{ database_system.description }} + {% endif %} +
diff --git a/core/themes/stable/templates/admin/status-report-grouped.html.twig b/core/themes/stable/templates/admin/status-report-grouped.html.twig new file mode 100644 index 0000000..bbeaa47 --- /dev/null +++ b/core/themes/stable/templates/admin/status-report-grouped.html.twig @@ -0,0 +1,49 @@ +{# +/** + * @file + * Theme override of grouped status report requirements. + * + * - grouped_requirements: Contains grouped requirements. + * Each group contains: + * - title: The title of the group. + * - type: The severity of the group. + * - items: The requirement instances. + * Each requirement item contains: + * - title: The title of the requirement. + * - value: (optional) The requirement's status. + * - description: (optional) The requirement's description. + * - severity_title: The title of the severity. + * - severity_status: Indicates the severity status. + */ +#} +{{ attach_library('core/drupal.collapse') }} + +
+ {% for group in grouped_requirements %} +
+

{{ group.title }}

+ {% for requirement in group.items %} +
+ {% + set summary_classes = [ + 'system-status-report__status-title', + group.type in ['warning', 'error'] ? 'system-status-report__status-icon system-status-report__status-icon--' ~ group.type + ] + %} + + {% if requirement.severity_title %} + {{ requirement.severity_title }} + {% endif %} + {{ requirement.title }} + +
+ {{ requirement.value }} + {% if requirement.description %} +
{{ requirement.description }}
+ {% endif %} +
+
+ {% endfor %} +
+ {% endfor %} +
diff --git a/core/themes/stable/templates/admin/status-report-page.html.twig b/core/themes/stable/templates/admin/status-report-page.html.twig new file mode 100644 index 0000000..27e0d15 --- /dev/null +++ b/core/themes/stable/templates/admin/status-report-page.html.twig @@ -0,0 +1,28 @@ +{# +/** + * @file + * Theme override for the status report page. + * + * Available variables: + * - counters: The list of counter elements. + * - general_info: A render array to create general info element. + * - requirements: A render array to create requirements table. + * + * @see template_preprocess_status_report() + */ +#} +{% if counters|length == 3 %} + {% set element_width_class = ' system-status-report-counters__item--third-width' %} +{% elseif counters|length == 2 %} + {% set element_width_class = ' system-status-report-counters__item--half-width' %} +{% endif %} +
+ {% for counter in counters %} +
+ {{ counter }} +
+ {% endfor %} +
+ +{{ general_info }} +{{ requirements }} diff --git a/sites/README.txt b/sites/README.txt deleted file mode 100644 index 0372902..0000000 --- a/sites/README.txt +++ /dev/null @@ -1,10 +0,0 @@ -This directory structure contains the settings and configuration files specific -to your site or sites and is an integral part of multisite configurations. - -It is now recommended to place your custom and downloaded extensions in the -/modules, /themes, and /profiles directories located in the Drupal root. The -sites/all/ subdirectory structure, which was recommended in previous versions -of Drupal, is still supported. - -See core/INSTALL.txt for information about single-site installation or -multisite configuration. diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml deleted file mode 100644 index e1bbbc7..0000000 --- a/sites/default/default.services.yml +++ /dev/null @@ -1,174 +0,0 @@ -parameters: - session.storage.options: - # Default ini options for sessions. - # - # Some distributions of Linux (most notably Debian) ship their PHP - # installations with garbage collection (gc) disabled. Since Drupal depends - # on PHP's garbage collection for clearing sessions, ensure that garbage - # collection occurs by using the most common settings. - # @default 1 - gc_probability: 1 - # @default 100 - gc_divisor: 100 - # - # Set session lifetime (in seconds), i.e. the time from the user's last - # visit to the active session may be deleted by the session garbage - # collector. When a session is deleted, authenticated users are logged out, - # and the contents of the user's $_SESSION variable is discarded. - # @default 200000 - gc_maxlifetime: 200000 - # - # Set session cookie lifetime (in seconds), i.e. the time from the session - # is created to the cookie expires, i.e. when the browser is expected to - # discard the cookie. The value 0 means "until the browser is closed". - # @default 2000000 - cookie_lifetime: 2000000 - # - # Drupal automatically generates a unique session cookie name based on the - # full domain name used to access the site. This mechanism is sufficient - # for most use-cases, including multi-site deployments. However, if it is - # desired that a session can be reused across different subdomains, the - # cookie domain needs to be set to the shared base domain. Doing so assures - # that users remain logged in as they cross between various subdomains. - # To maximize compatibility and normalize the behavior across user agents, - # the cookie domain should start with a dot. - # - # @default none - # cookie_domain: '.example.com' - # - twig.config: - # Twig debugging: - # - # When debugging is enabled: - # - The markup of each Twig template is surrounded by HTML comments that - # contain theming information, such as template file name suggestions. - # - Note that this debugging markup will cause automated tests that directly - # check rendered HTML to fail. When running automated tests, 'debug' - # should be set to FALSE. - # - The dump() function can be used in Twig templates to output information - # about template variables. - # - Twig templates are automatically recompiled whenever the source code - # changes (see auto_reload below). - # - # For more information about debugging Twig templates, see - # https://www.drupal.org/node/1906392. - # - # Not recommended in production environments - # @default false - debug: false - # Twig auto-reload: - # - # Automatically recompile Twig templates whenever the source code changes. - # If you don't provide a value for auto_reload, it will be determined - # based on the value of debug. - # - # Not recommended in production environments - # @default null - auto_reload: null - # Twig cache: - # - # By default, Twig templates will be compiled and stored in the filesystem - # to increase performance. Disabling the Twig cache will recompile the - # templates from source each time they are used. In most cases the - # auto_reload setting above should be enabled rather than disabling the - # Twig cache. - # - # Not recommended in production environments - # @default true - cache: true - renderer.config: - # Renderer required cache contexts: - # - # The Renderer will automatically associate these cache contexts with every - # render array, hence varying every render array by these cache contexts. - # - # @default ['languages:language_interface', 'theme', 'user.permissions'] - required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions'] - # Renderer automatic placeholdering conditions: - # - # Drupal allows portions of the page to be automatically deferred when - # rendering to improve cache performance. That is especially helpful for - # cache contexts that vary widely, such as the active user. On some sites - # those may be different, however, such as sites with only a handful of - # users. If you know what the high-cardinality cache contexts are for your - # site, specify those here. If you're not sure, the defaults are fairly safe - # in general. - # - # For more information about rendering optimizations see - # https://www.drupal.org/developing/api/8/render/arrays/cacheability#optimizing - auto_placeholder_conditions: - # Max-age at or below which caching is not considered worthwhile. - # - # Disable by setting to -1. - # - # @default 0 - max-age: 0 - # Cache contexts with a high cardinality. - # - # Disable by setting to []. - # - # @default ['session', 'user'] - contexts: ['session', 'user'] - # Tags with a high invalidation frequency. - # - # Disable by setting to []. - # - # @default [] - tags: [] - # Cacheability debugging: - # - # Responses with cacheability metadata (CacheableResponseInterface instances) - # get X-Drupal-Cache-Tags and X-Drupal-Cache-Contexts headers. - # - # For more information about debugging cacheable responses, see - # https://www.drupal.org/developing/api/8/response/cacheable-response-interface - # - # Not recommended in production environments - # @default false - http.response.debug_cacheability_headers: false - factory.keyvalue: - {} - # Default key/value storage service to use. - # @default keyvalue.database - # default: keyvalue.database - # Collection-specific overrides. - # state: keyvalue.database - factory.keyvalue.expirable: - {} - # Default key/value expirable storage service to use. - # @default keyvalue.database.expirable - # default: keyvalue.database.expirable - # Allowed protocols for URL generation. - filter_protocols: - - http - - https - - ftp - - news - - nntp - - tel - - telnet - - mailto - - irc - - ssh - - sftp - - webcal - - rtsp - - # Configure Cross-Site HTTP requests (CORS). - # Read https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS - # for more information about the topic in general. - # Note: By default the configuration is disabled. - cors.config: - enabled: false - # Specify allowed headers, like 'x-allowed-header'. - allowedHeaders: [] - # Specify allowed request methods, specify ['*'] to allow all possible ones. - allowedMethods: [] - # Configure requests allowed from specific origins. - allowedOrigins: ['*'] - # Sets the Access-Control-Expose-Headers header. - exposedHeaders: false - # Sets the Access-Control-Max-Age header. - maxAge: false - # Sets the Access-Control-Allow-Credentials header. - supportsCredentials: false diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php deleted file mode 100644 index 25d498e..0000000 --- a/sites/default/default.settings.php +++ /dev/null @@ -1,765 +0,0 @@ - 'databasename', - * 'username' => 'sqlusername', - * 'password' => 'sqlpassword', - * 'host' => 'localhost', - * 'port' => '3306', - * 'driver' => 'mysql', - * 'prefix' => '', - * 'collation' => 'utf8mb4_general_ci', - * ); - * @endcode - */ - $databases = array(); - -/** - * Customizing database settings. - * - * Many of the values of the $databases array can be customized for your - * particular database system. Refer to the sample in the section above as a - * starting point. - * - * The "driver" property indicates what Drupal database driver the - * connection should use. This is usually the same as the name of the - * database type, such as mysql or sqlite, but not always. The other - * properties will vary depending on the driver. For SQLite, you must - * specify a database file name in a directory that is writable by the - * webserver. For most other drivers, you must specify a - * username, password, host, and database name. - * - * Transaction support is enabled by default for all drivers that support it, - * including MySQL. To explicitly disable it, set the 'transactions' key to - * FALSE. - * Note that some configurations of MySQL, such as the MyISAM engine, don't - * support it and will proceed silently even if enabled. If you experience - * transaction related crashes with such configuration, set the 'transactions' - * key to FALSE. - * - * For each database, you may optionally specify multiple "target" databases. - * A target database allows Drupal to try to send certain queries to a - * different database if it can but fall back to the default connection if not. - * That is useful for primary/replica replication, as Drupal may try to connect - * to a replica server when appropriate and if one is not available will simply - * fall back to the single primary server (The terms primary/replica are - * traditionally referred to as master/slave in database server documentation). - * - * The general format for the $databases array is as follows: - * @code - * $databases['default']['default'] = $info_array; - * $databases['default']['replica'][] = $info_array; - * $databases['default']['replica'][] = $info_array; - * $databases['extra']['default'] = $info_array; - * @endcode - * - * In the above example, $info_array is an array of settings described above. - * The first line sets a "default" database that has one primary database - * (the second level default). The second and third lines create an array - * of potential replica databases. Drupal will select one at random for a given - * request as needed. The fourth line creates a new database with a name of - * "extra". - * - * You can optionally set prefixes for some or all database table names - * by using the 'prefix' setting. If a prefix is specified, the table - * name will be prepended with its value. Be sure to use valid database - * characters only, usually alphanumeric and underscore. If no prefixes - * are desired, leave it as an empty string ''. - * - * To have all database names prefixed, set 'prefix' as a string: - * @code - * 'prefix' => 'main_', - * @endcode - * - * Per-table prefixes are deprecated as of Drupal 8.2, and will be removed in - * Drupal 9.0. After that, only a single prefix for all tables will be - * supported. - * - * To provide prefixes for specific tables, set 'prefix' as an array. - * The array's keys are the table names and the values are the prefixes. - * The 'default' element is mandatory and holds the prefix for any tables - * not specified elsewhere in the array. Example: - * @code - * 'prefix' => array( - * 'default' => 'main_', - * 'users' => 'shared_', - * 'sessions' => 'shared_', - * 'role' => 'shared_', - * 'authmap' => 'shared_', - * ), - * @endcode - * You can also use a reference to a schema/database as a prefix. This may be - * useful if your Drupal installation exists in a schema that is not the default - * or you want to access several databases from the same code base at the same - * time. - * Example: - * @code - * 'prefix' => array( - * 'default' => 'main.', - * 'users' => 'shared.', - * 'sessions' => 'shared.', - * 'role' => 'shared.', - * 'authmap' => 'shared.', - * ); - * @endcode - * NOTE: MySQL and SQLite's definition of a schema is a database. - * - * Advanced users can add or override initial commands to execute when - * connecting to the database server, as well as PDO connection settings. For - * example, to enable MySQL SELECT queries to exceed the max_join_size system - * variable, and to reduce the database connection timeout to 5 seconds: - * @code - * $databases['default']['default'] = array( - * 'init_commands' => array( - * 'big_selects' => 'SET SQL_BIG_SELECTS=1', - * ), - * 'pdo' => array( - * PDO::ATTR_TIMEOUT => 5, - * ), - * ); - * @endcode - * - * WARNING: The above defaults are designed for database portability. Changing - * them may cause unexpected behavior, including potential data loss. See - * https://www.drupal.org/developing/api/database/configuration for more - * information on these defaults and the potential issues. - * - * More details can be found in the constructor methods for each driver: - * - \Drupal\Core\Database\Driver\mysql\Connection::__construct() - * - \Drupal\Core\Database\Driver\pgsql\Connection::__construct() - * - \Drupal\Core\Database\Driver\sqlite\Connection::__construct() - * - * Sample Database configuration format for PostgreSQL (pgsql): - * @code - * $databases['default']['default'] = array( - * 'driver' => 'pgsql', - * 'database' => 'databasename', - * 'username' => 'sqlusername', - * 'password' => 'sqlpassword', - * 'host' => 'localhost', - * 'prefix' => '', - * ); - * @endcode - * - * Sample Database configuration format for SQLite (sqlite): - * @code - * $databases['default']['default'] = array( - * 'driver' => 'sqlite', - * 'database' => '/path/to/databasefilename', - * ); - * @endcode - */ - -/** - * Location of the site configuration files. - * - * The $config_directories array specifies the location of file system - * directories used for configuration data. On install, the "sync" directory is - * created. This is used for configuration imports. The "active" directory is - * not created by default since the default storage for active configuration is - * the database rather than the file system. (This can be changed. See "Active - * configuration settings" below). - * - * The default location for the "sync" directory is inside a randomly-named - * directory in the public files path. The setting below allows you to override - * the "sync" location. - * - * If you use files for the "active" configuration, you can tell the - * Configuration system where this directory is located by adding an entry with - * array key CONFIG_ACTIVE_DIRECTORY. - * - * Example: - * @code - * $config_directories = array( - * CONFIG_SYNC_DIRECTORY => '/directory/outside/webroot', - * ); - * @endcode - */ -$config_directories = array(); - -/** - * Settings: - * - * $settings contains environment-specific configuration, such as the files - * directory and reverse proxy address, and temporary configuration, such as - * security overrides. - * - * @see \Drupal\Core\Site\Settings::get() - */ - -/** - * The active installation profile. - * - * Changing this after installation is not recommended as it changes which - * directories are scanned during extension discovery. If this is set prior to - * installation this value will be rewritten according to the profile selected - * by the user. - * - * @see install_select_profile() - * - * @deprecated in Drupal 8.3.0 and will be removed before Drupal 9.0.0. The - * install profile is written to the core.extension configuration. If a - * service requires the install profile use the 'install_profile' container - * parameter. Functional code can use \Drupal::installProfile(). - */ -# $settings['install_profile'] = ''; - -/** - * Salt for one-time login links, cancel links, form tokens, etc. - * - * This variable will be set to a random value by the installer. All one-time - * login links will be invalidated if the value is changed. Note that if your - * site is deployed on a cluster of web servers, you must ensure that this - * variable has the same value on each server. - * - * For enhanced security, you may set this variable to the contents of a file - * outside your document root; you should also ensure that this file is not - * stored with backups of your database. - * - * Example: - * @code - * $settings['hash_salt'] = file_get_contents('/home/example/salt.txt'); - * @endcode - */ -$settings['hash_salt'] = ''; - -/** - * Deployment identifier. - * - * Drupal's dependency injection container will be automatically invalidated and - * rebuilt when the Drupal core version changes. When updating contributed or - * custom code that changes the container, changing this identifier will also - * allow the container to be invalidated as soon as code is deployed. - */ -# $settings['deployment_identifier'] = \Drupal::VERSION; - -/** - * Access control for update.php script. - * - * If you are updating your Drupal installation using the update.php script but - * are not logged in using either an account with the "Administer software - * updates" permission or the site maintenance account (the account that was - * created during installation), you will need to modify the access check - * statement below. Change the FALSE to a TRUE to disable the access check. - * After finishing the upgrade, be sure to open this file again and change the - * TRUE back to a FALSE! - */ -$settings['update_free_access'] = FALSE; - -/** - * External access proxy settings: - * - * If your site must access the Internet via a web proxy then you can enter the - * proxy settings here. Set the full URL of the proxy, including the port, in - * variables: - * - $settings['http_client_config']['proxy']['http']: The proxy URL for HTTP - * requests. - * - $settings['http_client_config']['proxy']['https']: The proxy URL for HTTPS - * requests. - * You can pass in the user name and password for basic authentication in the - * URLs in these settings. - * - * You can also define an array of host names that can be accessed directly, - * bypassing the proxy, in $settings['http_client_config']['proxy']['no']. - */ -# $settings['http_client_config']['proxy']['http'] = 'http://proxy_user:proxy_pass@example.com:8080'; -# $settings['http_client_config']['proxy']['https'] = 'http://proxy_user:proxy_pass@example.com:8080'; -# $settings['http_client_config']['proxy']['no'] = ['127.0.0.1', 'localhost']; - -/** - * Reverse Proxy Configuration: - * - * Reverse proxy servers are often used to enhance the performance - * of heavily visited sites and may also provide other site caching, - * security, or encryption benefits. In an environment where Drupal - * is behind a reverse proxy, the real IP address of the client should - * be determined such that the correct client IP address is available - * to Drupal's logging, statistics, and access management systems. In - * the most simple scenario, the proxy server will add an - * X-Forwarded-For header to the request that contains the client IP - * address. However, HTTP headers are vulnerable to spoofing, where a - * malicious client could bypass restrictions by setting the - * X-Forwarded-For header directly. Therefore, Drupal's proxy - * configuration requires the IP addresses of all remote proxies to be - * specified in $settings['reverse_proxy_addresses'] to work correctly. - * - * Enable this setting to get Drupal to determine the client IP from - * the X-Forwarded-For header (or $settings['reverse_proxy_header'] if set). - * If you are unsure about this setting, do not have a reverse proxy, - * or Drupal operates in a shared hosting environment, this setting - * should remain commented out. - * - * In order for this setting to be used you must specify every possible - * reverse proxy IP address in $settings['reverse_proxy_addresses']. - * If a complete list of reverse proxies is not available in your - * environment (for example, if you use a CDN) you may set the - * $_SERVER['REMOTE_ADDR'] variable directly in settings.php. - * Be aware, however, that it is likely that this would allow IP - * address spoofing unless more advanced precautions are taken. - */ -# $settings['reverse_proxy'] = TRUE; - -/** - * Specify every reverse proxy IP address in your environment. - * This setting is required if $settings['reverse_proxy'] is TRUE. - */ -# $settings['reverse_proxy_addresses'] = array('a.b.c.d', ...); - -/** - * Set this value if your proxy server sends the client IP in a header - * other than X-Forwarded-For. - */ -# $settings['reverse_proxy_header'] = 'X_CLUSTER_CLIENT_IP'; - -/** - * Set this value if your proxy server sends the client protocol in a header - * other than X-Forwarded-Proto. - */ -# $settings['reverse_proxy_proto_header'] = 'X_FORWARDED_PROTO'; - -/** - * Set this value if your proxy server sends the client protocol in a header - * other than X-Forwarded-Host. - */ -# $settings['reverse_proxy_host_header'] = 'X_FORWARDED_HOST'; - -/** - * Set this value if your proxy server sends the client protocol in a header - * other than X-Forwarded-Port. - */ -# $settings['reverse_proxy_port_header'] = 'X_FORWARDED_PORT'; - -/** - * Set this value if your proxy server sends the client protocol in a header - * other than Forwarded. - */ -# $settings['reverse_proxy_forwarded_header'] = 'FORWARDED'; - -/** - * Page caching: - * - * By default, Drupal sends a "Vary: Cookie" HTTP header for anonymous page - * views. This tells a HTTP proxy that it may return a page from its local - * cache without contacting the web server, if the user sends the same Cookie - * header as the user who originally requested the cached page. Without "Vary: - * Cookie", authenticated users would also be served the anonymous page from - * the cache. If the site has mostly anonymous users except a few known - * editors/administrators, the Vary header can be omitted. This allows for - * better caching in HTTP proxies (including reverse proxies), i.e. even if - * clients send different cookies, they still get content served from the cache. - * However, authenticated users should access the site directly (i.e. not use an - * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid - * getting cached pages from the proxy. - */ -# $settings['omit_vary_cookie'] = TRUE; - - -/** - * Cache TTL for client error (4xx) responses. - * - * Items cached per-URL tend to result in a large number of cache items, and - * this can be problematic on 404 pages which by their nature are unbounded. A - * fixed TTL can be set for these items, defaulting to one hour, so that cache - * backends which do not support LRU can purge older entries. To disable caching - * of client error responses set the value to 0. Currently applies only to - * page_cache module. - */ -# $settings['cache_ttl_4xx'] = 3600; - - -/** - * Class Loader. - * - * If the APC extension is detected, the Symfony APC class loader is used for - * performance reasons. Detection can be prevented by setting - * class_loader_auto_detect to false, as in the example below. - */ -# $settings['class_loader_auto_detect'] = FALSE; - -/* - * If the APC extension is not detected, either because APC is missing or - * because auto-detection has been disabled, auto-loading falls back to - * Composer's ClassLoader, which is good for development as it does not break - * when code is moved in the file system. You can also decorate the base class - * loader with another cached solution than the Symfony APC class loader, as - * all production sites should have a cached class loader of some sort enabled. - * - * To do so, you may decorate and replace the local $class_loader variable. For - * example, to use Symfony's APC class loader without automatic detection, - * uncomment the code below. - */ -/* -if ($settings['hash_salt']) { - $prefix = 'drupal.' . hash('sha256', 'drupal.' . $settings['hash_salt']); - $apc_loader = new \Symfony\Component\ClassLoader\ApcClassLoader($prefix, $class_loader); - unset($prefix); - $class_loader->unregister(); - $apc_loader->register(); - $class_loader = $apc_loader; -} -*/ - -/** - * Authorized file system operations: - * - * The Update Manager module included with Drupal provides a mechanism for - * site administrators to securely install missing updates for the site - * directly through the web user interface. On securely-configured servers, - * the Update manager will require the administrator to provide SSH or FTP - * credentials before allowing the installation to proceed; this allows the - * site to update the new files as the user who owns all the Drupal files, - * instead of as the user the webserver is running as. On servers where the - * webserver user is itself the owner of the Drupal files, the administrator - * will not be prompted for SSH or FTP credentials (note that these server - * setups are common on shared hosting, but are inherently insecure). - * - * Some sites might wish to disable the above functionality, and only update - * the code directly via SSH or FTP themselves. This setting completely - * disables all functionality related to these authorized file operations. - * - * @see https://www.drupal.org/node/244924 - * - * Remove the leading hash signs to disable. - */ -# $settings['allow_authorize_operations'] = FALSE; - -/** - * Default mode for directories and files written by Drupal. - * - * Value should be in PHP Octal Notation, with leading zero. - */ -# $settings['file_chmod_directory'] = 0775; -# $settings['file_chmod_file'] = 0664; - -/** - * Public file base URL: - * - * An alternative base URL to be used for serving public files. This must - * include any leading directory path. - * - * A different value from the domain used by Drupal to be used for accessing - * public files. This can be used for a simple CDN integration, or to improve - * security by serving user-uploaded files from a different domain or subdomain - * pointing to the same server. Do not include a trailing slash. - */ -# $settings['file_public_base_url'] = 'http://downloads.example.com/files'; - -/** - * Public file path: - * - * A local file system path where public files will be stored. This directory - * must exist and be writable by Drupal. This directory must be relative to - * the Drupal installation directory and be accessible over the web. - */ -# $settings['file_public_path'] = 'sites/default/files'; - -/** - * Private file path: - * - * A local file system path where private files will be stored. This directory - * must be absolute, outside of the Drupal installation directory and not - * accessible over the web. - * - * Note: Caches need to be cleared when this value is changed to make the - * private:// stream wrapper available to the system. - * - * See https://www.drupal.org/documentation/modules/file for more information - * about securing private files. - */ -# $settings['file_private_path'] = ''; - -/** - * Session write interval: - * - * Set the minimum interval between each session write to database. - * For performance reasons it defaults to 180. - */ -# $settings['session_write_interval'] = 180; - -/** - * String overrides: - * - * To override specific strings on your site with or without enabling the Locale - * module, add an entry to this list. This functionality allows you to change - * a small number of your site's default English language interface strings. - * - * Remove the leading hash signs to enable. - * - * The "en" part of the variable name, is dynamic and can be any langcode of - * any added language. (eg locale_custom_strings_de for german). - */ -# $settings['locale_custom_strings_en'][''] = array( -# 'forum' => 'Discussion board', -# '@count min' => '@count minutes', -# ); - -/** - * A custom theme for the offline page: - * - * This applies when the site is explicitly set to maintenance mode through the - * administration page or when the database is inactive due to an error. - * The template file should also be copied into the theme. It is located inside - * 'core/modules/system/templates/maintenance-page.html.twig'. - * - * Note: This setting does not apply to installation and update pages. - */ -# $settings['maintenance_theme'] = 'bartik'; - -/** - * PHP settings: - * - * To see what PHP settings are possible, including whether they can be set at - * runtime (by using ini_set()), read the PHP documentation: - * http://php.net/manual/ini.list.php - * See \Drupal\Core\DrupalKernel::bootEnvironment() for required runtime - * settings and the .htaccess file for non-runtime settings. - * Settings defined there should not be duplicated here so as to avoid conflict - * issues. - */ - -/** - * If you encounter a situation where users post a large amount of text, and - * the result is stripped out upon viewing but can still be edited, Drupal's - * output filter may not have sufficient memory to process it. If you - * experience this issue, you may wish to uncomment the following two lines - * and increase the limits of these variables. For more information, see - * http://php.net/manual/pcre.configuration.php. - */ -# ini_set('pcre.backtrack_limit', 200000); -# ini_set('pcre.recursion_limit', 200000); - -/** - * Active configuration settings. - * - * By default, the active configuration is stored in the database in the - * {config} table. To use a different storage mechanism for the active - * configuration, do the following prior to installing: - * - Create an "active" directory and declare its path in $config_directories - * as explained under the 'Location of the site configuration files' section - * above in this file. To enhance security, you can declare a path that is - * outside your document root. - * - Override the 'bootstrap_config_storage' setting here. It must be set to a - * callable that returns an object that implements - * \Drupal\Core\Config\StorageInterface. - * - Override the service definition 'config.storage.active'. Put this - * override in a services.yml file in the same directory as settings.php - * (definitions in this file will override service definition defaults). - */ -# $settings['bootstrap_config_storage'] = array('Drupal\Core\Config\BootstrapConfigStorageFactory', 'getFileStorage'); - -/** - * Configuration overrides. - * - * To globally override specific configuration values for this site, - * set them here. You usually don't need to use this feature. This is - * useful in a configuration file for a vhost or directory, rather than - * the default settings.php. - * - * Note that any values you provide in these variable overrides will not be - * viewable from the Drupal administration interface. The administration - * interface displays the values stored in configuration so that you can stage - * changes to other environments that don't have the overrides. - * - * There are particular configuration values that are risky to override. For - * example, overriding the list of installed modules in 'core.extension' is not - * supported as module install or uninstall has not occurred. Other examples - * include field storage configuration, because it has effects on database - * structure, and 'core.menu.static_menu_link_overrides' since this is cached in - * a way that is not config override aware. Also, note that changing - * configuration values in settings.php will not fire any of the configuration - * change events. - */ -# $config['system.site']['name'] = 'My Drupal site'; -# $config['system.theme']['default'] = 'stark'; -# $config['user.settings']['anonymous'] = 'Visitor'; - -/** - * Fast 404 pages: - * - * Drupal can generate fully themed 404 pages. However, some of these responses - * are for images or other resource files that are not displayed to the user. - * This can waste bandwidth, and also generate server load. - * - * The options below return a simple, fast 404 page for URLs matching a - * specific pattern: - * - $config['system.performance']['fast_404']['exclude_paths']: A regular - * expression to match paths to exclude, such as images generated by image - * styles, or dynamically-resized images. The default pattern provided below - * also excludes the private file system. If you need to add more paths, you - * can add '|path' to the expression. - * - $config['system.performance']['fast_404']['paths']: A regular expression to - * match paths that should return a simple 404 page, rather than the fully - * themed 404 page. If you don't have any aliases ending in htm or html you - * can add '|s?html?' to the expression. - * - $config['system.performance']['fast_404']['html']: The html to return for - * simple 404 pages. - * - * Remove the leading hash signs if you would like to alter this functionality. - */ -# $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)|(?:system\/files)\//'; -# $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'; -# $config['system.performance']['fast_404']['html'] = '404 Not Found

Not Found

The requested URL "@path" was not found on this server.

'; - -/** - * Load services definition file. - */ -$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml'; - -/** - * Override the default service container class. - * - * This is useful for example to trace the service container for performance - * tracking purposes, for testing a service container with an error condition or - * to test a service container that throws an exception. - */ -# $settings['container_base_class'] = '\Drupal\Core\DependencyInjection\Container'; - -/** - * Override the default yaml parser class. - * - * Provide a fully qualified class name here if you would like to provide an - * alternate implementation YAML parser. The class must implement the - * \Drupal\Component\Serialization\SerializationInterface interface. - */ -# $settings['yaml_parser_class'] = NULL; - -/** - * Trusted host configuration. - * - * Drupal core can use the Symfony trusted host mechanism to prevent HTTP Host - * header spoofing. - * - * To enable the trusted host mechanism, you enable your allowable hosts - * in $settings['trusted_host_patterns']. This should be an array of regular - * expression patterns, without delimiters, representing the hosts you would - * like to allow. - * - * For example: - * @code - * $settings['trusted_host_patterns'] = array( - * '^www\.example\.com$', - * ); - * @endcode - * will allow the site to only run from www.example.com. - * - * If you are running multisite, or if you are running your site from - * different domain names (eg, you don't redirect http://www.example.com to - * http://example.com), you should specify all of the host patterns that are - * allowed by your site. - * - * For example: - * @code - * $settings['trusted_host_patterns'] = array( - * '^example\.com$', - * '^.+\.example\.com$', - * '^example\.org$', - * '^.+\.example\.org$', - * ); - * @endcode - * will allow the site to run off of all variants of example.com and - * example.org, with all subdomains included. - */ - -/** - * The default list of directories that will be ignored by Drupal's file API. - * - * By default ignore node_modules and bower_components folders to avoid issues - * with common frontend tools and recursive scanning of directories looking for - * extensions. - * - * @see file_scan_directory() - * @see \Drupal\Core\Extension\ExtensionDiscovery::scanDirectory() - */ -$settings['file_scan_ignore_directories'] = [ - 'node_modules', - 'bower_components', -]; - -/** - * Load local development override configuration, if available. - * - * Use settings.local.php to override variables on secondary (staging, - * development, etc) installations of this site. Typically used to disable - * caching, JavaScript/CSS compression, re-routing of outgoing emails, and - * other things that should not happen on development and testing sites. - * - * Keep this code block at the end of this file to take full effect. - */ -# -# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { -# include $app_root . '/' . $site_path . '/settings.local.php'; -# } diff --git a/sites/development.services.yml b/sites/development.services.yml deleted file mode 100644 index d2857c6..0000000 --- a/sites/development.services.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Local development services. -# -# To activate this feature, follow the instructions at the top of the -# 'example.settings.local.php' file, which sits next to this file. -parameters: - http.response.debug_cacheability_headers: true -services: - cache.backend.null: - class: Drupal\Core\Cache\NullBackendFactory diff --git a/sites/example.settings.local.php b/sites/example.settings.local.php deleted file mode 100644 index b1f73dd..0000000 --- a/sites/example.settings.local.php +++ /dev/null @@ -1,115 +0,0 @@ -..' => 'directory'. As an - * example, to map https://www.drupal.org:8080/mysite/test to the configuration - * directory sites/example.com, the array should be defined as: - * @code - * $sites = array( - * '8080.www.drupal.org.mysite.test' => 'example.com', - * ); - * @endcode - * The URL, https://www.drupal.org:8080/mysite/test/, could be a symbolic link - * or an Apache Alias directive that points to the Drupal root containing - * index.php. An alias could also be created for a subdomain. See the - * @link https://www.drupal.org/documentation/install online Drupal installation guide @endlink - * for more information on setting up domains, subdomains, and subdirectories. - * - * The following examples look for a site configuration in sites/example.com: - * @code - * URL: http://dev.drupal.org - * $sites['dev.drupal.org'] = 'example.com'; - * - * URL: http://localhost/example - * $sites['localhost.example'] = 'example.com'; - * - * URL: http://localhost:8080/example - * $sites['8080.localhost.example'] = 'example.com'; - * - * URL: https://www.drupal.org:8080/mysite/test/ - * $sites['8080.www.drupal.org.mysite.test'] = 'example.com'; - * @endcode - * - * @see default.settings.php - * @see \Drupal\Core\DrupalKernel::getSitePath() - * @see https://www.drupal.org/documentation/install/multi-site - */