diff options
author | Somrat Sorkar <37659754+somratpro@users.noreply.github.com> | 2021-09-14 12:45:11 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-14 12:45:11 +0300 |
commit | 1c4a5c74e663783da102fbedfed25fbea86824c2 (patch) | |
tree | 693d6d8104c8a0b6dbdb45c54051d0c24719a979 | |
parent | 4932bd37661f85926db8707cb6508cac8d7e82b0 (diff) | |
parent | ec7c4b8341f159257d12c4c3adbcab19aafebec4 (diff) |
Merge pull request #198 from salim-b/fix-contact-pagev1.1.0
Make contact page config more robust
-rw-r--r-- | layouts/_default/contact.html | 27 | ||||
-rw-r--r-- | layouts/partials/cloak_email.html | 4 |
2 files changed, 18 insertions, 13 deletions
diff --git a/layouts/_default/contact.html b/layouts/_default/contact.html index 5c53a76..8422d26 100644 --- a/layouts/_default/contact.html +++ b/layouts/_default/contact.html @@ -4,7 +4,7 @@ <section class="contact-form"> <div class="container"> - {{ with site.Params.contact.form }}{{ if .enable }} + {{ with site.Params.contact.form }}{{ if .enable -}} <div class="row"> <form method="POST" {{ if .use_netlify }}name="{{ printf "contact_%s" $.Language.Lang }}" action="{{ "/message_sent" | relLangURL }}" netlify netlify-honeypot="nhp"{{ else }}name="contact" action="{{ .action | safeURL }}"{{ end }}> <div class="col-md-6 col-sm-12"> @@ -21,11 +21,11 @@ <label for="subject" hidden>{{ i18n "contact_form_subject" }}</label> <input id="subject" name="subject" type="text" class="form-control" placeholder="{{ i18n "contact_form_subject" }}" required> </div> - {{ if .use_netlify }} + {{ if .use_netlify -}} <div class="form-group-h"> <input name="nhp" type="text" class="form-control" placeholder="Are you made of flesh and bone?"> </div> - {{ end -}} + {{- end }} </div> </div> <div class="col-md-6 col-sm-12"> @@ -39,26 +39,27 @@ </div> </form> </div> - {{ end }}{{ end }} + {{- end }}{{ end }} <div class="contact-box row"> - {{ with site.Params.contact }} + {{ with site.Params.contact -}} <div class="col-md-6 col-sm-12"> <div class="block"> <h2>{{ i18n "address_title" }}</h2> <ul class="address-block"> - {{ if isset . "location" }}<li><i class="ion-ios-location-outline"></i>{{ if .address_descriptors }}{{ i18n "location" | printf "%s: " }}{{ end }}<div>{{ .location | markdownify }}</div></li>{{ end }} - {{ if isset . "email" }}<li><i class="ion-ios-email-outline"></i>{{ if .address_descriptors }}{{ i18n "email" | printf "%s: " }}{{ end }}{{ partial "cloak_email" .email }}</li>{{ end }} - {{ if isset . "phone" }}<li><i class="ion-ios-telephone-outline"></i>{{ if .address_descriptors }}{{ i18n "phone" | printf "%s: " }}{{ end }}{{ .phone }}</li>{{ end }} + {{ $add_address_descriptors := .address_descriptors }} + {{ with .location }}<li><i class="ion-ios-location-outline"></i>{{ if $add_address_descriptors }}{{ i18n "location" | printf "%s: " }}{{ end }}<div>{{ . | markdownify }}</div></li>{{ end }} + {{ with .email }}<li><i class="ion-ios-email-outline"></i>{{ if $add_address_descriptors }}{{ i18n "email" | printf "%s: " }}{{ end }}{{ partial "cloak_email" . }}</li>{{ end }} + {{ with .phone }}<li><i class="ion-ios-telephone-outline"></i>{{ if $add_address_descriptors }}{{ i18n "phone" | printf "%s: " }}{{ end }}{{ . }}</li>{{ end }} </ul> <ul class="social-icons"> - {{ range site.Params.social }} + {{ range site.Params.social -}} <li><a href="{{ .link | safeURL }}"><i class="{{ .icon }}"></i></a></li> - {{ end }} + {{- end }} </ul> </div> </div> - {{ end }} - {{ if site.Params.gmap.enable }} + {{- end }} + {{ if site.Params.gmap.enable -}} <div class="col-md-6 col-sm-12"> <div class="block"> <div class="google-map"> @@ -66,7 +67,7 @@ </div> </div> </div> - {{ end }} + {{- end }} </div> </div> </section> diff --git a/layouts/partials/cloak_email.html b/layouts/partials/cloak_email.html index 9cd7aa9..cd631de 100644 --- a/layouts/partials/cloak_email.html +++ b/layouts/partials/cloak_email.html @@ -1,6 +1,10 @@ {{/* Cloak an e-mail address (first argument) */ -}} {{- $address_parts := split . "@" -}} +{{- if (eq (len $address_parts) 2) -}} {{- $user := index $address_parts 0 -}} {{- $domain := index $address_parts 1 -}} <span class="cloaked-e-mail" data-user="{{ range $index := seq (sub (len $user) 1) 0 }}{{ substr $user $index 1 }}{{ end }}" data-domain="{{ range $index := seq (sub (len $domain) 1) 0 }}{{ substr $domain $index 1 }}{{ end }}"></span> +{{- else -}} +<span>INVALID E-MAIL ADDRESS</span> +{{- end -}} {{- /* Dummy comment to strip trailing newline */ -}} |