diff --git a/opentech/apply/funds/blocks.py b/opentech/apply/funds/blocks.py index 6957921214ef3ddac61583ddc9d3797b3411496a..a2e55732d79fdb574c31f4b19c784a728ba1def7 100644 --- a/opentech/apply/funds/blocks.py +++ b/opentech/apply/funds/blocks.py @@ -1,3 +1,5 @@ +import json + from django import forms from django.utils.translation import ugettext_lazy as _ @@ -44,6 +46,10 @@ class AddressFieldBlock(ApplicationMustIncludeFieldBlock): label = _('Address') icon = 'home' + def format_data(self, data): + address = json.loads(data) + return ', '.join(address.values()) + class FullNameBlock(ApplicationMustIncludeFieldBlock): name = 'full_name' diff --git a/opentech/apply/funds/templates/funds/includes/rendered_answers.html b/opentech/apply/funds/templates/funds/includes/rendered_answers.html index b6d461a8543ff4820302aae2cb1de8b812829717..e056156ba1d7ce22e34f4e22122b179d12ed17c0 100644 --- a/opentech/apply/funds/templates/funds/includes/rendered_answers.html +++ b/opentech/apply/funds/templates/funds/includes/rendered_answers.html @@ -20,6 +20,10 @@ <h5>Email</h5> <p>{{ object.email }}</p> </div> + <div class="grid__cell--span-two"> + <h5>Address</h5> + <p>{{ object.get_address_display }}</p> + </div> </div> <div class="rich-text rich-text--answers"> {{ object.render_answers }} diff --git a/opentech/static_src/src/sass/apply/components/_grid.scss b/opentech/static_src/src/sass/apply/components/_grid.scss index 3a633983b84a1e8c79b415e2b3aba95347d5fb45..7756eedd427bee539deceaa5ac75a03d193ea49f 100644 --- a/opentech/static_src/src/sass/apply/components/_grid.scss +++ b/opentech/static_src/src/sass/apply/components/_grid.scss @@ -86,5 +86,13 @@ margin: 0; } } + + &__cell { + &--span-two{ + @include media-query(mob-landscape) { + grid-column: auto / span 2; + } + } + } } }