The post_remote_end hook was being called with an escaped version of the item, not...

[friendica.git] / view / head.tpl

diff --git a/view/head.tpl b/view/head.tpl
index 7e8369bddd4bcab64fee9ae880f9dab8c2a391a9..7b1ed7de933460fd5be48a19da6a9e6f3be9a220 100644 (file)
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -1,14 +1,18 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
-<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/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->#}
+<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.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" />
-<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3">
 
 <link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
+
+<link rel="apple-touch-icon" href="$baseurl/images/friendica-128.png"/>
+<meta name="apple-mobile-web-app-capable" content="yes" /> 
+
+
 <link rel="search"
          href="$baseurl/opensearch" 
          type="application/opensearchdescription+xml" 
@@ -20,8 +24,8 @@
 <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/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/fancybox/jquery.fancybox.pack.js"></script>-->#}
+<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.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>
@@ -30,6 +34,7 @@
 <script>
 
        var updateInterval = $update_interval;
+       var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
 
        function confirmDelete() { return confirm("$delitem"); }
        function commentOpen(obj,id) {
@@ -37,16 +42,22 @@
                        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);
+                       return true;
                }
+               return false;
        }
        function commentClose(obj,id) {
                if(obj.value == '') {
                        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);
+                       return true;
                }
+               return false;
        }
 
 
@@ -83,14 +94,15 @@
                $(obj).val('');
        }
 
-       function showHideComments(id) {
-               if( $('#collapsed-comments-' + id).is(':visible')) {
-                       $('#collapsed-comments-' + id).hide();
-                       $('#hide-comments-' + id).html('$showmore');
+       window.showMore = "$showmore";
+       window.showFewer = "$showfewer";
+
+       function showHideCommentBox(id) {
+               if( $('#comment-edit-form-' + id).is(':visible')) {
+                       $('#comment-edit-form-' + id).hide();
                }
                else {
-                       $('#collapsed-comments-' + id).show();
-                       $('#hide-comments-' + id).html('$showfewer');
+                       $('#comment-edit-form-' + id).show();
                }
        }