From 9d461846e28f90b120292a900af1328e275496ce Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 15:55:17 -0500
Subject: [PATCH 2/2] multiple fixes; the jot-header works as standalone, not
 sure what's up.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/contact_template.tpl |  3 +-
 view/theme/dispy/conversation.tpl     |  2 +
 view/theme/dispy/jot-header.tpl       | 69 ++++++++++++++-------------
 view/theme/dispy/style.css            | 12 ++++-
 4 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
index 2aa9b88fed..fbf354b475 100644
--- a/view/theme/dispy/contact_template.tpl
+++ b/view/theme/dispy/contact_template.tpl
@@ -20,7 +20,8 @@
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
+	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
+		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
 	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
 	<div class="contact-entry-end" ></div>
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
index 0b14f1c80a..41b6aeadff 100644
--- a/view/theme/dispy/conversation.tpl
+++ b/view/theme/dispy/conversation.tpl
@@ -17,5 +17,7 @@
 {{ endfor }}
 
 {{ if $dropping }}
+<div class="delete-checked">
 <a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
+</div>
 {{ endif }}
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 84f1523402..e72000b4ce 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,7 +1,8 @@
+<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
+<script type="text/javascript">
 
-<script language="javascript" type="text/javascript">
-
-var editor=false;
+var editor = false;
 var textlen = 0;
 var plaintext = '$editselect';
 // this is here because of the silly tinymce error. didn't help.
@@ -113,47 +114,16 @@ function initEditor(cb) {
 	}
 }
 
-function charCounter() {
-	// character count part deux
-	$('#profile-jot-text').keyup(function(event) {
-		var textlen = $('#profile-jot-text').val().length();
-		var maxLen1 = 140;
-		var maxLen2 = 420;
-
-		$('#character-counter').removeClass('jothidden');
-		if(textlen <= maxLen1) {
-			$('#character-counter').removeClass('red');
-			$('#character-counter').removeClass('orange');
-			$('#character-counter').addClass('grey');
-		}
-		if((textlen > maxLen1) && (textlen <= maxLen2)) {
-			$('#character-counter').removeClass('grey');
-			$('#character-counter').removeClass('red');
-			$('#character-counter').addClass('orange');
-		}
-		if(textlen > maxLen2) {
-			$('#character-counter').removeClass('grey');
-			$('#character-counter').removeClass('orange');
-			$('#character-counter').addClass('red');
-		}
-		$('#character-counter').html($('#profile-jot-text').val().length);
-	});
-}
-
 function enableOnUser(){
 	if (editor) return;
 	$(this).val("");
 	initEditor();
 }
 
-</script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
-<script>
 	var ispublic = '$ispublic';
 	var addtitle = '$addtitle';
 
 	$(document).ready(function() {
-		
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
@@ -309,5 +279,36 @@ function enableOnUser(){
 
 	$geotag
 
+	function charCounter() {
+		// character count part deux
+		//$(this).val().length is not a function Line 282(3)
+		$('#profile-jot-text').keyup(function() {
+			var textlen = 0;
+			var maxLen1 = 140;
+			var maxLen2 = 420;
+
+			$('#character-counter').removeClass('jothidden');
+
+			textLen = $(this).val().length;
+			if(textLen <= maxLen1) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((textLen > maxLen1) && (textlen <= maxLen2)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(textLen > maxLen2) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text( textLen );
+		});
+		$('#profile-jot-text').keyup();
+	}
+
 </script>
 
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 13f7d2d564..177b03f4f8 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1920,7 +1920,13 @@ div[id$="wrapper"] br {
 #item-delete-selected {
 	margin-top: 30px;
 }
-
+/* was tired of having no way of moving it around, so
+ * here's a little 'hook' to do so */
+.delete-checked {
+	position: absolute;
+	left: 35px;
+	margin-top: 20px;
+}
 #item-delete-selected-end {
 	clear: both;
 }
@@ -2102,13 +2108,15 @@ div[id$="wrapper"] br {
 }
 .field label {
     float: left;
-    width: 200px;
+    width: 275px;
 	display: block;
 	font-size: 1.077em;
+	/*font-weight: bold;*/
 	margin-bottom: 0.2em;
 	margin: 0 10px 0.2em 0;
 	border: 1px #999 solid;
 	padding: 5px;
+	background: #f2eedf;
 	vertical-align: middle;
 }
 .field input {