Skip to content

Commit cd8086f

Browse files
nicolaskempf57nicolaskempf57
committed
Merge branch 'main' into feat/add-transfer-notification
2 parents fa9522e + 6453188 commit cd8086f

File tree

59 files changed

+368
-331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+368
-331
lines changed

‎components/AdminTable/AdminContactPointsTable/AdminContactPointsTable.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@
6363
keep-margins-even-without-borders
6464
v-bind="attrs"
6565
v-on="listeners"
66-
>
67-
{{ $t('Modifier') }}
68-
</BrandedButton>
66+
/>
6967
</template>
7068
<form class="block space-y-4">
7169
<RequiredExplanation />

‎components/AdminTable/AdminDataservicesTable/AdminDataservicesTable.vue‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,19 @@
8686
color="tertiary"
8787
:href="dataservice.self_web_url"
8888
:icon="RiEyeLine"
89+
:title="$t('Voir la page publique')"
8990
icon-only
9091
keep-margins-even-without-borders
91-
>
92-
{{ $t('Voir la page publique') }}
93-
</BrandedButton>
92+
/>
9493
<BrandedButton
9594
size="xs"
9695
color="tertiary"
9796
:href="getDataserviceAdminUrl(dataservice)"
9897
:icon="RiPencilLine"
98+
:title="$t('Modifier')"
9999
icon-only
100100
keep-margins-even-without-borders
101-
>
102-
{{ $t('Modifier') }}
103-
</BrandedButton>
101+
/>
104102
</td>
105103
</tr>
106104
</tbody>

‎components/AdminTable/AdminDatasetsTable/AdminDatasetsTable.vue‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,21 +108,19 @@
108108
color="tertiary"
109109
:href="dataset.page"
110110
:icon="RiEyeLine"
111+
:title="$t('Voir la page publique')"
111112
icon-only
112113
keep-margins-even-without-borders
113-
>
114-
{{ $t('Voir la page publique') }}
115-
</BrandedButton>
114+
/>
116115
<BrandedButton
117116
size="xs"
118117
color="tertiary"
119118
:href="getDatasetAdminUrl(dataset)"
120119
:icon="RiPencilLine"
120+
:title="$t('Modifier')"
121121
icon-only
122122
keep-margins-even-without-borders
123-
>
124-
{{ $t('Modifier') }}
125-
</BrandedButton>
123+
/>
126124
<slot
127125
name="actions"
128126
:dataset

‎components/AdminTable/AdminDiscussionsTable/AdminDiscussionsTable.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
/>
6464
</p>
6565
<p v-if="!subject && subjects[discussion.subject.id]">
66-
<a
67-
class="fr-link inline-flex"
68-
:href="getSubjectPage(subjects[discussion.subject.id]!)"
66+
<CdataLink
67+
class="link inline-flex gap-1"
68+
:to="getSubjectPage(subjects[discussion.subject.id]!)"
6969
>
7070
<component
7171
:is="getSubjectTypeIcon(discussion.subject.class)"
@@ -78,7 +78,7 @@
7878
:auto-resize="true"
7979
:max-lines="1"
8080
/>
81-
</a>
81+
</CdataLink>
8282
</p>
8383
</td>
8484
<td>
@@ -119,11 +119,11 @@
119119
color="tertiary"
120120
:href="getDiscussionUrl(discussion.id, subject || subjects[discussion.subject.id])"
121121
:icon="RiEyeLine"
122+
:title="$t('Voir la discussion')"
123+
:aria-label="$t('Voir la discussion {title}', { title: discussion.title })"
122124
icon-only
123125
keep-margins-even-without-borders
124-
>
125-
{{ getDiscussionUrl(discussion.id, subject || subjects[discussion.subject.id]) }}
126-
</BrandedButton>
126+
/>
127127

128128
<DiscussionsRespondModal
129129
:thread="discussion"

‎components/AdminTable/AdminReusesTable/AdminReusesTable.vue‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,19 @@
7777
color="tertiary"
7878
:href="reuse.page"
7979
:icon="RiEyeLine"
80+
:title="$t('Voir la page publique')"
8081
icon-only
8182
keep-margins-even-without-borders
82-
>
83-
{{ $t('Voir la page publique') }}
84-
</BrandedButton>
83+
/>
8584
<BrandedButton
8685
size="xs"
8786
color="tertiary"
8887
:href="getReuseAdminUrl(reuse)"
8988
:icon="RiPencilLine"
89+
:title="$t('Modifier')"
9090
icon-only
9191
keep-margins-even-without-borders
92-
>
93-
{{ $t('Modifier') }}
94-
</BrandedButton>
92+
/>
9593
<slot
9694
name="actions"
9795
:reuse

‎components/AdminTable/Table/AdminTableTh.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
:class="sorted ? '' : 'opacity-50'"
2121
:title="t('Trier')"
2222
@click="toggleSort"
23-
>
24-
{{ t("Trier") }}
25-
</BrandedButton>
23+
/>
2624
</div>
2725
</th>
2826
</template>

‎components/Brand/BrandCard.vue‎

Lines changed: 21 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,11 @@
7373
class="product-link !no-underline product-link-custom"
7474
style="text-decoration: none !important;"
7575
>
76-
<svg
77-
width="16"
78-
height="16"
79-
viewBox="0 0 16 16"
80-
fill="none"
81-
xmlns="http://www.w3.org/2000/svg"
82-
>
83-
<path
84-
fill-rule="evenodd"
85-
clip-rule="evenodd"
86-
d="M7.99992 1.33331C11.6819 1.33331 14.6666 4.31798 14.6666 7.99998C14.6666 11.682 11.6819 14.6666 7.99992 14.6666C4.31792 14.6666 1.33325 11.682 1.33325 7.99998C1.33325 4.31798 4.31792 1.33331 7.99992 1.33331ZM9.31325 8.66665H6.68659C6.78725 10.2926 7.25192 11.82 7.99992 13.168C8.76813 11.7843 9.21688 10.2463 9.31325 8.66665ZM5.35125 8.66665H2.70792C2.97296 10.7627 4.44922 12.5054 6.47325 13.1113C5.81553 11.7162 5.4345 10.2068 5.35125 8.66665ZM13.2919 8.66665H10.6486C10.5653 10.2068 10.1843 11.7162 9.52659 13.1113C11.5506 12.5054 13.0269 10.7627 13.2919 8.66665ZM7.99992 2.83198C7.23171 4.21561 6.78296 5.75366 6.68659 7.33331H9.31259C9.21642 5.75371 8.7679 4.21567 7.99992 2.83198ZM6.47325 2.88865C4.44922 3.49461 2.97296 5.23721 2.70792 7.33331H5.35125C5.4345 5.79317 5.81553 4.28377 6.47325 2.88865ZM9.52659 2.88865C10.1843 4.28377 10.5653 5.79317 10.6486 7.33331H13.2919C13.0269 5.23721 11.5506 3.49461 9.52659 2.88865Z"
87-
fill="#3558A2"
88-
/>
89-
</svg>
90-
Voir le site
76+
<RiGlobalLine
77+
class="size-4"
78+
aria-hidden="true"
79+
/>
80+
{{ $t('Voir le site') }}
9181
</a>
9282
<a
9383
v-if="props.code"
@@ -97,19 +87,11 @@
9787
class="product-link !no-underline product-link-custom"
9888
style="text-decoration: none !important;"
9989
>
100-
<svg
101-
width="16"
102-
height="16"
103-
viewBox="0 0 16 16"
104-
fill="none"
105-
xmlns="http://www.w3.org/2000/svg"
106-
>
107-
<path
108-
d="M3.92207 12.4353C3.72207 12.302 3.55007 12.132 3.34873 11.8913C3.24423 11.7634 3.14067 11.6347 3.03807 11.5053C2.7294 11.122 2.53473 10.9453 2.3334 10.8726C2.16693 10.8129 2.03102 10.6894 1.95557 10.5295C1.88012 10.3695 1.87131 10.1861 1.93107 10.0196C1.99083 9.85317 2.11427 9.71726 2.27424 9.64181C2.43421 9.56636 2.6176 9.55755 2.78407 9.61731C3.2854 9.79731 3.62473 10.1073 4.08207 10.676C4.0194 10.598 4.30873 10.9606 4.37073 11.0353C4.4974 11.1866 4.59073 11.2786 4.66407 11.3273C4.80007 11.4186 5.0554 11.458 5.43073 11.4206C5.44607 11.166 5.4934 10.9186 5.5654 10.6906C3.58673 10.2066 2.46673 8.93064 2.46673 6.42664C2.46673 5.59997 2.7134 4.85597 3.17207 4.23197C3.02673 3.63597 3.04873 2.91531 3.3734 2.10397C3.41025 2.0122 3.46705 1.92977 3.53969 1.86266C3.61233 1.79555 3.699 1.74545 3.7934 1.71597C3.8474 1.69997 3.87807 1.69264 3.93207 1.68464C4.4674 1.60264 5.2234 1.79797 6.20873 2.41531C6.79593 2.27803 7.39704 2.20913 8.00007 2.20997C8.60807 2.20997 9.21207 2.27931 9.7894 2.41531C10.7741 1.79331 11.5314 1.59797 12.0707 1.68464C12.1274 1.69331 12.1754 1.70464 12.2161 1.71797C12.3086 1.74849 12.3934 1.79893 12.4643 1.86574C12.5353 1.93254 12.5907 2.01409 12.6267 2.10464C12.9514 2.91531 12.9734 3.63597 12.8281 4.23131C13.2887 4.85531 13.5334 5.59464 13.5334 6.42664C13.5334 8.93131 12.4174 10.2033 10.4387 10.688C10.5221 10.9646 10.5654 11.274 10.5654 11.608C10.5655 12.2115 10.5628 12.8151 10.5574 13.4186C10.7071 13.4513 10.841 13.5345 10.9366 13.6544C11.0321 13.7742 11.0834 13.9232 11.082 14.0765C11.0805 14.2297 11.0262 14.3777 10.9284 14.4957C10.8305 14.6136 10.6951 14.6942 10.5447 14.724C9.7854 14.876 9.22273 14.3693 9.22273 13.7073L9.22407 13.41L9.2274 12.94C9.23073 12.468 9.23207 12.048 9.23207 11.608C9.23207 11.1433 9.11007 10.84 8.94873 10.7013C8.50807 10.3213 8.7314 9.59797 9.30873 9.53331C11.2867 9.31131 12.2001 8.54531 12.2001 6.42664C12.2001 5.78997 11.9921 5.26397 11.5914 4.82397C11.507 4.73147 11.4503 4.61706 11.4279 4.49385C11.4055 4.37064 11.4183 4.24361 11.4647 4.12731C11.5754 3.85131 11.6227 3.48931 11.5287 3.05131L11.5221 3.05331C11.1947 3.14597 10.7821 3.34664 10.2834 3.68597C10.203 3.74054 10.1116 3.77688 10.0157 3.79242C9.91976 3.80797 9.8216 3.80236 9.72807 3.77597C9.16534 3.62017 8.58397 3.54189 8.00007 3.54331C7.40673 3.54331 6.81873 3.62264 6.27207 3.77664C6.17888 3.80281 6.08111 3.80838 5.98556 3.79295C5.89 3.77752 5.79895 3.74147 5.71873 3.68731C5.2174 3.34931 4.80273 3.14931 4.4734 3.05597C4.3774 3.49131 4.42473 3.85197 4.53473 4.12731C4.58127 4.24355 4.59414 4.37054 4.57185 4.49375C4.54957 4.61696 4.49304 4.7314 4.40873 4.82397C4.01073 5.25997 3.80007 5.79597 3.80007 6.42664C3.80007 8.54131 4.71407 9.31197 6.6814 9.53331C7.25807 9.59797 7.48207 10.318 7.04407 10.6986C6.91607 10.8106 6.75807 11.1866 6.75807 11.608V13.708C6.75807 14.3653 6.2014 14.858 5.4514 14.7266C5.29924 14.6999 5.16109 14.6212 5.06055 14.5039C4.96 14.3866 4.90331 14.2381 4.90016 14.0836C4.89701 13.9292 4.9476 13.7784 5.04328 13.6571C5.13896 13.5358 5.27379 13.4515 5.42473 13.4186V12.7586C4.81807 12.7993 4.31673 12.7 3.92207 12.4353Z"
109-
fill="#3558A2"
110-
/>
111-
</svg>
112-
Code
90+
<RiGithubLine
91+
class="size-4"
92+
aria-hidden="true"
93+
/>
94+
{{ $t('Code') }}
11395
</a>
11496
<a
11597
v-if="props.contact"
@@ -119,21 +101,11 @@
119101
class="product-link !no-underline product-link-custom"
120102
style="text-decoration: none !important;"
121103
>
122-
<svg
123-
width="16"
124-
height="16"
125-
viewBox="0 0 16 16"
126-
fill="none"
127-
xmlns="http://www.w3.org/2000/svg"
128-
>
129-
<path
130-
fill-rule="evenodd"
131-
clip-rule="evenodd"
132-
d="M1.99992 2H13.9999C14.3681 2 14.6666 2.29848 14.6666 2.66667V13.3333C14.6666 13.7015 14.3681 14 13.9999 14H1.99992C1.63173 14 1.33325 13.7015 1.33325 13.3333V2.66667C1.33325 2.29848 1.63173 2 1.99992 2ZM13.3333 4.82533L8.04792 9.55867L2.66659 4.81067V12.6667H13.3333V4.82533ZM3.00725 3.33333L8.04059 7.77467L13.0013 3.33333H3.00725Z"
133-
fill="#3558A2"
134-
/>
135-
</svg>
136-
Contact
104+
<RiMailLine
105+
class="size-4"
106+
aria-hidden="true"
107+
/>
108+
{{ $t('Contact') }}
137109
</a>
138110
</div>
139111
</div>
@@ -146,20 +118,10 @@
146118
class="text-new-primary inline-flex items-center"
147119
>
148120
{{ props.ctaLabel }}
149-
<svg
150-
width="1em"
151-
height="1em"
152-
viewBox="0 0 16 21"
153-
fill="none"
154-
xmlns="http://www.w3.org/2000/svg"
155-
class="inline-block align-middle ml-2"
156-
style="vertical-align: middle; position: relative; top: -1px;"
157-
>
158-
<path
159-
d="M10.9403 12.8572L7.58776 9.40909L8.47163 8.5L13.333 13.5L8.47163 18.5L7.58776 17.5909L10.9403 14.1429H3.33301V12.8572H10.9403Z"
160-
fill="#3558A2"
161-
/>
162-
</svg>
121+
<RiArrowRightLine
122+
class="size-3 ml-2"
123+
aria-hidden="true"
124+
/>
163125
</a>
164126
</div>
165127
</div>
@@ -168,6 +130,8 @@
168130
</template>
169131

170132
<script setup lang="ts">
133+
import { RiArrowRightLine, RiGithubLine, RiGlobalLine, RiMailLine } from '@remixicon/vue'
134+
171135
interface Props {
172136
theme?: string
173137
description?: string

‎components/Captchetat.client.vue‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,22 @@
1212
<BrandedButton
1313
type="button"
1414
:icon="RiVolumeUpLine"
15+
:title="$t('Énoncer le code du captcha')"
1516
icon-only
1617
size="xl"
1718
color="tertiary"
1819
keep-margins-even-without-borders
1920
@click="playSound"
20-
>
21-
{{ $t('Énoncer le code du captcha') }}
22-
</BrandedButton>
21+
/>
2322
<BrandedButton
2423
:icon="RiRefreshLine"
24+
:title="$t('Générer un nouveau captcha')"
2525
color="tertiary"
2626
size="xl"
2727
icon-only
2828
keep-margins-even-without-borders
2929
@click="() => refresh()"
30-
>
31-
{{ $t('Générer un nouveau captcha') }}
32-
</BrandedButton>
30+
/>
3331
</div>
3432
</div>
3533
<InputGroup

‎components/Datasets/AdminDatasetResourcesPage.vue‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,19 @@
130130
keep-margins-even-without-borders
131131
:disabled="index === 0"
132132
icon-only
133+
:title="$t('Déplacer vers le haut')"
133134
@click="moveFile(index, index - 1)"
134-
>
135-
{{ $t('Déplacer vers le haut') }}
136-
</BrandedButton>
135+
/>
137136
<RiDraggable class="handle" />
138137
<BrandedButton
139138
:icon="RiArrowDownLine"
140139
color="tertiary"
141140
keep-margins-even-without-borders
142141
:disabled="index === files.length - 1"
143142
icon-only
143+
:title="$t('Déplacer vers le bas')"
144144
@click="moveFile(index, index + 1)"
145-
>
146-
{{ $t('Déplacer vers le bas') }}
147-
</BrandedButton>
145+
/>
148146
</div>
149147
</td>
150148
<td>

‎components/Datasets/FileEditModal.vue‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
:icon="RiPencilLine"
1717
:color="buttonColor"
1818
:size="buttonSize"
19+
:title="$t('Éditer le fichier')"
1920
keep-margins-even-without-borders
2021
v-on="listeners"
21-
>
22-
{{ $t('Éditer le fichier') }}
23-
</BrandedButton>
22+
/>
2423
</template>
2524

2625
<template #default="{ close }">

0 commit comments

Comments
 (0)