fixes to cursor

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index d42b19aef780ac255c8ca1094e41f6030daddc18..5f6b26a78abb3393a9a4a7532e579f416521e631 100644 (file)
--- 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 (file)
Binary files a/view/theme/dispy/icons/sparkle.cur and b/view/theme/dispy/icons/sparkle.cur differ

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index dabe8bb3d0821d0f67ee0705a1a71ae52fac35e7..0be480df26e14e548c62d1a6ffda6182a9ae4654 100644 (file)
--- 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 563d58ce4975f5ccb06a87bd49e1d77a6730d4f3..12969dd031861e227d7ed3117209d6cace9dd474 100644 (file)
--- 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 }}