Clean up publishing

Signed-off-by: Gary Kim <gary@garykim.dev>

1 files changed, 43 insertions, 35 deletions

diff --git a/apps/files/src/components/TransferOwnershipDialogue.vue b/apps/files/src/components/TransferOwnershipDialogue.vue
index 1dd1542ea23..52fcbc5fb07 100644
--- a/apps/files/src/components/TransferOwnershipDialogue.vue
+++ b/apps/files/src/components/TransferOwnershipDialogue.vue
@@ -21,33 +21,27 @@
 
 <template>
 	<div>
-		<h3>{{ t('files', 'Transfer ownership') }} </h3>
-		<p>
-			{{ t('files', 'Select a file or directory to be transferred to another user. It may take some time until the process is done.') }}
-		</p>
+		<h3>{{ t('files', 'Transfer ownership of a file or folder') }} </h3>
 		<form @submit.prevent="submit">
-			<ol>
-				<li>
-					<div class="step-header">
-						{{ t('files', 'File or directory be transferred') }}
-					</div>
-					<span v-if="directory === undefined">{{ t('files', 'Nothing selected') }}</span>
-					<span v-else>{{ directory }}</span>
-					<button class="primary" @click.prevent="start">
-						{{ t('files', 'Select') }}
-					</button>
-					<span class="error">{{ directoryPickerError }}</span>
-				</li>
-				<li>
-					<div class="step-header">
-						{{ t('files', 'New owner') }}
-					</div>
+			<p>
+				<span>{{ readableDirectory }}</span>
+				<button v-if="directory === undefined" @click.prevent="start">
+					{{ t('files', 'Choose file or folder to transfer') }}
+				</button>
+				<button v-else @click.prevent="start">
+					{{ t('files', 'Change') }}
+				</button>
+				<span class="error">{{ directoryPickerError }}</span>
+			</p>
+			<p>
+				<label>
+					<span>{{ t('files', 'New owner') }}</span>
 					<Multiselect
 						v-model="selectedUser"
 						:options="formatedUserSuggestions"
 						:multiple="false"
 						:searchable="true"
-						:placeholder="t('core', 'Target user …')"
+						:placeholder="t('files', 'Search users')"
 						:preselect-first="true"
 						:preserve-search="true"
 						:loading="loadingUsers"
@@ -56,16 +50,17 @@
 						:internal-search="false"
 						:clear-on-select="false"
 						:user-select="true"
-						@search-change="findUserDebounced" />
-				</li>
-				<li>
-					<input type="submit"
-						class="primary"
-						:value="submitButtonText"
-						:disabled="!canSubmit">
-					<span class="error">{{ submitError }}</span>
-				</li>
-			</ol>
+						@search-change="findUserDebounced"
+						class="middle-align" />
+				</label>
+			</p>
+			<p>
+				<input type="submit"
+					class="primary"
+					:value="submitButtonText"
+					:disabled="!canSubmit">
+				<span class="error">{{ submitError }}</span>
+			</p>
 		</form>
 	</div>
 </template>
@@ -80,7 +75,7 @@ import Vue from 'vue'
 
 import logger from '../logger'
 
-const picker = getFilePickerBuilder(t('files', 'Select a file or directory to be transferred'))
+const picker = getFilePickerBuilder(t('files', 'Choose a file or folder to transfer'))
 	.setMultiSelect(false)
 	.setModal(true)
 	.setType(1)
@@ -118,9 +113,16 @@ export default {
 		},
 		submitButtonText() {
 			if (!this.canSubmit) {
-				return t('files', 'Set options above')
+				return t('files', 'Transfer')
 			}
-			return t('files', 'Transfer "{path}" to {userid}', { path: this.directory, userid: this.uid })
+			const components = this.readableDirectory.split('/')
+			return t('files', 'Transfer {path} to {userid}', { path: components[components.length - 1], userid: this.selectedUser.displayName })
+		},
+		readableDirectory() {
+			if (!this.directory) {
+				return ''
+			}
+			return this.directory.substring(1)
 		}
 	},
 	created() {
@@ -216,5 +218,11 @@ export default {
 </script>
 
 <style scoped>
-
+.middle-align {
+	vertical-align: middle;
+}
+p {
+	margin-top: 12px;
+	margin-bottom: 12px;
+}
 </style>