Commit 1909341f authored by Jacob's avatar Jacob

Change Text in Details and Edit Mode (Dieser Ort...)

Added Icon for connected Apps
Optimize Size of OSM Icon in DetailView
Change "Gemeinnützigkeit" -Selection to Radionbutton
parent e50d4ea3
......@@ -272,7 +272,7 @@
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
</div>
</div> -->
<!-- <div *ngFor="let tag of nodeService.detailView.tags"
class="form-group row item-detail">
<label for="elementKey" class="col-sm-4 col-form-label">
......@@ -283,7 +283,7 @@
id="elementKey">{{tag.value}}</span>
</div>
</div> -->
<div class="form-group row item-detail">
<label class="col-sm-4 col-form-label">
<strong>Name</strong>
......@@ -292,12 +292,12 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('name')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('name')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('name')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('name')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
<div class="form-group row item-detail">
......@@ -308,15 +308,15 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('contact:websit')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('contact:websit')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('contact:websit')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('contact:websit')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
<div class="form-group row item-detail">
<label class="col-sm-4 col-form-label">
<strong>Straße</strong>
......@@ -325,15 +325,15 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('addr:street')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('addr:street')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:street')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:street')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
<div class="form-group row item-detail">
<label class="col-sm-4 col-form-label">
<strong>Hausnummer</strong>
......@@ -342,15 +342,15 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('addr:housenumber')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('addr:housenumber')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:housenumber')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:housenumber')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
<div class="form-group row item-detail">
<label class="col-sm-4 col-form-label">
<strong>PLZ</strong>
......@@ -359,15 +359,15 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('addr:postcode')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('addr:postcode')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:postcode')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:postcode')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
<div class="form-group row item-detail">
<label class="col-sm-4 col-form-label">
<strong>Stadt</strong>
......@@ -376,15 +376,15 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('addr:city')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('addr:city')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:city')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:city')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
<div class="form-group row item-detail">
<label class="col-sm-4 col-form-label">
<strong>Land</strong>
......@@ -393,15 +393,15 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('addr:country')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('addr:country')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:country')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('addr:country')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
<div class="form-group row item-detail">
<label class="col-sm-4 col-form-label">
<strong>E-Mail</strong>
......@@ -410,15 +410,15 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('email')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('email')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('email')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('email')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
<div class="form-group row item-detail">
<label class="col-sm-4 col-form-label">
<strong>Öffnungszeiten</strong>
......@@ -427,15 +427,15 @@
<div *ngIf="nodeService.detailView.getOsmTagValue('opening_hours')">
<span class="form-control-plaintext" id="elementKey" >{{nodeService.detailView.getOsmTagValue('opening_hours')}}</span>
</div>
<div *ngIf="!nodeService.detailView.getOsmTagValue('opening_hours')">
<div *ngIf="!nodeService.detailView.getOsmTagValue('opening_hours')">
<span class="form-control-plaintext text-muted" id="elementKey" >Keine Angabe bisher.</span>
</div>
</div>
<div class="col-auto">
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="listicon gp_osmlink"></i></a>
<a href="http://www.openstreetmap.org/copyright" target="_blank"><i aria-hidden="true" class="osmlinkicon gp_osmlink"></i></a>
</div>
</div>
</div>
</div>
</div>
......@@ -509,7 +509,7 @@
<div (click)="descCollapsed = !descCollapsed"
[attr.aria-expanded]="!descCollapsed"
aria-controls="collapseDescription" class="collapseDescription">
<i class="_fa _fa-undo _fa-lg listicon gp_network" aria-hidden="true">&nbsp;</i>Dieser Ort und sein Netzwerk<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!descCollapsed,'fa-angle-right':descCollapsed, 'fa-right':true}"
<i class="_fa _fa-undo _fa-lg listicon gp_network" aria-hidden="true">&nbsp;</i>Netzwerk<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!descCollapsed,'fa-angle-right':descCollapsed, 'fa-right':true}"
aria-hidden="true">&nbsp;</i>
</div>
</div>
......@@ -590,7 +590,7 @@
<div (click)="sharingCollapsed = !sharingCollapsed"
[attr.aria-expanded]="sharingCollapsed" aria-controls="collapseSharing"
class="collapseSharing">
<i class="listicon gp_sharing" aria-hidden="true">&nbsp;</i>Dieser Ort und seine Sharing- und Giving-Angebote<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!sharingCollapsed,'fa-angle-right':sharingCollapsed, 'fa-right':true}"
<i class="listicon gp_sharing" aria-hidden="true">&nbsp;</i>Sharing- und Giving-Angebote<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!sharingCollapsed,'fa-angle-right':sharingCollapsed, 'fa-right':true}"
aria-hidden="true">&nbsp;</i>
</div>
</div>
......@@ -659,7 +659,7 @@
<div (click)="nutritionCollapsed = !nutritionCollapsed"
[attr.aria-expanded]="!nutritionCollapsed" aria-controls="collapseNutrition"
class="collapseNutrition">
<i class="listicon gp_food" aria-hidden="true">&nbsp;</i>Dieser Ort und nachhaltige Ernährung<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!nutritionCollapsed,'fa-angle-right':nutritionCollapsed, 'fa-right':true}"
<i class="listicon gp_food" aria-hidden="true">&nbsp;</i>Nachhaltige Ernährung<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!nutritionCollapsed,'fa-angle-right':nutritionCollapsed, 'fa-right':true}"
aria-hidden="true">&nbsp;</i>
</div>
</div>
......@@ -703,7 +703,7 @@
<div (click)="elementAppsCollapsed = !elementAppsCollapsed"
[attr.aria-expanded]="elementAppsCollapsed" aria-controls="elementAppsCollapsed"
class="collapseSharing">
<i class="listicon gp_sharing" aria-hidden="true">&nbsp;</i>Dieser Ort in befreundeten Apps<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!elementAppsCollapsed,'fa-angle-right':elementAppsCollapsed, 'fa-right':true}"
<i class="listicon gp_friendlyapp" aria-hidden="true">&nbsp;</i>Dieser Ort in befreundeten Apps<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!elementAppsCollapsed,'fa-angle-right':elementAppsCollapsed, 'fa-right':true}"
aria-hidden="true">&nbsp;</i>
</div>
</div>
......
......@@ -5,7 +5,7 @@
<div (click)="sharingCollapsed= !sharingCollapsed"
[attr.aria-expanded]="!sharingCollapsed" aria-controls="collapseSharing"
class="collapseSharing">
<h5><i class="" aria-hidden="true">&nbsp;</i>Dieser Ort und seine Sharing- & Giving Angebote<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!sharingCollapsed,'fa-angle-right':sharingCollapsed, 'fa-right':true}"
<h5><i class="" aria-hidden="true">&nbsp;</i>Sharing- & Giving Angebote<i [ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!sharingCollapsed,'fa-angle-right':sharingCollapsed, 'fa-right':true}"
aria-hidden="true">&nbsp;</i>
</h5>
</div>
......@@ -63,7 +63,7 @@
<div (click)="sustCollapsed= !sustCollapsed"
[attr.aria-expanded]="!sustCollapsed" aria-controls="collapseSust"
class="collapseSust">
<h5><i class="" aria-hidden="true">&nbsp;</i>Dieser Ort und nachhaltige Ernährung<i
<h5><i class="" aria-hidden="true">&nbsp;</i>Nachhaltige Ernährung<i
[ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!sustCollapsed,'fa-angle-right':sustCollapsed, 'fa-right':true}"
aria-hidden="true">&nbsp;</i></h5>
</div>
......
......@@ -4,7 +4,7 @@
<div class="form-group card-header edit_header">
<div (click)="descCollapsed= !descCollapsed" [attr.aria-expanded]="!descCollapsed"
aria-controls="collapseDescription" class="collapseDescription">
<h5><i class="" aria-hidden="true">&nbsp;</i>Dieser Ort und seine Netzwerke<i
<h5><i class="" aria-hidden="true">&nbsp;</i>Netzwerk<i
[ngClass]="{'fa':true,'fa-lg':true,'fa-angle-down':!descCollapsed,'fa-angle-right':descCollapsed, 'fa-right':true}"
aria-hidden="true">&nbsp;</i></h5>
</div>
......@@ -39,12 +39,25 @@
<div class="col-sm-9">
<!-- <input type="text" class="form-control" id="elementBenefittothepublic" formControlName="welfare" placeholder="Keine Angabe bisher."> -->
<select class="form-control" id="elementBenefittothepublic" formControlName="welfare">
<option selected disabled>Keine Angabe bisher.</option>
<!--<select class="form-control" id="elementBenefittothepublic" formControlName="welfare">
<option selected disabled>Keine Angabe bisher.</option>
<option>Ja</option>
<option>Nein</option>
</select>
</div>
</select>-->
<div class="form-check form-check-inline col">
<input class="form-check-input" formControlName="welfare" type="radio" value="Keine Angabe">
<label class="form-check-label" for="inlineRadio1">Keine Angabe</label>
</div>
<div class="form-check form-check-inline col" >
<input class="form-check-input" formControlName="welfare" type="radio" value="Ja">
<label class="form-check-label" for="inlineRadio2">Ja</label>
</div>
<div class="form-check form-check-inline col" formControlName="welfare">
<input class="form-check-input" formControlName="welfare" type="radio" value="Nein">
<label class="form-check-label" for="inlineRadio3">Nein</label>
</div>
</div>
</div>
<div class="form-group">
......@@ -105,4 +118,4 @@
</div>
</div>
</form>
</div>
\ No newline at end of file
</div>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;}
.st1{fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
.st2{fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
</style>
<rect class="st0" width="32" height="32"/>
<path class="st1" d="M6,27V5c0-1.1,0.9-2,2-2h16c1.1,0,2,0.9,2,2v22c0,1.1-0.9,2-2,2H8C6.9,29,6,28.1,6,27z"/>
<circle cx="16" cy="25" r="1"/>
<line class="st1" x1="26" y1="22" x2="6" y2="22"/>
<path class="st2" d="M21.8,9.9c-0.6-1.5-2.3-2.3-3.8-1.8c-1.2,0.4-1.9,1.5-1.9,2.7h-0.1c-0.1-1.2-0.8-2.2-1.9-2.7
c-1.5-0.6-3.2,0.2-3.8,1.8c-0.4,1.2-0.1,2.4,0.8,3.2l5.1,4.4l5-4.4C21.9,12.3,22.2,11.1,21.8,9.9z"/>
</svg>
......@@ -134,6 +134,11 @@
background-size: 16px;
}
.gp_friendlyapp:before {
background: url("/assets/icons/gp_apps.svg") no-repeat 0 0;
background-size: 16px;
}
.logo:before {
background: url("/assets/icons/logo.svg") no-repeat 0 0;
background-size: 46px;
......@@ -167,6 +172,16 @@
background-size: 16px;
}
.osmlinkicon:before{
display: inline-block;
width: 30px;
height: 34px;
margin: 0px 0px -6px 0px;
content: "";
background-position: center;
background-size: 24px;
}
.uiicon:before{
display: inline-block;
width:20px;
......
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