contact-edit cleanup

3 files changed, 36 insertions, 26 deletions

diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index dbcc3fd71..6f1dbbc7c 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -27,6 +27,7 @@
 	<div id="contact-edit-end" ></div>
 
 $blocked
+$ignored
 
 <form action="contacts/$contact_id" method="post" >
 <input type="hidden" name="contact_id" value="$contact_id">
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index f2bcdc2d5..763cde00b 100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,23 +1,24 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
 	<div class="contact-entry-photo-wrapper" >
-		<img class="contact-entry-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
+		<div class="contact-entry-nav-wrapper" >
+			<div class="contact-entry-direction-wrapper" >
+				<img class="contact-entry-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
+			</div>
+			<div class="contact-entry-direction-end" ></div>
+			<div class="contact-entry-edit-links" >
+				<a href="contacts/$id" class="contact-entry-edit-link" ><img src="images/b_edit.gif" alt="$edit_hover" title="$edit_hover" /></a>
+			</div>
+			<div class="contact-entry-edit-end"></div>
+		</div>
+		<div class="contact-entry-nav-end"></div>
 		<div class="contact-entry-photo" id="contact-entry-photo-$id" >
-			<a href="$url" title="Visit $name's profile" /><img src="$thumb" alt="$name" /></a>
+			<a href="$url" title="$img_hover" /><img src="$thumb" alt="$name" /></a>
 		</div>
-		<div class="contact-entry-photo-end" ></div>
+			
 	</div>
-	<div class="contact-entry-nav-wrapper" >
+	<div class="contact-entry-photo-end" ></div>
 		<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
 
-		<div class="contact-entry-break"></div>
-
-		<div class="contact-entry-edit-links" >
-			<a href="contacts/$id" class="contact-entry-edit-link" ><img src="images/b_edit.gif" alt="Edit contact" title="Edit contact" /></a>
-		</div>
-		<div class="contact-entry-nav-end"></div>
-	</div>
 	<div class="contact-entry-end" ></div>
 </div>
-
-<hr />
\ No newline at end of file
diff --git a/view/style.css b/view/style.css
index f8c483a89..fa0f948bb 100644
--- a/view/style.css
+++ b/view/style.css
@@ -437,37 +437,37 @@ input#dfrn-url {
 #contacts-main {
 	margin-bottom: 20px;
 }
-.contact-entry-photo-wrapper {
+
+.contact-entry-wrapper {
 	float: left;
+	width: 180px;
 }
+
 .contact-entry-direction-icon {
 	margin-top: 24px;
-	float: left;
 	margin-right: 2px;
 }
+
 .contact-entry-photo img {
 	border: none;
 }
 .contact-entry-photo-end {
 	clear: both;
 }
-.contact-entry-edit-links {
-	float: left;
-	margin-top: 10px;
-}
 .contact-entry-name {
 	float: left;
+	margin-left: 30px;
+}
+.contact-entry-edit-links {
+	margin-top: 6px;
+	margin-left: 10px;
+	width: 16px;
 }
 .contact-entry-nav-wrapper {
 	float: left;
 	margin-left: 10px;
 }
-.contact-entry-nav-end {
-	clear: both;
-}
-.contact-entry-break {
-	clear: both;
-}
+
 .contact-entry-edit-links img {
 	border: none;
 	margin-right: 15px;
@@ -478,6 +478,14 @@ input#dfrn-url {
 .contact-entry-end {
 	clear: both;
 }
+/*
+.contact-entry-nav-end {
+	clear: both;
+}
+*/
+#contact-edit-end {
+	clear: both;
+}
 
 .wall-item-outside-wrapper {
 	margin-top: 10px;
@@ -900,7 +908,7 @@ input#dfrn-url {
 	margin-left: 50px;
 }
 
-#block-message {
+#block-message, #ignore-message {
 	margin-top: 20px;
 	width: 180px;
 	color: #FF0000;