From 794ae669cefa8234da08718e81a5872832b79259 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 25 Jul 2012 22:28:09 -0400
Subject: [PATCH] fixes to cursor

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/head.tpl          |  20 ++++++++++++++------
 view/theme/dispy/icons/sparkle.cur | Bin 19942 -> 4286 bytes
 view/theme/dispy/jot-header.tpl    |   2 +-
 view/theme/dispy/jot.tpl           |   9 ++++++---
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index d42b19aef7..5f6b26a78a 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -2,29 +2,33 @@
 <meta charset="UTF-8" />
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search" href="$baseurl/opensearch"
-	type="application/opensearchdescription+xml" title="Search in Friendica" />
 <link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
 <script type="text/javascript" src="$baseurl/js/jquery.js"></script>
-<script type="text/javascript" src="$baseurl/js/acl.js"></script>
-<script type="text/javascript" src="$baseurl/js/main.js"></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script>
 <script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script>
 <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
 <script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
 <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script type="text/javascript" src="$baseurl/js/acl.js"></script>
 <script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script>
-<!-- in dispy-dark -->
+<script type="text/javascript" src="$baseurl/js/main.js"></script>
+<!-- in dispy -->
 <script>
 	var updateInterval = $update_interval;
+	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
 
 	function confirmDelete() { return confirm("$delitem"); }
 	function commentOpen(obj,id) {
@@ -32,6 +36,7 @@
 			obj.value = '';
 			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).show();
 			openMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}
@@ -40,10 +45,12 @@
 			obj.value = '$comment';
 			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
 			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).hide();
 			closeMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}
 
+
 	function commentInsert(obj,id) {
 		var tmpStr = $("#comment-edit-text-" + id).val();
 		if(tmpStr == '$comment') {
@@ -74,6 +81,7 @@
 		ins = ins.replace('&amp;','&');
 		ins = ins.replace('&quot;','"');
 		$("#comment-edit-text-" + id).val(tmpStr + ins);
+		$(obj).val('');
 	}
 
 	function showHideComments(id) {
diff --git a/view/theme/dispy/icons/sparkle.cur b/view/theme/dispy/icons/sparkle.cur
index 253259d8d54f755a2ba244be61fe5b9b58e5efcd..6a0130a7267486fd9f0504665eee500780587659 100644
GIT binary patch
literal 4286
zcmeH}y>1gh5XaXxaN;vmR7jVSA`d`;2pu&}b9T<Qgp{|ibQe)j5MsN+lBGncz%LQX
z6qGywt`I>fLKo24%lywf@#egHw+B%~!Aawpot>TE%-;I$gs6&&SX~wLTN5Ad3-Le*
z@rZ<6;u#6e(ytIP&HcZweg}rb;q^D8k$?5%IkDMn?m+7G`Zt#v%ElMvL_Q&<EW?*l
z%v|G5{PB2Pd%3mso_k?Fa@z88EHv@cdh_B<T=qo=2W#9n*qY4d`DKM;S+`n24}D*V
zmSURb;h+*4>y&%~pX|5nGo|4<Xw;yOv++D<+e<y3V!==Q*8MhH@pI!<%+!(3`><nU
z>VD+j+-#(KrTbxHj)nH<^Tx)DW0x~R+rM<bv$<Wy+;`@T%uuh(`oE3g-c=nxpgWzQ
z4{gc~e-L!~F89f_o_x~eSNz;Ff^|XA>QRcKXNi%a*v2{VS#0$!=I8vJb7EvD{tZ+9
zA|Kf3n}l+oi*3Ka|D|$PNrMTWtu7U6SKPa*BYl=M8sYAIytIy4(BDapNlLMqmpx~S
zZ|j>2(fL^$pHqbwIJC=4=Zx!`*I`YQW$NRfv`Qb})U)XM@l4<|c5xqMO<!ZM_56AE
zt?b$`Z0w?Mu$90r`_9T^^4#q#8{<s>U-hvm-r{41O&i(xuH$^*VjrN{S3=vk@Eh6O
zC*Nm`@%?bg{5!TDQV!j5=G)>N{ignnZ0;MnI-Oe1yCZcGmgV1FOf9VbXtW0I!;_Qq
z(|#>UQXBrkVBjsHOIbSK$mVQe7^d%9@bHg=X5pAW(9FN*x>o1AuE~i5-<gd(?RNX!
zCG?$BQt{MaZ|`w&)W01;M~JU|GJ0pJB(=$UQkksJYLh2X?<^rX^}ondUy}H;8~KOb
zu6GzEUSB5OwmkCVh{UUWj8`f$_DP-|$+-Jm#z`c%Y2B;IihNDFN8^1GNpA^UzX3CT
BPaXgO

literal 19942
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

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index dabe8bb3d0..0be480df26 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,5 +1,5 @@
 <script type="text/javascript">
-var editor = false;
+var editor=false;
 var textlen = 0;
 var plaintext = '$editselect';
 
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index 563d58ce49..12969dd031 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -1,8 +1,6 @@
 <form id="profile-jot-form" action="$action" method="post">
 	<div id="jot">
 		<div id="profile-jot-desc" class="jothidden">&#160;</div>
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
-		<div id="character-counter" class="grey jothidden"></div>
 
 		<input type="hidden" name="type" value="$ptyp" />
 		<input type="hidden" name="profile_uid" value="$profile_uid" />
@@ -11,11 +9,13 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /></div>
+		<div id="character-counter" class="grey jothidden"></div>
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
 		</textarea>
 
-
+<div id="profile-jot-submit-wrapper" class="jothidden">
 <div id="jot-tools" class="jothidden" style="display:none">
 	<div id="profile-jot-submit-wrapper" class="jothidden">
 
@@ -68,6 +68,9 @@
 			$jotnets
 		</div>
 	</div>
+</div>
 
+<div id="profile-jot-end"></div>
 </form>
+</div>
 		{{ if $content }}<script>initEditor();</script>{{ endif }}