From d08cf1752c7e0601397af79ad54496748fa20da7 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Fri, 12 Apr 2019 09:17:32 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20bug=20bouton=20"ajout";=20r=C3=A9organisa?=
=?UTF-8?q?tion=20des=20modules=20dans=20le=20th=C3=A8me=20PAB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.component.html | 4 ++--
src/app/config.json | 2 +-
src/locale/messages.fr.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 50dad1690..0b4c83e46 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -52,8 +52,8 @@
</div>
- <button mat-icon-button id="new-calculator" routerLink="/list" (click)="sidenav.close()">
- <mat-icon *ngIf="currentRoute != '/list'">add_box</mat-icon>
+ <button *ngIf="currentRoute != '/list'" mat-icon-button id="new-calculator" routerLink="/list" (click)="sidenav.close()">
+ <mat-icon>add_box</mat-icon>
</button>
<div id="toolbar-bottom-spacer"></div>
diff --git a/src/app/config.json b/src/app/config.json
index bfa33ed9d..86e823ea8 100644
--- a/src/app/config.json
+++ b/src/app/config.json
@@ -13,7 +13,7 @@
"title": "Passe à poisson sur le Lez, entre Bollène et Suze",
"credits": "Hervé Capra / Irstea"
},
- "calculators": [ 5, 6, 10, 9, 12, 13 ]
+ "calculators": [ 5, 6, 12, 13, 10, 9 ]
},
{
"name": "PASSE_NATURELLE",
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index 88e8961ce..4a03ee164 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -156,7 +156,7 @@
"INFO_OPTION_NONE": "Aucun",
"INFO_OPTION_NONE_F": "Aucune",
"INFO_OUVRAGE": "Ouvrage",
- "INFO_PABCHUTE_TITRE": "Passe à bassin : chute entre bassins",
+ "INFO_PABCHUTE_TITRE": "Passe à bassin : chute",
"INFO_PABCHUTE_TITRE_COURT": "PAB : chute",
"INFO_PABDIMENSIONS_TITRE": "Passe à bassin : dimensions",
"INFO_PABDIMENSIONS_TITRE_COURT": "PAB : dimensions",
--
GitLab