Skip to content

Commit 3b67249

Browse files
authored
Merge pull request #2733 from LibreSign/backport/2732/stable29
[stable29] chore: Remove NCContent
2 parents 5a39405 + 3a77de2 commit 3b67249

File tree

1 file changed

+63
-67
lines changed

1 file changed

+63
-67
lines changed

src/views/Validation.vue

Lines changed: 63 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,79 @@
11
<template>
2-
<NcContent app-name="libresign" class="jumbotron with-sidebar--full">
3-
<div class="container">
4-
<div class="image">
5-
<img :src="image" draggable="false">
6-
</div>
7-
<div id="dataUUID">
8-
<form v-show="!hasInfo" @submit="(e) => e.preventDefault()">
9-
<h1>{{ title }}</h1>
10-
<NcTextField :value.sync="myUuid" :label="legend" />
11-
<NcButton type="primary"
12-
@click.prevent="validate(myUuid)">
13-
<template #icon>
14-
<NcLoadingIcon v-if="hasLoading" :size="20" />
15-
</template>
16-
{{ buttonTitle }}
17-
</NcButton>
18-
</form>
19-
<div v-if="hasInfo" class="infor-container">
20-
<div class="infor-bg">
21-
<div class="infor">
22-
<div class="header">
23-
<img class="icon" :src="infoIcon">
24-
<h1>{{ infoDocument }}</h1>
25-
</div>
26-
<div class="info-document">
27-
<NcNoteCard v-if="isAfterSigned" type="success">
28-
{{ t('libresign', 'Congratulations you have digitally signed a document using LibreSign') }}
29-
</NcNoteCard>
30-
<p>
31-
<b>{{ document.name }}</b>
32-
</p>
33-
<NcRichText class="legal-information"
34-
:text="legalInformation"
35-
:use-markdown="true" />
2+
<div class="container">
3+
<div class="image">
4+
<img :src="image" draggable="false">
5+
</div>
6+
<div id="dataUUID">
7+
<form v-show="!hasInfo" @submit="(e) => e.preventDefault()">
8+
<h1>{{ title }}</h1>
9+
<NcTextField :value.sync="myUuid" :label="legend" />
10+
<NcButton type="primary"
11+
@click.prevent="validate(myUuid)">
12+
<template #icon>
13+
<NcLoadingIcon v-if="hasLoading" :size="20" />
14+
</template>
15+
{{ buttonTitle }}
16+
</NcButton>
17+
</form>
18+
<div v-if="hasInfo" class="infor-container">
19+
<div class="infor-bg">
20+
<div class="infor">
21+
<div class="header">
22+
<img class="icon" :src="infoIcon">
23+
<h1>{{ infoDocument }}</h1>
24+
</div>
25+
<div class="info-document">
26+
<NcNoteCard v-if="isAfterSigned" type="success">
27+
{{ t('libresign', 'Congratulations you have digitally signed a document using LibreSign') }}
28+
</NcNoteCard>
29+
<p>
30+
<b>{{ document.name }}</b>
31+
</p>
32+
<NcRichText class="legal-information"
33+
:text="legalInformation"
34+
:use-markdown="true" />
3635

37-
<NcButton type="primary"
38-
@click="viewDocument(document.file)">
39-
<template #icon>
40-
<NcLoadingIcon v-if="hasLoading" :size="20" />
41-
</template>
42-
{{ t('libresign', 'View') }}
43-
</NcButton>
44-
</div>
36+
<NcButton type="primary"
37+
@click="viewDocument(document.file)">
38+
<template #icon>
39+
<NcLoadingIcon v-if="hasLoading" :size="20" />
40+
</template>
41+
{{ t('libresign', 'View') }}
42+
</NcButton>
4543
</div>
4644
</div>
47-
<div class="infor-bg signed">
48-
<div class="header">
49-
<img class="icon" :src="signatureIcon">
50-
<h1>{{ t('libresign', 'Signatories:') }}</h1>
51-
</div>
52-
<div class="infor-content">
53-
<div v-for="item in document.signers"
54-
id="sign"
55-
:key="item.displayName"
56-
class="scroll">
57-
<div class="subscriber">
58-
<span><b>{{ getName(item) }}</b></span>
59-
<span v-if="item.signed" class="data-signed">
60-
{{ item.signed }}
61-
</span>
62-
<span v-else>{{ noDateMessage }}</span>
63-
</div>
45+
</div>
46+
<div class="infor-bg signed">
47+
<div class="header">
48+
<img class="icon" :src="signatureIcon">
49+
<h1>{{ t('libresign', 'Signatories:') }}</h1>
50+
</div>
51+
<div class="infor-content">
52+
<div v-for="item in document.signers"
53+
id="sign"
54+
:key="item.displayName"
55+
class="scroll">
56+
<div class="subscriber">
57+
<span><b>{{ getName(item) }}</b></span>
58+
<span v-if="item.signed" class="data-signed">
59+
{{ item.signed }}
60+
</span>
61+
<span v-else>{{ noDateMessage }}</span>
6462
</div>
6563
</div>
6664
</div>
67-
<NcButton type="primary"
68-
@click.prevent="goBack">
69-
{{ t('libresign', 'Return') }}
70-
</NcButton>
7165
</div>
66+
<NcButton type="primary"
67+
@click.prevent="goBack">
68+
{{ t('libresign', 'Return') }}
69+
</NcButton>
7270
</div>
7371
</div>
74-
</NcContent>
72+
</div>
7573
</template>
7674

7775
<script>
7876
import axios from '@nextcloud/axios'
79-
import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
8077
import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
8178
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
8279
import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
@@ -98,7 +95,6 @@ export default {
9895
components: {
9996
NcTextField,
10097
NcRichText,
101-
NcContent,
10298
NcButton,
10399
NcLoadingIcon,
104100
NcNoteCard,
@@ -240,6 +236,7 @@ $date-signed-font: .7rem;
240236
justify-content: center;
241237
overflow-y: auto;
242238
width: 100%;
239+
height: 100%;
243240
244241
.image{
245242
width: 100%;
@@ -357,7 +354,6 @@ button{
357354
}
358355
359356
.signed {
360-
width: 100%;
361357
margin-top: 10px;
362358
padding-right: 2px;
363359
strong {

0 commit comments

Comments
 (0)