contact editor

4 files changed, 143 insertions, 20 deletions

diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index a786e47b7..91ae30ec1 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -1,34 +1,61 @@
 
+<h2>Contact Editor</h2>
+
+<div id="contact-edit-banner-name">$name</div>
+
 
 <div id="contact-edit-wrapper" >
-	<div class="contact-edit-photo-wrapper" >
+
+	<div id="contact-edit-photo-wrapper" >
 		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
 		<div id="contact-edit-photo" >
 			<a href="$url" title="Visit $name's profile" /><img src="$photo" alt="$name" /></a>
 		</div>
 		<div id="contact-edit-photo-end" ></div>
 	</div>
-	<div id="contact-edit-nav-wrapper"
-		<div id="contact-edit-name" >$name</div>
-
-		<div id="contact-edit-break"></div>
-
-<form action="contacts" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
+	<div id="contact-edit-nav-wrapper" >
 
 		<div id="contact-edit-links" >
-			<a href="contacts/$id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="Block contact" title="Block contact"/></a>
-			<a href="contacts/$id/drop" id="contact-edit-drop-link"><img src="images/b_drop.gif" alt="Delete contact" title="Delete contact"/></a>
+			<a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="Block/Unblock contact" title="$block_text"/></a>
+			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link"><img src="images/b_drop.gif" alt="Delete contact" title="Delete contact"/></a>
 		</div>
 		<div id="contact-edit-nav-end"></div>
 	</div>
-	<div class="contact-dit-end" ></div>
+	<div id="contact-edit-end" ></div>
+
+$blocked
+
+<form action="contacts/$contact_id" method="post" >
+<input type="hidden" name="contact_id" value="$contact_id">
+
+<div class="contact-edit-profile-select-text">
+<h4>Profile Visibility</h4>
+<p>Please choose the profile you would like to display to $name - when he/she connects securely to your profile page.
+</p> 
+</div>
 $profile_select
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
 
-$groups
 
+<div id="contact-edit-rating-wrapper">
+<h4>Online Reputation</h4>
+<p>
+Occasionally your friends may wish to inquire about this person's online legitimacy. You may help them choose whether or not to interact with this person by providing a 'reputation' to guide them.
+</p>
+<div id="contact-edit-rating-select-wrapper">
 $rating
+</div>
+<div id="contact-edit-rating-explain">
+<p>
+Please take a moment to elaborate on this selection if you feel it could be helpful to others.
+</p>
+<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
+</div>
+</div>
+$groups
 
-$reason
+<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
 </form>
 </div>
diff --git a/view/contact_selectors.php b/view/contact_selectors.php
index a7d3d0f5b..a6cafe4ee 100644
--- a/view/contact_selectors.php
+++ b/view/contact_selectors.php
@@ -4,18 +4,43 @@
 function contact_profile_assign($current) {
 
 	$o = '';
-	$o .= "<select id=\"contact_profile_selector\" name=\"profile_assign\" />";
+	$o .= "<select id=\"contact-profile-selector\" name=\"profile-assign\" />\r\n";
 
-	$r = q("SELECT `profile-name` FROM `profile` WHERE `uid` = %d",
+	$r = q("SELECT `id`, `profile-name` FROM `profile` WHERE `uid` = %d",
                         intval($_SESSION['uid']));
 
 	if(count($r)) {
 		foreach($r as $rr) {
-			$selected = (($rr['profile-name'] == $current) ? " selected=\"selected\" " : "");
-			$o .= "<option value=\"{$rr['profile-name']}\" $selected >{$rr['profile-name']}</option>";
+			$selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
+			$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
 		}
 	}
-	$o .= "</select>";
+	$o .= "</select>\r\n";
 	return $o;
 }
 
+
+function contact_reputation($current) {
+
+	$o = '';
+	$o .= "<select id=\"contact-reputation-selector\" name=\"reputation\" />\r\n";
+
+	$rep = array(
+		0 => "Unknown | Not categorised",
+		1 => "Block immediately",
+		2 => "Shady, spammer, self-marketer",
+		3 => "Known to me, but no opinion",
+		4 => "OK, probably harmless",
+		5 => "Reputable, has my trust"
+	);
+
+	foreach($rep as $k => $v) {
+		$selected = (($k == $current) ? " selected=\"selected\" " : "");
+		$o .= "<option value=\"$k\" $selected >$v</option>\r\n";
+	}
+	$o .= "</select>\r\n";
+	return $o;
+}
+
+
+
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index 7481bdc70..f2bcdc2d5 100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -7,7 +7,7 @@
 		</div>
 		<div class="contact-entry-photo-end" ></div>
 	</div>
-	<div class="contact-entry-nav-wrapper"
+	<div class="contact-entry-nav-wrapper" >
 		<div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
 
 		<div class="contact-entry-break"></div>
diff --git a/view/style.css b/view/style.css
index 7b1a1beb5..169a89589 100644
--- a/view/style.css
+++ b/view/style.css
@@ -369,6 +369,7 @@ input#dfrn-url {
 .contact-entry-direction-icon {
 	margin-top: 24px;
 	float: left;
+	margin-right: 2px;
 }
 .contact-entry-photo img {
 	border: none;
@@ -650,4 +651,74 @@ input#dfrn-url {
 	margin-right: 20px;
 	padding: 10px;
 	border: 1px solid #CCCCCC;
-}
\ No newline at end of file
+}
+
+#contact-edit-wrapper {
+	margin-top: 50px;
+}
+
+#contact-edit-banner-name {
+	font-size: 1.4em;
+	font-weight: bold;
+	margin-left: 30px;
+}
+
+
+#contact-edit-links img {
+	margin-left: 20px;
+	border: none;
+}
+
+#contact-edit-direction-icon {
+	float: left;
+	margin-top: 70px;
+	margin-right: 2px;
+}
+
+#contact-edit-photo {
+	float: left;
+}
+
+#contact-edit-photo-end {
+	clear: both;
+}
+
+#contact-edit-photo-wrapper {
+	float: left;
+}
+
+#contact-edit-nav-wrapper {
+	float: left;
+}
+
+#contact-edit-end {
+	clear: both;
+}
+
+#contact-profile-selector {
+	width: 175px;
+	margin-left: 175px;
+}
+
+#contact-reputation-selector {
+	margin-left: 175px;
+}
+
+#contact-edit-rating-text {
+	margin-left: 175px;
+}
+
+.contact-edit-submit {
+	margin-top: 20px;
+	margin-left: 50px;
+}
+
+#block-message {
+	margin-top: 20px;
+	width: 180px;
+	color: #FF0000;
+	font-size: 1.1em;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 10px;
+}