diff --git a/core/modules/views/templates/views-view.html.twig b/core/modules/views/templates/views-view.html.twig new file mode 100644 index 0000000..9f32aba --- /dev/null +++ b/core/modules/views/templates/views-view.html.twig @@ -0,0 +1,82 @@ +{# +/** + * @file + * Default theme implementation for main View template. + * + * Available variables: + * - attributes: Remaining HTML attributes for the element. + * - attributes.class: HTML classes that can be used to style contextually + * through CSS. including: + * -view + * -view-[css_name] + * -view-id-[view_name] + * -view-display-id-[display_name] + * -view-dom-id-[dom_id] + * - css_name: A CSS-safe version of the View name. + * - css_class: The user-specified class names, if any. + * - header: The View header. + * - footer: The View footer. + * - rows: The results of the View query, if any. + * - empty_message: The empty text to display if the View is empty. + * - pager: The pager next/prev links to display, if any. + * - exposed: Exposed widget form/info to display. + * - feed_icon: Feed icon to display, if any. + * - more: A link to view more, if any. + * + * @ingroup views_templates + */ +#} + + {{ title_prefix }} + {% if title is not empty %} + {{ title }} + {% endif %} + {{ title_suffix }} + {% if header is not empty %} +
+ {{ header }} +
+ {% endif %} + {% if exposed %} +
+ {{ exposed }} +
+ {% endif %} + {% if attachment_before is not empty %} +
+ {{ attachment_before }} +
+ {% endif %} + + {% if rows %} +
+ {{ rows }} +
+ {% elseif empty_message is not empty %} +
+ {{ empty_message }} +
+ {% endif %} + + {% if pager %} + {{ pager }} + {% endif %} + {% if attachment_after is not empty %} +
+ {{ attachment_after }} +
+ {% endif %} + {% if more is not empty %} + {{ more }} + {% endif %} + {% if footer is not empty %} +
+ {{ footer }} +
+ {% endif %} + {% if feed_icon %} +
+ {{ feed_icon }} +
+ {% endif %} + diff --git a/core/modules/views/templates/views-view.tpl.php b/core/modules/views/templates/views-view.tpl.php deleted file mode 100644 index ca8faef..0000000 --- a/core/modules/views/templates/views-view.tpl.php +++ /dev/null @@ -1,90 +0,0 @@ - -
> - - - - - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- -
- -
- - - - - - - -
- -
- - - - - - - -
- -
- - - -
- -
- - -
diff --git a/core/modules/views/tests/views_test_data/templates/views-view--frontpage.html.twig b/core/modules/views/tests/views_test_data/templates/views-view--frontpage.html.twig new file mode 100644 index 0000000..4154f8c --- /dev/null +++ b/core/modules/views/tests/views_test_data/templates/views-view--frontpage.html.twig @@ -0,0 +1,77 @@ +{# +/** + * @file + * Default theme implementation for main View template. + * + * Available variables: + * - attributes: Remaining HTML attributes for the element. + * - attributes.class: HTML classes that can be used to style contextually + * through CSS. including: + * -view + * -view-[css_name] + * -view-id-[view_name] + * -view-display-id-[display_name] + * -view-dom-id-[dom_id] + * - css_name: A CSS-safe version of the View name. + * - css_class: The user-specified class names, if any. + * - header: The View header. + * - footer: The View footer. + * - rows: The results of the View query, if any. + * - empty_message: The empty text to display if the View is empty. + * - pager: The pager next/prev links to display, if any. + * - exposed: Exposed widget form/info to display. + * - feed_icon: Feed icon to display, if any. + * - more: A link to view more, if any. + * + * @ingroup views_templates + */ +#} + + {% if header is not empty %} +
+ {{ header }} +
+ {% endif %} + {% if exposed %} +
+ {{ exposed }} +
+ {% endif %} + {% if attachment_before is not empty %} +
+ {{ attachment_before }} +
+ {% endif %} + + {% if rows %} +
+ {{ rows }} +
+ {% elseif empty_message is not empty %} +
+ {{ empty_message }} +
+ {% endif %} + + {% if pager %} + {{ pager }} + {% endif %} + {% if attachment_after is not empty %} +
+ {{ attachment_after }} +
+ {% endif %} + {% if more is not empty %} + {{ more }} + {% endif %} + {% if footer is not empty %} +
+ {{ footer }} +
+ {% endif %} + {% if feed_icon %} +
+ {{ feed_icon }} +
+ {% endif %} + diff --git a/core/modules/views/tests/views_test_data/templates/views-view--frontpage.tpl.php b/core/modules/views/tests/views_test_data/templates/views-view--frontpage.tpl.php deleted file mode 100644 index 5e6c8fa..0000000 --- a/core/modules/views/tests/views_test_data/templates/views-view--frontpage.tpl.php +++ /dev/null @@ -1,85 +0,0 @@ - -
> - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- -
- -
- - - - - - - -
- -
- - - - - - - -
- -
- - - -
- -
- - -
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index 0bae0fc..734a6d4 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -40,14 +40,21 @@ function _views_theme_functions($hook, ViewExecutable $view, $display = NULL) { } /** - * Preprocess the primary theme implementation for a view. + * Prepares variables for view templates. + * + * Default template: views-view.html.twig. + * + * @param array $variables + * An associative array containing: + * - view: The view object. + * - directory: The location of the views module. */ function template_preprocess_views_view(&$vars) { global $base_path; $view = $vars['view']; - $vars['rows'] = (!empty($view->result) || $view->style_plugin->even_empty()) ? $view->style_plugin->render($view->result) : ''; + $vars['rows'] = (!empty($view->result) || $view->style_plugin->even_empty()) ? $view->style_plugin->render($view->result) : array(); // Force a render array so CSS/JS can be added. if (!is_array($vars['rows'])) { $vars['rows'] = array('#markup' => $vars['rows']); @@ -72,10 +79,10 @@ function template_preprocess_views_view(&$vars) { $vars['attributes']['class'][] = $vars['css_class']; } - $empty = empty($view->result); - $vars['header'] = $view->display_handler->renderArea('header', $empty); - $vars['footer'] = $view->display_handler->renderArea('footer', $empty); - $vars['empty'] = $empty ? $view->display_handler->renderArea('empty', $empty) : FALSE; + $empty_message = empty($view->result); + $vars['header'] = $view->display_handler->renderArea('header', $empty_message); + $vars['footer'] = $view->display_handler->renderArea('footer', $empty_message); + $vars['empty_message'] = $empty_message ? $view->display_handler->renderArea('empty', $empty_message) : FALSE; $vars['exposed'] = !empty($view->exposed_widgets) ? $view->exposed_widgets : ''; $vars['more'] = $view->display_handler->renderMoreLink(); @@ -110,7 +117,7 @@ function template_preprocess_views_view(&$vars) { // attached to an array (not an object) in order to process them. For our // purposes, it doesn't matter what we attach them to, since once they are // processed by contextual_preprocess() they will appear in the $title_suffix - // variable (which we will then render in views-view.tpl.php). + // variable (which we will then render in views-view.html.twig). views_add_contextual_links($vars['view_array'], 'view', $view, $view->current_display); // Attachments are always updated with the outer view, never by themselves, @@ -158,7 +165,7 @@ function template_preprocess_views_view(&$vars) { // Copy the rows so as not to modify them by reference when rendering. $rows = $vars['rows']; $rows = drupal_render($rows); - $output = !empty($rows) ? $rows : $vars['empty']; + $output = !empty($rows) ? $rows : $vars['empty_message']; $form = drupal_get_form(views_form_id($view), $view, $output); // The form is requesting that all non-essential views elements be hidden, // usually because the rendered step is not a view result. @@ -1104,7 +1111,7 @@ function theme_views_mini_pager($vars) { * or some combination thereof. * * For each view, there will be a minimum of two templates used. The first - * is used for all views: views-view.tpl.php. + * is used for all views: views-view.html.twig. * * The second template is determined by the style selected for the view. Note * that certain aspects of the view can also change which style is used; for @@ -1124,7 +1131,7 @@ function theme_views_mini_pager($vars) { * - views-view--foobar--page.tpl.php * - views-view--page.tpl.php * - views-view--foobar.tpl.php - * - views-view.tpl.php + * - views-view.html.twig * * - views-view-unformatted--foobar--page.tpl.php * - views-view-unformatted--page.tpl.php diff --git a/core/modules/views/views_ui/views_ui.module b/core/modules/views/views_ui/views_ui.module index a17e215..ea035f9 100644 --- a/core/modules/views/views_ui/views_ui.module +++ b/core/modules/views/views_ui/views_ui.module @@ -232,7 +232,14 @@ function views_ui_cache_set(ViewUI $view) { } /** - * Theme preprocess for views-view.tpl.php. + * Prepares variables for container templates. + * + * Default template: views-view.html.twig. + * + * @param array $variables + * An associative array containing: + * - view: The view object. + * - directory: The location of the views module. */ function views_ui_preprocess_views_view(&$vars) { $view = $vars['view']; @@ -244,11 +251,11 @@ function views_ui_preprocess_views_view(&$vars) { '#theme' => 'views_ui_view_preview_section', '#view' => $view, '#section' => $section, - '#content' => is_array($vars[$section]) ? drupal_render($vars[$section]) : $vars[$section], + '#content' => $vars[$section], '#theme_wrappers' => array('views_ui_container'), '#attributes' => array('class' => 'contextual-region'), ); - $vars[$section] = drupal_render($vars[$section]); + $vars[$section] = $vars[$section]; } } }