[Treepkg-commits] r443 - in trunk/contrib/sawmill/web: . templates
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sat Sep 18 11:46:23 CEST 2010
Author: teichmann
Date: 2010-09-18 11:46:22 +0200 (Sat, 18 Sep 2010)
New Revision: 443
Added:
trunk/contrib/sawmill/web/templates/footer.inc
trunk/contrib/sawmill/web/templates/header.inc
Modified:
trunk/contrib/sawmill/web/details.py
trunk/contrib/sawmill/web/index.py
trunk/contrib/sawmill/web/templates/details.html
trunk/contrib/sawmill/web/templates/overview.html
Log:
sawmill: moved wald's table layout into common header and footer
template include files.
Modified: trunk/contrib/sawmill/web/details.py
===================================================================
--- trunk/contrib/sawmill/web/details.py 2010-09-18 08:01:18 UTC (rev 442)
+++ trunk/contrib/sawmill/web/details.py 2010-09-18 09:46:22 UTC (rev 443)
@@ -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
})
Modified: trunk/contrib/sawmill/web/index.py
===================================================================
--- trunk/contrib/sawmill/web/index.py 2010-09-18 08:01:18 UTC (rev 442)
+++ trunk/contrib/sawmill/web/index.py 2010-09-18 09:46:22 UTC (rev 443)
@@ -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
+ })
Modified: trunk/contrib/sawmill/web/templates/details.html
===================================================================
--- trunk/contrib/sawmill/web/templates/details.html 2010-09-18 08:01:18 UTC (rev 442)
+++ trunk/contrib/sawmill/web/templates/details.html 2010-09-18 09:46:22 UTC (rev 443)
@@ -67,69 +67,9 @@
}
%>
<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <link rel="icon" href="img/favicon.ico" type="image/x-icon" />
- <link rel="stylesheet" href="styles/style.css" type="text/css" media="screen" />
- <title>Sägewerk - <%= escape(description) %></title>
- </head>
+<%@include file="header.inc" %>
- <body>
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td>
- <a href="index.py"><img src="img/logo.jpg" border="0" alt="" width="533" height="94" /></a>
- </td>
- </tr>
- </table>
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
-
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9">
- <img src="img/topleft.png" height="9" width="9" alt="" />
- </td>
- <td bgcolor="#E0E0E0" width="30">
- <img src="img/clear.png" width="30" height="1" alt="" />
- </td>
- <td bgcolor="#E0E0E0">
- <img src="img/clear.png" width="1" height="1" alt="" />
-
- </td>
- <td bgcolor="#E0E0E0" width="30">
- <img src="img/clear.png" width="30" height="1" alt="" />
- </td>
- <td align="right" bgcolor="#E0E0E0" width="9">
- <img src="img/topright.png" height="9" width="9" alt="" />
- </td>
- </tr>
-
- <tr>
- <!-- Outer body row -->
- <td bgcolor="#E0E0E0">
- <img src="img/clear.png" width="10" height="1" alt="" />
- </td>
- <td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
- <!-- Inner Tabs / Shell -->
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
-
- <td align="left" bgcolor="#ffffff" width="9">
- <img src="img/topleft-inner.png" height="9" width="9" alt="" />
- </td>
- <td bgcolor="#ffffff">
- <img src="img/clear.png" width="1" height="1" alt="" />
- </td>
- <td align="right" bgcolor="#ffffff" width="9">
- <img src="img/topright-inner.png" height="9" width="9" alt="" />
- </td>
-
- </tr>
- <tr>
- <td bgcolor="#ffffff">
- <img src="img/clear.png" width="10" height="1" alt="" />
- </td>
- <td valign="top" width="99%" bgcolor="white" class="css_prison">
- <!-- end main body row -->
+<td valign="top" width="99%" bgcolor="white" class="css_prison">
<h1><%= escape(description) %></h1>
<%= header %>
<table class="statustable">
@@ -194,56 +134,7 @@
<hr>
report generated at <%= pretty_time(datetime.now(), "%Y-%m-%d %H:%M:%S") %>, powered
by <a href="http://treepkg.wald.intevation.org">Tree Packager</a>
+</td>
-
- <!-- end main body row -->
- </td>
- <td width="10" bgcolor="#ffffff">
- <img src="img/clear.png" width="2" height="1" alt="" />
- </td>
- </tr>
-
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9">
- <img src="img/bottomleft-inner.png" height="11" width="11" alt="" />
- </td>
- <td bgcolor="#ffffff">
- <img src="img/clear.png" width="1" height="1" alt="" />
- </td>
- <td align="right" bgcolor="#E0E0E0" width="9">
- <img src="img/bottomright-inner.png" height="11" width="11" alt="" />
-
- </td>
- </tr>
- </table>
-
- <!-- end inner body row -->
-
- </td>
- <td width="10" bgcolor="#E0E0E0">
- <img src="img/clear.png" width="2" height="1" alt="" />
- </td>
-
- </tr>
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9">
- <img src="img/bottomleft.png" height="9" width="9" alt="" />
- </td>
- <td bgcolor="#E0E0E0" colspan="3">
- <img src="img/clear.png" width="1" height="1" alt="" />
- </td>
- <td align="right" bgcolor="#E0E0E0" width="9">
-
- <img src="img/bottomright.png" height="9" width="9" alt="" />
- </td>
- </tr>
- </table>
- <br />
- <center>
- <b style="color:white; font-size:13px;">
- This site is hosted by the <a href="http://www.intevation.de">Intevation GmbH</a>
- </b>
- </center>
-
- </body>
+<%@include file="footer.inc" %>
</html>
Added: trunk/contrib/sawmill/web/templates/footer.inc
===================================================================
--- trunk/contrib/sawmill/web/templates/footer.inc 2010-09-18 08:01:18 UTC (rev 442)
+++ trunk/contrib/sawmill/web/templates/footer.inc 2010-09-18 09:46:22 UTC (rev 443)
@@ -0,0 +1,42 @@
+ <!-- end main body row -->
+ <td width="10" bgcolor="#ffffff">
+ <img src="img/clear.png" width="2" height="1" alt="" />
+ </td>
+ </tr>
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9">
+ <img src="img/bottomleft-inner.png" height="11" width="11" alt="" />
+ </td>
+ <td bgcolor="#ffffff">
+ <img src="img/clear.png" width="1" height="1" alt="" />
+ </td>
+ <td align="right" bgcolor="#E0E0E0" width="9">
+ <img src="img/bottomright-inner.png" height="11" width="11" alt="" />
+ </td>
+ </tr>
+ </table>
+ <!-- end inner body row -->
+ </td>
+ <td width="10" bgcolor="#E0E0E0">
+ <img src="img/clear.png" width="2" height="1" alt="" />
+ </td>
+ </tr>
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9">
+ <img src="img/bottomleft.png" height="9" width="9" alt="" />
+ </td>
+ <td bgcolor="#E0E0E0" colspan="3">
+ <img src="img/clear.png" width="1" height="1" alt="" />
+ </td>
+ <td align="right" bgcolor="#E0E0E0" width="9">
+ <img src="img/bottomright.png" height="9" width="9" alt="" />
+ </td>
+ </tr>
+ </table>
+ <br>
+ <center>
+ <b style="color:white; font-size:13px;">
+ This site is hosted by the <a href="http://www.intevation.de">Intevation GmbH</a>
+ </b>
+ </center>
+</body>
Added: trunk/contrib/sawmill/web/templates/header.inc
===================================================================
--- trunk/contrib/sawmill/web/templates/header.inc 2010-09-18 08:01:18 UTC (rev 442)
+++ trunk/contrib/sawmill/web/templates/header.inc 2010-09-18 09:46:22 UTC (rev 443)
@@ -0,0 +1,61 @@
+<%
+from cgi import escape
+from xml.sax.saxutils import quoteattr
+%>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <link rel="icon" href="img/favicon.ico" type="image/x-icon" />
+ <link rel="stylesheet" href="styles/style.css" type="text/css" media="screen" />
+ <title>Sägewerk - <%= escape(page_title) %></title>
+</head>
+<body>
+ <table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td>
+ <a href=<%= quoteattr(back_link) %>><img src="img/logo.jpg"
+ border="0" alt="" width="533" height="94" /></a>
+ </td>
+ </tr>
+ </table>
+ <table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9">
+ <img src="img/topleft.png" height="9" width="9" alt="" />
+ </td>
+ <td bgcolor="#E0E0E0" width="30">
+ <img src="img/clear.png" width="30" height="1" alt="" />
+ </td>
+ <td bgcolor="#E0E0E0">
+ <img src="img/clear.png" width="1" height="1" alt="" />
+ </td>
+ <td bgcolor="#E0E0E0" width="30">
+ <img src="img/clear.png" width="30" height="1" alt="" />
+ </td>
+ <td align="right" bgcolor="#E0E0E0" width="9">
+ <img src="img/topright.png" height="9" width="9" alt="" />
+ </td>
+ </tr>
+ <tr>
+ <!-- Outer body row -->
+ <td bgcolor="#E0E0E0">
+ <img src="img/clear.png" width="10" height="1" alt="" />
+ </td>
+ <td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
+ <!-- Inner Tabs / Shell -->
+ <table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td align="left" bgcolor="#ffffff" width="9">
+ <img src="img/topleft-inner.png" height="9" width="9" alt="" />
+ </td>
+ <td bgcolor="#ffffff">
+ <img src="img/clear.png" width="1" height="1" alt="" />
+ </td>
+ <td align="right" bgcolor="#ffffff" width="9">
+ <img src="img/topright-inner.png" height="9" width="9" alt="" />
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#ffffff">
+ <img src="img/clear.png" width="10" height="1" alt="" />
+ </td>
+ <!-- begin main body row -->
Modified: trunk/contrib/sawmill/web/templates/overview.html
===================================================================
--- trunk/contrib/sawmill/web/templates/overview.html 2010-09-18 08:01:18 UTC (rev 442)
+++ trunk/contrib/sawmill/web/templates/overview.html 2010-09-18 09:46:22 UTC (rev 443)
@@ -5,71 +5,13 @@
from xml.sax.saxutils import quoteattr
%>
<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <link rel="icon" href="img/favicon.ico" type="image/x-icon" />
- <link rel="stylesheet" href="styles/style.css" type="text/css" media="screen" />
- <title>Sägewerk - Free Software forestry</title>
- </head>
+<%@include file="header.inc" %>
- <body>
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td>
- <a href="/"><img src="img/logo.jpg" border="0" alt="" width="533" height="94" /></a>
- </td>
- </tr>
- </table>
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
+<td valign="top" width="99%" bgcolor="white">
+<div style="text-align: right">
+ <a href="http://wald.intevation.de/">...to WALD source code repository</a>
+</div>
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9">
- <img src="img/topleft.png" height="9" width="9" alt="" />
- </td>
- <td bgcolor="#E0E0E0" width="30">
- <img src="img/clear.png" width="30" height="1" alt="" />
- </td>
- <td bgcolor="#E0E0E0">
- <img src="img/clear.png" width="1" height="1" alt="" />
-
- </td>
- <td bgcolor="#E0E0E0" width="30">
- <img src="img/clear.png" width="30" height="1" alt="" />
- </td>
- <td align="right" bgcolor="#E0E0E0" width="9">
- <img src="img/topright.png" height="9" width="9" alt="" />
- </td>
- </tr>
-
- <tr>
- <!-- Outer body row -->
- <td bgcolor="#E0E0E0">
- <img src="img/clear.png" width="10" height="1" alt="" />
- </td>
- <td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
- <!-- Inner Tabs / Shell -->
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
-
- <td align="left" bgcolor="#ffffff" width="9">
- <img src="img/topleft-inner.png" height="9" width="9" alt="" />
- </td>
- <td bgcolor="#ffffff">
- <img src="img/clear.png" width="1" height="1" alt="" />
- </td>
- <td align="right" bgcolor="#ffffff" width="9">
- <img src="img/topright-inner.png" height="9" width="9" alt="" />
- </td>
-
- </tr>
- <tr>
- <td bgcolor="#ffffff">
- <img src="img/clear.png" width="10" height="1" alt="" />
- </td>
- <td valign="top" width="99%" bgcolor="white">
- <!-- end main body row -->
- <div style="text-align: right"><a href="http://wald.intevation.de/">...to WALD source code repository</a></div>
-
<%
for treepkg, description in sorted(descriptions, key=lambda x: x[1]):
# for all descriptions
@@ -80,55 +22,7 @@
<%
# for all descriptions
%>
- <!-- end main body row -->
- </td>
- <td width="10" bgcolor="#ffffff">
- <img src="img/clear.png" width="2" height="1" alt="" />
- </td>
- </tr>
+</td>
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9">
- <img src="img/bottomleft-inner.png" height="11" width="11" alt="" />
- </td>
- <td bgcolor="#ffffff">
- <img src="img/clear.png" width="1" height="1" alt="" />
- </td>
- <td align="right" bgcolor="#E0E0E0" width="9">
- <img src="img/bottomright-inner.png" height="11" width="11" alt="" />
-
- </td>
- </tr>
- </table>
-
- <!-- end inner body row -->
-
- </td>
- <td width="10" bgcolor="#E0E0E0">
- <img src="img/clear.png" width="2" height="1" alt="" />
- </td>
-
- </tr>
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9">
- <img src="img/bottomleft.png" height="9" width="9" alt="" />
- </td>
- <td bgcolor="#E0E0E0" colspan="3">
- <img src="img/clear.png" width="1" height="1" alt="" />
- </td>
- <td align="right" bgcolor="#E0E0E0" width="9">
-
- <img src="img/bottomright.png" height="9" width="9" alt="" />
- </td>
- </tr>
- </table>
- <br />
- <center>
- <b style="color:white; font-size:13px;">
- This site is hosted by the <a href="http://www.intevation.de">Intevation GmbH</a>
-
- </b>
- </center>
-
- </body>
+<%@include file="footer.inc" %>
</html>
More information about the Treepkg-commits
mailing list