From 0a812656617be313c6648918f9b4c52a2ddb59c4 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 24 May 2015 13:16:49 +1200 Subject: docs: adjust for countershape changes --- doc-src/_layout.html | 88 ++++++++++++++++++++++++++++------------------------ doc-src/index.py | 7 +++-- 2 files changed, 52 insertions(+), 43 deletions(-) (limited to 'doc-src') diff --git a/doc-src/_layout.html b/doc-src/_layout.html index 0a12e25e..221da466 100644 --- a/doc-src/_layout.html +++ b/doc-src/_layout.html @@ -1,46 +1,54 @@ - -
-
-
- - - - -
-
- $!VERSION!$ docs + + + + @!pageTitle!@ + $!header!$ + + +
+
+
+ + + + +
+
+ $!VERSION!$ docs +
+
-
-
-
-
-
- $!navbar!$ -
-
-
-

@!this.title!@

+
+
+
+ $!navbar!$ +
+
+
+

@!this.title!@

+
+ $!body!$ +
+
- $!body!$ -
-
-
-
-
+
+
-
-

@!copyright!@

-
-
+
+

@!copyright!@

+
+
+ + diff --git a/doc-src/index.py b/doc-src/index.py index b049e3ce..4fefc866 100644 --- a/doc-src/index.py +++ b/doc-src/index.py @@ -2,7 +2,7 @@ import os import sys import datetime import countershape -from countershape import Page, Directory, markup, model +from countershape import Page, Directory, markup import countershape.template MITMPROXY_SRC = os.path.abspath( @@ -17,7 +17,8 @@ if ns.options.website: ns.idxpath = "doc/index.html" else: ns.idxpath = "index.html" -this.layout = countershape.Layout("_layout.html") + +this.layout = countershape.layout.FileLayout("_layout.html") ns.title = countershape.template.Template(None, "

@!this.title!@

") this.titlePrefix = "%s - " % version.NAMEVERSION @@ -51,7 +52,7 @@ def nav(page, current, state): else: pre = "
  • " p = state.application.getPage(page) - return pre + '%s
    • '%(model.UrlTo(page), p.title) + return pre + '%s'%(countershape.widgets.UrlTo(page), p.title) ns.nav = nav ns.navbar = countershape.template.File(None, "_nav.html") -- cgit v1.2.3