diff --git a/src/lib/components/variables/VariableReferredScaleParameter.svelte b/src/lib/components/variables/VariableReferredScaleParameter.svelte
index c17a0ecff087c9d546a2f2c835eae82d6560724b..df22443bfaa8ae2bcf5181b66693ea5d3f3ba387 100644
--- a/src/lib/components/variables/VariableReferredScaleParameter.svelte
+++ b/src/lib/components/variables/VariableReferredScaleParameter.svelte
@@ -158,72 +158,67 @@
/>
</div>
- <div class="rounded-b bg-gray-100 p-2">
- <div class="flex items-baseline text-xs text-gray-600">
- <div class="flex items-center">
- <div class="flex">
- <a
- class="link2 flex border-r border-gray-700 px-1 pr-2 text-sm tracking-wide text-gray-600"
- href="/parameters/{billParameter.name}/edit"
- rel="noreferrer"
- target="_blank"
- >
- {#if lastReviewOrChange < "2020"}
- <iconify-icon
- class="mr-0.5 text-[#FFAC33] shadow-none"
- icon="material-symbols:warning-rounded"
- width="20"
- height="20"
- />
- <span
- class="pl-1"
- title="La dernière relecture date du {dateFormatter(
- new Date(lastReviewOrChange),
- )}">À vérifier</span
- >
- {:else}
- <iconify-icon
- class="mr-0.5 text-[#13CC03]"
- icon="material-symbols:new-releases"
- width="20"
- height="20"
- />
- <span
- class="pl-1"
- title="La dernière relecture date du {dateFormatter(
- new Date(lastReviewOrChange),
- )}">Vérifié</span
- >
- {/if}
- </a>
-
- <div>
- <a
- class="link2 ml-2 flex items-center text-sm tracking-wide text-gray-600"
- href="/parameters/{billParameter.name}"
- rel="noreferrer"
- target="_blank"
- >
- <iconify-icon
- class="mr-1 inline-flex h-4 w-4"
- icon="ri-history-line"
- />Historique</a
- >
- </div>
- </div>
- </div>
- </div>
+ <div class="flex bg-gray-100 pb-2">
+ <a
+ class="link2 ml-2 flex items-center text-sm tracking-wide text-gray-600"
+ href="/parameters/{billParameter.name}"
+ rel="noreferrer"
+ target="_blank"
+ >
+ <iconify-icon
+ class="mr-1 align-[-0.3rem] text-base"
+ icon="ri-history-line"
+ />Historique
+ </a>
</div>
- {#if billLatestInstant !== "0001-01-01" || (billReferences !== undefined && billReferences.length > 0)}
- <!--Référence législative-->
- <div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2">
+ <div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2">
+ <div class="flex items-center justify-between">
{#if billLatestInstant !== "0001-01-01"}
<!--Date du paramètre-->
<p class="pb-2 text-xs">
Barème en vigueur depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]} :
</p>
{/if}
+ <a
+ class="hover:decoration-none flex px-1 pb-2 pr-2 text-sm tracking-wide text-black underline decoration-dotted hover:decoration-solid"
+ href="/parameters/{billParameter.name}/edit"
+ rel="noreferrer"
+ target="_blank"
+ >
+ {#if lastReviewOrChange < "2020"}
+ <span
+ class="text-center text-xs"
+ title="La dernière relecture date du {dateFormatter(
+ new Date(lastReviewOrChange),
+ )}. Cliquer pour proposer une modification du paramètre."
+ >
+ <iconify-icon
+ class="mr-1 align-[-0.3rem] text-xs text-[#FFAC33] shadow-none"
+ icon="material-symbols:warning-rounded"
+ width="20"
+ height="20"
+ />à vérifier</span
+ >
+ {:else}
+ <span
+ class="text-center text-xs"
+ title="La dernière relecture date du {dateFormatter(
+ new Date(lastReviewOrChange),
+ )}. Cliquer pour proposer une modification du paramètre."
+ ><iconify-icon
+ class="mr-1 align-[-0.3rem] text-sm text-[#13CC03]"
+ icon="material-symbols:new-releases"
+ width="20"
+ height="20"
+ />à jour</span
+ >
+ {/if}
+ </a>
+ </div>
+ {#if billLatestInstant !== "0001-01-01" || (billReferences !== undefined && billReferences.length > 0)}
+ <!--Référence législative-->
+
{#if billReferences !== undefined && billReferences.length > 0}
<ul>
{#each billReferences as { href, note, title }}
@@ -259,6 +254,6 @@
referenceUrl={openReferenceUrl ?? null}
/>
{/if}
- </div>
- {/if}
+ {/if}
+ </div>
</section>
diff --git a/src/lib/components/variables/VariableReferredValueParameter.svelte b/src/lib/components/variables/VariableReferredValueParameter.svelte
index eebd7a9070c95ac432e8eabeae4bc8269cbbb121..d76181fdb177fb9744373f739f6810e5d3f5c24d 100644
--- a/src/lib/components/variables/VariableReferredValueParameter.svelte
+++ b/src/lib/components/variables/VariableReferredValueParameter.svelte
@@ -153,7 +153,7 @@
<VariableReferredParameterHeader {depth} parameter={billParameter} />
<div
- class="flex flex-wrap items-center justify-start rounded bg-gray-100 p-2 pb-2 "
+ class="flex flex-wrap items-center justify-between gap-x-4 gap-y-2 rounded bg-gray-100 p-2 pb-2"
id="situation_color_code_lawside"
>
<div>
@@ -172,85 +172,76 @@
unitName={billParameter.unit}
/>
{/if}
- </div>
- <span class="ml-1 text-base">
- {getUnitShortLabel(billParameter.unit, date)}
- </span>
- {#if valueError !== null}<p class="text-red-500">{valueError}</p>{/if}
+ <span class="ml-1 text-base">
+ {getUnitShortLabel(billParameter.unit, date)}
+ </span>
- <div class="flex items-baseline p-2 text-xs text-gray-600">
- <div class="flex items-center">
- <div class="flex">
- <a
- class="link2 flex border-r border-gray-700 px-1 pr-2 text-sm tracking-wide"
- href="/parameters/{billParameter.name}/edit"
- rel="noreferrer"
- target="_blank"
- >
- {#if lastReviewOrChange === undefined || lastReviewOrChange < "2020"}
- <iconify-icon
- class="mr-0.5 text-[#FFAC33] shadow-none"
- icon="material-symbols:warning-rounded"
- width="20"
- height="20"
- />
- <span
- class="pl-1"
- title={lastReviewOrChange === undefined
- ? "Ce paramètre n'a jamais été relu"
- : `La dernière relecture date du ${dateFormatter(
- new Date(lastReviewOrChange),
- )}`}>À vérifier</span
- >
- {:else}
- <iconify-icon
- class="mr-0.5 text-[#13CC03]"
- icon="material-symbols:new-releases"
- width="20"
- height="20"
- />
- <span
- class="pl-1"
- title="La dernière relecture date du {dateFormatter(
- new Date(lastReviewOrChange),
- )}">Vérifié</span
- >
- {/if}
- </a>
+ {#if valueError !== null}<p class="text-red-500">{valueError}</p>{/if}
+ </div>
- <div>
- <a
- class="link2 ml-2 flex items-center text-sm tracking-wide text-gray-600"
- href="/parameters/{billParameter.name}"
- rel="noreferrer"
- target="_blank"
- >
- <!--Remixicon.com - history-fill -->
- <svg
- aria-hidden="true"
- class="mr-1 inline h-4 w-4 fill-current stroke-transparent text-gray-600"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- ><path
- d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12h2c0 4.418 3.582 8 8 8s8-3.582 8-8-3.582-8-8-8C9.536 4 7.332 5.114 5.865 6.865L8 9H2V3l2.447 2.446C6.28 3.336 8.984 2 12 2zm1 5v4.585l3.243 3.243-1.415 1.415L11 12.413V7h2z"
- /></svg
- >Historique</a
- >
- </div>
- </div>
- </div>
+ <div class="flex items-baseline pr-2 text-xs text-gray-500">
+ <a
+ class="link2 flex items-center text-sm tracking-wide text-gray-600"
+ href="/parameters/{billParameter.name}"
+ rel="noreferrer"
+ target="_blank"
+ >
+ <iconify-icon
+ class="mr-1 align-[-0.3rem] text-base"
+ icon="ri-history-line"
+ />Historique</a
+ >
</div>
</div>
- {#if billLatestInstant !== "0001-01-01" || (billReferences !== undefined && billReferences.length > 0)}
- <div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2">
+ <div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2">
+ <div class="flex items-center justify-between">
{#if billLatestInstant !== "0001-01-01"}
<!--Date du paramètre-->
<p class="pb-2 text-xs">
Valeur en vigueur depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]} :
</p>
+ <a
+ class="hover:decoration-none flex px-1 pb-2 pr-2 text-sm tracking-wide text-black underline decoration-dotted hover:decoration-solid"
+ href="/parameters/{billParameter.name}/edit"
+ rel="noreferrer"
+ target="_blank"
+ >
+ {#if lastReviewOrChange === undefined || lastReviewOrChange < "2020"}
+ <span
+ class="text-center text-xs"
+ title={lastReviewOrChange === undefined
+ ? "Ce paramètre n'a jamais été relu. . Cliquer pour proposer une modification du paramètre."
+ : `La dernière relecture date du ${dateFormatter(
+ new Date(lastReviewOrChange),
+ )}. Cliquer pour proposer une modification du paramètre.`}
+ >
+ <iconify-icon
+ class="mr-1 align-[-0.3rem] text-xs text-[#FFAC33]"
+ icon="material-symbols:warning-rounded"
+ width="20"
+ height="20"
+ />à vérifier</span
+ >
+ {:else}
+ <span
+ class="text-center text-xs"
+ title="La dernière relecture date du {dateFormatter(
+ new Date(lastReviewOrChange),
+ )}. Cliquer pour proposer une modification du paramètre."
+ >
+ <iconify-icon
+ class="mr-1 align-[-0.3rem] text-sm text-[#13CC03]"
+ icon="material-symbols:new-releases"
+ width="20"
+ height="20"
+ />à jour
+ </span>
+ {/if}
+ </a>
{/if}
-
+ </div>
+ {#if billLatestInstant !== "0001-01-01" || (billReferences !== undefined && billReferences.length > 0)}
{#if billReferences !== undefined && billReferences.length > 0}
<ul>
{#each billReferences as { href, note, title }}
@@ -286,7 +277,7 @@
referenceUrl={openReferenceUrl}
/>
{/if}
- </div>
- {/if}
+ {/if}
+ </div>
</section>
{/if}