Skip to content

[stable27] feat: improve save terms and reset signaturies actions #1021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GretaD merged 2 commits into from
Dec 13, 2024
Merged

[stable27] feat: improve save terms and reset signaturies actions #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2784d1f
feat: improve save terms and reset signaturies actions
GretaD Dec 13, 2024
cfd530f
chore(assets): Recompile assets
nextcloud-command Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/terms_of_service-admin.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/terms_of_service-admin.js.map
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 22 additions & 5 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
:checked.sync="showOnPublicShares">
{{ t('terms_of_service', 'Show on public shares') }}
</NcCheckboxRadioSwitch>

<p class="edit-form">
{{ t('terms_of_service', 'Enter or update terms of service below.. ') }}
</p>
<span class="form">
<NcMultiselect v-model="country"
:options="countryOptions"
Expand All @@ -55,7 +57,9 @@
<p class="settings-hint">
{{ t('terms_of_service', 'For formatting purposes Markdown is supported.') }}
</p>

<p class="terms-descr">
{{ t('terms_of_service', 'Saving the terms will update the text but will not send a notification to users. Notifications are only sent if you reset the signatories.') }}
</p>
<NcButton :disabled="saveButtonDisabled"
@click="onSubmit">
{{ saveButtonText }}
Expand All @@ -64,6 +68,9 @@

<NcSettingsSection v-if="hasTerms"
:title="t('terms_of_service', 'Existing terms of service')">
<p class="terms-descr">
{{ t('terms_of_service', 'We recommend to reset signatures if legal changes were applied. For minor changes like fixing typos or correcting links, it could be left out, as it would otherwise require all users to accept the Terms of Service again.') }}
</p>
<NcButton :disabled="resetButtonDisabled"
type="error"
@click="onResetSignatories">
Expand Down Expand Up @@ -153,7 +160,7 @@ export default {

mounted() {
this.saveButtonText = t('terms_of_service', 'Loading …')
this.resetButtonText = t('terms_of_service', 'Reset all signatories')
this.resetButtonText = t('terms_of_service', 'Reset signatories & notify users')
axios
.get(generateOcsUrl('/apps/terms_of_service/terms/admin'))
.then(response => {
Expand All @@ -178,7 +185,7 @@ export default {
})
})

this.saveButtonText = t('terms_of_service', 'Save')
this.saveButtonText = t('terms_of_service', 'Save terms')
this.$nextTick(() => {
this.saveButtonDisabled = false
})
Expand Down Expand Up @@ -229,8 +236,13 @@ export default {
display: block;
}

.form {
.edit-form {
margin-top: 30px;
opacity: .7;
}

.form {
margin-top: 10px;
display: block;
}

Expand All @@ -245,4 +257,9 @@ label span {
vertical-align: top;
}

.terms-descr {
opacity: .7;
margin-bottom: 10px;
}

</style>
Loading