Commit a7bf9904 authored by Jacob's avatar Jacob

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

parents 2644dca2 9d4047db
......@@ -71,8 +71,8 @@
</div>
</form>
<br><br>
<div markdown [src]="'assets/markdown/modal-content/Anmelden.md'"></div>
<a href="https://www.openstreetmap.org/login" target="_blank"><button
<div markdown [src]="'assets/markdown/modal-content/Anmelden.md'" class="d-none"></div>
<a href="https://www.openstreetmap.org/login" target="_blank" class="d-none"><button
class="btn btn-lg btn-outline-primary"
(click)="modalService.open(login,true)">Mit OpenStreetMap
anmelden</button></a>
......
......@@ -294,13 +294,13 @@
<div (click)="goodLifeCollapse= !goodLifeCollapse"
[attr.aria-expanded]="!infoCollapsed" aria-controls="collapseInfo"
class="collapseInfo">
<i class="listicon gp_betterlife" aria-hidden="true">&nbsp;</i>Ort des Guten Lebens<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!infoCollapsed,'fa-angle-right':infoCollapsed, 'fa-right':true}"
<i class="listicon gp_betterlife" aria-hidden="true">&nbsp;</i>Ort des Guten Lebens<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!goodLifeCollapse,'fa-angle-right':goodLifeCollapse, 'fa-right':true}"
aria-hidden="true">&nbsp;</i>
</div>
</div>
<div id="collapseInfo" [ngbCollapse]="goodLifeCollapse">
<div class="card">
<div class="card-body">
<div *ngIf="showGoodLife()" class="card-body">
<div *ngIf="nodeService.detailView.dimensions.length > 0" class="elementbli">
......
......@@ -241,6 +241,14 @@ translateTagKey(key:string){
}
}
showGoodLife(){
if(this.nodeService.detailView == null){
return false;
}
let desc = this.nodeService.detailView.getDescription();
return (desc != undefined && desc != null && desc != "" ) || (this.nodeService.detailView.dimensions.length > 0);
}
showSustainableNutrtition(){
if(this.nodeService.detailView == null){
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment