More template path tightening

src/templates/_components/fieldtypes/Assets/settings.twig

@@ -1,10 +1,10 @@
-{% extends "_components/fieldtypes/elementfieldsettings" %}
-{% import "_includes/forms" as forms %}
+{% extends '_components/fieldtypes/elementfieldsettings.twig' %}
+{% import '_includes/forms.twig' as forms %}
 
 {% macro uploadLocationField(config) %}
-    {% embed '_includes/forms/field' with config %}
+    {% embed '_includes/forms/field.twig' with config %}
         {% block input %}
-            {% import '_includes/forms' as forms %}
+            {% import '_includes/forms.twig' as forms %}
             <div class="flex flex-nowrap">
                 <div>
                     {{ forms.select({

src/templates/_components/fieldtypes/elementfieldsettings.twig

@@ -1,4 +1,4 @@
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% set sourceOptions = field.getSourceOptions() %}
 {% set elementType = elementType ?? pluralElementType %}

src/templates/_components/utilities/AssetIndexes.twig

@@ -1,4 +1,4 @@
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 <form id="asset-indexes" class="utility" method="post" accept-charset="UTF-8">
 

src/templates/_includes/revisionmenu.twig

@@ -4,7 +4,7 @@
     Only an existing element should be passed to this.
 #}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% set showDrafts = showDrafts ?? false %}
 {% set drafts = element.id and showDrafts ? element.find()

src/templates/_layouts/cp.twig

@@ -39,7 +39,7 @@
 └────────────────────────────────────────────────────────────────────────────────────┘
 #}
 
-{% extends "_layouts/basecp" %}
+{% extends '_layouts/basecp.twig' %}
 
 {# The control panel only supports queue components that implement QueueInterface #}
 {% set queue = craft.app.queue %}

src/templates/_layouts/elementindex.twig

@@ -1,4 +1,4 @@
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 
 {% set elementInstance = craft.app.elements.createElement(elementType) %}
 {% set title = title ?? elementInstance.pluralDisplayName() %}

src/templates/assets/index.twig

@@ -1,4 +1,4 @@
-{% extends "_layouts/elementindex" %}
+{% extends '_layouts/elementindex.twig' %}
 {% set title = "Assets"|t('app') %}
 {% set elementType = 'craft\\elements\\Asset' %}
 

src/templates/login.twig

@@ -1,5 +1,5 @@
-{% extends "_layouts/basecp" %}
-{% import "_includes/forms" as forms %}
+{% extends '_layouts/basecp.twig' %}
+{% import '_includes/forms.twig' as forms %}
 {% set title = "Sign In"|t('app') %}
 {% set bodyClass = 'login' %}
 {% do view.registerAssetBundle("craft\\web\\assets\\login\\LoginAsset") %}

src/templates/settings/assets/transforms/_settings.twig

@@ -1,6 +1,6 @@
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% set crumbs = [
     { label: "Settings"|t('app'), url: url('settings') },
@@ -101,12 +101,12 @@
             errors: (transform is defined ? transform.getErrors('height') : null),
         }) }}
 
-        {% embed '_includes/forms/field' with {
+        {% embed '_includes/forms/field.twig' with {
             label: 'Quality'|t('app'),
             errors: (transform is defined ? transform.getErrors('quality') : null),
         } %}
             {% block input %}
-                {% import '_includes/forms' as forms %}
+                {% import '_includes/forms.twig' as forms %}
                 <div class="flex flex-nowrap">
                     <div>
                         {{ forms.select({

src/templates/settings/assets/volumes/_edit.twig

@@ -1,4 +1,4 @@
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 
 {% if not isNewVolume %}{{ hiddenInput('volumeId', volume.id) }}{% endif %}

src/templates/settings/categories/_edit.twig

@@ -1,8 +1,8 @@
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 
 {% set fullPageForm = true %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% set headlessMode = craft.app.config.general.headlessMode %}
 

src/templates/settings/email/_index.twig

@@ -1,6 +1,6 @@
 {% requireAdmin %}
 
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 
 {% set crumbs = [
     { label: "Settings"|t('app'), url: url('settings') }
@@ -9,7 +9,7 @@
 {% set fullPageForm = true %}
 {% set title = "Email Settings"|t('app') %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% do view.registerTranslations('app', [
     "Email sent successfully! Check your inbox.",

src/templates/settings/fields/_edit.twig

@@ -1,4 +1,4 @@
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 {% set fullPageForm = true %}
 {% set formActions = [
     {
@@ -18,7 +18,7 @@
     },
 ]|filter %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% block content %}
     {{ actionInput('fields/save-field') }}

src/templates/settings/filesystems/_edit.twig

@@ -1,4 +1,4 @@
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% if oldHandle %}{{ hiddenInput('oldHandle', oldHandle) }}{% endif %}
 

src/templates/settings/globals/_edit.twig

@@ -1,7 +1,7 @@
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 {% set fullPageForm = true %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 
 {% block content %}

src/templates/settings/sections/_edit.twig

@@ -1,4 +1,4 @@
-{% extends 'settings/sections/_layout' %}
+{% extends 'settings/sections/_layout.twig' %}
 {% set selectedTab = 'settings' %}
 {% set fullPageForm = true %}
 {% set formActions = [
@@ -10,7 +10,7 @@
     },
 ] %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% set headlessMode = craft.app.config.general.headlessMode %}
 

src/templates/settings/sites/_edit.twig

@@ -1,8 +1,8 @@
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 
 {% set fullPageForm = true %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 
 {% block content %}

src/templates/settings/tags/_edit.twig

@@ -1,8 +1,8 @@
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 
 {% set fullPageForm = true %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% block content %}
     {{ actionInput('tags/save-tag-group') }}

src/templates/users/_accountfields.twig

@@ -1,4 +1,4 @@
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 {% set static = static ?? false %}
 
 {% if not craft.app.config.general.useEmailAsUsername %}

src/templates/users/_edit.twig

@@ -1,12 +1,12 @@
-{% extends "_layouts/cp" %}
+{% extends '_layouts/cp.twig' %}
 
 {% if CraftEdition == CraftPro and currentUser.can('editUsers') %}
     {% set crumbs = [
         { label: "Users"|t('app'), url: url('users') },
     ] %}
 {% endif %}
 
-{% import "_includes/forms" as forms %}
+{% import '_includes/forms.twig' as forms %}
 
 {% do view.registerAssetBundle("craft\\web\\assets\\fileupload\\FileUploadAsset") %}
 {% do view.setIsDeltaRegistrationActive(true) %}
@@ -158,7 +158,7 @@
                         {% do view.registerDeltaName('groups') %}
                         {% set assignableGroups = craft.app.userGroups.getAssignableGroups(user) %}
 
-                        {% embed '_includes/forms/field' with {
+                        {% embed '_includes/forms/field.twig' with {
                             fieldId: 'user-groups',
                         } %}
                             {% block input %}