diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-03 04:59:07 -0400 |
| commit | 598a2563e844477de2f688663c7c46962b26b602 (patch) | |
| tree | 525a6536b6ab7f9020e83daf9287c785303ad584 /view/profile_advanced.tpl | |
| parent | 8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6 (diff) | |
| parent | daa4f5213f726b22846859f2f12d06889e9bdc9b (diff) | |
| download | volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.gz volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.tar.bz2 volse-hubzilla-598a2563e844477de2f688663c7c46962b26b602.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
zrl's when visiting public photos at the source site
doco
cleanup
turn "follow" into a function
add hometown to profiles
bug #439 - remove web port number from notification email "from" address
webfinger profile linker
"howlong" added to marital status.
fewer "bob smith to bob smith via wall-to-wall".
[quote=somebody] was appearing as an extended spoiler tag.
* master:
Diffstat (limited to 'view/profile_advanced.tpl')
| -rw-r--r-- | view/profile_advanced.tpl | 9 |
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">♥</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> |