Merge pull request craftcms#11840 from craftcms/feature/twig-paths

`.twig` template paths

CHANGELOG-WIP.md

@@ -51,6 +51,7 @@
 - Element query date params now support passing `today`, `tomorrow`, and `yesterday`. ([#10485](https://github.com/craftcms/cms/issues/10485))
 - Element queries now support passing ambiguous column names (e.g. `dateCreated`) and field handles into `select()`. ([#11790](https://github.com/craftcms/cms/pull/11790), [#11800](https://github.com/craftcms/cms/pull/11800))
 - `{% cache %}` tags now store any HTML registered with `{% html %}` tags. ([#11811](https://github.com/craftcms/cms/discussions/11811))
+- Control panel `.twig` templates are now prioritized over `.html`. ([#11809](https://github.com/craftcms/cms/discussions/11809), [#11840](https://github.com/craftcms/cms/pull/11840))
 - `craft\helpers\Component::iconSvg()` now namespaces the SVG contents, and adds `aria-hidden="true"`. ([#11703](https://github.com/craftcms/cms/pull/11703))
 - `craft\services\Search::EVENT_BEFORE_INDEX_KEYWORDS` is now cancellable by setting `$event->isValid` to `false`. ([#11705](https://github.com/craftcms/cms/discussions/11705))
 - `checkboxSelect` inputs without `showAllOption: true` now post an empty value if no options were selected. ([#11748](https://github.com/craftcms/cms/issues/11748))

src/assetpreviews/Image.php

@@ -34,7 +34,7 @@ public function getPreviewHtml(array $variables = []): string
             ]);
         }
 
-        return Craft::$app->getView()->renderTemplate('assets/_previews/image',
+        return Craft::$app->getView()->renderTemplate('assets/_previews/image.twig',
             array_merge([
                 'asset' => $this->asset,
                 'url' => $url,

src/assetpreviews/Text.php

@@ -31,7 +31,7 @@ public function getPreviewHtml(array $variables = []): string
         FileHelper::unlink($localCopy);
         $language = $this->asset->kind === Asset::KIND_HTML ? 'markup' : $this->asset->kind;
 
-        return Craft::$app->getView()->renderTemplate('assets/_previews/text',
+        return Craft::$app->getView()->renderTemplate('assets/_previews/text.twig',
             array_merge([
                 'asset' => $this->asset,
                 'language' => $language,

src/assetpreviews/Video.php

@@ -30,7 +30,7 @@ public function getPreviewHtml(array $variables = []): string
             throw new NotSupportedException('Preview not supported.');
         }
 
-        return Craft::$app->getView()->renderTemplate('assets/_previews/video',
+        return Craft::$app->getView()->renderTemplate('assets/_previews/video.twig',
             array_merge([
                 'asset' => $this->asset,
                 'url' => $url,

src/base/MissingComponentTrait.php

@@ -128,7 +128,7 @@ public function getPlaceholderHtml(): string
             }
         }
 
-        return Craft::$app->getView()->renderTemplate('_special/missing-component', compact(
+        return Craft::$app->getView()->renderTemplate('_special/missing-component.twig', compact(
             'error',
             'showPlugin',
             'isComposerInstalled',

src/base/Plugin.php

@@ -206,7 +206,7 @@ public function getSettingsResponse(): mixed
         /** @var Controller $controller */
         $controller = Craft::$app->controller;
 
-        return $controller->renderTemplate('settings/plugins/_settings', [
+        return $controller->renderTemplate('settings/plugins/_settings.twig', [
             'plugin' => $this,
             'settingsHtml' => $settingsHtml,
         ]);

src/controllers/AssetsController.php

@@ -764,7 +764,7 @@ public function actionImageEditor(): Response
 
         $focal = $asset->getHasFocalPoint() ? $asset->getFocalPoint() : null;
 
-        $html = $this->getView()->renderTemplate('_special/image_editor');
+        $html = $this->getView()->renderTemplate('_special/image_editor.twig');
 
         return $this->asJson(['html' => $html, 'focalPoint' => $focal]);
     }

src/controllers/BaseUpdaterController.php

@@ -97,7 +97,7 @@ public function actionIndex(): Response
         $stateJs = Json::encode($state);
         $this->getView()->registerJs("Craft.updater = (new Craft.Updater($idJs)).setState($stateJs);");
 
-        return $this->renderTemplate('_special/updater', [
+        return $this->renderTemplate('_special/updater.twig', [
             'title' => $this->pageTitle(),
         ]);
     }

src/controllers/CategoriesController.php

@@ -58,7 +58,7 @@ public function actionGroupIndex(): Response
 
         $groups = Craft::$app->getCategories()->getAllGroups();
 
-        return $this->renderTemplate('settings/categories/index', [
+        return $this->renderTemplate('settings/categories/index.twig', [
             'categoryGroups' => $groups,
         ]);
     }
@@ -113,7 +113,7 @@ public function actionEditCategoryGroup(?int $groupId = null, ?CategoryGroup $ca
         $variables['groupId'] = $groupId;
         $variables['categoryGroup'] = $categoryGroup;
 
-        return $this->renderTemplate('settings/categories/_edit', $variables);
+        return $this->renderTemplate('settings/categories/_edit.twig', $variables);
     }
 
     /**
@@ -225,7 +225,7 @@ public function actionCategoryIndex(?string $groupHandle = null): Response
             'New category',
         ]);
 
-        return $this->renderTemplate('categories/_index', [
+        return $this->renderTemplate('categories/_index.twig', [
             'groupHandle' => $groupHandle,
             'groups' => $groups,
         ]);
@@ -549,7 +549,7 @@ public function actionInputHtml(): Response
             }
         }
 
-        $html = $this->getView()->renderTemplate('_components/fieldtypes/Categories/input',
+        $html = $this->getView()->renderTemplate('_components/fieldtypes/Categories/input.twig',
             [
                 'elements' => $categories,
                 'id' => $this->request->getParam('id'),

src/controllers/DashboardController.php

@@ -142,7 +142,7 @@ public function actionIndex(): Response
 
         $variables['widgetTypes'] = $widgetTypeInfo;
 
-        return $this->renderTemplate('dashboard/_index', $variables);
+        return $this->renderTemplate('dashboard/_index.twig', $variables);
     }
 
     /**
@@ -301,7 +301,7 @@ public function actionSendSupportRequest(): Response
         $getHelpModel->attachment = UploadedFile::getInstanceByName($namespace . 'attachAdditionalFile');
 
         if (!$getHelpModel->validate()) {
-            return $this->renderTemplate('_components/widgets/CraftSupport/response', [
+            return $this->renderTemplate('_components/widgets/CraftSupport/response.twig', [
                 'widgetId' => $widgetId,
                 'success' => false,
                 'errors' => $getHelpModel->getErrors(),
@@ -434,7 +434,7 @@ public function actionSendSupportRequest(): Response
         }
 
         if (isset($requestException)) {
-            return $this->renderTemplate('_components/widgets/CraftSupport/response', [
+            return $this->renderTemplate('_components/widgets/CraftSupport/response.twig', [
                 'widgetId' => $widgetId,
                 'success' => false,
                 'errors' => [
@@ -445,7 +445,7 @@ public function actionSendSupportRequest(): Response
             ]);
         }
 
-        return $this->renderTemplate('_components/widgets/CraftSupport/response', [
+        return $this->renderTemplate('_components/widgets/CraftSupport/response.twig', [
             'widgetId' => $widgetId,
             'success' => true,
             'errors' => [],

src/controllers/ElementIndexesController.php

@@ -294,7 +294,7 @@ public function actionGetSourceTreeHtml(): Response
         $sources = Craft::$app->getElementSources()->getSources($this->elementType, $this->context);
 
         return $this->asJson([
-            'html' => $this->getView()->renderTemplate('_elements/sources', [
+            'html' => $this->getView()->renderTemplate('_elements/sources.twig', [
                 'elementType' => $this->elementType,
                 'sources' => $sources,
             ]),

src/controllers/ElementSelectorModalsController.php

@@ -99,7 +99,7 @@ public function actionBody(): Response
         })();
 
         return $this->asJson([
-            'html' => $this->getView()->renderTemplate('_elements/modalbody', [
+            'html' => $this->getView()->renderTemplate('_elements/modalbody.twig', [
                 'context' => $context,
                 'elementType' => $elementType,
                 'sources' => $sources,

src/controllers/ElementsController.php

@@ -616,7 +616,7 @@ private function _contextMenu(
             $showDrafts ||
             ($element->hasRevisions() && $element::find()->revisionOf($element)->status(null)->exists())
         ) {
-            return Craft::$app->getView()->renderTemplate('_includes/revisionmenu', [
+            return Craft::$app->getView()->renderTemplate('_includes/revisionmenu.twig', [
                 'element' => $element,
                 'showDrafts' => $showDrafts,
                 'supportedSiteIds' => $propSiteIds,
@@ -1187,7 +1187,7 @@ public function actionSaveDraft(): ?Response
             $tabs = $form->getTabMenu();
             if (count($tabs) > 1) {
                 $selectedTab = isset($tabs[$this->_selectedTab]) ? $this->_selectedTab : null;
-                $tabHtml = $view->namespaceInputs(fn() => $view->renderTemplate('_includes/tabs', [
+                $tabHtml = $view->namespaceInputs(fn() => $view->renderTemplate('_includes/tabs.twig', [
                     'tabs' => $tabs,
                     'selectedTab' => $selectedTab,
                 ], View::TEMPLATE_MODE_CP), $namespace);

src/controllers/EntriesController.php

@@ -78,7 +78,7 @@ public function actionCreate(?string $section = null): ?Response
         if (!in_array($site->id, $editableSiteIds)) {
             // If there’s more than one possibility and entries doesn’t propagate to all sites, let the user choose
             if (count($editableSiteIds) > 1 && $section->propagationMethod !== Section::PROPAGATION_METHOD_ALL) {
-                return $this->renderTemplate('_special/sitepicker', [
+                return $this->renderTemplate('_special/sitepicker.twig', [
                     'siteIds' => $editableSiteIds,
                     'baseUrl' => "entries/$section->handle/new",
                 ]);

src/controllers/FieldsController.php

@@ -257,7 +257,7 @@ public function actionEditField(?int $fieldId = null, ?FieldInterface $field = n
         $view->registerAssetBundle(FieldSettingsAsset::class);
         $view->registerJs($js);
 
-        return $this->renderTemplate('settings/fields/_edit', compact(
+        return $this->renderTemplate('settings/fields/_edit.twig', compact(
             'fieldId',
             'field',
             'allFieldTypes',
@@ -287,7 +287,7 @@ public function actionRenderSettings(): Response
         $field = Craft::$app->getFields()->createField($type);
 
         $view = Craft::$app->getView();
-        $html = $view->renderTemplate('settings/fields/_type-settings', [
+        $html = $view->renderTemplate('settings/fields/_type-settings.twig', [
             'field' => $field,
             'namespace' => $this->request->getBodyParam('namespace'),
         ]);

src/controllers/FsController.php

@@ -49,7 +49,7 @@ public function actionIndex(): Response
         $variables = [];
         $variables['filesystems'] = Craft::$app->getFs()->getAllFilesystems();
 
-        return $this->renderTemplate('settings/filesystems/_index', $variables);
+        return $this->renderTemplate('settings/filesystems/_index.twig', $variables);
     }
 
     /**
@@ -112,7 +112,7 @@ public function actionEdit(?string $handle = null, ?Fs $filesystem = null): Resp
             ->addCrumb(Craft::t('app', 'Filesystems'), 'settings/filesystems')
             ->action('fs/save')
             ->redirectUrl('settings/filesystems')
-            ->contentTemplate('settings/filesystems/_edit', [
+            ->contentTemplate('settings/filesystems/_edit.twig', [
                 'oldHandle' => $handle,
                 'filesystem' => $filesystem,
                 'fsOptions' => $fsOptions,

src/controllers/GlobalsController.php

@@ -174,7 +174,7 @@ public function actionEditContent(string $globalSetHandle, ?GlobalSet $globalSet
         ]);
 
         // Render the template!
-        return $this->renderTemplate('globals/_edit', [
+        return $this->renderTemplate('globals/_edit.twig', [
             'bodyClass' => 'edit-global-set',
             'editableGlobalSets' => $editableGlobalSets,
             'globalSet' => $globalSet,

src/controllers/GraphqlController.php

@@ -319,7 +319,7 @@ public function actionGraphiql(): Response
             $schemas[$name] = $schema->uid;
         }
 
-        return $this->renderTemplate('graphql/graphiql', [
+        return $this->renderTemplate('graphql/graphiql.twig', [
             'url' => UrlHelper::actionUrl('graphql/api'),
             'schemas' => $schemas,
             'selectedSchema' => $selectedSchema,
@@ -362,7 +362,7 @@ public function actionViewSchemas(): Response
         // Ensure the public schema is created.
         Craft::$app->getGql()->getPublicSchema();
 
-        return $this->renderTemplate('graphql/schemas/_index');
+        return $this->renderTemplate('graphql/schemas/_index.twig');
     }
 
     /**
@@ -419,7 +419,7 @@ public function actionEditToken(?int $tokenId = null, ?GqlToken $token = null):
             ]);
         }
 
-        return $this->renderTemplate('graphql/tokens/_edit', compact(
+        return $this->renderTemplate('graphql/tokens/_edit.twig', compact(
             'token',
             'title',
             'accessToken',
@@ -503,7 +503,7 @@ public function actionDeleteToken(): Response
     public function actionViewTokens(): Response
     {
         $this->requireAdmin(false);
-        return $this->renderTemplate('graphql/tokens/_index');
+        return $this->renderTemplate('graphql/tokens/_index.twig');
     }
 
     /**
@@ -536,7 +536,7 @@ public function actionEditSchema(?int $schemaId = null, ?GqlSchema $schema = nul
         }
 
 
-        return $this->renderTemplate('graphql/schemas/_edit', compact(
+        return $this->renderTemplate('graphql/schemas/_edit.twig', compact(
             'schema',
             'title'
         ));
@@ -562,7 +562,7 @@ public function actionEditPublicSchema(?GqlSchema $schema = null): Response
         $token = $gqlService->getPublicToken();
         $title = Craft::t('app', 'Edit the public GraphQL schema');
 
-        return $this->renderTemplate('graphql/schemas/_edit', compact(
+        return $this->renderTemplate('graphql/schemas/_edit.twig', compact(
             'schema',
             'token',
             'title'

src/controllers/ImageTransformsController.php

@@ -48,7 +48,7 @@ public function actionIndex(): Response
         $variables['transforms'] = Craft::$app->getImageTransforms()->getAllTransforms();
         $variables['modes'] = ImageTransform::modes();
 
-        return $this->renderTemplate('settings/assets/transforms/_index', $variables);
+        return $this->renderTemplate('settings/assets/transforms/_index.twig', $variables);
     }
 
     /**
@@ -81,7 +81,7 @@ public function actionEdit(?string $transformHandle = null, ?ImageTransform $tra
             $title = Craft::t('app', 'Create a new image transform');
         }
 
-        return $this->renderTemplate('settings/assets/transforms/_settings', [
+        return $this->renderTemplate('settings/assets/transforms/_settings.twig', [
             'handle' => $transformHandle,
             'transform' => $transform,
             'title' => $title,

src/controllers/InstallController.php

@@ -99,7 +99,7 @@ public function actionIndex(): Response
         $userIcon = file_get_contents($iconsPath . DIRECTORY_SEPARATOR . 'user.svg');
         $worldIcon = file_get_contents($iconsPath . DIRECTORY_SEPARATOR . 'world.svg');
 
-        return $this->renderTemplate('_special/install', compact(
+        return $this->renderTemplate('_special/install/index.twig', compact(
             'showDbScreen',
             'license',
             'defaultSystemName',

src/controllers/PluginStoreController.php

@@ -79,7 +79,7 @@ public function actionIndex(): Response
 
         $view->registerAssetBundle(PluginStoreAsset::class);
 
-        return $this->renderTemplate('plugin-store/_index');
+        return $this->renderTemplate('plugin-store/_index.twig');
     }
 
     /**
@@ -170,7 +170,7 @@ public function actionCallback(): Response
 
         $this->getView()->registerJs('new Craft.PluginStoreOauthCallback(' . Json::encode($options) . ');');
 
-        return $this->renderTemplate('plugin-store/_special/oauth/callback');
+        return $this->renderTemplate('plugin-store/_special/oauth/callback.twig');
     }
 
     /**
@@ -182,7 +182,7 @@ public function actionModalCallback(): Response
     {
         $craftIdAccessToken = $this->getCraftIdAccessToken();
 
-        return $this->renderTemplate('plugin-store/_special/oauth/modal-callback', [
+        return $this->renderTemplate('plugin-store/_special/oauth/modal-callback.twig', [
             'craftIdAccessToken' => $craftIdAccessToken,
         ]);
     }

src/controllers/RebrandController.php

@@ -84,7 +84,7 @@ public function actionUploadSiteImage(): Response
         }
 
         $imagesService->loadImage($fileDestination)->scaleToFit(300, 300)->saveAs($fileDestination);
-        $html = $this->getView()->renderTemplate('settings/general/_images/' . $type);
+        $html = $this->getView()->renderTemplate("settings/general/_images/$type.twig");
 
         return $this->asJson([
             'html' => $html,
@@ -107,7 +107,7 @@ public function actionDeleteSiteImage(): ?Response
 
         FileHelper::clearDirectory(Craft::$app->getPath()->getRebrandPath() . '/' . $type);
 
-        $html = $this->getView()->renderTemplate('settings/general/_images/' . $type);
+        $html = $this->getView()->renderTemplate("settings/general/_images/$type.twig");
 
         return $this->asJson([
             'html' => $html,

src/controllers/SectionsController.php

@@ -52,7 +52,7 @@ public function actionIndex(array $variables = []): Response
     {
         $variables['sections'] = Craft::$app->getSections()->getAllSections();
 
-        return $this->renderTemplate('settings/sections/_index', $variables);
+        return $this->renderTemplate('settings/sections/_index.twig', $variables);
     }
 
     /**
@@ -105,7 +105,7 @@ public function actionEditSection(?int $sectionId = null, ?Section $section = nu
 
         $this->getView()->registerAssetBundle(EditSectionAsset::class);
 
-        return $this->renderTemplate('settings/sections/_edit', $variables);
+        return $this->renderTemplate('settings/sections/_edit.twig', $variables);
     }
 
     /**
@@ -225,7 +225,7 @@ public function actionEntryTypesIndex(int $sectionId): Response
         $title = Craft::t('app', '{section} Entry Types',
             ['section' => Craft::t('site', $section->name)]);
 
-        return $this->renderTemplate('settings/sections/_entrytypes/index', [
+        return $this->renderTemplate('settings/sections/_entrytypes/index.twig', [
             'sectionId' => $sectionId,
             'section' => $section,
             'title' => $title,
@@ -293,7 +293,7 @@ public function actionEditEntryType(int $sectionId, ?int $entryTypeId = null, ?E
             ],
         ];
 
-        return $this->renderTemplate('settings/sections/_entrytypes/edit', [
+        return $this->renderTemplate('settings/sections/_entrytypes/edit.twig', [
             'sectionId' => $sectionId,
             'section' => $section,
             'entryTypeId' => $entryTypeId,