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 | |
| parent | 39d4bfde6b9c49f0a8b13699be701bda11eb851a (diff) | |
| parent | e90d67d3c9a93862657563e17e24054087f205d1 (diff) | |
Merge branch 'master' into templatemove
| -rw-r--r-- | IkiWiki/Plugin/relativedate.pm | 4 | ||||
| -rw-r--r-- | IkiWiki/Plugin/toggle.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | debian/postinst | 2 | ||||
| -rw-r--r-- | underlays/javascript/ikiwiki/ikiwiki.js (renamed from underlays/javascript/ikiwiki.js) | 0 | ||||
| -rw-r--r-- | underlays/javascript/ikiwiki/relativedate.js (renamed from underlays/javascript/relativedate.js) | 0 | ||||
| -rw-r--r-- | underlays/javascript/ikiwiki/toggle.js (renamed from underlays/javascript/toggle.js) | 0 |
7 files changed, 9 insertions, 6 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>'; } diff --git a/debian/changelog b/debian/changelog index 425e28fa6..53febb433 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100422) UNRELEASED; urgency=low +ikiwiki (3.20100424) UNRELEASED; urgency=low [ Joey Hess ] * tag: Automatic creation of tag pages can now be enabled using @@ -71,6 +71,9 @@ ikiwiki (3.20100422) UNRELEASED; urgency=low (Jelmer Vernooij) * Quite a lot of new optimisations, and one major fix to a recent performance regression. + * Moved javascript files under the ikiwiki/ directory, to avoid cluttering + the top of the web root. This is another things that requires a wiki + rebuild on upgrade to this version. -- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/debian/postinst b/debian/postinst index 810b7cfe0..76ad115ac 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ set -e # Change this when some incompatible change is made that requires # rebuilding all wikis. -firstcompat=3.20100422 +firstcompat=3.20100424 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then diff --git a/underlays/javascript/ikiwiki.js b/underlays/javascript/ikiwiki/ikiwiki.js index aebc5cf7e..aebc5cf7e 100644 --- a/underlays/javascript/ikiwiki.js +++ b/underlays/javascript/ikiwiki/ikiwiki.js diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/ikiwiki/relativedate.js index 5142332f1..5142332f1 100644 --- a/underlays/javascript/relativedate.js +++ b/underlays/javascript/ikiwiki/relativedate.js diff --git a/underlays/javascript/toggle.js b/underlays/javascript/ikiwiki/toggle.js index d190b737a..d190b737a 100644 --- a/underlays/javascript/toggle.js +++ b/underlays/javascript/ikiwiki/toggle.js |