Merge pull request #370 from tobiasd/20160909-forumdir

only show address information when set

diff --git a/forumdirectory/templates/forumdirectory_item.tpl b/forumdirectory/templates/forumdirectory_item.tpl
index ee38c28a0e15a5db3e848f4f26c8aa5c12622d3e..61b165d71cf695e8992fe341c6d82d50700e3360 100644 (file)
--- a/forumdirectory/templates/forumdirectory_item.tpl
+++ b/forumdirectory/templates/forumdirectory_item.tpl
@@ -18,11 +18,11 @@
                                <dd class="adr">
                                        {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
                                        <span class="city-state-zip">
-                                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-                                               <span class="region">{{$profile.region}}</span>
-                                               <span class="postal-code">{{$profile.postal-code}}</span>
+                                               {{if $profile.locality}}<span class="locality">{{$profile.locality}}</span>, {{/if}}
+                                               {{if $profile.region}}<span class="region">{{$profile.region}}</span>{{/if}}
+                                               {{if $profile['postal-code']}}<span class="postal-code">{{$profile['postal-code']}}</span>{{/if}}
                                        </span>
-                                       {{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+                                       {{if $profile['country-name']}}<span class="country-name">{{$profile['country-name']}}</span>{{/if}}
                                </dd>
                                </dl>
                        {{/if}}