3 files changed, 30 insertions, 15 deletions
diff --git a/apps/files/src/newMenu/newFolder.ts b/apps/files/src/newMenu/newFolder.ts
index a570fa71c61..f0f854d2801 100644
--- a/apps/files/src/newMenu/newFolder.ts
+++ b/apps/files/src/newMenu/newFolder.ts
@@ -8,11 +8,11 @@ import { basename } from 'path'
 import { emit } from '@nextcloud/event-bus'
 import { getCurrentUser } from '@nextcloud/auth'
 import { Permission, Folder } from '@nextcloud/files'
-import { showSuccess } from '@nextcloud/dialogs'
+import { showError, showSuccess } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 import axios from '@nextcloud/axios'
 
-import FolderPlusSvg from '@mdi/svg/svg/folder-plus.svg?raw'
+import FolderPlusSvg from '@mdi/svg/svg/folder-plus-outline.svg?raw'
 
 import { newNodeName } from '../utils/newNodeDialog'
 import logger from '../logger'
@@ -42,19 +42,26 @@ const createNewFolder = async (root: Folder, name: string): Promise<createFolder
 export const entry = {
 	id: 'newFolder',
 	displayName: t('files', 'New folder'),
-	enabled: (context: Folder) => (context.permissions & Permission.CREATE) !== 0,
-	iconSvgInline: FolderPlusSvg,
+	enabled: (context: Folder) => Boolean(context.permissions & Permission.CREATE) && Boolean(context.permissions & Permission.READ),
+
+	// Make the svg icon color match the primary element color
+	iconSvgInline: FolderPlusSvg.replace(/viewBox/gi, 'style="color: var(--color-primary-element)" viewBox'),
 	order: 0,
+
 	async handler(context: Folder, content: Node[]) {
 		const name = await newNodeName(t('files', 'New folder'), content)
-		if (name !== null) {
-			const { fileid, source } = await createNewFolder(context, name)
+		if (name === null) {
+			return
+		}
+		try {
+			const { fileid, source } = await createNewFolder(context, name.trim())
+
 			// Create the folder in the store
 			const folder = new Folder({
 				source,
 				id: fileid,
 				mtime: new Date(),
-				owner: getCurrentUser()?.uid || null,
+				owner: context.owner,
 				permissions: Permission.ALL,
 				root: context?.root || '/files/' + getCurrentUser()?.uid,
 				// Include mount-type from parent folder as this is inherited
@@ -65,14 +72,20 @@ export const entry = {
 				},
 			})
 
+			// Show success
+			emit('files:node:created', folder)
 			showSuccess(t('files', 'Created new folder "{name}"', { name: basename(source) }))
 			logger.debug('Created new folder', { folder, source })
-			emit('files:node:created', folder)
+
+			// Navigate to the new folder
 			window.OCP.Files.Router.goToRoute(
 				null, // use default route
-				{ view: 'files', fileid: folder.fileid },
+				{ view: 'files', fileid: String(fileid) },
 				{ dir: context.path },
 			)
+		} catch (error) {
+			logger.error('Creating new folder failed', { error })
+			showError('Creating new folder failed')
 		}
 	},
 } as Entry
diff --git a/apps/files/src/newMenu/newFromTemplate.ts b/apps/files/src/newMenu/newFromTemplate.ts
index 9c8e405b911..356fc5e1611 100644
--- a/apps/files/src/newMenu/newFromTemplate.ts
+++ b/apps/files/src/newMenu/newFromTemplate.ts
@@ -69,7 +69,7 @@ export function registerTemplateEntries() {
 				if (name !== null) {
 					// Create the file
 					const picker = await templatePicker
-					picker.open(name, provider)
+					picker.open(name.trim(), provider)
 				}
 			},
 		} as Entry)
diff --git a/apps/files/src/newMenu/newTemplatesFolder.ts b/apps/files/src/newMenu/newTemplatesFolder.ts
index e2c27ce067f..bf6862bda08 100644
--- a/apps/files/src/newMenu/newTemplatesFolder.ts
+++ b/apps/files/src/newMenu/newTemplatesFolder.ts
@@ -15,9 +15,11 @@ import { newNodeName } from '../utils/newNodeDialog'
 
 import PlusSvg from '@mdi/svg/svg/plus.svg?raw'
 import axios from '@nextcloud/axios'
-import logger from '../logger.js'
+import logger from '../logger.ts'
 
+const templatesEnabled = loadState<boolean>('files', 'templates_enabled', true)
 let templatesPath = loadState<string|false>('files', 'templates_path', false)
+logger.debug('Templates folder enabled', { templatesEnabled })
 logger.debug('Initial templates folder', { templatesPath })
 
 /**
@@ -53,12 +55,12 @@ const initTemplatesFolder = async function(directory: Folder, name: string) {
 
 export const entry = {
 	id: 'template-picker',
-	displayName: t('files', 'Create new templates folder'),
+	displayName: t('files', 'Create templates folder'),
 	iconSvgInline: PlusSvg,
-	order: 10,
+	order: 30,
 	enabled(context: Folder): boolean {
-		// Templates folder already initialized
-		if (templatesPath) {
+		// Templates disabled or templates folder already initialized
+		if (!templatesEnabled || templatesPath) {
 			return false
 		}
 		// Allow creation on your own folders only