From 63e7c5cba8bbeff58c3e00112e87e437a3df7fa2 Mon Sep 17 00:00:00 2001 From: jhagg Date: Tue, 7 Aug 2012 16:41:02 -0400 Subject: [PATCH 1/9] --- doc/forum/possible_utf-8_problem__63__.mdwn | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/forum/possible_utf-8_problem__63__.mdwn diff --git a/doc/forum/possible_utf-8_problem__63__.mdwn b/doc/forum/possible_utf-8_problem__63__.mdwn new file mode 100644 index 000000000..eeb077a37 --- /dev/null +++ b/doc/forum/possible_utf-8_problem__63__.mdwn @@ -0,0 +1,25 @@ +I have some problems with a blog wiki that I try to setup. + +Everything seemed to work correctly with utf-8 until +I tried to have a page name with utf-8 characters that +contained a blog. More testing showed that the 'from'-parameter +in the form didn't like utf-8. Just that variable, everything +else works fine. + +As soon as I try to add a new entry I get "bad page name" +instead of the editpage. + +Here is an example: +The page itself is named 'hönshuset.mdwn' and it contains +this blog inline: + +\[\[!inline pages="honshuset/*" postform=yes ]] + +Looking at the form, it is the from-parameter that contains 'hönshuset' +that triggers the problem. If I rename the file to honshuset.mdwn +everything works fine. + +(Yes, I renamed the blog directory to honshuset for debugging, but +that didn't help.) + +I use ikiwiki 3.20120629 in Debian sid. From 10a21a5133041d1bc231b333aa78c3b085bc61ee Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Tue, 7 Aug 2012 21:36:31 -0400 Subject: [PATCH 2/9] changing the tiles location is possible now too --- doc/todo/custom_location_for_openlayers.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/custom_location_for_openlayers.mdwn b/doc/todo/custom_location_for_openlayers.mdwn index ac9b40cf5..c387a4cf5 100644 --- a/doc/todo/custom_location_for_openlayers.mdwn +++ b/doc/todo/custom_location_for_openlayers.mdwn @@ -8,3 +8,5 @@ For those reasons, I think the location of that script should be customizable. - [[!template id=gitbranch branch=anarcat/master author="[[anarcat]]"]] There is now a [[patch]] for this, thanks to Genevieve, available in my master branch. + +Note that there's an update to the patch in my master branch, that allows changing the URL for tiles too. From 9265bd6918e926711028554d380642e881c899cf Mon Sep 17 00:00:00 2001 From: jhagg Date: Wed, 8 Aug 2012 05:05:06 -0400 Subject: [PATCH 3/9] --- doc/forum/possible_utf-8_problem__63__.mdwn | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/forum/possible_utf-8_problem__63__.mdwn b/doc/forum/possible_utf-8_problem__63__.mdwn index eeb077a37..fb87fadd1 100644 --- a/doc/forum/possible_utf-8_problem__63__.mdwn +++ b/doc/forum/possible_utf-8_problem__63__.mdwn @@ -19,7 +19,8 @@ Looking at the form, it is the from-parameter that contains 'hönshuset' that triggers the problem. If I rename the file to honshuset.mdwn everything works fine. -(Yes, I renamed the blog directory to honshuset for debugging, but -that didn't help.) +For some reason the from-parameter seems to depend on both the filename and +the rootpage parameter. If I add *rootpage*, then I must not use +utf-8 characters in *rootpage* or in the source filename. I use ikiwiki 3.20120629 in Debian sid. From fa4fb57fcf43395a0960d3ebf865c2a09397a622 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawniDusi9gEyC8xdnsxbJo91zJyzIWv4QV0" Date: Wed, 8 Aug 2012 09:07:58 -0400 Subject: [PATCH 4/9] Try stuff --- doc/sandbox.mdwn | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 51c24ba96..d388342da 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -2,32 +2,24 @@ [[!pagestats pages="/tags/*"]] -An initial change Hello, ikiwiki. Testing. [[!sidebar ]] +Here's a hr: +--------------------------------------------------------- ## number 2 ### number 3 +#### number 4 This is the SandBox, a page anyone can edit to try out ikiwiki (version [[!version ]]). [[!toc levels=1 startlevel=2 ]] -See, online editing :-p - -Let's try this~! - -w00t, how does this look on the **git** end? Well, as a commit of course. - -Testing this sandbox thing. - -Awesome :P - ## Blockquotes > This is a blockquote. @@ -178,16 +170,3 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] - -# - -This is simple enough for now [[sandbocen]] no? - - Do code tags work? - -test by max - -test by bbb - - -Can I make a [[NewPage]]? From 3980e5fac8b409a0f9fa6db43a4e5f2e929a83ae Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawniDusi9gEyC8xdnsxbJo91zJyzIWv4QV0" Date: Wed, 8 Aug 2012 09:08:26 -0400 Subject: [PATCH 5/9] Fix hr --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index d388342da..35edc1ff7 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -9,6 +9,7 @@ Testing. [[!sidebar ]] Here's a hr: + --------------------------------------------------------- ## number 2 From bfd5a2cb6c48d8f05aef47922bb5594eac17d97b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmKyeW2G4jjSdnL1m6kPPtAiGFUBsnYCfY" Date: Wed, 8 Aug 2012 20:11:27 -0400 Subject: [PATCH 6/9] Added a comment: How to install the trail package? --- ..._ee65792a5b796caa216f4e7a653fc668._comment | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/forum/How_to_add_link_to_previous_and_next_blog_on_blog_pages__63__/comment_2_ee65792a5b796caa216f4e7a653fc668._comment diff --git a/doc/forum/How_to_add_link_to_previous_and_next_blog_on_blog_pages__63__/comment_2_ee65792a5b796caa216f4e7a653fc668._comment b/doc/forum/How_to_add_link_to_previous_and_next_blog_on_blog_pages__63__/comment_2_ee65792a5b796caa216f4e7a653fc668._comment new file mode 100644 index 000000000..5546c4789 --- /dev/null +++ b/doc/forum/How_to_add_link_to_previous_and_next_blog_on_blog_pages__63__/comment_2_ee65792a5b796caa216f4e7a653fc668._comment @@ -0,0 +1,23 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawmKyeW2G4jjSdnL1m6kPPtAiGFUBsnYCfY" + nickname="FName" + subject="How to install the trail package?" + date="2012-08-09T00:11:26Z" + content=""" +I tried putting + +trail + +in + + add_plugins => [qw{ + ... + trail + ... + }] + +in site.setup and rebuild. It gives error + + Failed to load plugin IkiWiki::Plugin::trail: Can't locate IkiWiki/Plugin/trail.pm in @IN ... + +"""]] From 1ceae77acef70d9ad42f16e087d0fd074b8e6add Mon Sep 17 00:00:00 2001 From: deuxpi Date: Wed, 8 Aug 2012 22:27:42 -0400 Subject: [PATCH 7/9] Add patch to fix OSM plugin KML for Google Maps/Earth --- .../osm_KML_maps_do_not_display_properly_on_google_maps.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn b/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn index fc10b4d47..2aac650ce 100644 --- a/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn +++ b/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn @@ -1 +1,3 @@ I know this sounds backwards, but it seems to me that the KML-generated map should be displayable on google maps. KML is the standard Google uses for google maps, and since we use it, we should interoperate with them. God knows why this is failing, but it is and should probably be fixed for the sake of interoperability: -- [[users/anarcat]] + +The KML only needs a Document tag because it uses "shared styles" -- don't ask me what this is. Here is a [[patch]]: [[https://reseaulibre.deuxpi.ca/0001-Add-Document-tag-to-OSM-plugin-KML-output.patch]] --[[deuxpi]] From 2a5eabb89c6eb755e9959635bdc07adcb04a82c5 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Wed, 8 Aug 2012 22:57:54 -0400 Subject: [PATCH 8/9] tested: works. --- ...osm_KML_maps_do_not_display_properly_on_google_maps.mdwn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn b/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn index 2aac650ce..66d71a223 100644 --- a/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn +++ b/doc/bugs/osm_KML_maps_do_not_display_properly_on_google_maps.mdwn @@ -1,3 +1,7 @@ +[[!template id=gitbranch branch=anarcat/master author="[[anarcat]]"]] + I know this sounds backwards, but it seems to me that the KML-generated map should be displayable on google maps. KML is the standard Google uses for google maps, and since we use it, we should interoperate with them. God knows why this is failing, but it is and should probably be fixed for the sake of interoperability: -- [[users/anarcat]] -The KML only needs a Document tag because it uses "shared styles" -- don't ask me what this is. Here is a [[patch]]: [[https://reseaulibre.deuxpi.ca/0001-Add-Document-tag-to-OSM-plugin-KML-output.patch]] --[[deuxpi]] +> The KML only needs a Document tag because it uses "shared styles" -- don't ask me what this is. Here is a [[patch]]: [[https://reseaulibre.deuxpi.ca/0001-Add-Document-tag-to-OSM-plugin-KML-output.patch]] --[[deuxpi]] + +> > I applied the patch to my master branch and tested it on the above URL: it works... mostly. The icons for the elements on the actual map seem incorrect (some are the proper icons, some others are the ugly default blue pin of google maps, weird) but I think this is a step in the right direction. Thus, this should be merged. -- [[anarcat]] From 44ffdd28462b0084ae81934dd8766340b74b3b53 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkQLrxPzofXA8FVa5NsbISfnDsU3v9rAEQ" Date: Fri, 10 Aug 2012 18:17:41 -0400 Subject: [PATCH 9/9] --- doc/sandbox.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 35edc1ff7..5c3bb8d51 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -47,6 +47,15 @@ Let's see a table: Heading 1|Heading 2|Heading 3 Item 1| Item 2| Item 3"""]] + location / { + proxy_pass http://test.ashep:80; + proxy_cache default; + proxy_cache_valid 200 302 10m; + proxy_cache_valid 404 1m; + } + + + Numbered list