Changes between Version 20 and Version 21 of web

Timestamp:

01/03/10 05:06:19 (3 years ago)

Author:

marcusl

Comment:

updated to indicate that jinja has been merged and is scheduled to ship with 0.8.0

web

@@ -4 +4 @@
 #!div style="width:45%; float:left"
 
-This work intends to replace the current HTML generation in the !WebStatus part with [http://jinja.pocoo.org/ Jinja] templates instead, providing the following advantages:
+This branch was created to replace the current HTML generation in the !WebStatus part with [http://jinja.pocoo.org/ Jinja] templates instead, providing the following advantages:
 
  * Fix encoding problems due to varying string types
@@ -11 +11 @@
  * Ease contributions of  "themes" and/or general HTML improvements
  * Nice UI usally sell well, and the more users, the better. :)
-
-The active work can be seen on the jinja branch in these two forks:
-
- * [http://github.com/marcusl/buildbot/tree/jinja Marcus Lindblom]
- * [http://github.com/stefans/buildbot/tree/jinja Stefan Seefeld]
-
+The work has now been merged to the master-branch and will ship with 0.8.0.
 
 
 == Master Plan ==
 
- 1. Move all HTML generation into Jinja templates ''partially done''
- 1. Document and cleanup template parameters
+ 1. Move all HTML generation into Jinja templates '''done''
+ 1. Document and cleanup template parameters (t.b.d.)
  1. Catch up with current mainline repo '''done'''
- 1. Submit for public review (and hope for acceptance ;)
- 1. Merge into main
+ 1. Submit for public review (and hope for acceptance ;) '''seemingly ok'''
+ 1. Merge into main '''done'''
  1. ?
- 1. Profit! ;)
+ 1. Profit! ;) (''still waiting'')
 
 == Plan details ==