diff --git a/core/modules/views/src/Plugin/views/pager/Mini.php b/core/modules/views/src/Plugin/views/pager/Mini.php
index 72f5d1c..f2cefa9 100644
--- a/core/modules/views/src/Plugin/views/pager/Mini.php
+++ b/core/modules/views/src/Plugin/views/pager/Mini.php
@@ -17,7 +17,7 @@
* title = @Translation("Paged output, mini pager"),
* short_title = @Translation("Mini"),
* help = @Translation("A simple pager containing previous and next links."),
- * theme = "views_mini_pager"
+ * theme = "pager__mini_pager"
* )
*/
class Mini extends SqlBase {
diff --git a/core/modules/views/templates/pager--mini-pager.html.twig b/core/modules/views/templates/pager--mini-pager.html.twig
new file mode 100644
index 0000000..f4c77bf
--- /dev/null
+++ b/core/modules/views/templates/pager--mini-pager.html.twig
@@ -0,0 +1,43 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a pager mini-pager.
+ *
+ * Available variables:
+ * - items: List of pager items.
+ *
+ * @see template_preprocess_pager__mini_pager()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if items.previous or items.next %}
+
+{% endif %}
diff --git a/core/modules/views/templates/views-mini-pager.html.twig b/core/modules/views/templates/views-mini-pager.html.twig
deleted file mode 100644
index 2f36b16..0000000
--- a/core/modules/views/templates/views-mini-pager.html.twig
+++ /dev/null
@@ -1,43 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for a views mini-pager.
- *
- * Available variables:
- * - items: List of pager items.
- *
- * @see template_preprocess_views_mini_pager()
- *
- * @ingroup themeable
- */
-#}
-{% if items.previous or items.next %}
-
-{% endif %}
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 22424a1..236cbaa 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -98,7 +98,8 @@ function views_theme($existing, $type, $theme, $path) {
);
// Our extra version of pager from pager.inc
- $hooks['views_mini_pager'] = $base + array(
+ $hooks['pager__mini_pager'] = $base + array(
+ 'base hook' => 'pager',
'variables' => array('tags' => array(), 'quantity' => 9, 'element' => 0, 'parameters' => array()),
);
@@ -211,7 +212,10 @@ function views_theme($existing, $type, $theme, $path) {
// implement hook_theme() by itself.
if (!function_exists('theme_' . $def['theme'])) {
$hooks[$def['theme']]['path'] .= '/templates';
- $hooks[$def['theme']]['template'] = Html::cleanCssIdentifier($def['theme']);
+ $hooks[$def['theme']]['template'] = Html::cleanCssIdentifier($def['theme'], array(
+ '_' => '-',
+ '__' => '--'
+ ));
}
else {
$hooks[$def['theme']]['function'] = 'theme_' . $def['theme'];
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index f34d076..cefff82 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -1009,9 +1009,9 @@ function template_preprocess_views_exposed_form(&$variables) {
}
/**
- * Prepares variables for views mini-pager templates.
+ * Prepares variables for pager mini-pager templates.
*
- * Default template: views-mini-pager.html.twig.
+ * Default template: pager--mini-pager.html.twig.
*
* @param array $variables
* An associative array containing:
@@ -1020,7 +1020,7 @@ function template_preprocess_views_exposed_form(&$variables) {
* - parameters: Any extra GET parameters that should be retained, such as
* exposed input.
*/
-function template_preprocess_views_mini_pager(&$variables) {
+function template_preprocess_pager__mini_pager(&$variables) {
global $pager_page_array, $pager_total;
$tags = &$variables['tags'];
diff --git a/core/themes/classy/templates/views/pager--mini-pager.html.twig b/core/themes/classy/templates/views/pager--mini-pager.html.twig
new file mode 100644
index 0000000..9c48338
--- /dev/null
+++ b/core/themes/classy/templates/views/pager--mini-pager.html.twig
@@ -0,0 +1,41 @@
+{#
+/**
+ * @file
+ * Theme override for a pager mini-pager.
+ *
+ * Available variables:
+ * - items: List of pager items.
+ *
+ * @see template_preprocess_pager__mini_pager()
+ */
+#}
+{% if items.previous or items.next %}
+
+{% endif %}
diff --git a/core/themes/classy/templates/views/views-mini-pager.html.twig b/core/themes/classy/templates/views/views-mini-pager.html.twig
deleted file mode 100644
index 124700b..0000000
--- a/core/themes/classy/templates/views/views-mini-pager.html.twig
+++ /dev/null
@@ -1,41 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a views mini-pager.
- *
- * Available variables:
- * - items: List of pager items.
- *
- * @see template_preprocess_views_mini_pager()
- */
-#}
-{% if items.previous or items.next %}
-
-{% endif %}