Merge remote-tracking branch 'upstream/master'

1 files changed, 42 insertions, 0 deletions

diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
new file mode 100755
index 000000000..91102306c
--- /dev/null
+++ b/view/tpl/profile_vcard_short.tpl
@@ -0,0 +1,42 @@
+{{$contact_block}}
+
+	{{if $connect}}
+	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="icon-plus"></i> {{$connect}}</a></div>
+	{{/if}}
+
+
+{{$rating}}
+
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<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>
+			</span>
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
+
+	{{if $diaspora}}
+	{{include file="diaspora_vcard.tpl"}}
+	{{/if}}
+
+<div id="clear"></div>
+
+{{$chanmenu}}
+
+
+