Allow external html in rustdoc for crates.

Updated documentation to reflect md->html. Modularized external file loading.
2014-06-28 03:35:25 -07:00
parent 0ddf6f4b7c
commit 63afc08262
8 changed files with 143 additions and 69 deletions
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -11,10 +11,13 @@
 use std::fmt;
 use std::io;

+use externalfiles::ExternalHtml;
+
 #[deriving(Clone)]
 pub struct Layout {
    pub logo: String,
    pub favicon: String,
+    pub external_html: ExternalHtml,
    pub krate: String,
    pub playground_url: String,
 }
@@ -44,6 +47,7 @@ r##"<!DOCTYPE html>
    <link rel="stylesheet" type="text/css" href="{root_path}main.css">

    {favicon}
+    {in_header}
 </head>
 <body>
    <!--[if lte IE 8]>
@@ -53,6 +57,8 @@ r##"<!DOCTYPE html>
    </div>
    <![endif]-->

+    {before_content}
+
    <section class="sidebar">
        {logo}
        {sidebar}
@@ -105,6 +111,8 @@ r##"<!DOCTYPE html>
        </div>
    </div>

+    {after_content}
+
    <script>
        window.rootPath = "{root_path}";
        window.currentCrate = "{krate}";
@@ -133,6 +141,9 @@ r##"<!DOCTYPE html>
    } else {
        format!(r#"<link rel="shortcut icon" href="{}">"#, layout.favicon)
    },
+    in_header = layout.external_html.in_header,
+    before_content = layout.external_html.before_content,
+    after_content = layout.external_html.after_content,
    sidebar   = *sidebar,
    krate     = layout.krate,
    play_url  = layout.playground_url,