diff --git a/data/kontakt.toml b/data/kontakt.toml index c9df219..8339d04 100644 --- a/data/kontakt.toml +++ b/data/kontakt.toml @@ -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" [kontakt.geo] - lat = "1.234" - lon = "1.234" + lat = "50.8157" + lon = "7.0376" [kontakt.social] 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" [kontakt.geo] - lat = "1.234" - lon = "1.234" + lat = "50.8195" + lon = "7.1746" [kontakt.social] 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" [kontakt.geo] - lat = "1.234" - lon = "1.234" + lat = "50.7981" + lon = "7.1126" [kontakt.social] facebook = "https://www.facebook.com/pages/Neff-SteinDesign/150422701728311" diff --git a/static/.htaccess b/static/.htaccess index fa06f47..095aba8 100644 --- a/static/.htaccess +++ b/static/.htaccess @@ -30,10 +30,10 @@ RewriteRule ^wappen/$ /galerie/gestaltung/wappen/ [R=301,L] RewriteRule ^fraesarbeiten/$ /galerie/gestaltung/fraesarbeiten/ [R=301,L] RewriteRule ^angebote/schriftbeispiel/$ /galerie/gestaltung/schriftbeispiele/ [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 ^kontakt/ - [L,R=410] -RewriteRule ^links/ - [L,R=410] RewriteRule ^ueber-uns/ - [L,R=410] ## End new rules diff --git a/themes/neff/layouts/partials/address.html b/themes/neff/layouts/partials/address.html index 45f02e7..16e9b59 100755 --- a/themes/neff/layouts/partials/address.html +++ b/themes/neff/layouts/partials/address.html @@ -1,45 +1,48 @@ -
-
- {{ with .address.telephone }}{{ i18n "telephone" }}: {{ . }}
{{ end }}
- {{ with .address.faxNumber }}{{ i18n "fax" }}: {{ . }}{{ end }}
-
- {{ i18n "openingHours" }}:
- {{- 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 }}
- {{- end -}}
+ {{ with .address.telephone }}{{ i18n "telephone" }}: {{ . }}
{{ end }}
+ {{ with .address.faxNumber }}{{ i18n "fax" }}: {{ . }}{{ end }}
+ {{ i18n "openingHours" }}:
+ {{- 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 }}
+ {{- end -}}
+