Finale änderungen

This commit is contained in:
Patrick Neff 2019-01-12 15:18:56 +01:00
parent 8445b99274
commit 985e2b29be
3 changed files with 53 additions and 50 deletions

View File

@ -12,8 +12,8 @@ openingHours = ["Mo-Fr 08:00-12:00", "Mo-Fr 13:30-17:00", "Sa 09:00-12:00"]
streetAddress = "Rosenstr. 45-49" streetAddress = "Rosenstr. 45-49"
[kontakt.geo] [kontakt.geo]
lat = "1.234" lat = "50.8157"
lon = "1.234" lon = "7.0376"
[kontakt.social] [kontakt.social]
facebook = "https://www.facebook.com/pages/Neff-SteinDesign/150422701728311" facebook = "https://www.facebook.com/pages/Neff-SteinDesign/150422701728311"
@ -34,8 +34,8 @@ openingHours = ["Tu-Th 10:00-12:00", "Mo-Fr 13:00-16:15", "Sa 10:00-12:00"]
streetAddress = "Heerstr. 15" streetAddress = "Heerstr. 15"
[kontakt.geo] [kontakt.geo]
lat = "1.234" lat = "50.8195"
lon = "1.234" lon = "7.1746"
[kontakt.social] [kontakt.social]
facebook = "https://www.facebook.com/pages/Neff-SteinDesign/150422701728311" facebook = "https://www.facebook.com/pages/Neff-SteinDesign/150422701728311"
@ -57,8 +57,8 @@ openingHours = ["Mo-Fr 14:30-17:00", "Sa 10:00-12:00"]
streetAddress = "Vorgebirgsblick 46" streetAddress = "Vorgebirgsblick 46"
[kontakt.geo] [kontakt.geo]
lat = "1.234" lat = "50.7981"
lon = "1.234" lon = "7.1126"
[kontakt.social] [kontakt.social]
facebook = "https://www.facebook.com/pages/Neff-SteinDesign/150422701728311" facebook = "https://www.facebook.com/pages/Neff-SteinDesign/150422701728311"

View File

@ -30,10 +30,10 @@ RewriteRule ^wappen/$ /galerie/gestaltung/wappen/ [R=301,L]
RewriteRule ^fraesarbeiten/$ /galerie/gestaltung/fraesarbeiten/ [R=301,L] RewriteRule ^fraesarbeiten/$ /galerie/gestaltung/fraesarbeiten/ [R=301,L]
RewriteRule ^angebote/schriftbeispiel/$ /galerie/gestaltung/schriftbeispiele/ [R=301,L] RewriteRule ^angebote/schriftbeispiel/$ /galerie/gestaltung/schriftbeispiele/ [R=301,L]
RewriteRule ^angebote/standsicherheit/$ /info/standsicherheit [R=301,L] RewriteRule ^angebote/standsicherheit/$ /info/standsicherheit [R=301,L]
RewriteRule ^links/ /zulieferer-und-partnerbetriebe [L,R=301]
RewriteRule ^angebote/ - [L,R=410] RewriteRule ^angebote/ - [L,R=410]
RewriteRule ^kontakt/ - [L,R=410] RewriteRule ^kontakt/ - [L,R=410]
RewriteRule ^links/ - [L,R=410]
RewriteRule ^ueber-uns/ - [L,R=410] RewriteRule ^ueber-uns/ - [L,R=410]
## End new rules ## End new rules
</IfModule> </IfModule>

View File

@ -1,45 +1,48 @@
<address class="address padding"> <div class="padding">
<header> <address class="address">
<h3>{{ .address.address.addressLocality }}</h3> <header>
</header> <h3>{{ .address.address.addressLocality }}</h3>
{{ with .address.name }}<span>{{ . }}</span>{{ end }} </header>
<div> {{ with .address.name }}<span>{{ . }}</span>{{ end }}
{{ with .address.address.streetAddress }}<span>{{ . }}</span><br>{{ end }} <div>
{{ with .address.address.postalCode }}<span>{{ . }}</span>{{ end }} {{ with .address.address.streetAddress }}<span>{{ . }}</span><br>{{ end }}
{{ with .address.address.addressLocality }}<span>{{ . }}</span><br>{{ end }} {{ with .address.address.postalCode }}<span>{{ . }}</span>{{ end }}
{{ with .address.address.addressRegion }}<span>{{ . }}</span><br>{{ end }} {{ with .address.address.addressLocality }}<span>{{ . }}</span><br>{{ end }}
{{ with .address.address.addressCountry }}<span>{{ i18n . }}</span><br>{{ end }} {{ with .address.address.addressRegion }}<span>{{ . }}</span><br>{{ end }}
</div> {{ with .address.address.addressCountry }}<span>{{ i18n . }}</span><br>{{ end }}
<p> </div>
{{ with .address.telephone }}<em>{{ i18n "telephone" }}:</em> <span>{{ . }}</span><br>{{ end }}
{{ with .address.faxNumber }}<em>{{ i18n "fax" }}:</em> <span>{{ . }}</span>{{ end }}<br>
</p>
{{ with .address.openingHours }}
<p> <p>
<em>{{ i18n "openingHours" }}:</em><br> {{ with .address.telephone }}<em>{{ i18n "telephone" }}:</em> <span>{{ . }}</span><br>{{ end }}
{{- range . -}} {{ with .address.faxNumber }}<em>{{ i18n "fax" }}:</em> <span>{{ . }}</span>{{ end }}<br>
{{- $split := split . " " }}
{{- $daysStr := index (split (index $split 0) " ") 0 }}
{{- $hoursStr := index (split (index $split 1) " ") 0 }}
{{- $days := split $daysStr "," }}
{{- $localizedDays := slice }}
{{- range $idx, $day := $days -}}
{{- if in . "-" -}}
{{- $innerDays := split . "-" -}}
{{- $innerLocalizedDays := slice -}}
{{- range $innerDays -}}
{{- $innerLocalizedDays = $innerLocalizedDays | append (i18n .) -}}
{{- end -}}
{{- $dayRange := delimit $innerLocalizedDays "-" -}}
{{- $dayRange -}}
{{- $localizedDays = $localizedDays | append (i18n $dayRange) -}}
{{- else -}}
{{- $localizedDays = $localizedDays | append (i18n $day) -}}
{{- end -}}
{{- end -}}
{{ delimit $localizedDays ", " }} {{ $hoursStr }}<br>
{{- end -}}
</p> </p>
{{- end -}} {{ with .address.openingHours }}
</address> <p>
{{ partial "schema/localbusiness.html" (dict "contact" .address "ctx" .ctx "short" false) }} <em>{{ i18n "openingHours" }}:</em><br>
{{- range . -}}
{{- $split := split . " " }}
{{- $daysStr := index (split (index $split 0) " ") 0 }}
{{- $hoursStr := index (split (index $split 1) " ") 0 }}
{{- $days := split $daysStr "," }}
{{- $localizedDays := slice }}
{{- range $idx, $day := $days -}}
{{- if in . "-" -}}
{{- $innerDays := split . "-" -}}
{{- $innerLocalizedDays := slice -}}
{{- range $innerDays -}}
{{- $innerLocalizedDays = $innerLocalizedDays | append (i18n .) -}}
{{- end -}}
{{- $dayRange := delimit $innerLocalizedDays "-" -}}
{{- $dayRange -}}
{{- $localizedDays = $localizedDays | append (i18n $dayRange) -}}
{{- else -}}
{{- $localizedDays = $localizedDays | append (i18n $day) -}}
{{- end -}}
{{- end -}}
{{ delimit $localizedDays ", " }} {{ $hoursStr }}<br>
{{- end -}}
</p>
{{- end -}}
{{ partial "schema/localbusiness.html" (dict "contact" .address "ctx" .ctx "short" false) }}
</address>
<a href="https://maps.openrouteservice.org/directions?n1={{ .address.geo.lat }}&n2={{ .address.geo.lon }}&n3=13&a=0,0,{{ .address.geo.lat }},{{ .address.geo.lon }},b=0&k1=de-DE&k2=km"><i class="fa fa-map"></i></a>
</div>