Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / view / theme / dispy / head.tpl

diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index f606f2f7e2dde6a0bdff17a11e9a9c4e19f1a4bf..d42b19aef780ac255c8ca1094e41f6030daddc18 100644 (file)
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -1,52 +1,49 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<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/friendika-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/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
+<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>
-<script type="text/javascript" src="$baseurl/js/main.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/webtoolkit.base64.js"></script>
+<!-- in dispy-dark -->
 <script>
-
        var updateInterval = $update_interval;
 
        function confirmDelete() { return confirm("$delitem"); }
        function commentOpen(obj,id) {
                if(obj.value == '$comment') {
                        obj.value = '';
-                       obj.className = "comment-edit-text-full";
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
                        openMenu("comment-edit-submit-wrapper-" + id);
                }
        }
        function commentClose(obj,id) {
                if(obj.value == '') {
                        obj.value = '$comment';
-                       obj.className="comment-edit-text-empty";
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
                        closeMenu("comment-edit-submit-wrapper-" + id);
                }
        }
 
-
        function commentInsert(obj,id) {
                var tmpStr = $("#comment-edit-text-" + id).val();
                if(tmpStr == '$comment') {
@@ -63,6 +60,22 @@
                $("#comment-edit-text-" + id).val(tmpStr + ins);
        }
 
+       function qCommentInsert(obj,id) {
+               var tmpStr = $("#comment-edit-text-" + id).val();
+               if(tmpStr == '$comment') {
+                       tmpStr = '';
+                       $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+                       $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+                       openMenu("comment-edit-submit-wrapper-" + id);
+               }
+               var ins = $(obj).val();
+               ins = ins.replace('&lt;','<');
+               ins = ins.replace('&gt;','>');
+               ins = ins.replace('&amp;','&');
+               ins = ins.replace('&quot;','"');
+               $("#comment-edit-text-" + id).val(tmpStr + ins);
+       }
+
        function showHideComments(id) {
                if( $('#collapsed-comments-' + id).is(':visible')) {
                        $('#collapsed-comments-' + id).hide();
@@ -73,8 +86,4 @@
                        $('#hide-comments-' + id).html('$showfewer');
                }
        }
-
-
 </script>
-
-