diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-09 11:41:23 +0100 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-09 11:41:23 +0100 |
| commit | 11c29e0cba4f521c5f37d963109c4807af8bccae (patch) | |
| tree | 3dde72ce8528cfa9cc6111098585623b5971b605 /view/theme/dispy/profile_vcard.tpl | |
| parent | 52ea842e872cc004fd012496c828e9fb6186bec9 (diff) | |
| parent | 2ce78253aeda8672e12f18f0963f52cd4a35e546 (diff) | |
| download | volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.tar.gz volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.tar.bz2 volse-hubzilla-11c29e0cba4f521c5f37d963109c4807af8bccae.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/dispy/profile_vcard.tpl')
| -rw-r--r--[-rwxr-xr-x] | view/theme/dispy/profile_vcard.tpl | 59 |
1 files changed, 39 insertions, 20 deletions
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl index b3f5cc50d..0c289d982 100755..100644 --- a/view/theme/dispy/profile_vcard.tpl +++ b/view/theme/dispy/profile_vcard.tpl @@ -2,34 +2,53 @@ <div class="fn label">$profile.name</div> - - - {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }} - <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div> - - + {{ if $pdesc }} + <div class="title">$profile.pdesc</div> + {{ endif }} + <div id="profile-photo-wrapper"> + <img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" /> + </div> {{ if $location }} - <dl class="location"><dt class="location-label">$location</dt> - <dd class="adr"> - {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }} - <span class="city-state-zip"> - <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }} - <span class="region">$profile.region</span> - <span class="postal-code">$profile.postal-code</span> - </span> + <div class="location"> + <span class="location-label">$location</span> + <div class="adr"> + {{ if $profile.address }} + <div class="street-address">$profile.address</div>{{ endif }} + <span class="city-state-zip">$profile.zip</span> + <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }} + <span class="region">$profile.region</span> + <span class="postal-code">$profile.postal-code</span> {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }} - </dd> - </dl> + </div> + </div> {{ endif }} - {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }} + {{ if $gender }} + <div class="mf"> + <span class="gender-label">$gender</span> + <span class="x-gender">$profile.gender</span> + </div> + {{ endif }} - {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }} + {{ if $profile.pubkey }} + <div class="key" style="display:none;">$profile.pubkey</div> + {{ endif }} - {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }} + {{ if $marital }} + <div class="marital"> + <span class="marital-label"> + <span class="heart">♥</span>$marital</span> + <span class="marital-text">$profile.marital</span> + </div> + {{ endif }} - {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }} + {{ if $homepage }} + <div class="homepage"> + <span class="homepage-label">$homepage</span> + <span class="homepage-url"><a href="$profile.homepage" + target="external-link">$profile.homepage</a></span> + </div>{{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} |