# HG changeset patch # User Sascha Teichmann # Date 1284803182 0 # Node ID 28aa6ac933fb77ced6372875738e948287fc05dc # Parent a89f73f7c965f6c777a77a5687ae957a3d3f5bc1 sawmill: moved wald's table layout into common header and footer template include files. diff -r a89f73f7c965 -r 28aa6ac933fb contrib/sawmill/web/details.py --- a/contrib/sawmill/web/details.py Sat Sep 18 08:01:18 2010 +0000 +++ b/contrib/sawmill/web/details.py Sat Sep 18 09:46:22 2010 +0000 @@ -157,8 +157,10 @@ req.content_type = 'text/html;charset=utf-8' template = psp.PSP(req, filename='templates/details.html') template.run({ - 'base_dir': BASE_DIR, + 'page_title' : description, + 'back_link' : 'index.py', + 'base_dir' : BASE_DIR, 'description': description, - 'header': header, + 'header' : header, 'track_items': track_items }) diff -r a89f73f7c965 -r 28aa6ac933fb contrib/sawmill/web/index.py --- a/contrib/sawmill/web/index.py Sat Sep 18 08:01:18 2010 +0000 +++ b/contrib/sawmill/web/index.py Sat Sep 18 09:46:22 2010 +0000 @@ -37,4 +37,8 @@ descriptions.append((os.path.basename(d), description)) - template.run({'descriptions': descriptions}) + template.run({ + 'page_title' : 'Free Software forestry', + 'back_link' : '/', + 'descriptions': descriptions + }) diff -r a89f73f7c965 -r 28aa6ac933fb contrib/sawmill/web/templates/details.html --- a/contrib/sawmill/web/templates/details.html Sat Sep 18 08:01:18 2010 +0000 +++ b/contrib/sawmill/web/templates/details.html Sat Sep 18 09:46:22 2010 +0000 @@ -67,69 +67,9 @@ } %> - - - - - Sägewerk - <%= escape(description) %> - - - - - - - -
- -
- - - - - - - - - - - - - - + + + + + + +
- - - - - +<%@include file="header.inc" %> - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - +

<%= escape(description) %>

<%= header %> @@ -194,56 +134,7 @@
report generated at <%= pretty_time(datetime.now(), "%Y-%m-%d %H:%M:%S") %>, powered by Tree Packager - - - - - - - - - - - - -
- -
- - - - - - -
- - +		 - -
- - - - - - -
-
-
- - This site is hosted by the Intevation GmbH - -
- - +<%@include file="footer.inc" %> diff -r a89f73f7c965 -r 28aa6ac933fb contrib/sawmill/web/templates/footer.inc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/sawmill/web/templates/footer.inc Sat Sep 18 09:46:22 2010 +0000 @@ -0,0 +1,42 @@ + + 		+ +
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
+
+ + This site is hosted by the Intevation GmbH + +
+ diff -r a89f73f7c965 -r 28aa6ac933fb contrib/sawmill/web/templates/header.inc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/sawmill/web/templates/header.inc Sat Sep 18 09:46:22 2010 +0000 @@ -0,0 +1,61 @@ +<% +from cgi import escape +from xml.sax.saxutils import quoteattr +%> + + + + + Sägewerk - <%= escape(page_title) %> + + + + + + +
+ > +
+ + + + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + diff -r a89f73f7c965 -r 28aa6ac933fb contrib/sawmill/web/templates/overview.html --- a/contrib/sawmill/web/templates/overview.html Sat Sep 18 08:01:18 2010 +0000 +++ b/contrib/sawmill/web/templates/overview.html Sat Sep 18 09:46:22 2010 +0000 @@ -5,70 +5,12 @@ from xml.sax.saxutils import quoteattr %> - - - - - Sägewerk - Free Software forestry - - - -
+ + + + + +
+ +
- - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - +<%@include file="header.inc" %> - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - + + <% for treepkg, description in sorted(descriptions, key=lambda x: x[1]): @@ -80,55 +22,7 @@ <% # for all descriptions %> - - - -
- - - - - - -
- - +		 - -
- - - - - - -
-
-
- - This site is hosted by the Intevation GmbH - - -
- - +<%@include file="footer.inc" %>