From ade2b8b84eee1b055043145f715717b24a0c4bcb Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Thu, 17 Apr 2003 03:38:00 +0000
Subject: [PATCH] moving templates around

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1663 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 CHANGES.txt                                   |   3 +
 MANIFEST.in                                   |   4 +-
 roundup/admin.py                              |  76 ++-
 roundup/cgi/templating.py                     |  40 +-
 roundup/init.py                               |  18 +-
 roundup/mailgw.py                             |   3 +-
 roundup/templates/.cvsignore                  |   5 -
 roundup/templates/README.txt                  |  14 -
 roundup/templates/__init__.py                 |  32 --
 roundup/templates/builder.py                  |  92 ---
 setup.py                                      |  56 +-
 .../classic/.cvsignore                        |   0
 templates/classic/TEMPLATE-INFO.txt           |   7 +
 .../classic/__init__.py                       |   2 +-
 .../templates => templates}/classic/config.py |   2 +-
 .../templates => templates}/classic/dbinit.py |   2 +-
 .../classic/detectors/.cvsignore              |   0
 .../classic/detectors/__init__.py             |   2 +-
 .../classic/detectors/messagesummary.py       |   2 +-
 .../classic/detectors/nosyreaction.py         |   2 +-
 .../classic/detectors/statusauditor.py        |   2 +-
 .../classic/html/_generic.help.html           |   0
 .../classic/html/_generic.index.html          |   0
 .../classic/html/_generic.item.html           |   0
 .../classic/html/file.index.html              |   0
 .../classic/html/file.item.html               |   0
 .../classic/html/home.classlist.html          |   0
 .../home => templates/classic/html/home.html  |   0
 .../classic/html/issue.index.html             |   0
 .../classic/html/issue.item.html              |   0
 .../classic/html/issue.search.html            |   0
 .../classic/html/keyword.item.html            |   0
 .../classic/html/msg.index.html               |   0
 .../classic/html/msg.item.html                |   0
 .../page => templates/classic/html/page.html  |   0
 .../classic/html/query.item.html              |   0
 .../classic/html/style.css                    |   0
 .../classic/html/user.forgotten.html          |   0
 .../classic/html/user.index.html              |   0
 .../classic/html/user.item.html               |   0
 .../classic/html/user.register.html           |   0
 .../classic/html/user.rego_progress.html      |   0
 templates/classic/htmlbase.py                 | 529 ++++++++++++++++++
 .../classic}/interfaces.py                    |   2 +-
 .../minimal/.cvsignore                        |   0
 templates/minimal/TEMPLATE-INFO.txt           |   8 +
 .../minimal/__init__.py                       |   2 +-
 .../templates => templates}/minimal/config.py |   2 +-
 .../templates => templates}/minimal/dbinit.py |   2 +-
 .../minimal/detectors/.cvsignore              |   0
 .../minimal/detectors/__init__.py             |   2 +-
 .../minimal/html/_generic.help.html           |   0
 .../minimal/html/_generic.index.html          |   0
 .../minimal/html/_generic.item.html           |   0
 .../minimal/html/home.classlist.html          |   0
 .../home => templates/minimal/html/home.html  |   0
 .../page => templates/minimal/html/page.html  |   0
 .../minimal/html/style.css                    |   0
 .../minimal/html/user.index.html              |   0
 .../minimal/html/user.item.html               |   0
 .../minimal/html/user.register.html           |   0
 .../minimal}/interfaces.py                    |   2 +-
 62 files changed, 675 insertions(+), 238 deletions(-)
 delete mode 100644 roundup/templates/.cvsignore
 delete mode 100644 roundup/templates/README.txt
 delete mode 100644 roundup/templates/__init__.py
 delete mode 100644 roundup/templates/builder.py
 rename {roundup/templates => templates}/classic/.cvsignore (100%)
 create mode 100644 templates/classic/TEMPLATE-INFO.txt
 rename {roundup/templates => templates}/classic/__init__.py (94%)
 rename {roundup/templates => templates}/classic/config.py (98%)
 rename {roundup/templates => templates}/classic/dbinit.py (99%)
 rename {roundup/templates => templates}/classic/detectors/.cvsignore (100%)
 rename {roundup/templates => templates}/classic/detectors/__init__.py (96%)
 rename {roundup/templates => templates}/classic/detectors/messagesummary.py (88%)
 rename {roundup/templates => templates}/classic/detectors/nosyreaction.py (98%)
 rename {roundup/templates => templates}/classic/detectors/statusauditor.py (97%)
 rename roundup/templates/classic/html/_generic.help => templates/classic/html/_generic.help.html (100%)
 rename roundup/templates/classic/html/_generic.index => templates/classic/html/_generic.index.html (100%)
 rename roundup/templates/classic/html/_generic.item => templates/classic/html/_generic.item.html (100%)
 rename roundup/templates/classic/html/file.index => templates/classic/html/file.index.html (100%)
 rename roundup/templates/classic/html/file.item => templates/classic/html/file.item.html (100%)
 rename roundup/templates/classic/html/home.classlist => templates/classic/html/home.classlist.html (100%)
 rename roundup/templates/classic/html/home => templates/classic/html/home.html (100%)
 rename roundup/templates/classic/html/issue.index => templates/classic/html/issue.index.html (100%)
 rename roundup/templates/classic/html/issue.item => templates/classic/html/issue.item.html (100%)
 rename roundup/templates/classic/html/issue.search => templates/classic/html/issue.search.html (100%)
 rename roundup/templates/classic/html/keyword.item => templates/classic/html/keyword.item.html (100%)
 rename roundup/templates/classic/html/msg.index => templates/classic/html/msg.index.html (100%)
 rename roundup/templates/classic/html/msg.item => templates/classic/html/msg.item.html (100%)
 rename roundup/templates/classic/html/page => templates/classic/html/page.html (100%)
 rename roundup/templates/classic/html/query.item => templates/classic/html/query.item.html (100%)
 mode change 100755 => 100644
 rename {roundup/templates => templates}/classic/html/style.css (100%)
 rename roundup/templates/classic/html/user.forgotten => templates/classic/html/user.forgotten.html (100%)
 rename roundup/templates/classic/html/user.index => templates/classic/html/user.index.html (100%)
 rename roundup/templates/classic/html/user.item => templates/classic/html/user.item.html (100%)
 rename roundup/templates/classic/html/user.register => templates/classic/html/user.register.html (100%)
 rename roundup/templates/classic/html/user.rego_progress => templates/classic/html/user.rego_progress.html (100%)
 create mode 100644 templates/classic/htmlbase.py
 rename {roundup/templates/minimal => templates/classic}/interfaces.py (95%)
 rename {roundup/templates => templates}/minimal/.cvsignore (100%)
 create mode 100644 templates/minimal/TEMPLATE-INFO.txt
 rename {roundup/templates => templates}/minimal/__init__.py (94%)
 rename {roundup/templates => templates}/minimal/config.py (98%)
 rename {roundup/templates => templates}/minimal/dbinit.py (98%)
 rename {roundup/templates => templates}/minimal/detectors/.cvsignore (100%)
 rename {roundup/templates => templates}/minimal/detectors/__init__.py (96%)
 rename roundup/templates/minimal/html/_generic.help => templates/minimal/html/_generic.help.html (100%)
 rename roundup/templates/minimal/html/_generic.index => templates/minimal/html/_generic.index.html (100%)
 rename roundup/templates/minimal/html/_generic.item => templates/minimal/html/_generic.item.html (100%)
 rename roundup/templates/minimal/html/home.classlist => templates/minimal/html/home.classlist.html (100%)
 rename roundup/templates/minimal/html/home => templates/minimal/html/home.html (100%)
 rename roundup/templates/minimal/html/page => templates/minimal/html/page.html (100%)
 rename {roundup/templates => templates}/minimal/html/style.css (100%)
 rename roundup/templates/minimal/html/user.index => templates/minimal/html/user.index.html (100%)
 rename roundup/templates/minimal/html/user.item => templates/minimal/html/user.item.html (100%)
 rename roundup/templates/minimal/html/user.register => templates/minimal/html/user.register.html (100%)
 rename {roundup/templates/classic => templates/minimal}/interfaces.py (95%)

diff --git a/CHANGES.txt b/CHANGES.txt
index fc64ee6..900ea99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -59,6 +59,9 @@ Feature:
 - added command-line functionality for roundup-adming (sf feature 687664)
 - added nicer popup windows for topic, nosy, etc (has add/remove buttons)
   thanks Gus Gollings
+- HTML templating files now have a .html extension
+- Roundup templates are now distributed much more sanely, allowing for
+  3rd-party templates.
 
 
 Fixed:
diff --git a/MANIFEST.in b/MANIFEST.in
index a0cbe81..26aa1a6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-recursive-include roundup *.* home* page*
+recursive-include roundup *.*
 recursive-include frontends *.*
 recursive-include scripts *.* *-*
 recursive-include tools *.*
@@ -6,8 +6,10 @@ recursive-include cgi-bin *.cgi
 recursive-include test *.py *.txt
 recursive-include doc *.html *.png *.txt *.css *.1
 recursive-include detectors *.py
+recursive-include templates *.* home* page*
 recursive-exclude roundup *.pyc *.pyo .cvsignore
 recursive-exclude frontends *.pyc *.pyo .cvsignore
+recursive-exclude templates *.pyc *.pyo .cvsignore
 include run_tests *.txt
 exclude BUILD.txt I18N_PROGRESS.txt TODO.txt
 exclude doc/security.txt doc/templating.txt
diff --git a/roundup/admin.py b/roundup/admin.py
index 65bfa8c..fda6e46 100644
--- a/roundup/admin.py
+++ b/roundup/admin.py
@@ -16,12 +16,12 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: admin.py,v 1.50 2003-03-27 05:23:39 richard Exp $
+# $Id: admin.py,v 1.51 2003-04-17 03:37:57 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
 
-import sys, os, getpass, getopt, re, UserDict, shlex, shutil
+import sys, os, getpass, getopt, re, UserDict, shlex, shutil, rfc822
 try:
     import csv
 except ImportError:
@@ -278,10 +278,43 @@ Command help:
                     print line
         return 0
 
+    def listTemplates(self):
+        ''' List all the available templates.
+
+            Look in three places:
+                <prefix>/share/roundup/templates
+                <__file__>/../templates
+                current dir
+        '''
+        # OK, try <prefix>/share/roundup/templates
+        # -- this module (roundup.admin) will be installed in something
+        # _like_ /usr/lib/python2.2/site-packages/roundup/admin.py, and
+        # we're interested in where the "lib" directory is - ie. the /usr/
+        # part
+        path = __file__
+        for i in range(5):
+            path = os.path.dirname(path)
+        tdir = os.path.join(path, 'share', 'roundup', 'templates')
+        if os.path.isdir(tdir):
+            templates = listTemplates(tdir)
+        else:
+            templates = {}
+
+        # OK, now try as if we're in the roundup source distribution
+        # directory, so this module will be in .../roundup-*/roundup/admin.py
+        # and we're interested in the .../roundup-*/ part.
+        path = __file__
+        for i in range(2):
+            path = os.path.dirname(path)
+        tdir = os.path.join(path, 'templates')
+        if os.path.isdir(tdir):
+            templates.update(listTemplates(tdir))
+
+        return templates
+
     def help_initopts(self):
-        import roundup.templates
-        templates = roundup.templates.listTemplates()
-        print _('Templates:'), ', '.join(templates)
+        templates = self.listTemplates()
+        print _('Templates:'), ', '.join(templates.keys())
         import roundup.backends
         backends = roundup.backends.__all__
         print _('Back ends:'), ', '.join(backends)
@@ -312,12 +345,11 @@ Command help:
                 ' does not exist')%locals()
 
         # select template
-        import roundup.templates
-        templates = roundup.templates.listTemplates()
+        templates = self.listTemplates()
         template = len(args) > 1 and args[1] or ''
-        if template not in templates:
-            print _('Templates:'), ', '.join(templates)
-        while template not in templates:
+        if not templates.has_key(template):
+            print _('Templates:'), ', '.join(templates.keys())
+        while not templates.has_key(template):
             template = raw_input(_('Select template [classic]: ')).strip()
             if not template:
                 template = 'classic'
@@ -335,7 +367,7 @@ Command help:
         # XXX perform a unit test based on the user's selections
 
         # install!
-        init.install(tracker_home, template)
+        init.install(tracker_home, templates[template]['path'])
         init.write_select_db(tracker_home, backend)
 
         print _('''
@@ -1377,6 +1409,28 @@ Date format is "YYYY-MM-DD" eg:
             if self.db:
                 self.db.close()
 
+
+def listTemplates(dir):
+    ''' List all the Roundup template directories in a given directory.
+
+        Find all the dirs that contain a TEMPLATE-INFO.txt and parse it.
+
+        Return a list of dicts of info about the templates.
+    '''
+    ret = {}
+    for idir in os.listdir(dir):
+        idir = os.path.join(dir, idir)
+        ti = os.path.join(idir, 'TEMPLATE-INFO.txt')
+        if os.path.isfile(ti):
+            m = rfc822.Message(open(ti))
+            ti = {}
+            ti['name'] = m['name']
+            ti['description'] = m['description']
+            ti['intended-for'] = m['intended-for']
+            ti['path'] = idir
+            ret[m['name']] = ti
+    return ret
+
 if __name__ == '__main__':
     tool = AdminTool()
     sys.exit(tool.main())
diff --git a/roundup/cgi/templating.py b/roundup/cgi/templating.py
index e2d2b6c..4eacc8c 100644
--- a/roundup/cgi/templating.py
+++ b/roundup/cgi/templating.py
@@ -38,9 +38,9 @@ class Templates:
             if os.path.isdir(filename): continue
             if '.' in filename:
                 name, extension = filename.split('.')
-                self.getTemplate(name, extension)
+                self.get(name, extension)
             else:
-                self.getTemplate(filename, None)
+                self.get(filename, None)
 
     def get(self, name, extension=None):
         ''' Interface to get a template, possibly loading a compiled template.
@@ -66,27 +66,31 @@ class Templates:
             filename = name
 
         src = os.path.join(self.dir, filename)
+        if not os.path.exists(src):
+            filename = filename + '.html'
+            src = os.path.join(self.dir, filename)
+            if not os.path.exists(src):
+                if not extension:
+                    raise NoTemplate, 'Template file "%s" doesn\'t exist'%name
+
+                # try for a generic template
+                generic = '_generic.%s'%extension
+                src = os.path.join(self.dir, generic)
+                if not os.path.exists(src):
+                    generic = '_generic.%s.html'%extension
+                    src = os.path.join(self.dir, generic)
+                    if not os.path.exists(src):
+                        raise NoTemplate, 'No template file exists for '\
+                            'templating "%s" with template "%s" (neither '\
+                            '"%s" nor "%s")'%(name, extension, filename,
+                            generic)
+                filename = generic
+
         try:
             stime = os.stat(src)[os.path.stat.ST_MTIME]
         except os.error, error:
             if error.errno != errno.ENOENT:
                 raise
-            if not extension:
-                raise NoTemplate, 'Template file "%s" doesn\'t exist'%name
-
-            # try for a generic template
-            generic = '_generic.%s'%extension
-            src = os.path.join(self.dir, generic)
-            try:
-                stime = os.stat(src)[os.path.stat.ST_MTIME]
-            except os.error, error:
-                if error.errno != errno.ENOENT:
-                    raise
-                # nicer error
-                raise NoTemplate, 'No template file exists for templating '\
-                    '"%s" with template "%s" (neither "%s" nor "%s")'%(name,
-                    extension, filename, generic)
-            filename = generic
 
         if self.templates.has_key(src) and \
                 stime < self.templates[src].mtime:
diff --git a/roundup/init.py b/roundup/init.py
index 9a7ffc5..fd7124c 100644
--- a/roundup/init.py
+++ b/roundup/init.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: init.py,v 1.25 2003-02-25 10:19:31 richard Exp $
+# $Id: init.py,v 1.26 2003-04-17 03:37:58 richard Exp $
 
 __doc__ = """
 Init (create) a roundup instance.
@@ -58,8 +58,8 @@ def install(instance_home, template):
     '''Install an instance using the named template and backend.
 
     instance_home - the directory to place the instance data in
-    template - the template to use in creating the instance data
-    backend - the database to use to store the instance data
+    template      - the directory holding the template to use in creating
+                    the instance data
 
     The instance_home directory will be created using the files found in
     the named template (roundup.templates.<name>). A standard instance_home
@@ -82,20 +82,10 @@ def install(instance_home, template):
         . detectors/
           - the auditor and reactor modules for this instance
 
-    The html directory is typically extracted from the htmlbase module in
-    the template.
     '''
-    # first, copy the template dir over
-    from roundup.templates import builder
-
-    # copy the roundup.templates.<template> package contents to the instance dir
-    template_dir = os.path.split(__file__)[0]
-    template_name = template
-    template = os.path.join(template_dir, 'templates', template)
+    # At the moment, it's just a copy
     copytree(template, instance_home)
 
-    builder.installHtmlBase(template_name, instance_home)
-
 
 def write_select_db(instance_home, backend):
     ''' Write the file that selects the backend for the tracker
diff --git a/roundup/mailgw.py b/roundup/mailgw.py
index 468a3b7..1a5332b 100644
--- a/roundup/mailgw.py
+++ b/roundup/mailgw.py
@@ -73,7 +73,7 @@ are calling the create() method to create a new node). If an auditor raises
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception. 
 
-$Id: mailgw.py,v 1.114 2003-04-10 05:12:41 richard Exp $
+$Id: mailgw.py,v 1.115 2003-04-17 03:37:59 richard Exp $
 '''
 
 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
@@ -806,6 +806,7 @@ not find a text/plain part to use.
         # parse the body of the message, stripping out bits as appropriate
         summary, content = parseContent(content, keep_citations, 
             keep_body)
+        content = content.strip()
 
         # 
         # handle the attachments
diff --git a/roundup/templates/.cvsignore b/roundup/templates/.cvsignore
deleted file mode 100644
index 8d65e41..0000000
--- a/roundup/templates/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.pyc
-*.pyo
-*.cover
-*_htmlbase.py
-*_htmlbase.pyc
diff --git a/roundup/templates/README.txt b/roundup/templates/README.txt
deleted file mode 100644
index 11a9223..0000000
--- a/roundup/templates/README.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains "templates" for installations of roundup. 
-
-Choose a template that matches your needs most closely, then run
-roundup-admin init <templatename>, then customise the new instance's 
-templates.
-
-The currently available templates are:
-
-  classic  -- The schema is as described in the Roundup spec.
-
-  extended -- The classic schema with some extra fields useful for support
-              calls: product identification, customer name, source of call,
-              log of time spent on call.
-
diff --git a/roundup/templates/__init__.py b/roundup/templates/__init__.py
deleted file mode 100644
index 2abf9ce..0000000
--- a/roundup/templates/__init__.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
-# This module is free software, and you may redistribute it and/or modify
-# under the same terms as Python, so long as this copyright message and
-# disclaimer are retained in their original form.
-#
-# IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR
-# DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
-# OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
-# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-# 
-# $Id: __init__.py,v 1.5 2002-09-10 01:07:06 richard Exp $
-
-import os
-
-def listTemplates():
-    t_dir = os.path.split(__file__)[0]
-    l = []
-    for entry in os.listdir(t_dir):
-        # this isn't strictly necessary - the CVS dir won't be distributed
-        if entry == 'CVS': continue
-        if os.path.isdir(os.path.join(t_dir, entry)):
-            l.append(entry)
-    return l
-
-# vim: set filetype=python ts=4 sw=4 et si
diff --git a/roundup/templates/builder.py b/roundup/templates/builder.py
deleted file mode 100644
index eeb93cf..0000000
--- a/roundup/templates/builder.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
-# This module is free software, and you may redistribute it and/or modify
-# under the same terms as Python, so long as this copyright message and
-# disclaimer are retained in their original form.
-#
-# IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR
-# DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
-# OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
-# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-# 
-# $Id: builder.py,v 1.4 2002-09-13 04:39:12 richard Exp $
-import os, sys, glob, errno, re
-
-__doc__ = """
-Collect template parts and create instance template files.
-"""
-
-preamble = """ 
-# Do Not Edit (Unless You Want To)
-# This file automagically generated by roundup.templatebuilder.makeHtmlBase
-# 
-"""
-
-def makeHtmlBase(templateDir):
-    ''' make a <template>_htmlbase.py file in rondup.tempaltes, from the
-        contents of templateDir/html
-    '''
-    print "packing up templates in", templateDir
-
-    filelist = glob.glob(os.path.join(templateDir, 'html', '*'))
-    filelist = filter(os.path.isfile, filelist) # only want files
-    filelist.sort()
-
-    # ok, figure the template name and templates dir
-    dir, name = os.path.split(templateDir)
-
-    fd = open(os.path.join(dir, '%s_htmlbase.py'%name), 'w')
-    fd.write(preamble)
-    for file in filelist:
-        # skip the backup files created by richard's vim
-        if file[-1] == '~': continue
-        mangled_name = os.path.basename(file).replace('.','DOT')
-        fd.write('%s = """'%mangled_name)
-        fd.write(re.sub(r'\$((Id|File|Log).*?)\$', r'dollar\1dollar',
-            open(file).read(), re.I))
-        fd.write('"""\n\n')
-    fd.close()
-
-def installHtmlBase(template, installDir):
-    ''' passed a template name and an installDir, unpacks the html files into
-        the installdir
-    '''
-    tmod = '%s_htmlbase'%template
-    tdir = __import__('roundup.templates.'+tmod).templates
-    if hasattr(tdir, tmod):
-        htmlbase = getattr(tdir, tmod)
-    else:
-        raise "TemplateError", \
-            "couldn't find roundup.templates.%s_htmlbase"%template
-    installDir = os.path.join(installDir, 'html')
-    try:
-        os.makedirs(installDir)
-    except OSError, error:
-        if error.errno != errno.EEXIST: raise
-
-#    print "installing from", htmlbase.__file__, "into", installDir
-    modulecontents = dir(htmlbase)
-    for mangledfile in modulecontents:
-        if mangledfile.startswith('__') and mangledfile.endswith('__'):
-            continue
-        filename = re.sub('DOT', '.', mangledfile)
-        outfile = os.path.join(installDir, filename)
-        outfd = open(outfile, 'w')
-        data = getattr(htmlbase, mangledfile)
-        outfd.write(data)
-    
-if __name__ == "__main__":
-    if len(sys.argv) == 2:
-        makeHtmlBase(sys.argv[1])
-    elif len(sys.argv) == 3:
-        installHtmlBase(sys.argv[1], sys.argv[2])
-    else:
-        print "Usage: %s <template directory>"%sys.argv[0]
-
-# vim: set filetype=python ts=4 sw=4 et si
diff --git a/setup.py b/setup.py
index 08bfe44..bb1d8a3 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: setup.py,v 1.47 2003-04-17 01:14:10 richard Exp $
+# $Id: setup.py,v 1.48 2003-04-17 03:37:57 richard Exp $
 
 from distutils.core import setup, Extension
 from distutils.util import get_platform
@@ -31,8 +31,6 @@ if sys.version < '2.2.3':
     DistributionMetadata.classifiers = None
     DistributionMetadata.download_url = None
 
-from roundup.templates.builder import makeHtmlBase
-
 
 #############################################################################
 ### Build script files
@@ -124,26 +122,11 @@ def scriptname(path):
 ### Main setup stuff
 #############################################################################
 
-def isTemplateDir(dir):
-    return dir[0] != '.' and dir != 'CVS' and os.path.isdir(dir) \
-        and os.path.isfile(os.path.join(dir, '__init__.py'))
-
-# use that function to list all the templates
-templates = map(os.path.basename, filter(isTemplateDir,
-    glob(os.path.join('roundup', 'templates', '*'))))
-
-def buildTemplates():
-    for template in templates:
-        tdir = os.path.join('roundup', 'templates', template)
-        makeHtmlBase(tdir)
-
 def main():
     # build list of scripts from their implementation modules
     roundup_scripts = map(scriptname, glob('roundup/scripts/[!_]*.py'))
 
     # template munching
-    templates = map(os.path.basename, filter(isTemplateDir,
-        glob(os.path.join('roundup', 'templates', '*'))))
     packagelist = [
         'roundup',
         'roundup.cgi',
@@ -151,8 +134,7 @@ def main():
         'roundup.cgi.TAL',
         'roundup.cgi.ZTUtils',
         'roundup.backends',
-        'roundup.scripts',
-        'roundup.templates'
+        'roundup.scripts'
     ]
     installdatafiles = [
         ('share/roundup/cgi-bin', ['cgi-bin/roundup.cgi']),
@@ -163,23 +145,23 @@ def main():
         installdatafiles.append(('man/man1', ['doc/roundup-admin.1',
             'doc/roundup-mailgw.1', 'doc/roundup-server.1']))
 
-    # munge the template HTML into the htmlbase module
-    buildTemplates()
-
-    # add the templates to the setup packages and data files lists
-    for template in templates:
-        tdir = os.path.join('roundup', 'templates', template)
-
-        # add the template package and subpackage
-        packagelist.append('roundup.templates.%s' % template)
-        packagelist.append('roundup.templates.%s.detectors' % template)
-
+    # add the templates to the data files lists
+    from roundup.admin import listTemplates
+    templates = [t['path'] for t in listTemplates('.').values()]
+    for tdir in templates:
         # scan for data files
-        tfiles = glob(os.path.join(tdir, 'html', '*'))
-        tfiles = filter(os.path.isfile, tfiles)
-        installdatafiles.append(
-            ('share/roundup/templates/%s/html' % template, tfiles)
-        )
+        for idir in '. detectors html'.split():
+            idir = os.path.join(tdir, idir)
+            tfiles = []
+            for f in os.listdir(idir):
+                if f.startswith('.'):
+                    continue
+                ifile = os.path.join(idir, f)
+                if os.path.isfile(ifile):
+                    tfiles.append(ifile)
+            installdatafiles.append(
+                (os.path.join('share', 'roundup', idir), tfiles)
+            )
 
     # perform the setup action
     from roundup import __version__
@@ -233,7 +215,7 @@ def install_demo():
         if error.errno != errno.ENOENT:
             raise
     from roundup import init, instance, password
-    init.install(home, 'classic')
+    init.install(home, os.path.join('templates', 'classic'))
     # don't have email flying around
     os.remove(os.path.join(home, 'detectors', 'nosyreaction.py'))
     init.write_select_db(home, 'anydbm')
diff --git a/roundup/templates/classic/.cvsignore b/templates/classic/.cvsignore
similarity index 100%
rename from roundup/templates/classic/.cvsignore
rename to templates/classic/.cvsignore
diff --git a/templates/classic/TEMPLATE-INFO.txt b/templates/classic/TEMPLATE-INFO.txt
new file mode 100644
index 0000000..1c20d54
--- /dev/null
+++ b/templates/classic/TEMPLATE-INFO.txt
@@ -0,0 +1,7 @@
+Name: classic
+Description: This is a generic issue tracker that may be used to track bugs,
+             feature requests, project issues or any number of other types
+             of issues. Most users of Roundup will find that this template
+             suits them, with perhaps a few customisations.
+Intended-For: All first-time Roundup users
+
diff --git a/roundup/templates/classic/__init__.py b/templates/classic/__init__.py
similarity index 94%
rename from roundup/templates/classic/__init__.py
rename to templates/classic/__init__.py
index a64f168..e566b54 100644
--- a/roundup/templates/classic/__init__.py
+++ b/templates/classic/__init__.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.7 2002-09-09 23:55:19 richard Exp $
+# $Id: __init__.py,v 1.1 2003-04-17 03:26:03 richard Exp $
 
 import config
 from dbinit import open, init
diff --git a/roundup/templates/classic/config.py b/templates/classic/config.py
similarity index 98%
rename from roundup/templates/classic/config.py
rename to templates/classic/config.py
index ceb6235..3c3df21 100644
--- a/roundup/templates/classic/config.py
+++ b/templates/classic/config.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: config.py,v 1.7 2003-01-12 00:41:27 richard Exp $
+# $Id: config.py,v 1.1 2003-04-17 03:26:03 richard Exp $
 
 import os
 
diff --git a/roundup/templates/classic/dbinit.py b/templates/classic/dbinit.py
similarity index 99%
rename from roundup/templates/classic/dbinit.py
rename to templates/classic/dbinit.py
index 0bd0bf3..f7849ce 100644
--- a/roundup/templates/classic/dbinit.py
+++ b/templates/classic/dbinit.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: dbinit.py,v 1.34 2003-04-10 05:12:42 richard Exp $
+# $Id: dbinit.py,v 1.1 2003-04-17 03:26:03 richard Exp $
 
 import os
 
diff --git a/roundup/templates/classic/detectors/.cvsignore b/templates/classic/detectors/.cvsignore
similarity index 100%
rename from roundup/templates/classic/detectors/.cvsignore
rename to templates/classic/detectors/.cvsignore
diff --git a/roundup/templates/classic/detectors/__init__.py b/templates/classic/detectors/__init__.py
similarity index 96%
rename from roundup/templates/classic/detectors/__init__.py
rename to templates/classic/detectors/__init__.py
index 96bb081..ead90bb 100644
--- a/roundup/templates/classic/detectors/__init__.py
+++ b/templates/classic/detectors/__init__.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: __init__.py,v 1.8 2003-02-24 04:12:15 richard Exp $
+#$Id: __init__.py,v 1.1 2003-04-17 03:26:38 richard Exp $
 
 import sys, os, imp
 
diff --git a/roundup/templates/classic/detectors/messagesummary.py b/templates/classic/detectors/messagesummary.py
similarity index 88%
rename from roundup/templates/classic/detectors/messagesummary.py
rename to templates/classic/detectors/messagesummary.py
index 2b23475..2558213 100644
--- a/roundup/templates/classic/detectors/messagesummary.py
+++ b/templates/classic/detectors/messagesummary.py
@@ -1,4 +1,4 @@
-#$Id: messagesummary.py,v 1.1 2003-02-13 21:14:27 richard Exp $
+#$Id: messagesummary.py,v 1.1 2003-04-17 03:26:38 richard Exp $
 
 from roundup.mailgw import parseContent
 
diff --git a/roundup/templates/classic/detectors/nosyreaction.py b/templates/classic/detectors/nosyreaction.py
similarity index 98%
rename from roundup/templates/classic/detectors/nosyreaction.py
rename to templates/classic/detectors/nosyreaction.py
index 0aba92a..2c29204 100644
--- a/roundup/templates/classic/detectors/nosyreaction.py
+++ b/templates/classic/detectors/nosyreaction.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: nosyreaction.py,v 1.14 2002-09-10 01:07:06 richard Exp $
+#$Id: nosyreaction.py,v 1.1 2003-04-17 03:26:38 richard Exp $
 
 from roundup import roundupdb, hyperdb
 
diff --git a/roundup/templates/classic/detectors/statusauditor.py b/templates/classic/detectors/statusauditor.py
similarity index 97%
rename from roundup/templates/classic/detectors/statusauditor.py
rename to templates/classic/detectors/statusauditor.py
index 7b4a526..05f1710 100644
--- a/roundup/templates/classic/detectors/statusauditor.py
+++ b/templates/classic/detectors/statusauditor.py
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-#$Id: statusauditor.py,v 1.3 2002-10-11 01:26:05 richard Exp $
+#$Id: statusauditor.py,v 1.1 2003-04-17 03:26:38 richard Exp $
 
 def chatty(db, cl, nodeid, newvalues):
     ''' If the issue is currently 'unread', 'resolved' or 'done-cbb', then set
diff --git a/roundup/templates/classic/html/_generic.help b/templates/classic/html/_generic.help.html
similarity index 100%
rename from roundup/templates/classic/html/_generic.help
rename to templates/classic/html/_generic.help.html
diff --git a/roundup/templates/classic/html/_generic.index b/templates/classic/html/_generic.index.html
similarity index 100%
rename from roundup/templates/classic/html/_generic.index
rename to templates/classic/html/_generic.index.html
diff --git a/roundup/templates/classic/html/_generic.item b/templates/classic/html/_generic.item.html
similarity index 100%
rename from roundup/templates/classic/html/_generic.item
rename to templates/classic/html/_generic.item.html
diff --git a/roundup/templates/classic/html/file.index b/templates/classic/html/file.index.html
similarity index 100%
rename from roundup/templates/classic/html/file.index
rename to templates/classic/html/file.index.html
diff --git a/roundup/templates/classic/html/file.item b/templates/classic/html/file.item.html
similarity index 100%
rename from roundup/templates/classic/html/file.item
rename to templates/classic/html/file.item.html
diff --git a/roundup/templates/classic/html/home.classlist b/templates/classic/html/home.classlist.html
similarity index 100%
rename from roundup/templates/classic/html/home.classlist
rename to templates/classic/html/home.classlist.html
diff --git a/roundup/templates/classic/html/home b/templates/classic/html/home.html
similarity index 100%
rename from roundup/templates/classic/html/home
rename to templates/classic/html/home.html
diff --git a/roundup/templates/classic/html/issue.index b/templates/classic/html/issue.index.html
similarity index 100%
rename from roundup/templates/classic/html/issue.index
rename to templates/classic/html/issue.index.html
diff --git a/roundup/templates/classic/html/issue.item b/templates/classic/html/issue.item.html
similarity index 100%
rename from roundup/templates/classic/html/issue.item
rename to templates/classic/html/issue.item.html
diff --git a/roundup/templates/classic/html/issue.search b/templates/classic/html/issue.search.html
similarity index 100%
rename from roundup/templates/classic/html/issue.search
rename to templates/classic/html/issue.search.html
diff --git a/roundup/templates/classic/html/keyword.item b/templates/classic/html/keyword.item.html
similarity index 100%
rename from roundup/templates/classic/html/keyword.item
rename to templates/classic/html/keyword.item.html
diff --git a/roundup/templates/classic/html/msg.index b/templates/classic/html/msg.index.html
similarity index 100%
rename from roundup/templates/classic/html/msg.index
rename to templates/classic/html/msg.index.html
diff --git a/roundup/templates/classic/html/msg.item b/templates/classic/html/msg.item.html
similarity index 100%
rename from roundup/templates/classic/html/msg.item
rename to templates/classic/html/msg.item.html
diff --git a/roundup/templates/classic/html/page b/templates/classic/html/page.html
similarity index 100%
rename from roundup/templates/classic/html/page
rename to templates/classic/html/page.html
diff --git a/roundup/templates/classic/html/query.item b/templates/classic/html/query.item.html
old mode 100755
new mode 100644
similarity index 100%
rename from roundup/templates/classic/html/query.item
rename to templates/classic/html/query.item.html
diff --git a/roundup/templates/classic/html/style.css b/templates/classic/html/style.css
similarity index 100%
rename from roundup/templates/classic/html/style.css
rename to templates/classic/html/style.css
diff --git a/roundup/templates/classic/html/user.forgotten b/templates/classic/html/user.forgotten.html
similarity index 100%
rename from roundup/templates/classic/html/user.forgotten
rename to templates/classic/html/user.forgotten.html
diff --git a/roundup/templates/classic/html/user.index b/templates/classic/html/user.index.html
similarity index 100%
rename from roundup/templates/classic/html/user.index
rename to templates/classic/html/user.index.html
diff --git a/roundup/templates/classic/html/user.item b/templates/classic/html/user.item.html
similarity index 100%
rename from roundup/templates/classic/html/user.item
rename to templates/classic/html/user.item.html
diff --git a/roundup/templates/classic/html/user.register b/templates/classic/html/user.register.html
similarity index 100%
rename from roundup/templates/classic/html/user.register
rename to templates/classic/html/user.register.html
diff --git a/roundup/templates/classic/html/user.rego_progress b/templates/classic/html/user.rego_progress.html
similarity index 100%
rename from roundup/templates/classic/html/user.rego_progress
rename to templates/classic/html/user.rego_progress.html
diff --git a/templates/classic/htmlbase.py b/templates/classic/htmlbase.py
new file mode 100644
index 0000000..0b40ae7
--- /dev/null
+++ b/templates/classic/htmlbase.py
@@ -0,0 +1,529 @@
+ 
+# Do Not Edit (Unless You Want To)
+# This file automagically generated by roundup.templatebuilder.makeHtmlBase
+# 
+fileDOTindex = """<!-- dollarId: file.index,v 1.4 2002/01/23 05:10:27 richard Exp dollar-->
+<tr>
+    <property name="name">
+        <td><display call="download('name')"></td>
+    </property>
+    <property name="type">
+        <td><display call="plain('type')"></td>
+    </property>
+    <property name="creator">
+        <td><display call="plain('creator')"></td>
+    </property>
+    <property name="creation">
+        <td><display call="plain('creation')"></td>
+    </property>
+</tr>
+"""
+
+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">
+  <td colspan=2>File upload details</td>
+</td>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">File:</span></td>
+    <td class="form-text"><input type="file" name="content" size="40"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td>&nbsp;</td>
+    <td class="form-text"><display call="submit()"></td>
+</tr>
+
+</table>
+"""
+
+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>
+</property>
+<property name="status">
+ <tr><th width="1%" align="right" class="location-bar">Status</th>
+ <td><display call="checklist('status')"></td></tr>
+</property>
+<property name="priority">
+ <tr><th width="1%" align="right" class="location-bar">Priority</th>
+ <td><display call="checklist('priority')"></td></tr>
+</property>
+<property name="assignedto">
+ <tr><th width="1%" align="right" class="location-bar">Assignedto</th>
+ <td><display call="field('assignedto')"></td></tr>
+</property>
+"""
+
+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>
+    </property>
+    <property name="activity">
+        <td valign="top"><display call="reldate('activity', pretty=1)"></td>
+    </property>
+    <property name="priority">
+        <td valign="top"><display call="plain('priority')"></td>
+    </property>
+    <property name="title">
+        <td valign="top"><display call="link('title')"></td>
+    </property>
+    <property name="status">
+        <td valign="top"><display call="plain('status')"></td>
+    </property>
+    <property name="assignedto">
+        <td valign="top"><display call="link('assignedto')"></td>
+    </property>
+</tr>
+"""
+
+issueDOTitem = """<!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
+<table border=0 cellspacing=0 cellpadding=2>
+
+<tr  bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Title</span></td>
+    <td colspan=3 class="form-text"><display call="field('title', size=80)"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Created</span></td>
+    <td class="form-text"><display call="reldate('creation', pretty=1)">
+        (<display call="plain('creator')">)</td>
+    <td width=1% nowrap align=right><span class="form-label">Last activity</span></td>
+    <td class="form-text"><display call="reldate('activity', pretty=1)"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Priority</span></td>
+    <td class="form-text"><display call="menu('priority')"></td>
+    <td width=1% nowrap align=right><span class="form-label">Status</span></td>
+    <td class="form-text"><display call="menu('status')"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Superseder</span></td>
+    <td class="form-text"><display call="field('superseder', size=40, showid=1)"></td>
+    <td width=1% nowrap align=right><span class="form-label">Nosy List</span></td>
+    <td class="form-text"><display call="field('nosy')"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Assigned To</span></td>
+    <td class="form-text"><display call="menu('assignedto')"></td>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Change Note</span></td>
+    <td colspan=3 class="form-text"><display call="note()"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">File</span></td>
+    <td colspan=3 class="form-text"><input type="file" name="__file" size="80"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td>&nbsp;</td>
+    <td colspan=3 class="form-text"><display call="submit()"></td>
+</tr>
+
+<tr class="msg-header">
+    <td colspan=4><b>Messages</b></td>
+</tr>
+<property name="messages">
+<tr>
+    <td colspan=4><display call="list('messages')"></td>
+</tr>
+</property>
+
+<tr class="file-header">
+  <td colspan=4><b>Files</b></td>
+</tr>
+<tr class="form-help">
+ <td colspan=4>
+   <a href="newfile?:multilink=issue<display
+call="plain('id')">:files">Attach a file to this issue</a>
+ </td>
+</tr>
+<property name="files">
+ <tr>
+     <td colspan=4><display call="list('files')"></td>
+ </tr>
+</property>
+
+<tr class="history-header">
+    <td colspan=4><b>History</b></td>
+</tr>
+<tr>
+    <td colspan=4><display call="history()"></td>
+</tr>
+
+</table>
+
+"""
+
+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>
+    </property>
+    <property name="author">
+        <td><display call="plain('author')"></td>
+    </property>
+    <property name="summary">
+        <td><display call="plain('summary')"></td>
+    </property>
+</tr>
+"""
+
+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">
+  <td colspan=2>Message Information</td>
+</td>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Author</span></td>
+    <td class="form-text"><display call="plain('author')"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Recipients</span></td>
+    <td class="form-text"><display call="plain('recipients')"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Date</span></td>
+    <td class="form-text"><display call="plain('date')"></td>
+</tr>
+
+<tr bgcolor="ffeaff">
+ <td colspan=2 class="form-text">
+  <pre><display call="plain('content')"></pre>
+ </td>
+</tr>
+
+<property name="files">
+<tr class="strong-header"><td colspan=2><b>Files</b></td></tr>
+<tr><td colspan=2><display call="list('files')"></td></tr>
+</property>
+
+<tr class="strong-header"><td colspan=2><b>History</b></td><tr>
+<tr><td colspan=2><display call="history()"></td></tr>
+
+</table>
+"""
+
+styleDOTcss = """h1 {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-size: 18pt; 
+  font-weight: bold; 
+}
+
+h2 {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-size: 16pt; 
+  font-weight: bold; 
+}
+
+h3 {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-size: 12pt; 
+  font-weight: bold; 
+}
+
+a:hover {  
+  font-family: Verdana, Helvetica, sans-serif; 
+  text-decoration: underline;
+  color: #333333; 
+}
+
+a:link {
+  font-family: Verdana, Helvetica, sans-serif; 
+  text-decoration: none;
+  color: #000099;
+}
+
+a {
+  font-family: Verdana, Helvetica, sans-serif; 
+  text-decoration: none;
+  color: #000099;
+}
+
+p {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 10pt;
+  color: #333333;
+}
+
+th {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-weight: bold;
+  font-size: 10pt; 
+  color: #333333;
+}
+
+.form-help {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 10pt;
+  color: #333333;
+}
+
+.std-text {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 10pt;
+  color: #333333;
+}
+
+.tab-small {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-size: 8pt; 
+  color: #333333;
+}
+
+.location-bar {
+  background-color: #44bb66;
+  color: #ffffff;
+  border: none;
+}
+
+.strong-header {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 12pt;
+  font-weight: bold;
+  background-color: #000000;
+  color: #ffffff;
+}
+
+.msg-header {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 12pt;
+  font-weight: bold;
+  background-color: #EE71AC;
+  color: #ffffff;
+}
+
+.file-header {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 12pt;
+  font-weight: bold;
+  background-color: #41BE62;
+  color: #ffffff;
+}   
+
+.history-header {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 12pt;
+  font-weight: bold;
+  background-color: #739DEE;
+  color: #ffffff;
+}
+
+.list-header {
+  background-color: #aaccff;
+  color: #000000;
+  border: none;
+}
+
+.list-item {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-size: 10pt; 
+}
+
+.list-nav {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-size: 10pt; 
+  font-weight: bold;
+}
+
+.row-normal {
+  background-color: #ffffff;
+  border: none;
+
+}
+
+.row-hilite {
+  background-color: #efefef;
+  border: none;
+}
+
+.row-unread {
+  background-color: #ffddd9;
+  border: none;
+}
+
+.row-in-progress {
+  background-color: #3ccc50;
+  border: none;
+}
+
+.row-resolved {
+  background-color: #aaccff;
+  border: none;
+}
+
+.row-done-cbb {
+  background-color: #aaccff;
+  border: none;
+}
+
+.row-testing {
+  background-color: #c6ddff;
+  border: none;
+}
+
+.row-need-eg {
+  background-color: #ffc7c0;
+  border: none;
+}
+
+.row-chatting {
+  background-color: #ffe3c0;
+  border: none;
+}
+
+.row-deferred {
+  background-color: #cccccc;
+  border: none;
+}
+
+.section-bar {
+  background-color: #707070;
+  color: #ffffff;
+  border: 1px solid #404040;
+}
+
+.system-msg {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-size: 10pt; 
+  background-color: #ffffff;
+  border:  1px solid #000000;
+  margin-bottom: 6px;
+  margin-top: 6px;
+  padding: 4px;
+  width: 100%;
+  color: #660033;
+}
+
+.form-title {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-weight: bold;
+  font-size: 12pt; 
+  color: #333333;
+}
+
+.form-label {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-weight: bold;
+  font-size: 10pt; 
+  color: #333333;
+}
+
+.form-optional {
+  font-family: Verdana, Helvetica, sans-serif; 
+  font-weight: bold;
+  font-style: italic;
+  font-size: 10pt; 
+  color: #333333;
+}
+
+.form-element {
+  font-family: Verdana, Helvetica, aans-serif;
+  font-size: 10pt;
+  color: #000000;
+}
+
+.form-text {
+  font-family: Verdana, Helvetica, sans-serif;
+  font-size: 10pt;
+  color: #333333;
+}
+
+.form-mono {
+  font-family: monospace;
+  font-size: 12px;
+  text-decoration: none;
+}
+"""
+
+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>
+    </property>
+    <property name="realname">
+        <td><display call="plain('realname')"></td>
+    </property>
+    <property name="organisation">
+        <td><display call="plain('organisation')"></td>
+    </property>
+    <property name="address">
+        <td><display call="plain('address')"></td>
+    </property>
+    <property name="phone">
+        <td><display call="plain('phone')"></td>
+    </property>
+</tr>
+"""
+
+userDOTitem = """<!-- dollarId: user.item,v 1.3 2002/02/15 07:08:44 richard Exp dollar-->
+<table border=0 cellspacing=0 cellpadding=2>
+
+<tr class="strong-header">
+  <td colspan=2>Your Details</td>
+</td>
+
+<tr  bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Name</span></td>
+    <td class="form-text"><display call="field('realname', size=40)"></td>
+</tr>
+<tr  bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Login Name</span></td>
+    <td class="form-text"><display call="field('username', size=40)"></td>
+</tr>
+<tr  bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Login Password</span></td>
+    <td class="form-text"><display call="field('password', size=10)"></td>
+</tr>
+<tr  bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Phone</span></td>
+    <td class="form-text"><display call="field('phone', size=40)"></td>
+</tr>
+<tr  bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Organisation</span></td>
+    <td class="form-text"><display call="field('organisation', size=40)"></td>
+</tr>
+<tr  bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">E-mail address</span></td>
+    <td class="form-text"><display call="field('address', size=40)"></td>
+</tr>
+<tr bgcolor="ffffea">
+    <td width=1% nowrap align=right><span class="form-label">Alternate
+    E-mail addresses</span><br>
+     <span class="form-help">One address per line</span></td>
+    <td class="form-text"><display call="multiline('alternate_addresses')"></td>
+</tr>
+
+<tr bgcolor="ffffea">
+    <td>&nbsp;</td>
+    <td class="form-text"><display call="submit()"></td>
+</tr>
+
+<tr class="strong-header">
+    <td colspan=2><b>History</b></td>
+</tr>
+<tr>
+    <td colspan=2><display call="history()"></td>
+</tr>
+
+</table>
+
+"""
+
diff --git a/roundup/templates/minimal/interfaces.py b/templates/classic/interfaces.py
similarity index 95%
rename from roundup/templates/minimal/interfaces.py
rename to templates/classic/interfaces.py
index 489699a..69f4048 100644
--- a/roundup/templates/minimal/interfaces.py
+++ b/templates/classic/interfaces.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: interfaces.py,v 1.2 2002-10-11 01:26:43 richard Exp $
+# $Id: interfaces.py,v 1.1 2003-04-17 03:26:03 richard Exp $
 
 from roundup import mailgw 
 from roundup.cgi import client
diff --git a/roundup/templates/minimal/.cvsignore b/templates/minimal/.cvsignore
similarity index 100%
rename from roundup/templates/minimal/.cvsignore
rename to templates/minimal/.cvsignore
diff --git a/templates/minimal/TEMPLATE-INFO.txt b/templates/minimal/TEMPLATE-INFO.txt
new file mode 100644
index 0000000..0cb35b5
--- /dev/null
+++ b/templates/minimal/TEMPLATE-INFO.txt
@@ -0,0 +1,8 @@
+Name: minimal
+Description: This is an empty tracker - it must be customised for it to be
+             useful! It only defines the bare minimum of information - the
+             user database and the two default users (admin and anonymous).
+             The rest is entirely up to you! Not recommended for first-time
+             Roundup users (it's easier to tweak the Classic tracker).
+Intended-For: Roundup experts who need a clean slate to start with.
+
diff --git a/roundup/templates/minimal/__init__.py b/templates/minimal/__init__.py
similarity index 94%
rename from roundup/templates/minimal/__init__.py
rename to templates/minimal/__init__.py
index 28e7663..fdc93c3 100644
--- a/roundup/templates/minimal/__init__.py
+++ b/templates/minimal/__init__.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.1 2002-09-26 04:15:07 richard Exp $
+# $Id: __init__.py,v 1.1 2003-04-17 03:27:27 richard Exp $
 
 import config
 from dbinit import open, init
diff --git a/roundup/templates/minimal/config.py b/templates/minimal/config.py
similarity index 98%
rename from roundup/templates/minimal/config.py
rename to templates/minimal/config.py
index f047fa1..e5e40f2 100644
--- a/roundup/templates/minimal/config.py
+++ b/templates/minimal/config.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: config.py,v 1.5 2003-01-12 00:41:27 richard Exp $
+# $Id: config.py,v 1.1 2003-04-17 03:27:27 richard Exp $
 
 import os
 
diff --git a/roundup/templates/minimal/dbinit.py b/templates/minimal/dbinit.py
similarity index 98%
rename from roundup/templates/minimal/dbinit.py
rename to templates/minimal/dbinit.py
index 4801f85..b1fb6a4 100644
--- a/roundup/templates/minimal/dbinit.py
+++ b/templates/minimal/dbinit.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: dbinit.py,v 1.3 2002-10-10 07:17:39 richard Exp $
+# $Id: dbinit.py,v 1.1 2003-04-17 03:27:27 richard Exp $
 
 import os
 
diff --git a/roundup/templates/minimal/detectors/.cvsignore b/templates/minimal/detectors/.cvsignore
similarity index 100%
rename from roundup/templates/minimal/detectors/.cvsignore
rename to templates/minimal/detectors/.cvsignore
diff --git a/roundup/templates/minimal/detectors/__init__.py b/templates/minimal/detectors/__init__.py
similarity index 96%
rename from roundup/templates/minimal/detectors/__init__.py
rename to templates/minimal/detectors/__init__.py
index 9ae5e06..e96d262 100644
--- a/roundup/templates/minimal/detectors/__init__.py
+++ b/templates/minimal/detectors/__init__.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: __init__.py,v 1.2 2003-02-20 07:04:55 richard Exp $
+#$Id: __init__.py,v 1.1 2003-04-17 03:27:56 richard Exp $
 
 import sys, os, imp
 
diff --git a/roundup/templates/minimal/html/_generic.help b/templates/minimal/html/_generic.help.html
similarity index 100%
rename from roundup/templates/minimal/html/_generic.help
rename to templates/minimal/html/_generic.help.html
diff --git a/roundup/templates/minimal/html/_generic.index b/templates/minimal/html/_generic.index.html
similarity index 100%
rename from roundup/templates/minimal/html/_generic.index
rename to templates/minimal/html/_generic.index.html
diff --git a/roundup/templates/minimal/html/_generic.item b/templates/minimal/html/_generic.item.html
similarity index 100%
rename from roundup/templates/minimal/html/_generic.item
rename to templates/minimal/html/_generic.item.html
diff --git a/roundup/templates/minimal/html/home.classlist b/templates/minimal/html/home.classlist.html
similarity index 100%
rename from roundup/templates/minimal/html/home.classlist
rename to templates/minimal/html/home.classlist.html
diff --git a/roundup/templates/minimal/html/home b/templates/minimal/html/home.html
similarity index 100%
rename from roundup/templates/minimal/html/home
rename to templates/minimal/html/home.html
diff --git a/roundup/templates/minimal/html/page b/templates/minimal/html/page.html
similarity index 100%
rename from roundup/templates/minimal/html/page
rename to templates/minimal/html/page.html
diff --git a/roundup/templates/minimal/html/style.css b/templates/minimal/html/style.css
similarity index 100%
rename from roundup/templates/minimal/html/style.css
rename to templates/minimal/html/style.css
diff --git a/roundup/templates/minimal/html/user.index b/templates/minimal/html/user.index.html
similarity index 100%
rename from roundup/templates/minimal/html/user.index
rename to templates/minimal/html/user.index.html
diff --git a/roundup/templates/minimal/html/user.item b/templates/minimal/html/user.item.html
similarity index 100%
rename from roundup/templates/minimal/html/user.item
rename to templates/minimal/html/user.item.html
diff --git a/roundup/templates/minimal/html/user.register b/templates/minimal/html/user.register.html
similarity index 100%
rename from roundup/templates/minimal/html/user.register
rename to templates/minimal/html/user.register.html
diff --git a/roundup/templates/classic/interfaces.py b/templates/minimal/interfaces.py
similarity index 95%
rename from roundup/templates/classic/interfaces.py
rename to templates/minimal/interfaces.py
index 82fd85f..e74ce46 100644
--- a/roundup/templates/classic/interfaces.py
+++ b/templates/minimal/interfaces.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: interfaces.py,v 1.16 2002-10-11 01:26:43 richard Exp $
+# $Id: interfaces.py,v 1.1 2003-04-17 03:27:27 richard Exp $
 
 from roundup import mailgw 
 from roundup.cgi import client
-- 
2.30.2