From 49366596a923167288caf04411b69cccb4797882 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Sat, 9 May 2020 04:17:30 +0200
Subject: [PATCH 1/4] Do not prefill title for less confusion

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 lib/Controller/ApiController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index c82fa1b..dcf3fa8 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -148,7 +148,7 @@ class ApiController extends Controller {
 			$this->logger->debug('Could not find form');
 			return new Http\JSONResponse([], Http::STATUS_BAD_REQUEST);
 		}
-	
+
 		if (!$this->formsService->hasUserAccess($id)) {
 			$this->logger->debug('User has no permissions to get this form');
 			return new Http\JSONResponse([], Http::STATUS_FORBIDDEN);
@@ -171,7 +171,7 @@ class ApiController extends Controller {
 			16,
 			ISecureRandom::CHAR_HUMAN_READABLE
 		));
-		$form->setTitle('New form');
+		$form->setTitle('');
 		$form->setDescription('');
 		$form->setAccess([
 			'type' => 'public'
@@ -279,7 +279,7 @@ class ApiController extends Controller {
 			$this->logger->debug('Invalid type');
 			return new Http\JSONResponse(['message' => 'Invalid type'], Http::STATUS_BAD_REQUEST);
 		}
-		
+
 		try {
 			$form = $this->formMapper->findById($formId);
 		} catch (IMapperException $e) {

From a09c44476cbc8dca0f8fbf3c1e6536ced8ae43dd Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Sat, 9 May 2020 04:23:41 +0200
Subject: [PATCH 2/4] Do not prefill question titles either for even less
 confusion

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 src/components/Questions/Question.vue | 4 ++--
 src/views/Create.vue                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Questions/Question.vue b/src/components/Questions/Question.vue
index f4051d9..1c03977 100644
--- a/src/components/Questions/Question.vue
+++ b/src/components/Questions/Question.vue
@@ -34,8 +34,8 @@
 
 		<!-- Header -->
 		<div class="question__header">
-			<input v-if="edit"
-				:placeholder="t('forms', 'Enter a title for this question')"
+			<input v-if="edit || !text"
+				:placeholder="t('forms', 'Question title')"
 				:aria-label="t('forms', 'Title of question number {index}', {index})"
 				:value="text"
 				class="question__header-title"
diff --git a/src/views/Create.vue b/src/views/Create.vue
index f4377ba..b4cd43a 100644
--- a/src/views/Create.vue
+++ b/src/views/Create.vue
@@ -248,7 +248,7 @@ export default {
 		 * @param {string} type the question type, see AnswerTypes
 		 */
 		async addQuestion(type) {
-			const text = t('forms', 'New question')
+			const text = ''
 			this.isLoadingQuestions = true
 
 			try {

From 385708af8021cf597bb10cbb96802605fc7002ce Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Sat, 9 May 2020 15:56:01 +0200
Subject: [PATCH 3/4] Fix navigation placeholder and also fix further wording
 in loading messages etc

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 lib/Controller/ApiController.php      |  2 +-
 src/components/AppNavigationForm.vue  | 17 ++++++++++++++---
 src/components/Results/Submission.vue |  4 +---
 src/views/Results.vue                 | 19 +++++++++++++++----
 src/views/Submit.vue                  | 13 ++++++++++++-
 5 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
index dcf3fa8..a37f07f 100644
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@@ -633,7 +633,7 @@ class ApiController extends Controller {
 			// Append Display Name
 			if (substr($submission['userId'], 0, 10) === 'anon-user-') {
 				// Anonymous User
-				$submission['userDisplayName'] = $this->l10n->t('anonymous user');
+				$submission['userDisplayName'] = $this->l10n->t('Anonymous response');
 			} else {
 				$userEntity = $this->userManager->get($submission['userId']);
 
diff --git a/src/components/AppNavigationForm.vue b/src/components/AppNavigationForm.vue
index 7922e12..5cbf3d1 100644
--- a/src/components/AppNavigationForm.vue
+++ b/src/components/AppNavigationForm.vue
@@ -25,7 +25,7 @@
 		ref="navigationItem"
 		:exact="true"
 		:icon="icon"
-		:title="form.title"
+		:title="formTitle"
 		:to="{ name: 'edit', params: { hash: form.hash } }">
 		<template v-if="!loading" #actions>
 			<ActionLink
@@ -124,6 +124,17 @@ export default {
 			return this.form.expires && moment().unix() > this.form.expires
 		},
 
+		/**
+		 * Return form title, or placeholder if not set
+		 * @returns {string}
+		 */
+		formTitle() {
+			if (this.form.title) {
+				return this.form.title
+			}
+			return 'New form'
+		},
+
 		/**
 		 * Return the form share link
 		 * @returns {string}
@@ -148,7 +159,7 @@ export default {
 
 	methods: {
 		async onDeleteForm() {
-			if (!confirm(t('forms', 'Are you sure you want to delete the form “{title}”?', { title: this.form.title }))) {
+			if (!confirm(t('forms', 'Are you sure you want to delete {title}?', { title: this.formTitle }))) {
 				return
 			}
 
@@ -158,7 +169,7 @@ export default {
 				await axios.delete(generateUrl('/apps/forms/api/v1/form/{id}', { id: this.form.id }))
 				this.$emit('delete', this.form.id)
 			} catch (error) {
-				showError(t('forms', 'Error while deleting form “{title}”', { title: this.form.title }))
+				showError(t('forms', 'Error while deleting {title}', { title: this.formTitle }))
 				console.error(error.response)
 			} finally {
 				this.loading = false
diff --git a/src/components/Results/Submission.vue b/src/components/Results/Submission.vue
index 89d3369..72619d1 100644
--- a/src/components/Results/Submission.vue
+++ b/src/components/Results/Submission.vue
@@ -23,9 +23,7 @@
 <template>
 	<div class="section submission">
 		<div class="submission-head">
-			<h3>
-				{{ t('forms', 'Response by {userDisplayName}', { userDisplayName: submission.userDisplayName }) }}
-			</h3>
+			<h3>{{ submission.userDisplayName }}</h3>
 			<Actions class="submission-menu" :force-menu="true">
 				<ActionButton icon="icon-delete" @click="onDelete">
 					{{ t('forms', 'Delete this response') }}
diff --git a/src/views/Results.vue b/src/views/Results.vue
index f75db1d..db942fb 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -33,12 +33,12 @@
 		<TopBar>
 			<button @click="showEdit">
 				<span class="icon-forms" role="img" />
-				{{ t('forms', 'Back to form') }}
+				{{ t('forms', 'Back to questions') }}
 			</button>
 		</TopBar>
 
 		<header v-if="!noSubmissions">
-			<h2>{{ t('forms', 'Responses for {title}', { title: form.title }) }}</h2>
+			<h2>{{ t('forms', 'Responses for {title}', { title: formTitle }) }}</h2>
 			<div class="response_actions">
 				<button class="response_actions__export" @click="download">
 					<span class="icon-download" role="img" />
@@ -125,6 +125,17 @@ export default {
 		noSubmissions() {
 			return this.submissions && this.submissions.length === 0
 		},
+
+		/**
+		 * Return form title, or placeholder if not set
+		 * @returns {string}
+		 */
+		formTitle() {
+			if (this.form.title) {
+				return this.form.title
+			}
+			return 'New form'
+		},
 	},
 
 	beforeMount() {
@@ -185,7 +196,7 @@ export default {
 		},
 
 		async deleteAllSubmissions() {
-			if (!confirm(t('forms', 'Are you sure you want to delete all responses of this form?'))) {
+			if (!confirm(t('forms', 'Are you sure you want to delete all responses of {title}?', { title: this.formTitle }))) {
 				return
 			}
 
@@ -228,7 +239,7 @@ export default {
 
 			const element = document.createElement('a')
 			element.setAttribute('href', 'data:text/csv;charset=utf-8,' + encodeURIComponent(parser.parse(formattedSubmissions)))
-			element.setAttribute('download', this.form.title + '.csv')
+			element.setAttribute('download', this.formTitle + '.csv')
 			element.style.display = 'none'
 			document.body.appendChild(element)
 			element.click()
diff --git a/src/views/Submit.vue b/src/views/Submit.vue
index 7f8645c..417d4ff 100644
--- a/src/views/Submit.vue
+++ b/src/views/Submit.vue
@@ -26,7 +26,7 @@
 			<!-- Forms title & description-->
 			<header>
 				<h2 id="form-title">
-					{{ form.title }}
+					{{ formTitle }}
 				</h2>
 				<p v-if="!loading && !success" class="form-desc">
 					{{ form.description }}
@@ -111,6 +111,17 @@ export default {
 	},
 
 	computed: {
+		/**
+		 * Return form title, or placeholder if not set
+		 * @returns {string}
+		 */
+		formTitle() {
+			if (this.form.title) {
+				return this.form.title
+			}
+			return 'New form'
+		},
+
 		validQuestions() {
 			return this.form.questions.filter(question => {
 				// All questions must have a valid title

From 56c0ecce77d8336ec4ab67c767193898079aa00f Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Sat, 9 May 2020 18:42:29 +0200
Subject: [PATCH 4/4] Fix translations for formTitle

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 src/components/AppNavigationForm.vue | 2 +-
 src/views/Results.vue                | 2 +-
 src/views/Submit.vue                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AppNavigationForm.vue b/src/components/AppNavigationForm.vue
index 5cbf3d1..a476738 100644
--- a/src/components/AppNavigationForm.vue
+++ b/src/components/AppNavigationForm.vue
@@ -132,7 +132,7 @@ export default {
 			if (this.form.title) {
 				return this.form.title
 			}
-			return 'New form'
+			return t('forms', 'New form')
 		},
 
 		/**
diff --git a/src/views/Results.vue b/src/views/Results.vue
index db942fb..b2fd807 100644
--- a/src/views/Results.vue
+++ b/src/views/Results.vue
@@ -134,7 +134,7 @@ export default {
 			if (this.form.title) {
 				return this.form.title
 			}
-			return 'New form'
+			return t('forms', 'New form')
 		},
 	},
 
diff --git a/src/views/Submit.vue b/src/views/Submit.vue
index 417d4ff..48bc40b 100644
--- a/src/views/Submit.vue
+++ b/src/views/Submit.vue
@@ -119,7 +119,7 @@ export default {
 			if (this.form.title) {
 				return this.form.title
 			}
-			return 'New form'
+			return t('forms', 'New form')
 		},
 
 		validQuestions() {