Add short address

This commit is contained in:
2021-02-07 21:38:09 +01:00
parent e19cc078da
commit 48b71970b6
8 changed files with 56 additions and 30 deletions

File diff suppressed because one or more lines are too long

View File

@@ -150,6 +150,7 @@
{{if .Basic.Location.City -}}
<div class="contact-item">
<div class="icon pull-left text-center"><span class="fa fa-map-marker fa-fw"></span></div>
{{- if .UseFullAddress -}}
{{if .Basic.Location.Address}}<div class="title pull-right">{{.Basic.Location.Address}}</div>{{- end}}
<div class="title {{if not .Basic.Location.Address}}only {{- end}} pull-right">
{{- if eq .Language "fr" -}}
@@ -158,9 +159,18 @@
{{.Basic.Location.City}}{{if .Basic.Location.Region}}, {{.Basic.Location.Region}}{{- end}}{{if .Basic.Location.PostalCode}} {{.Basic.Location.PostalCode}}{{- end}}{{if .Basic.Location.CountryCode}} {{.Basic.Location.CountryCode}}{{- end}}
{{- end -}}
</div>
{{- else -}}
<div class="title only pull-right">
{{- if eq .Language "fr" -}}
{{.Basic.Location.ShortAddress}}{{if .Basic.Location.Region}}, {{.Basic.Location.Region}}{{- end}}{{if .Basic.Location.CountryCode}} {{.Basic.Location.CountryCode}}{{- end}}
{{- else -}}
{{.Basic.Location.ShortAddress}}{{if .Basic.Location.Region}}, {{.Basic.Location.Region}}{{- end}}{{if .Basic.Location.CountryCode}} {{.Basic.Location.CountryCode}}{{- end}}
{{- end -}}
</div>
{{- end -}}
</div>
{{- end}}
{{if .Basic.Phone -}}
{{if and .Basic.Phone .UseFullAddress -}}
<div class="contact-item">
<div class="icon pull-left text-center"><span class="fa fa-phone fa-fw"></span></div>
<div class="title only pull-right">{{.Basic.Phone}}</div>