From 0828ab353f67fd221b1a6cb2dc86780b4dd8cbd0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 8 Jan 2012 05:16:55 -0800
Subject: [PATCH] fix git horkage

---
 view/contact_template.tpl               | 22 ++++++++++++----------
 view/theme/quattro/contact_template.tpl | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 view/theme/quattro/contact_template.tpl

diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index f2749656a..e1a080b67 100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,21 +1,23 @@
 
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
-	<div class="contact-photo-wrapper" >
-		<div class="contact-photo mframe" id="contact-entry-photo-$id"
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$id"
 		onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
 
 			<a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
 
-			<a href="#" rel="#contact-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$id">menu</a>
-			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$id">
-				$contact_photo_menu
-			</ul>
+			<span onclick="openClose('contact-photo-menu-$id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$id">
+                    <ul>
+                        $contact_photo_menu
+                    </ul>
+                </div>
 
 		</div>
 			
 	</div>
-	<div class="contact-name" id="contact-entry-name-$id" >$name</div>
-
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
 
+	<div class="contact-entry-end" ></div>
 </div>
-
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
new file mode 100644
index 000000000..f2749656a
--- /dev/null
+++ b/view/theme/quattro/contact_template.tpl
@@ -0,0 +1,21 @@
+
+<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
+	<div class="contact-photo-wrapper" >
+		<div class="contact-photo mframe" id="contact-entry-photo-$id"
+		onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
+
+			<a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
+
+			<a href="#" rel="#contact-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$id">menu</a>
+			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$id">
+				$contact_photo_menu
+			</ul>
+
+		</div>
+			
+	</div>
+	<div class="contact-name" id="contact-entry-name-$id" >$name</div>
+
+
+</div>
+