summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2013-07-25 14:08:22 (GMT)
committerAlex Pott2013-07-25 14:08:22 (GMT)
commit637beb94d0716d58e7627dc176196898f930156e (patch)
treea8327b8d77bede4356d49869db20dcd4f3c62a05
parent337b3709b108d4ce40c9a76fdfc39ae9b69dd43c (diff)
Issue #1915026 by steveoliver, 2ndmile, damiankloip, echeese, eromero1, joelpittet, rvilar, waynethayer, Hydra, drupalninja99, dsdeiz: Convert theme_views_ui_container() to Twig.
-rw-r--r--core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php4
-rw-r--r--core/modules/views_ui/templates/views-ui-container.html.twig15
-rw-r--r--core/modules/views_ui/views_ui.module3
-rw-r--r--core/modules/views_ui/views_ui.theme.inc8
4 files changed, 20 insertions, 10 deletions
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
index 4e74450..11bc5e3 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
@@ -7,6 +7,8 @@
namespace Drupal\views_ui\Tests;
+use Drupal\Component\Utility\String;
+
/**
* Tests the handling of displays in the UI, adding removing etc.
*/
@@ -251,7 +253,7 @@ class DisplayTest extends UITestBase {
// Assert that the expected text is found in each area category.
foreach ($areas as $type => $class) {
$element = $this->xpath('//div[contains(@class, :class)]/div', array(':class' => $class));
- $this->assertEqual((string) $element[0], "The selected display type does not utilize $type plugins");
+ $this->assertEqual((string) $element[0], String::format('The selected display type does not utilize @type plugins', array('@type' => $type)));
}
}
diff --git a/core/modules/views_ui/templates/views-ui-container.html.twig b/core/modules/views_ui/templates/views-ui-container.html.twig
new file mode 100644
index 0000000..d45b158
--- /dev/null
+++ b/core/modules/views_ui/templates/views-ui-container.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a generic views UI container/wrapper.
+ *
+ * Available variables:
+ * - attributes: HTML attributes to apply to the container element.
+ * - children: The remaining elements such as dropbuttons and tabs.
+ *
+ * @see template_preprocess_views_ui_container()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes }}>{{ children }}</div>
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 9074ab3..295c805 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -162,7 +162,8 @@ function views_ui_theme() {
// Generic container wrapper, to use instead of theme_container when an id
// is not desired.
'views_ui_container' => array(
- 'render element' => 'element',
+ 'variables' => array('children' => NULL, 'attributes' => array()),
+ 'template' => 'views-ui-container',
'file' => 'views_ui.theme.inc',
),
);
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index 61bff4d..acd4573 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -8,14 +8,6 @@
use Drupal\Core\Template\Attribute;
/**
- * Generic <div> container function.
- */
-function theme_views_ui_container($variables) {
- $element = $variables['element'];
- return '<div' . new Attribute($element['#attributes']) . '>' . $element['#children'] . '</div>';
-}
-
-/**
* Prepares variables for Views UI display tab setting templates.
*
* Default template: views-ui-display-tab-setting.html.twig.