aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-12-07 22:27:35 +0000
committerThomas Willingham <founder@kakste.com>2012-12-07 22:27:35 +0000
commit44263d5ac3e5189df28c92f58c2875137052b6ea (patch)
tree70aa75426f2b3c984faecdb5f684157bccedda3a /view
parent555226ada4946b78be5fa2966f5c8532a997953f (diff)
parent2452b822f909a3cac432a76d8c928733a7683c6a (diff)
downloadvolse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.tar.gz
volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.tar.bz2
volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
-rw-r--r--view/js/mod_connections.js2
-rw-r--r--view/tpl/micropro_img.tpl1
-rw-r--r--view/tpl/micropro_txt.tpl1
-rw-r--r--view/tpl/profile_vcard.tpl10
-rw-r--r--view/tpl/xchan_vcard.tpl11
5 files changed, 14 insertions, 11 deletions
diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index b7352d336..6a7f2eaed 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -5,7 +5,7 @@ $(document).ready(function() {
minChars: 2,
width: 350,
});
- a.setOptions({ params: { autoSubmit: true, type: 'a' }});
+ a.setOptions({ autoSubmit: true, params: { type: 'a' }});
});
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>
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>
+