Merge branch 'master' into templatemove

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 7f006af839e7cf1eb50002c73262e7aac3234291..7e615f7f1685c32a2586cb3a49abfc67acea6828 100644 (file)
--- 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 f9c89954044e30aefbd5627773e5886fb0941e2d..3319421d923d56c3489b7374edb912be7493027b 100644 (file)
--- 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 425e28fa6a352776a2e26ba8b8fc58956043448c..53febb43362b7a8bbbae7f526d174c100f33803a 100644 (file)
--- 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 810b7cfe04dd518ad1c7bd7c90a41fde5f4d616c..76ad115ac0ddc6512832997ea20d66e2d05fc10a 100755 (executable)
--- 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
similarity index 100%
rename from underlays/javascript/ikiwiki.js
rename to underlays/javascript/ikiwiki/ikiwiki.js

diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/ikiwiki/relativedate.js
similarity index 100%
rename from underlays/javascript/relativedate.js
rename to underlays/javascript/ikiwiki/relativedate.js

diff --git a/underlays/javascript/toggle.js b/underlays/javascript/ikiwiki/toggle.js
similarity index 100%
rename from underlays/javascript/toggle.js
rename to underlays/javascript/ikiwiki/toggle.js