diff options
| -rw-r--r-- | js/acl.js (renamed from include/acl.js) | 0 | ||||
| -rw-r--r-- | js/ajaxupload.js (renamed from include/ajaxupload.js) | 0 | ||||
| -rw-r--r-- | js/country.js (renamed from include/country.js) | 0 | ||||
| -rw-r--r-- | js/jquery.htmlstream.js (renamed from include/jquery.htmlstream.js) | 0 | ||||
| -rw-r--r-- | js/jquery.js (renamed from include/jquery.js) | 0 | ||||
| -rw-r--r-- | js/main.js (renamed from include/main.js) | 0 | ||||
| -rw-r--r-- | view/admin_remoteupdate.tpl | 2 | ||||
| -rw-r--r-- | view/head.tpl | 8 | ||||
| -rw-r--r-- | view/jot-header.tpl | 2 | ||||
| -rw-r--r-- | view/msg-header.tpl | 2 | ||||
| -rw-r--r-- | view/theme/dispy/jot-header.tpl | 2 |
11 files changed, 9 insertions, 7 deletions
diff --git a/include/acl.js b/js/acl.js index 82b631ee9..82b631ee9 100644 --- a/include/acl.js +++ b/js/acl.js diff --git a/include/ajaxupload.js b/js/ajaxupload.js index 67c4a56fb..67c4a56fb 100644 --- a/include/ajaxupload.js +++ b/js/ajaxupload.js diff --git a/include/country.js b/js/country.js index 07ab29ba6..07ab29ba6 100644 --- a/include/country.js +++ b/js/country.js diff --git a/include/jquery.htmlstream.js b/js/jquery.htmlstream.js index c62c538f7..c62c538f7 100644 --- a/include/jquery.htmlstream.js +++ b/js/jquery.htmlstream.js diff --git a/include/jquery.js b/js/jquery.js index 7c2430802..7c2430802 100644 --- a/include/jquery.js +++ b/js/jquery.js diff --git a/include/main.js b/js/main.js index 83dcc720c..83dcc720c 100644 --- a/include/main.js +++ b/js/main.js diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl index 0c15692c2..41ecfaf85 100644 --- a/view/admin_remoteupdate.tpl +++ b/view/admin_remoteupdate.tpl @@ -1,4 +1,4 @@ -<script src="include/jquery.htmlstream.js"></script> +<script src="js/jquery.htmlstream.js"></script> <script> /* ajax updater */ function updateEnd(data){ diff --git a/view/head.tpl b/view/head.tpl index 9d73269e1..a18bcdd5e 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -3,6 +3,7 @@ <meta name="generator" content="$generator" /> <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> <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="shortcut icon" href="$baseurl/images/friendika-32.png" /> <link rel="search" href="$baseurl/opensearch" @@ -12,11 +13,12 @@ <!--[if IE]> <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> -<script type="text/javascript" src="$baseurl/include/jquery.js" ></script> +<script type="text/javascript" src="$baseurl/js/jquery.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/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script> -<script type="text/javascript" src="$baseurl/include/acl.js" ></script> -<script type="text/javascript" src="$baseurl/include/main.js" ></script> +<script type="text/javascript" src="$baseurl/js/acl.js" ></script> +<script type="text/javascript" src="$baseurl/js/main.js" ></script> <script> function confirmDelete() { return confirm("$delitem"); } diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 6195c5bbc..8174026ab 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -80,7 +80,7 @@ function initEditor(cb){ } </script> -<script type="text/javascript" src="include/ajaxupload.js" ></script> +<script type="text/javascript" src="js/ajaxupload.js" ></script> <script> var ispublic = '$ispublic'; $(document).ready(function() { diff --git a/view/msg-header.tpl b/view/msg-header.tpl index 67775a45b..a74154c19 100644 --- a/view/msg-header.tpl +++ b/view/msg-header.tpl @@ -53,7 +53,7 @@ tinyMCE.init({ }); </script> -<script type="text/javascript" src="include/ajaxupload.js" ></script> +<script type="text/javascript" src="js/ajaxupload.js" ></script> <script> $(document).ready(function() { var uploader = new window.AjaxUpload( diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 155595056..0093bf82a 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -90,7 +90,7 @@ function initEditor(cb) { } } // initEditor </script> -<script type="text/javascript" src="include/ajaxupload.js" ></script> +<script type="text/javascript" src="js/ajaxupload.js" ></script> <script> var ispublic = '$ispublic'; $(document).ready(function() { |