Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions src/rustbook/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,34 @@ pub fn parse_cmd(name: &str) -> Option<Box<Subcommand>> {
}
}

fn write_toc(book: &Book, path_to_root: &Path, out: &mut Write) -> io::Result<()> {
fn write_toc(book: &Book, current_page: &BookItem, out: &mut Write) -> io::Result<()> {
fn walk_items(items: &[BookItem],
section: &str,
path_to_root: &Path,
current_page: &BookItem,
out: &mut Write) -> io::Result<()> {
for (i, item) in items.iter().enumerate() {
try!(walk_item(item, &format!("{}{}.", section, i + 1)[..], path_to_root, out));
try!(walk_item(item, &format!("{}{}.", section, i + 1)[..], current_page, out));
}
Ok(())
}
fn walk_item(item: &BookItem,
section: &str,
path_to_root: &Path,
current_page: &BookItem,
out: &mut Write) -> io::Result<()> {
try!(writeln!(out, "<li><a href='{}'><b>{}</b> {}</a>",
path_to_root.join(&item.path.with_extension("html")).display(),
let class_string = if item.path == current_page.path {
"class='active'"
} else {
""
};

try!(writeln!(out, "<li><a {} href='{}'><b>{}</b> {}</a>",
class_string,
item.path_to_root.join(&item.path.with_extension("html")).display(),
section,
item.title));
if !item.children.is_empty() {
try!(writeln!(out, "<ul class='section'>"));
let _ = walk_items(&item.children[..], section, path_to_root, out);
let _ = walk_items(&item.children[..], section, current_page, out);
try!(writeln!(out, "</ul>"));
}
try!(writeln!(out, "</li>"));
Expand All @@ -67,7 +74,7 @@ fn write_toc(book: &Book, path_to_root: &Path, out: &mut Write) -> io::Result<()

try!(writeln!(out, "<div id='toc' class='mobile-hidden'>"));
try!(writeln!(out, "<ul class='chapter'>"));
try!(walk_items(&book.chapters[..], "", path_to_root, out));
try!(walk_items(&book.chapters[..], "", &current_page, out));
try!(writeln!(out, "</ul>"));
try!(writeln!(out, "</div>"));

Expand Down Expand Up @@ -115,7 +122,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
<span class="bar"></span>
</button>
</div>"#));
let _ = write_toc(book, &item.path_to_root, &mut toc);
let _ = write_toc(book, &item, &mut toc);
try!(writeln!(&mut toc, "<div id='page-wrapper'>"));
try!(writeln!(&mut toc, "<div id='page'>"));
}
Expand Down
5 changes: 5 additions & 0 deletions src/rustbook/css.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ body {
color: #000000;
}
.chapter li a.active {
text-decoration: underline;
font-weight: bold;
}
#toggle-nav {
height: 20px;
width: 30px;
Expand Down