|
62 | 62 | </div> |
63 | 63 | <NcDialog v-if="signMethodsStore.modal.clickToSign" |
64 | 64 | :no-close="loading" |
65 | | - :name="t('libresign', 'Confirm')" |
| 65 | + :name="t('libresign', 'Sign document')" |
66 | 66 | size="small" |
67 | 67 | dialog-classes="libresign-dialog" |
68 | 68 | @closing="signMethodsStore.closeModal('clickToSign')"> |
|
73 | 73 | <NcRichText :text="error.message" |
74 | 74 | :use-markdown="true" /> |
75 | 75 | </NcNoteCard> |
76 | | - {{ t('libresign', 'Confirm your signature') }} |
| 76 | + |
| 77 | + <p class="confirmation-text"> |
| 78 | + {{ t('libresign', 'Confirm that you want to sign this document.') }} |
| 79 | + </p> |
| 80 | + |
77 | 81 | <template #actions> |
78 | 82 | <NcButton :disabled="loading" |
79 | 83 | @click="signMethodsStore.closeModal('clickToSign')"> |
|
85 | 89 | <template #icon> |
86 | 90 | <NcLoadingIcon v-if="loading" :size="20" /> |
87 | 91 | </template> |
88 | | - {{ t('libresign', 'Confirm') }} |
| 92 | + {{ t('libresign', 'Sign document') }} |
89 | 93 | </NcButton> |
90 | 94 | </template> |
91 | 95 | </NcDialog> |
92 | 96 | <NcDialog v-if="signMethodsStore.modal.password" |
93 | 97 | :no-close="loading" |
94 | | - :name="t('libresign', 'Confirm your signature')" |
| 98 | + :name="t('libresign', 'Sign document')" |
95 | 99 | size="small" |
96 | 100 | dialog-classes="libresign-dialog" |
97 | 101 | @closing="onCloseConfirmPassword"> |
|
102 | 106 | <NcRichText :text="error.message" |
103 | 107 | :use-markdown="true" /> |
104 | 108 | </NcNoteCard> |
105 | | - {{ t('libresign', 'Subscription password.') }} |
| 109 | + |
| 110 | + <p class="confirmation-text"> |
| 111 | + {{ t('libresign', 'Enter your signature password to sign the document.') }} |
| 112 | + </p> |
| 113 | + |
106 | 114 | <form @submit.prevent="signWithPassword()"> |
107 | | - <NcPasswordField v-model="signPassword" type="password" /> |
| 115 | + <NcPasswordField v-model="signPassword" |
| 116 | + :label="t('libresign', 'Signature password')" |
| 117 | + type="password" /> |
108 | 118 | </form> |
109 | 119 | <a id="lost-password" @click="toggleManagePassword">{{ t('libresign', 'Forgot password?') }}</a> |
110 | 120 | <ManagePassword v-if="showManagePassword" |
|
117 | 127 | <template #icon> |
118 | 128 | <NcLoadingIcon v-if="loading" :size="20" /> |
119 | 129 | </template> |
120 | | - {{ t('libresign', 'Sign the document.') }} |
| 130 | + {{ t('libresign', 'Sign document') }} |
121 | 131 | </NcButton> |
122 | 132 | </template> |
123 | 133 | </NcDialog> |
@@ -239,8 +249,10 @@ export default { |
239 | 249 |
|
240 | 250 | const visibleElements = getVisibleElementsFromDocument(document) |
241 | 251 | .filter(row => { |
242 | | - return this.signatureElementsStore.hasSignatureOfType(row.type) |
243 | | - && signRequestIds.has(String(row.signRequestId)) |
| 252 | + // Access signatureElementsStore.signs[row.type] directly to ensure reactivity |
| 253 | + const signatureData = this.signatureElementsStore.signs[row.type] |
| 254 | + const hasSignature = signatureData && signatureData.createdAt && signatureData.createdAt.length > 0 |
| 255 | + return hasSignature && signRequestIds.has(String(row.signRequestId)) |
244 | 256 | }) |
245 | 257 | return visibleElements |
246 | 258 | }, |
@@ -535,6 +547,29 @@ export default { |
535 | 547 | </script> |
536 | 548 |
|
537 | 549 | <style lang="scss" scoped> |
| 550 | +.progress-indicator { |
| 551 | + font-weight: bold; |
| 552 | + color: var(--color-primary-element); |
| 553 | + text-align: center; |
| 554 | + margin-bottom: 16px; |
| 555 | + padding: 8px; |
| 556 | + background-color: var(--color-primary-element-light); |
| 557 | + border-radius: var(--border-radius-large); |
| 558 | +} |
| 559 | +
|
| 560 | +.step-explanation { |
| 561 | + margin-bottom: 16px; |
| 562 | + color: var(--color-text-maxcontrast); |
| 563 | + line-height: 1.5; |
| 564 | +} |
| 565 | +
|
| 566 | +.confirmation-text { |
| 567 | + margin-bottom: 16px; |
| 568 | + color: var(--color-text-maxcontrast); |
| 569 | + line-height: 1.5; |
| 570 | + text-align: center; |
| 571 | +} |
| 572 | +
|
538 | 573 | .no-signature-warning { |
539 | 574 | margin-top: 1em; |
540 | 575 | } |
|
0 commit comments