From 978717a2475bbd25d61969e9448dc6f197c8d637 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 00:14:34 -0800
Subject: add webfinger to poco, if present

---
 view/poco_entry_xml.tpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl
index 8d5515152..c3db9f2b2 100644
--- a/view/poco_entry_xml.tpl
+++ b/view/poco_entry_xml.tpl
@@ -2,6 +2,10 @@
 {{ if $entry.id }}<id>$entry.id</id>{{ endif }}
 {{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
 {{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
-{{ if $entry.urls }}<urls><value>$entry.urls.value</value><type>$entry.urls.type</type></urls>{{ endif }}
+{{ if $entry.urls }}
+{{for $entry.urls as $url }}
+<urls><value>$url.value</value><type>$url.type</type></urls>
+{{endfor}}
+{{ endif }}
 {{ if $entry.photos }}<photos><value>$entry.photos.value</value><type>$entry.photos.type</type></photos>{{ endif }}
 </entry>
-- 
cgit v1.2.3


From c4a5fcaf278947782e4d600a3d6bdfe14eeb7fab Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 00:39:15 -0800
Subject: fix xml poco for arrays

---
 view/poco_entry_xml.tpl | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl
index c3db9f2b2..4d84cee41 100644
--- a/view/poco_entry_xml.tpl
+++ b/view/poco_entry_xml.tpl
@@ -2,10 +2,6 @@
 {{ if $entry.id }}<id>$entry.id</id>{{ endif }}
 {{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
 {{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
-{{ if $entry.urls }}
-{{for $entry.urls as $url }}
-<urls><value>$url.value</value><type>$url.type</type></urls>
-{{endfor}}
-{{ endif }}
-{{ if $entry.photos }}<photos><value>$entry.photos.value</value><type>$entry.photos.type</type></photos>{{ endif }}
+{{ if $entry.urls }}{{ for $entry.urls as $url }}<urls><value>$url.value</value><type>$url.type</type></urls>{{ endfor }}{{ endif }}
+{{ if $entry.photos }}{{ for $entry.photos as $photo }}<photos><value>$photo.value</value><type>$photo.type</type></photos>{{ endfor }}{{ endif }}
 </entry>
-- 
cgit v1.2.3


From 974a52a16d3440b6d361b883412c00edd15e770b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 01:08:32 -0800
Subject: add connect link to friend suggest

---
 view/suggest_friends.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view')

diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl
index 8e6056494..c66cdd65d 100644
--- a/view/suggest_friends.tpl
+++ b/view/suggest_friends.tpl
@@ -9,5 +9,8 @@
 	<div class="profile-match-name">
 		<a href="$url" title="$name">$name</a>
 	</div>
+	{{ if $connlnk }}
+	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+	{{ endif }}
 	<div class="profile-match-end"></div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From 5d6a098ce0bf14e372c297ed09c9f0452fa60ec7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 01:44:46 -0800
Subject: add connect link to suggestion and matches

---
 view/match.tpl                    | 4 ++++
 view/suggest_friends.tpl          | 2 +-
 view/theme/duepuntozero/style.css | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/match.tpl b/view/match.tpl
index 330245a2a..5f2fc7a30 100644
--- a/view/match.tpl
+++ b/view/match.tpl
@@ -9,4 +9,8 @@
 		<a href="$url" title="$name[$tags]">$name</a>
 	</div>
 	<div class="profile-match-end"></div>
+	{{ if $connlnk }}
+	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+	{{ endif }}
+
 </div>
\ No newline at end of file
diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl
index c66cdd65d..e97b5e8cc 100644
--- a/view/suggest_friends.tpl
+++ b/view/suggest_friends.tpl
@@ -9,8 +9,8 @@
 	<div class="profile-match-name">
 		<a href="$url" title="$name">$name</a>
 	</div>
+	<div class="profile-match-end"></div>
 	{{ if $connlnk }}
 	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
 	{{ endif }}
-	<div class="profile-match-end"></div>
 </div>
\ No newline at end of file
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 1127f1145..c6582d068 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2383,6 +2383,11 @@ aside input[type='text'] {
 	clear: both;
 }
 
+.profile-match-connect {
+	text-align: center;
+	font-weight: bold;
+}
+
 .profile-match-wrapper {
 	float: left;
 	padding: 10px;
-- 
cgit v1.2.3


From eb05d00794055dcd895ff9c3f73c55d7d7a13d10 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 18 Dec 2011 12:51:45 -0800
Subject: connect on suggest/match - added to testbubble

---
 view/theme/testbubble/match.tpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
index 49c3c81e4..244b243ec 100644
--- a/view/theme/testbubble/match.tpl
+++ b/view/theme/testbubble/match.tpl
@@ -4,7 +4,10 @@
 			<img src="$photo" alt="$name" />
 		</a>
 	</div>
-	<span><a href="$url">$name</a> is interested in:<br />$tags</span>
+	<span><a href="$url">$name</a>$inttxt<br />$tags</span>
 	<div class="profile-match-break"></div>
+	{{ if $connlnk }}
+	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
+	{{ endif }}
 	<div class="profile-match-end"></div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From 177af1fc9d286c4ecc7e5ce43e17f492b9e11817 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 19 Dec 2011 01:23:12 -0800
Subject: jquery effects missing from zero derivatives

---
 view/theme/darkzero/theme.php   | 45 +++++++++++++++++++++++++++++++++++++++++
 view/theme/greenzero/theme.php  | 45 +++++++++++++++++++++++++++++++++++++++++
 view/theme/purplezero/theme.php | 45 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 135 insertions(+)

(limited to 'view')

diff --git a/view/theme/darkzero/theme.php b/view/theme/darkzero/theme.php
index 338f40cbf..5d63583f4 100644
--- a/view/theme/darkzero/theme.php
+++ b/view/theme/darkzero/theme.php
@@ -2,3 +2,48 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;
diff --git a/view/theme/greenzero/theme.php b/view/theme/greenzero/theme.php
index 338f40cbf..5d63583f4 100644
--- a/view/theme/greenzero/theme.php
+++ b/view/theme/greenzero/theme.php
@@ -2,3 +2,48 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;
diff --git a/view/theme/purplezero/theme.php b/view/theme/purplezero/theme.php
index 338f40cbf..5d63583f4 100644
--- a/view/theme/purplezero/theme.php
+++ b/view/theme/purplezero/theme.php
@@ -2,3 +2,48 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;
-- 
cgit v1.2.3