Skip to content

Commit b185d80

Browse files
tobihagemanntobihagemann
committed
re-added optional message, other finetuning
1 parent 89ce05c commit b185d80

File tree

4 files changed

+36
-14
lines changed

4 files changed

+36
-14
lines changed

‎assets/js/hubmanaged.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HubManaged {
3535
});
3636
}
3737

38-
validateSubdomainAndTeam() {
38+
validateTeamAndSubdomain() {
3939
if (!$(this._form)[0].checkValidity()) {
4040
$(this._form).find(':input').addClass('show-invalid');
4141
this._feedbackData.errorMessage = 'Please fill in all required fields.';
@@ -48,13 +48,13 @@ class HubManaged {
4848
url: VALIDATE_HUB_MANAGED_REQUEST_URL,
4949
type: 'GET',
5050
data: {
51-
subdomain: this._submitData.subdomain,
52-
team: this._submitData.team
51+
team: this._submitData.team,
52+
subdomain: this._submitData.subdomain
5353
}
5454
}).done(_ => {
5555
this.onValidationSucceeded();
5656
}).fail(xhr => {
57-
this.onValidationFailed(xhr.responseJSON?.message || 'Validating subdomain and team failed.');
57+
this.onValidationFailed(xhr.responseJSON?.message || 'Validating team and subdomain failed.');
5858
});
5959
}
6060

‎i18n/de.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,13 @@
655655
- id: hub_managed_step_4_url
656656
translation: "URL"
657657
- id: hub_managed_step_4_quantity
658-
translation: "Anzahl der erwarteten Nutzer"
658+
translation: "Erwartete Nutzer"
659+
- id: hub_managed_step_4_message
660+
translation: "Nachricht"
661+
- id: hub_managed_step_4_message_add
662+
translation: "Nachricht hinzufügen (optional)"
663+
- id: hub_managed_step_4_message_add_placeholder
664+
translation: "Nachricht an das Cryptomator-Team (optional)"
659665
- id: hub_managed_step_4_loadcaptcha
660666
translation: "Weiter…"
661667
- id: hub_managed_step_4_submit

‎i18n/en.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,12 @@
656656
translation: "URL"
657657
- id: hub_managed_step_4_quantity
658658
translation: "Expected Users"
659+
- id: hub_managed_step_4_message
660+
translation: "Message"
661+
- id: hub_managed_step_4_message_add
662+
translation: "Add message (optional)"
663+
- id: hub_managed_step_4_message_add_placeholder
664+
translation: "Message to the Cryptomator team (optional)"
659665
- id: hub_managed_step_4_loadcaptcha
660666
translation: "Continue…"
661667
- id: hub_managed_step_4_submit

‎layouts/hub-managed/single.html‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ define "main" }}
2-
<section x-data="{steps: ['{{ i18n "hub_managed_step_1_nav_title" }}', '{{ i18n "hub_managed_step_2_nav_title" }}', '{{ i18n "hub_managed_step_3_nav_title" }}', '{{ i18n "hub_managed_step_4_nav_title" }}'], feedbackData: {currentStep: 0, success: false, inProgress: false, errorMessage: ''}, submitData: {captcha: null, subdomain: '', email: '', quantity: null, team: '', acceptNewsletter: false}, acceptTerms: false, lowQuantityModalIsOpen: false, hubManaged: null}" x-init="hubManaged = new HubManaged($refs.form, feedbackData, submitData); $watch('submitData.team', team => submitData.subdomain = teamToSubdomain(team))" class="container py-12">
2+
<section x-data="{steps: ['{{ i18n "hub_managed_step_1_nav_title" }}', '{{ i18n "hub_managed_step_2_nav_title" }}', '{{ i18n "hub_managed_step_3_nav_title" }}', '{{ i18n "hub_managed_step_4_nav_title" }}'], feedbackData: {currentStep: 0, success: false, inProgress: false, errorMessage: ''}, submitData: {captcha: null, email: '', team: '', subdomain: '', quantity: null, message: null, acceptNewsletter: false}, acceptTerms: false, lowQuantityModalIsOpen: false, hubManaged: null}" x-init="hubManaged = new HubManaged($refs.form, feedbackData, submitData); $watch('submitData.team', team => submitData.subdomain = teamToSubdomain(team))" class="container py-12">
33
<header class="mb-6">
44
<h1 class="font-h1 mb-8">{{ .Title }}</h1>
55
<p class="lead">{{ i18n "hub_managed_description" }}</p>
@@ -94,14 +94,14 @@ <h2 class="font-h2 mb-6">
9494
</p>
9595
<div class="col-span-6 mb-8 lg:col-span-4">
9696
<div class="flex items-center rounded-sm bg-gray-300">
97-
<div class="text-gray-700 px-3">https://</div>
98-
<input type="text" id="subdomain" pattern="[a-z\d\-](?:[a-z\d\-]{0,61}[a-z\d])?" class="block input-box rounded-none w-full" placeholder="{{ i18n "hub_managed_step_2_subdomain_placeholder" }}" maxlength="63" x-model="submitData.subdomain" @blur="$el.classList.add('show-invalid')" required>
99-
<div class="text-gray-700 px-3">.cryptomator.cloud</div>
97+
<div class="text-sm text-gray-700 px-3">https://</div>
98+
<input type="text" id="subdomain" pattern="[a-z\d\-](?:[a-z\d\-]{0,61}[a-z\d])?" class="block input-box rounded-none text-sm w-full" placeholder="{{ i18n "hub_managed_step_2_subdomain_placeholder" }}" maxlength="63" x-model="submitData.subdomain" @blur="$el.classList.add('show-invalid')" required>
99+
<div class="text-sm text-gray-700 px-3">.cryptomator.cloud</div>
100100
</div>
101101
</div>
102102
<div class="mt-auto">
103103
<p :class="{'hidden': !feedbackData.errorMessage}" class="text-sm text-red-600 mb-2" x-text="feedbackData.errorMessage"></p>
104-
<button :disabled="feedbackData.inProgress" @click.prevent="hubManaged.validateSubdomainAndTeam()" class="btn btn-primary w-full md:w-64 plausible-event-name=hub-managed-step-2" data-umami-event="hub-managed-step-2">
104+
<button :disabled="feedbackData.inProgress" @click.prevent="hubManaged.validateTeamAndSubdomain()" class="btn btn-primary w-full md:w-64 plausible-event-name=hub-managed-step-2" data-umami-event="hub-managed-step-2">
105105
<i :class="{'fa-chevron-right': !feedbackData.inProgress, 'fa-spinner fa-spin': feedbackData.inProgress}" class="fas fa-fw" aria-hidden="true"></i>
106106
{{ i18n "hub_managed_steps_next" }}
107107
</button>
@@ -146,30 +146,40 @@ <h2 class="font-h2 mb-6">
146146
{{ i18n "hub_managed_step_4_title" }}
147147
</h2>
148148
<ul class="space-y-2 mb-6">
149-
<li class="flex justify-between">
149+
<li class="flex justify-between gap-2">
150150
<span class="font-p text-sm text-gray-500">
151151
{{ i18n "hub_managed_step_4_email" }}
152152
</span>
153153
<span class="font-p text-sm" x-text="submitData.email"></span>
154154
</li>
155-
<li class="flex justify-between">
155+
<li class="flex justify-between gap-2">
156156
<span class="font-p text-sm text-gray-500">
157157
{{ i18n "hub_managed_step_4_team" }}
158158
</span>
159159
<span class="font-p text-sm" x-text="submitData.team"></span>
160160
</li>
161-
<li class="flex justify-between">
161+
<li class="flex justify-between gap-2">
162162
<span class="font-p text-sm text-gray-500">
163163
{{ i18n "hub_managed_step_4_url" }}
164164
</span>
165165
<span class="font-p text-sm" x-text="subdomainToURL(submitData.subdomain)"></span>
166166
</li>
167-
<li class="flex justify-between">
167+
<li class="flex justify-between gap-2">
168168
<span class="font-p text-sm text-gray-500">
169169
{{ i18n "hub_managed_step_4_quantity" }}
170170
</span>
171171
<span class="font-p text-sm" x-text="submitData.quantity"></span>
172172
</li>
173+
<li class="flex justify-between gap-2">
174+
<span class="font-p text-sm text-gray-500">
175+
{{ i18n "hub_managed_step_4_message" }}
176+
</span>
177+
<a x-show="submitData.message == null" href="#" class="font-p text-link text-sm" @click.prevent="submitData.message = ''">
178+
<i class="fas fa-plus-circle"></i>
179+
{{ i18n "hub_managed_step_4_message_add" }}
180+
</a>
181+
<textarea x-show="submitData.message != null" id="message" rows="3" maxlength="400" class="input-box text-sm w-full max-w-xs" placeholder="{{ i18n "hub_managed_step_4_message_add_placeholder" }}" x-model="submitData.message" x-cloak></textarea>
182+
</li>
173183
</ul>
174184
<p class="font-p text-sm mb-2">
175185
{{ partial "checkbox.html" (dict "context" . "alpineVariable" "acceptTerms" "label" (i18n "accept_hub_managed_terms_and_privacy" | safeHTML)) }}

0 commit comments

Comments
 (0)