diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-15 16:49:54 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-15 16:49:54 +0200 |
| commit | a147d6113c081694d4209002fa5e57106d4c6f41 (patch) | |
| tree | de6f940efa0439ab3d54ff7d280e221b7b59d348 /view/theme/dispy/head.tpl | |
| parent | e825a73f1de308b6ae0ae3cc5549263704a14594 (diff) | |
| parent | f994f9abc6092106659a29f5ee1be0706825c203 (diff) | |
| download | volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.gz volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.bz2 volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/dispy/head.tpl')
| -rw-r--r-- | view/theme/dispy/head.tpl | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index d1bdc256b..d42b19aef 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -1,33 +1,29 @@ <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/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/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"); } @@ -48,7 +44,6 @@ } } - function commentInsert(obj,id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == '$comment') { |