Skip to content

Commit cea9469

Browse files
authored
Replace Terms of Use checkbox in Instance Creation workflow (#1042)
* Replace Terms of Use checkbox in Instance Creation workflow * refactor accept terms of use checkbox deletion * fix linting * fix UI error * Add terms of use title
1 parent eb5154e commit cea9469

File tree

2 files changed

+17
-35
lines changed

2 files changed

+17
-35
lines changed

src/components/Cards/CreateWiki.vue

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
:inFlight="inFlight"
2929
:error="error"
3030
:dismissable="false"
31-
:showTerms="true"
3231
submitButtonText="Create Wiki"
3332
v-model="stepThree"
3433
@previous-step="goToStep(2)"
@@ -76,8 +75,7 @@ export default {
7675
},
7776
stepThree: {
7877
temporality: '',
79-
otherTemporality: '',
80-
terms: false
78+
otherTemporality: ''
8179
},
8280
hasError: false,
8381
error: [],
@@ -174,10 +172,6 @@ export default {
174172
this.hasError = true
175173
this.error.username = errors.username[0]
176174
}
177-
if (errors.terms) {
178-
this.hasError = true
179-
this.error.terms = errors.terms[0]
180-
}
181175
if (errors.tooManyWikis) {
182176
this.hasError = true
183177
this.displayGenericError(errors.message)
@@ -199,7 +193,6 @@ export default {
199193
this.error.sitename = message
200194
this.error.siteaddress = message
201195
this.error.username = message
202-
this.error.terms = message
203196
},
204197
checkCurrentLogin () {
205198
if (!this.currentUser) {

src/components/Cards/CreateWikiWizardStepThree.vue

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -54,32 +54,22 @@
5454
</template>
5555
</v-radio>
5656
</v-radio-group>
57-
58-
<h3 v-if="showTerms" class="mt-6">Terms of Use</h3>
59-
<v-checkbox
60-
v-model="value.terms"
61-
:disabled="inFlight"
62-
:rules="[() => !!value.terms || 'You must accept the Terms of Service.']"
63-
v-if="showTerms"
64-
>
65-
<template v-slot:label>
66-
<div>
67-
I agree to the
68-
<v-tooltip bottom>
69-
<template v-slot:activator="{ on }">
70-
<a
71-
target="_blank"
72-
href="/terms-of-use"
73-
@click.stop
74-
v-on="on"
75-
>
76-
Terms of Use</a>
77-
</template>
78-
Opens in new window
79-
</v-tooltip>.
80-
</div>
81-
</template>
82-
</v-checkbox>
57+
<h3 class="mt-6">Terms of Use</h3>
58+
<div class="body-2">
59+
Previously accepted
60+
<v-tooltip top>
61+
<template v-slot:activator="{ on }">
62+
<a
63+
target="_blank"
64+
href="/terms-of-use"
65+
@click.stop
66+
v-on="on"
67+
>
68+
Terms of Use</a>
69+
</template>
70+
Opens in new window
71+
</v-tooltip> still apply.
72+
</div>
8373
</v-form>
8474
</v-card-text>
8575
<v-card-actions>
@@ -112,7 +102,6 @@ export default {
112102
value: Object,
113103
error: Array,
114104
dismissable: Boolean,
115-
showTerms: Boolean,
116105
submitButtonText: String
117106
},
118107
methods: {

0 commit comments

Comments
 (0)