From 435836b224adac299d7c6868279b014010e70d29 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 6 Dec 2012 18:17:43 -0800
Subject: templatise micropro

---
 view/tpl/micropro_img.tpl | 1 +
 view/tpl/micropro_txt.tpl | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 view/tpl/micropro_img.tpl
 create mode 100644 view/tpl/micropro_txt.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
new file mode 100644
index 000000000..06df22d7b
--- /dev/null
+++ b/view/tpl/micropro_img.tpl
@@ -0,0 +1 @@
+<div class="contact-block-div{{if $class}} $class{{endif}}"><a class="contact-block-link{{if $class}} $class{{endif}}{{if $click}} fakelink{{endif}}" href="{{if $click}}#{{else}}$url{{endif}}" {{if $click}}onclick="$click"{{endif}}><img class="contact-block-img{{if $class}} $class{{endif}}" src="$photo" title="$title" alt="$name" /></a></div>
diff --git a/view/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl
new file mode 100644
index 000000000..6a6ef6392
--- /dev/null
+++ b/view/tpl/micropro_txt.tpl
@@ -0,0 +1 @@
+<div class="contact-block-textdiv{{if $class}} $class{{endif}}"><a class="contact-block-link{{if $class}} $class{{endif}}{{if $click}} fakelink{{endif}}" href="{{if $click}}#{{else}}$url{{endif}}" {{if $click}}onclick="$click"{{endif}} title="$title">$name</a></div>
-- 
cgit v1.2.3


From 2a7a5b2d0182193c96a12097dd3cf47f517e3553 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 6 Dec 2012 19:44:13 -0800
Subject: move 'Connect' button to local chanview page, remove from remote
 profile pages - still requires some theming love

---
 view/tpl/profile_vcard.tpl | 10 ----------
 view/tpl/xchan_vcard.tpl   | 11 +++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 216f9665a..7ae62330c 100644
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -47,16 +47,6 @@
 	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" >$profile.homepage</a></dd></dl>{{ endif }}
 
 	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
 </div>
 
 $contact_block
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 6bc56ce74..4e3f69b0c 100644
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -2,3 +2,14 @@
 <div class="fn">$name</div>
 <div id="profile-photo-wrapper"><img class="vcard-photo photo" src="$photo" alt="name" /></div>
 </div>
+
+
+	
+<div id="profile-extra-links">
+<ul>
+{{ if $connect }}
+	<li><a id="follow-link" href="follow?f=&url=$follow">$connect</a></li>
+{{ endif }}
+</ul>
+</div>
+
-- 
cgit v1.2.3