aboutsummaryrefslogtreecommitdiffstats
path: root/view/profile_advanced.tpl
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-06-03 14:21:51 +0200
committerzottel <github@zottel.net>2012-06-03 14:21:51 +0200
commit70c4ab68754941749a5e89434d6db19f6bba1e16 (patch)
tree525a6536b6ab7f9020e83daf9287c785303ad584 /view/profile_advanced.tpl
parentdf2fdf08ddf8cb354022992d4353ced4295b77b3 (diff)
parentdaa4f5213f726b22846859f2f12d06889e9bdc9b (diff)
downloadvolse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.tar.gz
volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.tar.bz2
volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/profile_advanced.tpl')
-rw-r--r--view/profile_advanced.tpl9
1 files changed, 8 insertions, 1 deletions
diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl
index 470404fc3..0b8f31f43 100644
--- a/view/profile_advanced.tpl
+++ b/view/profile_advanced.tpl
@@ -29,7 +29,7 @@
{{ if $profile.marital }}
<dl id="aprofile-marital" class="aprofile">
<dt><span class="heart">&hearts;</span> $profile.marital.0</dt>
- <dd>$profile.marital.1 {{ if $profile.marital.with }}($profile.marital.with){{ endif }}</dd>
+ <dd>$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}</dd>
</dl>
{{ endif }}
@@ -54,6 +54,13 @@
</dl>
{{ endif }}
+{{ if $profile.hometown }}
+<dl id="aprofile-hometown" class="aprofile">
+ <dt>$profile.hometown.0</dt>
+ <dd>$profile.hometown.1</dd>
+</dl>
+{{ endif }}
+
{{ if $profile.politic }}
<dl id="aprofile-politic" class="aprofile">
<dt>$profile.politic.0</dt>