Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion portal/app/components/layout/layout-nav-bar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:height="(appBarHeight || 64) - 10"
:link="navBarConfig.logoLink"
:logo="logo"
class="pl-4"
:class="navBarConfig.fluid !== false ? 'pl-4' : undefined"
/>

<nav-tabs-or-drawer
Expand Down
18 changes: 6 additions & 12 deletions portal/app/components/page-element/basic/page-element-contact.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,12 @@

<v-list-item
v-if="portalConfig.contactInformations.phone"
ref="phoneItem"
:prepend-icon="mdiPhone"
:title="portalConfig.contactInformations.phoneLabel || portalConfig.contactInformations.phone"
:aria-label="t('phoneAriaLabel', { value: portalConfig.contactInformations.phoneLabel || portalConfig.contactInformations.phone })"
:href="`tel:${portalConfig.contactInformations.phone}`"
target="_blank"
rel="noopener"
/>
>
{{ portalConfig.contactInformations.phoneLabel || portalConfig.contactInformations.phone }}
</v-list-item>
<v-list-item
v-if="portalConfig.contactInformations.website"
ref="websiteItem"
Expand Down Expand Up @@ -184,13 +183,6 @@ const { portal, portalConfig, preview } = usePortalStore()
const url = !preview ? useRequestURL() : null

// v-bind:title.attr causes SSR hydration mismatch with Vuetify 4
const phoneItem = useTemplateRef('phoneItem')
watchEffect(() => {
const el = phoneItem.value?.$el
if (!el) return
const title = (portalConfig.value.contactInformations.phoneLabel || portalConfig.value.contactInformations.phone) + ' - ' + t('newWindow')
el.setAttribute('title', title)
})
const websiteItem = useTemplateRef('websiteItem')
watchEffect(() => {
const el = websiteItem.value?.$el
Expand Down Expand Up @@ -377,6 +369,7 @@ const sendMessage = useAsyncAction(async () => {
messageSent: 'Message sent!'
messageBody: 'Message body:'
newWindow: 'New window'
phoneAriaLabel: 'Phone: {value}'
send: 'Send'
socialMedia: 'Find us on social media'
subject: 'Subject'
Expand All @@ -390,6 +383,7 @@ const sendMessage = useAsyncAction(async () => {
messageSent: 'Message envoyé !'
messageBody: 'Corps du message :'
newWindow: 'Nouvelle fenêtre'
phoneAriaLabel: 'Téléphone : {value}'
send: 'Envoyer'
socialMedia: 'Retrouvez-nous sur les réseaux sociaux'
subject: 'Sujet'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
:class="[element.mb !== 0 && `mb-${element.mb ?? 4}`, 'text-center']"
:color="element.color"
>
<v-card-text>
<div class="text-headline-medium font-weight-bold">{{ metrics[key] }}</div>
<div class="text-headline-small font-weight-light">{{ t('title.' + key) }}</div>
<v-card-text class="px-12">
<div class="text-headline-small font-weight-bold">{{ metrics[key].toLocaleString(locale) }}</div>
<div class="text-title-large font-weight-bold text-uppercase">{{ t('title.' + key) }}</div>
</v-card-text>
</v-card>
</v-col>
Expand All @@ -29,7 +29,7 @@ const { element } = defineProps({
})

const { preview, portal } = usePortalStore()
const { t } = useI18n()
const { t, locale } = useI18n()

let metrics: { datasets: number, records: number, applications: number } | ComputedRef<{ datasets: number, records: number, applications: number }>
if (!preview) {
Expand Down
27 changes: 16 additions & 11 deletions portal/app/components/reuse/reuse-card.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,22 @@
<v-spacer />

<!-- Publication/update date -->
<v-list-item>
<p
v-if="cardConfig.showAuthor && reuse.config.author"
class="text-body-small"
>
{{ t('publishedBy', { author: reuse.config.author }) }}
</p>
<p class="text-body-small">
{{ t('updatedAt') }} {{ dayjs(reuse.updatedAt).format('L') }}
</p>
</v-list-item>
<v-row
no-gutters
class="px-4 py-2"
>
<v-col cols="12">
<p
v-if="cardConfig.showAuthor && reuse.config.author"
class="text-body-small"
>
{{ t('publishedBy', { author: reuse.config.author }) }}
</p>
<p class="text-body-small">
{{ t('updatedAt') }} {{ dayjs(reuse.updatedAt).format('L') }}
</p>
</v-col>
</v-row>
</v-col>
</v-row>
</v-card>
Expand Down
Loading