From 80b5f69dc2ab654719f78b996502f6cc57e1d75d Mon Sep 17 00:00:00 2001
From: AtomicNicos <nicolas.boeckh@etu.unige.ch>
Date: Mon, 27 Apr 2020 00:28:06 +0200
Subject: [PATCH] Open links in new window.

---
 src/app/maps/maps.component.html | 89 ++++++++++++++++----------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/app/maps/maps.component.html b/src/app/maps/maps.component.html
index 50c5c80..728166a 100644
--- a/src/app/maps/maps.component.html
+++ b/src/app/maps/maps.component.html
@@ -1,50 +1,51 @@
 <div class="container my-4">
-    <select class="browser-default custom-select" [ngModel]="cantonSelected" (ngModelChange)="onSelect($event)">
-        <!-- <option selected>Select your canton</option> -->
-        <option *ngFor="let canton of cantons; let i=index" value="{{i}}">{{canton}}</option>
-    </select>
+  <select class="browser-default custom-select" [ngModel]="cantonSelected" (ngModelChange)="onSelect($event)">
+      <!-- <option selected>Select your canton</option> -->
+      <option *ngFor="let canton of cantons; let i=index" value="{{i}}">{{canton}}</option>
+  </select>
 
-    <p class="font-weight-bold" *ngIf='cantonSelected!=""'>{{ 'MAP.CANTONOF' | translate }} {{cantonSelected}}</p>
-    <!-- <p *ngIf='cantonSelected!=""'><strong > {{cantons[cantonSelected].desCentre}} </strong></p> -->
-    <p *ngIf="!centersFound" class="noCentre" translate>MAP.SORRY</p>
-    <agm-map *ngIf="cantonCenter.lat !== undefined"
-        [latitude]="cantonCenter?.lat"
-        [longitude]="cantonCenter?.lng"
-        [zoom]="11"
-        [disableDefaultUI]="false"
-        [zoomControl]="false">
-        <agm-marker *ngFor="let place of cantonData"
-            [latitude]="place.latitude"
-            [longitude]="place.longitude">
-            <agm-info-window #infoWindow>
-                <span>{{ place.name }}</span><br/>
-                <span *ngIf="place.address !== ''" >{{ place.address }}</span><br/>
-                <span *ngIf="place.postalCode != 0" >{{ place.postalCode }}</span><br/>
-                <span *ngIf="place.city !== ''" >{{ place.city }}</span><br/>
-                <a *ngIf="place.website !== ''" href="{{place.website}}" translate>MAP.WEBSITE</a><br/>
-                <a *ngIf="place.tel !== ''" href="tel://+{{place.tel.replace(' ', '')}}">{{ place.tel }}</a><br/>
-                <span class="target" *ngIf="place.type !== ''">{{ 'MAP.WHO' | translate }} : {{ place.type }}</span><br/>
-            </agm-info-window>
-        </agm-marker>
-    </agm-map>
+  <p class="font-weight-bold" *ngIf='cantonSelected!=""'>{{ 'MAP.CANTONOF' | translate }} {{cantonSelected}}</p>
+  <!-- <p *ngIf='cantonSelected!=""'><strong > {{cantons[cantonSelected].desCentre}} </strong></p> -->
+  <p *ngIf="!centersFound" class="noCentre" translate>MAP.SORRY</p>
+  <agm-map *ngIf="cantonCenter.lat !== undefined"
+      [latitude]="cantonCenter?.lat"
+      [longitude]="cantonCenter?.lng"
+      [zoom]="11"
+      [disableDefaultUI]="false"
+      [zoomControl]="false">
+      <agm-marker *ngFor="let place of cantonData"
+          [latitude]="place.latitude"
+          [longitude]="place.longitude">
+          <agm-info-window #infoWindow>
+              <span>{{ place.name }}</span><br/>
+              <span *ngIf="place.address !== ''" >{{ place.address }}</span><br/>
+              <span *ngIf="place.postalCode != 0" >{{ place.postalCode }}</span><br/>
+              <span *ngIf="place.city !== ''" >{{ place.city }}</span><br/>
+              <a *ngIf="place.website !== ''" href="{{place.website}}" translate>MAP.WEBSITE</a><br/>
+              <a *ngIf="place.tel !== ''" href="tel://+{{place.tel.replace(' ', '')}}">{{ place.tel }}</a><br/>
+              <a *ngIf="place.website !== ''" href="{{place.website}}" target="_blank" translate>MAP.WEBSITE</a><br/>
+              <a *ngIf="place.tel !== ''" href="tel://+{{place.tel.replace(' ', '')}}" target="_blank">{{ place.tel }}</a><br/>
+              <span class="target" *ngIf="place.type !== ''">{{ 'MAP.WHO' | translate }} : {{ place.type }}</span><br/>
+          </agm-info-window>
+      </agm-marker>
+  </agm-map>
 
-    <div *ngFor='let t of typeMap | keyvalue'>
-      <div *ngIf='t.key != ""' class="content-header"><p>{{t.key}}</p></div>
-      <div *ngIf='t.key == ""' class="content-header"><p translate>MAP.UNCATEGORIZED</p></div>
-      <div class="content-grid">
-        <div *ngFor="let d of t.value">
-          <p>
-            <strong>{{d.name}}</strong><br/>
-            <span *ngIf="d.address != ''">{{d.address}}</span><br *ngIf="d.address != ''"/>
-            <span *ngIf="d.postalCode != 0 || d.city != ''">{{d.postalCode}} {{ d.city }}</span><br *ngIf="d.postalCode != 0 || d.city != ''"/>
-            <span *ngIf="d.tel != ''"><a href="tel://+{{ d.tel }}">{{ d.tel }}</a></span><br *ngIf="d.tel != ''"/>
-            <span *ngIf="d.website != ''"><a href="{{ d.website }}" translate>MAP.WEBSITE</a></span><br *ngIf="d.website != ''"/>
-            <span class="description" *ngIf="d.description !== ''">{{ 'MAP.DESCRIPTION' | translate }} : {{ d.description }}</span><br/>
-          </p>
-        </div>
+  <div *ngFor='let t of typeMap | keyvalue'>
+    <div *ngIf='t.key != ""' class="content-header"><p>{{t.key}}</p></div>
+    <div *ngIf='t.key == ""' class="content-header"><p translate>MAP.UNCATEGORIZED</p></div>
+    <div class="content-grid">
+      <div *ngFor="let d of t.value">
+        <p>
+          <strong>{{d.name}}</strong><br/>
+          <span *ngIf="d.address != ''">{{d.address}}</span><br *ngIf="d.address != ''"/>
+          <span *ngIf="d.postalCode != 0 || d.city != ''">{{d.postalCode}} {{ d.city }}</span><br *ngIf="d.postalCode != 0 || d.city != ''"/>
+          <span *ngIf="d.tel != ''"><a href="tel://+{{ d.tel }}">{{ d.tel }}</a></span><br *ngIf="d.tel != ''"/>
+          <span *ngIf="d.website != ''"><a href="{{ d.website }}" translate>MAP.WEBSITE</a></span><br *ngIf="d.website != ''"/>
+          <span *ngIf="d.tel != ''"><a href="tel://+{{ d.tel }}" target="_blank">{{ d.tel }}</a></span><br *ngIf="d.tel != ''"/>
+          <span *ngIf="d.website != ''"><a href="{{ d.website }}" target="_blank" translate>MAP.WEBSITE</a></span><br *ngIf="d.website != ''"/>
+          <span class="description" *ngIf="d.description !== ''">{{ 'MAP.DESCRIPTION' | translate }} : {{ d.description }}</span><br/>
+        </p>
       </div>
     </div>
+  </div>
 </div>
-
-
-
-- 
GitLab