diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-08-09 01:35:46 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-08-09 01:35:46 +0100 |
| commit | 29b8b8f82b72f646ea4c55d66766bd0e0c950657 (patch) | |
| tree | 4b0b3a7c7fe941cddbdb359d4a7e3384e6b33dd6 /view/theme/dispy/head.tpl | |
| parent | 5b1a4100e07db023b0f6dae89aa009e74992b7e6 (diff) | |
| parent | c28da5673731acbedecb4209c38b72046db597e1 (diff) | |
| download | volse-hubzilla-29b8b8f82b72f646ea4c55d66766bd0e0c950657.tar.gz volse-hubzilla-29b8b8f82b72f646ea4c55d66766bd0e0c950657.tar.bz2 volse-hubzilla-29b8b8f82b72f646ea4c55d66766bd0e0c950657.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/head.tpl')
| -rw-r--r-- | view/theme/dispy/head.tpl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index d42b19aef..4f24bac8f 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -2,27 +2,30 @@ <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; @@ -44,6 +47,7 @@ } } + function commentInsert(obj,id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == '$comment') { |