Skip to content

Commit 968ef59

Browse files
author
Richard Jones
committed
htmlbase doesn't have extraneous $Foo$ in it any more
1 parent 5279525 commit 968ef59

File tree

3 files changed

+30
-26
lines changed

3 files changed

+30
-26
lines changed

‎roundup/templatebuilder.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# $Id: templatebuilder.py,v 1.8 2001-07-30 08:12:17 richard Exp $
2-
import errno
1+
# $Id: templatebuilder.py,v 1.9 2001-08-01 05:06:10 richard Exp $
2+
import errno, re
33

44
preamble = """
55
# Do Not Edit (Unless You Want To)
@@ -22,7 +22,8 @@ def makeHtmlBase(templateDir):
2222
if file[-1] == '~': continue
2323
mangled_name = os.path.basename(re.sub(r'\.', 'DOT', file))
2424
fd.write('%s = """'%mangled_name)
25-
fd.write(open(file).read())
25+
fd.write(re.sub(r'\$((Id|File|Log).*?)\$', r'dollar\1dollar',
26+
open(file).read(), re.I))
2627
fd.write('"""\n\n')
2728
fd.close()
2829

@@ -67,6 +68,9 @@ def installHtmlBase(template, installDir):
6768

6869
#
6970
# $Log: not supported by cvs2svn $
71+
# Revision 1.8 2001/07/30 08:12:17 richard
72+
# Added time logging and file uploading to the templates.
73+
#
7074
# Revision 1.7 2001/07/30 00:06:52 richard
7175
# Hrm - had IOError instead of OSError. Not sure why there's two. Ho hum.
7276
#

‎roundup/templates/classic/htmlbase.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Do Not Edit (Unless You Want To)
33
# This file automagically generated by roundup.htmldata.makeHtmlBase
44
#
5-
fileDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
5+
fileDOTindex = """<!-- dollarId: file.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
66
<tr>
77
<property name="name">
88
<td><display call="link('name')"></td>
@@ -13,7 +13,7 @@
1313
</tr>
1414
"""
1515

16-
fileDOTnewitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
16+
fileDOTnewitem = """<!-- dollarId: file.newitem,v 1.1 2001/07/30 08:12:17 richard Exp dollar-->
1717
<table border=0 cellspacing=0 cellpadding=2>
1818
1919
<tr class="strong-header">
@@ -33,7 +33,7 @@
3333
</table>
3434
"""
3535

36-
issueDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
36+
issueDOTfilter = """<!-- dollarId: issue.filter,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
3737
<property name="title">
3838
<tr><th width="1%" align="right" class="location-bar">Title</th>
3939
<td><display call="field('title')"></td></tr>
@@ -48,7 +48,7 @@
4848
</property>
4949
"""
5050

51-
issueDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
51+
issueDOTindex = """<!-- dollarId: issue.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
5252
<tr class="row-<display call="plain('status')">">
5353
<property name="id">
5454
<td valign="top"><display call="plain('id')"></td>
@@ -71,7 +71,7 @@
7171
</tr>
7272
"""
7373

74-
issueDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
74+
issueDOTitem = """<!-- dollarId: issue.item,v 1.3 2001/07/30 08:12:17 richard Exp dollar-->
7575
<table border=0 cellspacing=0 cellpadding=2>
7676
7777
<tr class="strong-header">
@@ -142,7 +142,7 @@
142142
143143
"""
144144

145-
msgDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
145+
msgDOTindex = """<!-- dollarId: msg.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
146146
<tr>
147147
<property name="date">
148148
<td><display call="link('date')"></td>
@@ -156,7 +156,7 @@
156156
</tr>
157157
"""
158158

159-
msgDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
159+
msgDOTitem = """<!-- dollarId: msg.item,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
160160
<table border=0 cellspacing=0 cellpadding=2>
161161
162162
<tr class="strong-header">
@@ -403,7 +403,7 @@
403403
}
404404
"""
405405

406-
userDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
406+
userDOTindex = """<!-- dollarId: user.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
407407
<tr>
408408
<property name="username">
409409
<td><display call="link('username')"></td>
@@ -423,7 +423,7 @@
423423
</tr>
424424
"""
425425

426-
userDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
426+
userDOTitem = """<!-- dollarId: user.item,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
427427
<table border=0 cellspacing=0 cellpadding=2>
428428
429429
<tr class="strong-header">

‎roundup/templates/extended/htmlbase.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Do Not Edit (Unless You Want To)
33
# This file automagically generated by roundup.htmldata.makeHtmlBase
44
#
5-
fileDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
5+
fileDOTindex = """<!-- dollarId: file.index,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
66
<tr>
77
<property name="name">
88
<td><display call="link('name')"></td>
@@ -13,7 +13,7 @@
1313
</tr>
1414
"""
1515

16-
fileDOTnewitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
16+
fileDOTnewitem = """<!-- dollarId: file.newitem,v 1.1 2001/07/30 08:04:26 richard Exp dollar-->
1717
<table border=0 cellspacing=0 cellpadding=2>
1818
1919
<tr class="strong-header">
@@ -33,7 +33,7 @@
3333
</table>
3434
"""
3535

36-
issueDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
36+
issueDOTfilter = """<!-- dollarId: issue.filter,v 1.2 2001/07/30 01:26:59 richard Exp dollar-->
3737
<property name="title">
3838
<tr><th width="1%" align="right" class="location-bar">Title</th>
3939
<td><display call="field('title')"></td></tr>
@@ -64,7 +64,7 @@
6464
</property>
6565
"""
6666

67-
issueDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
67+
issueDOTindex = """<!-- dollarId: issue.index,v 1.2 2001/07/30 01:26:59 richard Exp dollar-->
6868
<tr>
6969
<property name="id">
7070
<td valign="top"><display call="field('id')"></td>
@@ -96,7 +96,7 @@
9696
</tr>
9797
"""
9898

99-
issueDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
99+
issueDOTitem = """<!-- dollarId: issue.item,v 1.5 2001/07/30 08:03:56 richard Exp dollar-->
100100
<table border=0 cellspacing=0 cellpadding=2>
101101
102102
<tr class="strong-header">
@@ -182,7 +182,7 @@
182182
183183
"""
184184

185-
msgDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
185+
msgDOTindex = """<!-- dollarId: msg.index,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
186186
<tr>
187187
<property name="date">
188188
<td><display call="link('date')"></td>
@@ -196,7 +196,7 @@
196196
</tr>
197197
"""
198198

199-
msgDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
199+
msgDOTitem = """<!-- dollarId: msg.item,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
200200
<table border=0 cellspacing=0 cellpadding=2>
201201
202202
<tr class="strong-header">
@@ -400,7 +400,7 @@
400400
}
401401
"""
402402

403-
supportDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
403+
supportDOTfilter = """<!-- dollarId: support.filter,v 1.1 2001/07/30 01:27:28 richard Exp dollar-->
404404
<property name="title">
405405
<tr><th width="1%" align="right" class="location-bar">Title</th>
406406
<td><display call="field('title')"></td></tr>
@@ -435,7 +435,7 @@
435435
</property>
436436
"""
437437

438-
supportDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
438+
supportDOTindex = """<!-- dollarId: support.index,v 1.1 2001/07/30 01:27:28 richard Exp dollar-->
439439
<tr>
440440
<property name="id">
441441
<td valign="top"><display call="field('id')"></td>
@@ -470,7 +470,7 @@
470470
</tr>
471471
"""
472472

473-
supportDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
473+
supportDOTitem = """<!-- dollarId: support.item,v 1.2 2001/07/30 08:03:56 richard Exp dollar-->
474474
<table border=0 cellspacing=0 cellpadding=2>
475475
476476
<tr class="strong-header">
@@ -577,7 +577,7 @@
577577
578578
"""
579579

580-
timelogDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
580+
timelogDOTindex = """<!-- dollarId: timelog.index,v 1.1 2001/07/30 08:04:26 richard Exp dollar-->
581581
<tr>
582582
<property name="date">
583583
<td><display call="link('date')"></td>
@@ -594,7 +594,7 @@
594594
</tr>
595595
"""
596596

597-
timelogDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
597+
timelogDOTitem = """<!-- dollarId: timelog.item,v 1.1 2001/07/30 08:04:26 richard Exp dollar-->
598598
<table border=0 cellspacing=0 cellpadding=2>
599599
600600
<tr class="strong-header">
@@ -634,7 +634,7 @@
634634
635635
"""
636636

637-
userDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
637+
userDOTindex = """<!-- dollarId: user.index,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
638638
<tr>
639639
<property name="username">
640640
<td><display call="link('username')"></td>
@@ -654,7 +654,7 @@
654654
</tr>
655655
"""
656656

657-
userDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
657+
userDOTitem = """<!-- dollarId: user.item,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
658658
<table border=0 cellspacing=0 cellpadding=2>
659659
660660
<tr class="strong-header">

0 commit comments

Comments
 (0)