Merge branch 'master' into fix-build

Author: avsm

content/universe.xhtml

@@ -5,7 +5,7 @@
           <t:insert name="nav" />
         </ul>
       </div>
-      <form class="span3 form-search">
+      <form class="span3 form-search" style="display:none;">
         <div class="input-append">
           <input id="search" class="search-query" type="text" placeholder="Search packages" />
           <button id="search-button" class="btn add-on">

ext/js/site.js

@@ -11,6 +11,7 @@
     $('.form-search').submit(function(e) {
       e.preventDefault();
     });
+    $('.form-search').show();
 
     $('a,h2,h3,h4').filter(':not([href])[id]').click(function() {
       location.hash = $( this ).attr('id');

opam2web.opam

@@ -20,6 +20,9 @@ depends: [
   "opam-file-format" {>="2.1.0" & < "2.1.1"}
   "cohttp-lwt-unix"
   "yojson" {>= "1.6.0"}
+  "opam-file-format" {< "2.1.1"}
+  "cmdliner" {>= "1.0.4"}
+  "omd" {>= "1.3.1"}
 ]
 build: [
 #  ["dune" "subst"] {pinned}

src/o2wDocumentation.ml

@@ -109,7 +109,7 @@ let doc_toc md_content =
 
 (* Generate the HTML corresponding to a documentation page in the <content>/doc
    directory *)
-let to_menu_aux ~subdir ?(header=Cow.Html.nil) ~menu_pages ~srcurl =
+let to_menu_aux ~subdir ?(header=Cow.Html.nil) ~menu_pages ~srcurl () =
 
   (* Convert a content page to html *)
   let to_html doc_menu kind filename: Cow.Html.t =
@@ -228,7 +228,7 @@ let to_menu ~content_dir =
       read_menu ~dir:(content_dir / subdir)
         (content_dir / subdir / "index.menu")
     in
-    let menu = to_menu_aux ~subdir ~menu_pages ~srcurl ?header in
+    let menu = to_menu_aux ~subdir ~menu_pages ~srcurl ?header () in
     menu, srcurl
   in
   (* Main (current) 1.2 help menu *)