From 7d267ffc43f66ab5699f009cea37c53fac1d8fe8 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Thu, 27 Jun 2013 10:26:32 +0100 Subject: [PATCH] Issue #1963988 by joelpittet, Gaelan, chrisjlee: Convert theme_views_ui_view_preview_section() to Twig. --- .../views-ui-view-preview-section.html.twig | 20 +++++++++++++++++ core/modules/views_ui/views_ui.module | 1 + core/modules/views_ui/views_ui.theme.inc | 22 ++++++++----------- 3 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 core/modules/views_ui/templates/views-ui-view-preview-section.html.twig diff --git a/core/modules/views_ui/templates/views-ui-view-preview-section.html.twig b/core/modules/views_ui/templates/views-ui-view-preview-section.html.twig new file mode 100644 index 00000000000..cfc840f72d8 --- /dev/null +++ b/core/modules/views_ui/templates/views-ui-view-preview-section.html.twig @@ -0,0 +1,20 @@ +{# +/** + * @file + * Default theme implementation for a views UI preview section. + * + * Available variables: + * - title: The human readable section title. + * - links: A list of contextual links. + * - content: The content for this section preview. + * + * @see template_preprocess_views_ui_view_preview_section() + * + * @ingroup themeable + */ +#} +

{{ title }}

+{% if links %} +
{{ links }}
+{% endif %} +
{{ content }}
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module index 269bdcddd82..4ce059501a9 100644 --- a/core/modules/views_ui/views_ui.module +++ b/core/modules/views_ui/views_ui.module @@ -176,6 +176,7 @@ function views_ui_theme() { 'views_ui_view_preview_section' => array( 'variables' => array('view' => NULL, 'section' => NULL, 'content' => NULL, 'links' => ''), 'file' => 'views_ui.theme.inc', + 'template' => 'views-ui-view-preview-section', ), // Generic container wrapper, to use instead of theme_container when an id diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc index 8e503fc69c7..3a9aab32e48 100644 --- a/core/modules/views_ui/views_ui.theme.inc +++ b/core/modules/views_ui/views_ui.theme.inc @@ -389,7 +389,14 @@ function theme_views_ui_style_plugin_table($variables) { } /** - * Theme preprocess for theme_views_ui_view_preview_section(). + * Prepares variables for views UI view preview section templates. + * + * Default template: views-ui-view-preview-section.html.twig. + * + * @param array $variables + * An associative array containing: + * - view: The view object. + * - section: The section name of a View (e.g. title, rows or pager). */ function template_preprocess_views_ui_view_preview_section(&$vars) { switch ($vars['section']) { @@ -439,8 +446,6 @@ function template_preprocess_views_ui_view_preview_section(&$vars) { if (isset($links)) { $build = array( - '#prefix' => '
', - '#suffix' => '
', '#theme' => 'links__contextual', '#links' => $links, '#attributes' => array('class' => array('contextual-links')), @@ -448,16 +453,7 @@ function template_preprocess_views_ui_view_preview_section(&$vars) { 'library' => array(array('contextual', 'drupal.contextual-links')), ), ); - $vars['links'] = drupal_render($build); + $vars['links'] = $build; } $vars['theme_hook_suggestions'][] = 'views_ui_view_preview_section__' . $vars['section']; } - -/** - * Returns the HTML for a section of a View being previewed within the Views UI. - */ -function theme_views_ui_view_preview_section($vars) { - return '

' . $vars['title'] . '

' - . $vars['links'] - . '
'. drupal_render($vars['content']) . '
'; -}