Merge https://github.com/friendica/friendica into pull

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

diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index d42b19aef780ac255c8ca1094e41f6030daddc18..3d1701b29eb42fa9a0e2b3c55cbb0cd5fa375d69 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) {
@@ -86,4 +94,15 @@
                        $('#hide-comments-' + id).html('$showfewer');
                }
        }
+
+       function showHideCommentBox(id) {
+               if( $('#comment-edit-form-' + id).is(':visible')) {
+                       $('#comment-edit-form-' + id).hide();
+               }
+               else {
+                       $('#comment-edit-form-' + id).show();
+               }
+       }
+
+
 </script>