Merge: Nitiwiki: fix isues with relative paths and the root href

close #1872

Can you try it @Morriar ?

Pull-Request: #1874
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>

Author: privat

contrib/nitiwiki/examples/default/config.ini

@@ -1,4 +1,3 @@
 wiki.name=MyWiki
 wiki.desc=proudly powered by nit
 wiki.logo=assets/logo.png
-wiki.root_dir=/full/path/to/your/wiki/root/dir

contrib/nitiwiki/examples/default/templates/header.html

@@ -1,5 +1,5 @@
 <header>
-    <a href="#"><img src="%ROOT_URL%/%LOGO%" alt="logo"/></a>
+    <a href="%ROOT_URL%/index.html"><img src="%ROOT_URL%/%LOGO%" alt="logo"/></a>
     <h2>%SUBTITLE%</h2>
     <h1>%TITLE%</h1>
 </header>

contrib/nitiwiki/examples/nitiwiki/templates/menu.html

@@ -8,7 +8,7 @@
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="%ROOT_URL%index.html">%TITLE%</a>
+			<a class="navbar-brand" href="%ROOT_URL%/index.html">%TITLE%</a>
 		</div>
 		<!-- Collect the nav links, forms, and other content for toggling -->
 		<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

contrib/nitiwiki/src/wiki_html.nit

@@ -189,10 +189,7 @@ redef class WikiArticle
 	fun load_template(template_file: String): TemplateString do
 		var tpl = wiki.load_template(template_file)
 		if tpl.has_macro("ROOT_URL") then
-			var root_dir = href.dirname.relpath("")
-			# Avoid issues if the macro is just followed by a `/` (as with url prefix)
-			if root_dir == "" then root_dir = "."
-			tpl.replace("ROOT_URL", root_dir)
+			tpl.replace("ROOT_URL", root_href)
 		end
 		return tpl
 	end

contrib/nitiwiki/src/wiki_links.nit

@@ -100,12 +100,23 @@ redef class WikiEntry
 	# Relative path to `self` from the target root_url
 	fun href: String do return breadcrumbs.join("/")
 
+	# Relative path to the directory `self` from the target root_url
+	fun dir_href: String do return href.dirname
+
+	# Relative path to the root url from `self`
+	fun root_href: String do
+		var root_dir = dir_href.relpath("")
+		# Avoid issues if used as a macro just followed by a `/` (as with url prefix)
+		if root_dir == "" then root_dir = "."
+		return root_dir
+	end
+
 	# A relative `href` to `self` from the page `context`.
 	#
 	# Should be used to navigate between documents.
 	fun href_from(context: WikiEntry): String
 	do
-		var res = context.href.dirname.relpath(href)
+		var res = context.dir_href.relpath(href)
 		return res
 	end
 
@@ -174,6 +185,8 @@ redef class WikiSection
 		end
 		return new WikiSectionIndex(wiki, "index", self)
 	end
+
+	redef fun dir_href do return href
 end
 
 redef class WikiArticle
@@ -212,6 +225,8 @@ class WikiSectionIndex
 	redef fun title do return section.title
 
 	redef fun href do return section.href
+
+	redef fun dir_href do return section.dir_href
 end
 
 # A MarkdownProcessor able to parse wiki links.