From d0d9ae30969d7b95de74a9382604d17e1f8dda81 Mon Sep 17 00:00:00 2001 From: Thomas Willingham <founder@kakste.com> Date: Wed, 30 Jan 2013 02:51:47 +0000 Subject: [PATCH] Dispy - remove head.tpl. It isn't actually required, and is the main cause of breakage in the theme. --- view/theme/dispy/head.tpl | 100 ---------------------------- view/theme/dispy/smarty3/head.tpl | 105 ------------------------------ 2 files changed, 205 deletions(-) delete mode 100644 view/theme/dispy/head.tpl delete mode 100644 view/theme/dispy/smarty3/head.tpl diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl deleted file mode 100644 index 027c5d3723..0000000000 --- a/view/theme/dispy/head.tpl +++ /dev/null @@ -1,100 +0,0 @@ -<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="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/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> -<!-- 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) { - if(obj.value == '$comment') { - 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); - } - } - 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); - } - } - - - function commentInsert(obj,id) { - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == '$comment') { - tmpStr = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - } - var ins = $(obj).html(); - ins = ins.replace('<','<'); - ins = ins.replace('>','>'); - ins = ins.replace('&','&'); - ins = ins.replace('"','"'); - $("#comment-edit-text-" + id).val(tmpStr + ins); - } - - function qCommentInsert(obj,id) { - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == '$comment') { - tmpStr = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - } - var ins = $(obj).val(); - ins = ins.replace('<','<'); - ins = ins.replace('>','>'); - ins = ins.replace('&','&'); - ins = ins.replace('"','"'); - $("#comment-edit-text-" + id).val(tmpStr + ins); - $(obj).val(''); - } - - window.showMore = "$showmore"; - window.showFewer = "$showfewer"; - - function showHideCommentBox(id) { - if( $('#comment-edit-form-' + id).is(':visible')) { - $('#comment-edit-form-' + id).hide(); - } - else { - $('#comment-edit-form-' + id).show(); - } - } - - -</script> diff --git a/view/theme/dispy/smarty3/head.tpl b/view/theme/dispy/smarty3/head.tpl deleted file mode 100644 index c633d1c42a..0000000000 --- a/view/theme/dispy/smarty3/head.tpl +++ /dev/null @@ -1,105 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -<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="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}}/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> -<!-- in dispy --> -<script> - var updateInterval = {{$update_interval}}; - var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; - - function confirmDelete() { return confirm("{{$delitem}}"); } - function commentOpen(obj,id) { - if(obj.value == '{{$comment}}') { - 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); - } - } - 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); - } - } - - - function commentInsert(obj,id) { - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == '{{$comment}}') { - tmpStr = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - } - var ins = $(obj).html(); - ins = ins.replace('<','<'); - ins = ins.replace('>','>'); - ins = ins.replace('&','&'); - ins = ins.replace('"','"'); - $("#comment-edit-text-" + id).val(tmpStr + ins); - } - - function qCommentInsert(obj,id) { - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == '{{$comment}}') { - tmpStr = ''; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - } - var ins = $(obj).val(); - ins = ins.replace('<','<'); - ins = ins.replace('>','>'); - ins = ins.replace('&','&'); - ins = ins.replace('"','"'); - $("#comment-edit-text-" + id).val(tmpStr + ins); - $(obj).val(''); - } - - window.showMore = "{{$showmore}}"; - window.showFewer = "{{$showfewer}}"; - - function showHideCommentBox(id) { - if( $('#comment-edit-form-' + id).is(':visible')) { - $('#comment-edit-form-' + id).hide(); - } - else { - $('#comment-edit-form-' + id).show(); - } - } - - -</script>