Fix documentation links

ocaml-opam · May 10, 2018 · 6b17ecf · 6b17ecf
1 parent 185a056
commit 6b17ecf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/jbuild-ignore b/jbuild-ignore
@@ -0,0 +1,2 @@
+www
+www0
diff --git a/src/o2wDocumentation.ml b/src/o2wDocumentation.ml
@@ -281,7 +281,7 @@ let to_menu ~content_dir =
   menu_20 @
   [{
     menu_source = "1.1";
-    menu_link = Uri.make ~path:(content_dir ^ "/doc/1.1/") ();
+    menu_link = Uri.make ~path:("doc/1.1/") ();
     menu_link_text = "Archives (OPAM 1.1)";
     menu_link_html = Html.string "Archives (OPAM 1.1)";
     menu_item = External;
@@ -292,7 +292,7 @@ let to_menu ~content_dir =
   };
   {
     menu_source = "1.2";
-    menu_link = Uri.make ~path:(content_dir ^ "/doc/1.2/") ();
+    menu_link = Uri.make ~path:("doc/1.2/") ();
     menu_link_text = "Archives (OPAM 1.2)";
     menu_link_html = Html.string "Archives (OPAM 1.2)";
     menu_item = External;

diff --git a/src/o2wTemplate.ml b/src/o2wTemplate.ml
@@ -119,8 +119,13 @@ let make_nav (active, depth) pages =
     in
     match m.menu_item with
     | External   ->
-       Html.li ~cls:class_attr
-         (Html.a ~href:m.menu_link m.menu_link_html)
+      let lnk =
+        if Uri.host m.menu_link = None then
+          prepend_root depth m.menu_link
+        else m.menu_link
+      in
+      Html.li ~cls:class_attr
+        (Html.a ~href:lnk m.menu_link_html)
     | Internal _ ->
       let lnk = prepend_root depth m.menu_link in
       Html.li ~cls:class_attr