Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage

[friendica.git] / view / templates / head.tpl

diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 6a1e7167038e7159fc6e3ad78e6da28112c5ed2f..e32205fa50467600205bedceba4f9ffb08121668 100644 (file)
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -1,21 +1,20 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
+
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
 <link rel="stylesheet" href="{{$baseurl}}/view/global.css" type="text/css" media="all" />
-{{*<!--<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" />
 
+<!--
 <link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
-
 <link rel="apple-touch-icon" href="{{$baseurl}}/images/friendica-128.png"/>
+-->
+<link rel="shortcut icon" href="{{$shortcut_icon}}" />
+<link rel="apple-touch-icon" href="{{$touch_icon}}"/>
+
 <meta name="apple-mobile-web-app-capable" content="yes" /> 
 
 
@@ -27,10 +26,12 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
+<script type="text/javascript" src="{{$baseurl}}/js/modernizr.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<!-- <script type="text/javascript" src="{{$baseurl}}/js/jquery-migrate.js" ></script>-->
+<script type="text/javascript" src="{{$baseurl}}/js/jquery-migrate.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.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>
@@ -43,6 +44,15 @@
        var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
 
        function confirmDelete() { return confirm("{{$delitem}}"); }
+       function commentExpand(id) {
+               $("#comment-edit-text-" + id).value = '';
+               $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+               $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+               $("#comment-edit-text-" + id).focus();
+               $("#mod-cmnt-wrap-" + id).show();
+               openMenu("comment-edit-submit-wrapper-" + id);
+               return true;
+       }
        function commentOpen(obj,id) {
                if(obj.value == '{{$comment}}') {
                        obj.value = '';