diff --git a/core/modules/color/color.module b/core/modules/color/color.module index 20d099abcf..b7d12767dc 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -300,8 +300,8 @@ function template_preprocess_color_scheme_form(&$variables) { } // Attempt to load preview HTML if the theme provides it. - $preview_html_path = \Drupal::root() . '/' . (isset($info['preview_html']) ? drupal_get_path('theme', $theme) . '/' . $info['preview_html'] : drupal_get_path('module', 'color') . '/preview.html'); - $variables['html_preview']['#markup'] = file_get_contents($preview_html_path); + $preview_html_path = isset($info['preview_html']) ? drupal_get_path('theme', $theme) . '/' . $info['preview_html'] : drupal_get_path('module', 'color') . '/preview.html.twig'; + $variables['html_preview']['#markup'] = \Drupal::service('twig')->loadTemplate($preview_html_path, NULL)->render(array()); } /** diff --git a/core/modules/color/preview.html b/core/modules/color/preview.html deleted file mode 100644 index d89edcb0d0..0000000000 --- a/core/modules/color/preview.html +++ /dev/null @@ -1,7 +0,0 @@ -
-
-

Lorem ipsum dolor

-

Sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-
-
-
diff --git a/core/modules/color/preview.html.twig b/core/modules/color/preview.html.twig new file mode 100644 index 0000000000..62061f3377 --- /dev/null +++ b/core/modules/color/preview.html.twig @@ -0,0 +1,17 @@ +
+
+

+ {% trans %}Example heading{% endtrans %} +

+

+ {% trans %}This is a block of example content.{% endtrans %} + {% trans %}This content is here to demonstrate what actual content would + look like in the color scheme you configure.{% endtrans %} + {% trans %}This is an example link, to demonstrate how + background colors you configure may affect the readability of links.{% endtrans %} + {% trans %}This is some more text to demonstrate what actual content would + look like in the color scheme you configure.{% endtrans %} +

+
+
+
diff --git a/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/_preview.html similarity index 100% rename from core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html rename to core/modules/color/tests/modules/color_test/themes/color_test_theme/color/_preview.html diff --git a/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html.twig b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html.twig new file mode 100644 index 0000000000..370f48c599 --- /dev/null +++ b/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/preview.html.twig @@ -0,0 +1,8 @@ +
+
+

{% trans %}TEST COLOR PREVIEW{% endtrans %}

+

{% trans %}Sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.{% endtrans %}

+
+
+
+ diff --git a/core/themes/bartik/color/color.inc b/core/themes/bartik/color/color.inc index 55464f2403..c90f58956c 100644 --- a/core/themes/bartik/color/color.inc +++ b/core/themes/bartik/color/color.inc @@ -116,7 +116,7 @@ // Preview files. 'preview_library' => 'bartik/color.preview', - 'preview_html' => 'color/preview.html', + 'preview_html' => 'color/preview.html.twig', // Attachments. '#attached' => [ diff --git a/core/themes/bartik/color/preview.html b/core/themes/bartik/color/preview.html deleted file mode 100644 index 7031b08945..0000000000 --- a/core/themes/bartik/color/preview.html +++ /dev/null @@ -1,65 +0,0 @@ -
- -
- -
Bartik
-
- -
-
- -
-
-
-

Etiam est risus

-
- Maecenas id porttitor Ut enim ad minim veniam, quis nostrudfelis. - Laboris nisi ut aliquip ex ea. -
-
-
-
-

Lorem ipsum dolor

-
-
- Sit amet, consectetur adipisicing elit, sed do eiusmod tempor - incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis - nostrud exercitation ullamco laboris nisi ut aliquip ex ea - commodo consequat. Maecenas id porttitor Ut enim ad minim veniam, quis nostr udfelis. -
-
-
-
- -
-
-
-
-

Etiam est risus

-
- Maecenas id porttitor Ut enim ad minim veniam, quis nostrudfelis. - Laboris nisi ut aliquip ex ea. -
-
-
-
-
-

Erisus dolor

-
- -
-
-
-
-
- -
diff --git a/core/themes/bartik/color/preview.html.twig b/core/themes/bartik/color/preview.html.twig new file mode 100644 index 0000000000..e778520d61 --- /dev/null +++ b/core/themes/bartik/color/preview.html.twig @@ -0,0 +1,74 @@ +
+ +
+ +
{% trans %}Bartik{% endtrans %}
+
+ +
+
+ +
+
+
+

{% trans %}Example heading{% endtrans %}

+
+ {% trans %}This content is here to demonstrate what actual content would + look like in the color scheme you configure. This is a block of example content.{% endtrans %} +
+
+
+
+

+ {% trans %}This is an example heading{% endtrans %} +

+
+
+ {% trans %}This content is here to demonstrate what actual content would + look like in the color scheme you configure. This is a block of example content.{% endtrans %} + {% trans %}This is an example link, to + demonstrate how background colors you configure may affect the + readability of links.{% endtrans %} + {% trans %}Another sentence to demonstrate what actual content would + look like in the color scheme you configure.{% endtrans %} + {% trans %}This is another example link.{% endtrans %} + {% trans %}This is the end of this block of example content.{% endtrans %} +
+
+
+
+ +
+
+
+
+

{% trans %}Example heading{% endtrans %}

+
+ {% trans %}This content is here to demonstrate what actual content would + look like in the color scheme you configure. This is a block of example content.{% endtrans %} +
+
+
+
+
+

{% trans %}Example heading{% endtrans %}

+
+ +
+
+
+
+
+ +