diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-24 00:55:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-24 00:55:09 -0400 |
| commit | 998f47ed137959d0a0951368d8d0f891673c3ce5 (patch) | |
| tree | 10b26da9fe1513c3b8b4990e6caa7446352218a5 /IkiWiki | |
| parent | 39d4bfde6b9c49f0a8b13699be701bda11eb851a (diff) | |
| parent | e90d67d3c9a93862657563e17e24054087f205d1 (diff) | |
| download | ikiwiki-998f47ed137959d0a0951368d8d0f891673c3ce5.tar ikiwiki-998f47ed137959d0a0951368d8d0f891673c3ce5.tar.gz | |
Merge branch 'master' into templatemove
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/relativedate.pm | 4 | ||||
| -rw-r--r-- | IkiWiki/Plugin/toggle.pm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index 7f006af83..7e615f7f1 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -37,9 +37,9 @@ sub include_javascript ($;$) { my $page=shift; my $absolute=shift; - return '<script src="'.urlto("ikiwiki.js", $page, $absolute). + return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute). '" type="text/javascript" charset="utf-8"></script>'."\n". - '<script src="'.urlto("relativedate.js", $page, $absolute). + '<script src="'.urlto("ikiwiki/relativedate.js", $page, $absolute). '" type="text/javascript" charset="utf-8"></script>'; } diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index f9c899540..3319421d9 100644 --- a/IkiWiki/Plugin/toggle.pm +++ b/IkiWiki/Plugin/toggle.pm @@ -81,9 +81,9 @@ sub include_javascript ($;$) { my $page=shift; my $absolute=shift; - return '<script src="'.urlto("ikiwiki.js", $page, $absolute). + return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute). '" type="text/javascript" charset="utf-8"></script>'."\n". - '<script src="'.urlto("toggle.js", $page, $absolute). + '<script src="'.urlto("ikiwiki/toggle.js", $page, $absolute). '" type="text/javascript" charset="utf-8"></script>'; } |