JoeKung/Progetto-m152-Angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
tito
2023-04-27 10:17:22 +02:00
parent 98ddd4a7f3 6c7dacf561
commit 4e0fbe7191
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/list/list.component.html
View File

@@ -1,12 +1,13 @@
<div class="dropdown dropdown-hover" id="translate"> <div class="dropdown dropdown-hover" id="translate">
<label tabindex="0" class="btn m-1 bg-black border-neutral text-base-100" id="translateLabel">{{translations.translate}}</label> <label tabindex="0" class="btn m-1 bg-black border-neutral text-base-100"
<ul tabindex="0" class="dropdown-content menu p-2 shadow rounded-box w-52" id="translateUl"> id="translateLabel">{{translations.translate}}</label>
<li (click)="switchLanguage('DE')"><a>DE</a></li> <ul tabindex="0" class="dropdown-content menu p-2 shadow rounded-box w-52" id="translateUl">
<li (click)="switchLanguage('FR')"><a>FR</a></li> <li (click)="switchLanguage('DE')"><a>DE</a></li>
<li (click)="switchLanguage('IT')"><a>IT</a></li> <li (click)="switchLanguage('FR')"><a>FR</a></li>
<li (click)="switchLanguage('EN')"><a>EN</a></li> <li (click)="switchLanguage('IT')"><a>IT</a></li>
</ul> <li (click)="switchLanguage('EN')"><a>EN</a></li>
</div> </ul>
</div>
<div *ngIf="isNear" class="container"> <div *ngIf="isNear" class="container">
<h1> <h1>
{{translations.locationName}}{{locationParams}} {{translations.locationName}}{{locationParams}}
@@ -16,8 +17,8 @@
<a class="link link-primary" href="location/{{locations.location}}">{{locations.location}}</a> <a class="link link-primary" href="location/{{locations.location}}">{{locations.location}}</a>
</h3> </h3>
<div> <div>
<h4 *ngIf="distance[i]">{{translations.distance}}{{distance[i]}} km</h4> <h4 *ngIf="distance[i] &&! positionNotFound">{{translations.distance}}{{distance[i]}} km</h4>
<h4 *ngIf="positionNotFound">could not retrieve distance</h4> <h4 *ngIf="positionNotFound && !distance[i]">{{translations.positionNotFoundErrorMessage}}</h4>
</div> </div>
</div> </div>
</div> </div>
@@ -31,8 +32,8 @@
<a class="link link-primary" href="location/{{location.location}}/{{waypoinst.id}}"> {{waypoinst.name}}</a> <a class="link link-primary" href="location/{{location.location}}/{{waypoinst.id}}"> {{waypoinst.name}}</a>
</h3> </h3>
<div class="distance"> <div class="distance">
<h4 *ngIf="distance[i]">{{translations.distance}}{{distance[i]}} km</h4> <h4 *ngIf="distance[i] && !positionNotFound">{{translations.distance}}{{distance[i]}} km</h4>
<h4 *ngIf="positionNotFound">{{translations.positionNotFoundErrorMessage}}</h4> <h4 *ngIf="positionNotFound && !distance[i]">{{translations.positionNotFoundErrorMessage}}</h4>
</div> </div>
</div> </div>