From ec76e6671787c126ed32f65a8564da41c2ad7196 Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Wed, 1 Aug 2001 05:06:10 +0000
Subject: [PATCH] htmlbase doesn't have extraneous $Foo$ in it any more

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@180 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 roundup/templatebuilder.py             | 10 ++++++---
 roundup/templates/classic/htmlbase.py  | 18 ++++++++---------
 roundup/templates/extended/htmlbase.py | 28 +++++++++++++-------------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/roundup/templatebuilder.py b/roundup/templatebuilder.py
index bd47d0c..7b9ac87 100644
--- a/roundup/templatebuilder.py
+++ b/roundup/templatebuilder.py
@@ -1,5 +1,5 @@
-# $Id: templatebuilder.py,v 1.8 2001-07-30 08:12:17 richard Exp $
-import errno
+# $Id: templatebuilder.py,v 1.9 2001-08-01 05:06:10 richard Exp $
+import errno, re
 
 preamble = """ 
 # Do Not Edit (Unless You Want To)
@@ -22,7 +22,8 @@ def makeHtmlBase(templateDir):
         if file[-1] == '~': continue
         mangled_name = os.path.basename(re.sub(r'\.', 'DOT', file))
         fd.write('%s = """'%mangled_name)
-        fd.write(open(file).read())
+        fd.write(re.sub(r'\$((Id|File|Log).*?)\$', r'dollar\1dollar',
+            open(file).read(), re.I))
         fd.write('"""\n\n')
     fd.close()
 
@@ -67,6 +68,9 @@ if __name__ == "__main__":
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.8  2001/07/30 08:12:17  richard
+# Added time logging and file uploading to the templates.
+#
 # Revision 1.7  2001/07/30 00:06:52  richard
 # Hrm - had IOError instead of OSError. Not sure why there's two. Ho hum.
 #
diff --git a/roundup/templates/classic/htmlbase.py b/roundup/templates/classic/htmlbase.py
index cccb573..2e005bb 100644
--- a/roundup/templates/classic/htmlbase.py
+++ b/roundup/templates/classic/htmlbase.py
@@ -2,7 +2,7 @@
 # Do Not Edit (Unless You Want To)
 # This file automagically generated by roundup.htmldata.makeHtmlBase
 # 
-fileDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+fileDOTindex = """<!-- dollarId: file.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <tr>
     <property name="name">
         <td><display call="link('name')"></td>
@@ -13,7 +13,7 @@ fileDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-
 </tr>
 """
 
-fileDOTnewitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+fileDOTnewitem = """<!-- dollarId: file.newitem,v 1.1 2001/07/30 08:12:17 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -33,7 +33,7 @@ fileDOTnewitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp
 </table>
 """
 
-issueDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+issueDOTfilter = """<!-- dollarId: issue.filter,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <property name="title">
  <tr><th width="1%" align="right" class="location-bar">Title</th>
  <td><display call="field('title')"></td></tr>
@@ -48,7 +48,7 @@ issueDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp
 </property>
 """
 
-issueDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+issueDOTindex = """<!-- dollarId: issue.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <tr class="row-<display call="plain('status')">">
     <property name="id">
         <td valign="top"><display call="plain('id')"></td>
@@ -71,7 +71,7 @@ issueDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $
 </tr>
 """
 
-issueDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+issueDOTitem = """<!-- dollarId: issue.item,v 1.3 2001/07/30 08:12:17 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -142,7 +142,7 @@ issueDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-
 
 """
 
-msgDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+msgDOTindex = """<!-- dollarId: msg.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <tr>
     <property name="date">
         <td><display call="link('date')"></td>
@@ -156,7 +156,7 @@ msgDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $--
 </tr>
 """
 
-msgDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+msgDOTitem = """<!-- dollarId: msg.item,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -403,7 +403,7 @@ th {
 }
 """
 
-userDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+userDOTindex = """<!-- dollarId: user.index,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <tr>
     <property name="username">
         <td><display call="link('username')"></td>
@@ -423,7 +423,7 @@ userDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-
 </tr>
 """
 
-userDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+userDOTitem = """<!-- dollarId: user.item,v 1.2 2001/07/29 04:07:37 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
diff --git a/roundup/templates/extended/htmlbase.py b/roundup/templates/extended/htmlbase.py
index 91a3952..911f4a7 100644
--- a/roundup/templates/extended/htmlbase.py
+++ b/roundup/templates/extended/htmlbase.py
@@ -2,7 +2,7 @@
 # Do Not Edit (Unless You Want To)
 # This file automagically generated by roundup.htmldata.makeHtmlBase
 # 
-fileDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+fileDOTindex = """<!-- dollarId: file.index,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
 <tr>
     <property name="name">
         <td><display call="link('name')"></td>
@@ -13,7 +13,7 @@ fileDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-
 </tr>
 """
 
-fileDOTnewitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+fileDOTnewitem = """<!-- dollarId: file.newitem,v 1.1 2001/07/30 08:04:26 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -33,7 +33,7 @@ fileDOTnewitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp
 </table>
 """
 
-issueDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+issueDOTfilter = """<!-- dollarId: issue.filter,v 1.2 2001/07/30 01:26:59 richard Exp dollar-->
 <property name="title">
  <tr><th width="1%" align="right" class="location-bar">Title</th>
  <td><display call="field('title')"></td></tr>
@@ -64,7 +64,7 @@ issueDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp
 </property>
 """
 
-issueDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+issueDOTindex = """<!-- dollarId: issue.index,v 1.2 2001/07/30 01:26:59 richard Exp dollar-->
 <tr>
     <property name="id">
         <td valign="top"><display call="field('id')"></td>
@@ -96,7 +96,7 @@ issueDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $
 </tr>
 """
 
-issueDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+issueDOTitem = """<!-- dollarId: issue.item,v 1.5 2001/07/30 08:03:56 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -182,7 +182,7 @@ issueDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-
 
 """
 
-msgDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+msgDOTindex = """<!-- dollarId: msg.index,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
 <tr>
     <property name="date">
         <td><display call="link('date')"></td>
@@ -196,7 +196,7 @@ msgDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $--
 </tr>
 """
 
-msgDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+msgDOTitem = """<!-- dollarId: msg.item,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -400,7 +400,7 @@ th {
 }
 """
 
-supportDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+supportDOTfilter = """<!-- dollarId: support.filter,v 1.1 2001/07/30 01:27:28 richard Exp dollar-->
 <property name="title">
  <tr><th width="1%" align="right" class="location-bar">Title</th>
  <td><display call="field('title')"></td></tr>
@@ -435,7 +435,7 @@ supportDOTfilter = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Ex
 </property>
 """
 
-supportDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+supportDOTindex = """<!-- dollarId: support.index,v 1.1 2001/07/30 01:27:28 richard Exp dollar-->
 <tr>
     <property name="id">
         <td valign="top"><display call="field('id')"></td>
@@ -470,7 +470,7 @@ supportDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp
 </tr>
 """
 
-supportDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+supportDOTitem = """<!-- dollarId: support.item,v 1.2 2001/07/30 08:03:56 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -577,7 +577,7 @@ supportDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp
 
 """
 
-timelogDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+timelogDOTindex = """<!-- dollarId: timelog.index,v 1.1 2001/07/30 08:04:26 richard Exp dollar-->
 <tr>
     <property name="date">
         <td><display call="link('date')"></td>
@@ -594,7 +594,7 @@ timelogDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp
 </tr>
 """
 
-timelogDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+timelogDOTitem = """<!-- dollarId: timelog.item,v 1.1 2001/07/30 08:04:26 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
@@ -634,7 +634,7 @@ timelogDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp
 
 """
 
-userDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+userDOTindex = """<!-- dollarId: user.index,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
 <tr>
     <property name="username">
         <td><display call="link('username')"></td>
@@ -654,7 +654,7 @@ userDOTindex = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-
 </tr>
 """
 
-userDOTitem = """<!-- $Id: htmlbase.py,v 1.5 2001-07-30 08:12:17 richard Exp $-->
+userDOTitem = """<!-- dollarId: user.item,v 1.1 2001/07/23 04:21:20 richard Exp dollar-->
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr class="strong-header">
-- 
2.30.2