TracWebAdminDevelopment: 0-8-4-webadmin-patch-with-fixes.diff

htdocs/css/admin.css

@@ +1 @@
+
+td.targets {
+ padding-right: 2em;
+}
+
+#targets_nav ul {
+ padding: 0px;
+}
+
+#targets_nav ul li a {
+ list-style: none;
+ display: block;
+ padding: .25em .25em;
+ padding-left: 1em;
+ padding-right: 1em;
+}
+
+#targets_nav li.target {
+ list-style: none;
+ border: 1px solid transparent;
+}
+
+#targets_nav li.curr_target { 
+ list-style: none;
+ color: #000; 
+ background: #f7f7f7;
+ border: 1px solid #fb2;
+}
+
+span.curr_target {
+ color: red;
+}
+
+table.listing {
+ margin-top: 0;
+}
+
+.addnew {
+ text-align: center;
+ font-size: 85%;
+ font-weight: bold;
+ border solid 1px lightgray;
+}
+
+/* Styles for the editor form */
+#edit fieldset { margin: 1em 0 }
+#edit em { color: #888; font-size: smaller }
+#edit .disabled em { color: #d7d7d7 }
+#edit .field { margin-top: 1.3em }
+#edit label { padding-left: .2em }
+#edit textarea#description { width: 97% }

trac/core.py

@@ -59 +59 @@
-    'attachment'  : ('File', 'Attachment', 0),
-    'roadmap'     : ('Roadmap', 'Roadmap', 0),
-    'settings'    : ('Settings', 'Settings', 0),
-
+
+
-    }
-
-class TracFieldStorage(cgi.FieldStorage):
@@ -127 +128 @@
-        if match.group(1):
-            set_if_missing(args, 'id', urllib.unquote(match.group(1)))
-        return args
+#    match = re.search('^/admin(?:/([^\?]+))?(?:/(.*)/?)?', path_info)
+    match = re.search('^/admin/(general|ticket|user)(?:/([^\?]+))?(?:/(.*)/?)?', path_info)
+    if match:
+        set_if_missing(args, 'mode', 'admin')
+        if match.group(1):
+            set_if_missing(args, 'type', match.group(1))
+        if match.group(2):
+            set_if_missing(args, 'target', urllib.unquote_plus(match.group(2)))
+        return args
-    return args
-
-def parse_args(command, path_info, query_string,
@@ -230 +240 @@
-    hdf.setValue('trac.href.login', env.href.login())
-    hdf.setValue('trac.href.logout', env.href.logout())
-    hdf.setValue('trac.href.settings', env.href.settings())
+    hdf.setValue('trac.href.admin', env.href.admin('ticket', 'component'))
-    hdf.setValue('trac.href.homepage', 'http://trac.edgewall.com/')
-    hdf.setValue('trac.version', __version__)
-    hdf.setValue('trac.time', time.strftime('%c', time.localtime()))

trac/Admin.py

@@ +1 @@
+# -*- coding: iso8859-1 -*-
+#
+# Copyright (C) 2005 Edgewall Software
+# Copyright (C) 2005 Brad Anderson <brad@dsource.org>
+#
+# Trac is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# Trac is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# Author: Brad Anderson <brad@dsource.org>
+
+import time
+
+import perm
+import urllib
+import string
+from util import *
+from Module import Module
+
+
+
+class Admin(Module):
+    template_name = 'admin.cs'
+
+    def render(self):
+        
+        self.req.hdf.setValue('title', 'Admin')
+        
+        # Commented out general admin, as it does nothing
+        #if self.perm.has_permission(perm.TRAC_ADMIN):
+        #    self.req.hdf.setValue('admin.general_href',
+        #                     self.env.href.admin('general', None))
+        
+        if self.perm.has_permission(perm.TICKET_ADMIN):
+            self.req.hdf.setValue('admin.ticket_href',
+                             self.env.href.admin('ticket', 'component'))
+        
+        # Commented out user admin, as it does nothing
+        #if self.perm.has_permission(perm.TRAC_ADMIN):
+        #    self.req.hdf.setValue('admin.user_href',
+        #                     self.env.href.admin('user', 'users'))
+                             
+        type = self.args.get('type', 'ticket').lower()
+        self.req.hdf.setValue('admin.type', type)
+        self.req.hdf.setValue('admin.path', '/admin/%s/' % type)
+        
+        if type == 'general':
+            self.admin = AdminGeneral(self)
+        elif type == 'ticket':
+            self.admin = AdminTicket(self)
+        elif type == 'user':
+            self.admin = AdminUser(self)
+        
+        self.admin.render()
+        
+class AdminGeneral(Admin):
+    def __init__(self, admin_parent):
+        self.req = admin_parent.req
+    self.perm = admin_parent.perm
+        self.env = admin_parent.env
+        self.db = admin_parent.db
+        self.args = admin_parent.args
+    
+    def render (self):
+        self.perm.assert_permission(perm.TRAC_ADMIN)
+        
+    
+class AdminTicket(Admin):
+    def __init__(self, admin_parent):
+    self.req = admin_parent.req
+        self.perm = admin_parent.perm
+        self.env = admin_parent.env
+        self.db = admin_parent.db
+    self.args = admin_parent.args
+
+    def save_attrib(self, target, id):
+        self.perm.assert_permission(perm.TRAC_ADMIN)
+        if self.args.has_key('save'):
+            name = self.args.get('name', '')
+            if not name:
+                raise TracError('You must provide a name for the %s.' % target,
+                                'Required Field Missing')
+            
+            if id == '-1':
+                self.create_attrib(target, name)
+            else:
+                self.update_attrib(target, id, name)
+
+    def formatVal(self, val, fieldtype):
+        """formats the val parameter to be better suited (escaped) for SQL
+           strings to be executed by cursor.execute()"""
+        
+        self.env.log.debug("In formatVal, %s" % val)
+
+        # TODO: handle single and double quotes in val right here
+        
+        # check some things based on metadata, add quotes to val
+        if fieldtype == 'date':
+            if val == '':
+                val = '0'
+            else:
+                val = "%s" % parse_date(val)
+        elif fieldtype in ('string','wiki') and val == '':
+            val = 'null'
+        else:
+            val = "'%s'" % sql_escape(val)
+            
+        return val
+        
+    def create_attrib(self, target, name):
+        
+        self.perm.assert_permission(perm.TRAC_ADMIN)
+        cursor = self.db.cursor()
+        self.env.log.debug("Creating new %s '%s'" % (target, name))
+        
+        meta = self.get_attrib_metadata(target)
+        fields = meta[0]
+        types  = meta[1]
+        table  = meta[2]
+        where  = meta[3]
+        values = []
+        
+        # loop thru fields, getting values list
+    flds = zip(fields, types)
+        for f in flds:
+            # add to values
+            val = self.args.get(f[0], '')
+            formattedval = self.formatVal(val, f[1])
+        self.env.log.debug("create_attrib(): field=%s val=%s type=%s fmtd=%s" % (f[0], val, f[1], formattedval) )
+            values.append( formattedval )
+
+        # special case for enum
+        if table == "enum":
+            fields.insert(0, 'type')
+            values.insert(0, self.formatVal(target, 'string') )
+            
+        # self.env.log.debug("create_attrib() fields: %s" % fields)
+        # self.env.log.debug("create_attrib() values: %s" % values)
+       
+    fieldlist = string.join(fields, ',')
+        valueslist = string.join(values, ',')
+                    
+        # self.env.log.debug("create_attrib() fieldlist : %s" % (fieldlist))
+        # self.env.log.debug("create_attrib() valueslist: %s" % (valueslist))
+        
+        
+        sql = "INSERT INTO %s (%s) VALUES (%s)" % (table, fieldlist, valueslist)
+        self.env.log.debug("create_attrib() sql      : %s" % (sql))    
+        
+        cursor.execute(sql)
+        self.db.commit()
+        self.req.redirect(self.env.href.admin('ticket', target))
+
+    def update_attrib(self, target, id, name):
+        
+        self.perm.assert_permission(perm.TRAC_ADMIN)
+        cursor = self.db.cursor()
+        self.env.log.debug( "Updating %s '%s'" % (target,id) )
+
+        if self.args.has_key('save'):
+            self.env.log.info("Updating %s field of all tickets "
+                              "associated with %s '%s'" % (target, target, id) )
+            sql = "UPDATE ticket SET %s = '%s' WHERE %s = '%s'" % (target, sql_escape(name), target, sql_escape(id))
+            self.env.log.info("sql: %s" % sql)
+            cursor.execute(sql)
+            self.db.commit()
+
+            self.env.log.info("Updating %s '%s' to '%s'" % (target, id, name) )
+            meta = self.get_attrib_metadata(target)
+            fields = meta[0]
+            types  = meta[1]
+            table  = meta[2]
+            where  = meta[3]
+            set = ""
+            
+            flds = zip(fields,types)
+            for f in flds:
+                val = self.args.get(f[0], "")
+                val = self.formatVal(val, f[1])
+
+                self.env.log.debug( "update_attrib:  %s %s" % (f[0],val) )
+                set += ", %s=%s" % (f[0], val)
+            set = set[2:]
+            
+            if len(where) > 0:
+                where += " and "
+            where += "name='%s'" % sql_escape(id)
+            
+            sql = "update %s set %s where %s" % (table, set, where)
+            # raise TracError("save_attrib sql: '%s'" % sql)
+            cursor.execute(sql)
+            self.db.commit()
+            
+            cursor.close()
+            
+        self.req.redirect(self.env.href.admin('ticket', target))
+            
+    def delete_attrib(self, target, id):
+        self.perm.assert_permission(perm.TRAC_ADMIN)
+        
+        if self.args.has_key('delete'):
+            cursor = self.db.cursor()
+            if self.args.has_key('chk_retarget'):
+                retarget = self.args.get('retarget')
+                if retarget:
+                    self.env.log.info('Retargeting %s field of all '
+                        'tickets associated with %s=%s to %s=%s' % 
+                        (target, target, id, target, retarget))
+                    sql = "UPDATE ticket SET %s = '%s' WHERE %s = '%s'" % (target, sql_escape(retarget), target, sql_escape(id)) 
+                    self.env.log.debug("retarget SQL: %s" % sql)
+                    cursor.execute(sql)
+
+                else:
+                    self.env.log.info('Resetting %s field of all '
+                        'tickets associated with %s=%s' % (target, target, id))
+                    sql = "UPDATE ticket SET %s = NULL WHERE %s = '%s'" % (target, target, sql_escape(id))
+                    self.env.log.debug("sql: %s" % sql)
+                    cursor.execute(sql)
+
+
+            self.env.log.debug('Deleting %s %s' % (target, id))
+            meta = self.get_attrib_metadata(target)
+            table  = meta[2]
+            where  = meta[3]
+            
+            sql  = "DELETE FROM %s " % table
+            sql += "WHERE name = %s " % self.formatVal(id, 'string')
+            if where:
+                sql += "AND %s " % where
+            self.env.log.debug('delete_attrib - sql(delete from target '
+                               'table): %s' % (sql))
+            cursor.execute(sql)
+            self.db.commit()
+            
+        self.req.redirect(self.env.href.admin('ticket', target))
+        
+    # all of this info could be in the db as a metadata table
+    def get_attrib_metadata(self, target):
+        
+        if target == 'component':
+            fields = ['name', 'owner']
+            types = ['string', 'string']
+            table = 'component'
+            where = ''
+        elif target == 'version':
+            fields = ['name', 'time']
+            types = ['string', 'date']
+            table = 'version'
+            where = ''
+        elif target == 'severity' or target == 'priority' or \
+             target == 'status' or target == 'resolution':
+            fields = ['name', 'value']
+            types = ['string', 'string']
+            table='enum'
+            where='type = \'%s\'' % target
+        elif target == 'milestone':
+            fields = ['name', 'time', 'descr']
+            types = ['string', 'date', 'wiki']
+            table = 'milestone'
+            where = ''
+        
+        meta = (fields, types, table, where)
+        return meta
+                
+    def get_attrib_data(self, target, id):
+        self.env.log.debug("id 1 %s: " % id)
+        meta = self.get_attrib_metadata(target)
+        fields = meta[0]
+        types  = meta[1]
+        table  = meta[2]
+        where  = meta[3]
+
+        if id != -1:
+            sql_select = string.join(fields, ',')
+            sql = 'SELECT %s ' \
+                  'FROM %s ' \
+                  'WHERE name = \'%s\'' % (sql_select, table, sql_escape(id))
+            if where:
+                sql += ' and %s' % where
+            
+            self.env.log.debug("sql 1: %s" % sql)
+            
+            cursor = self.db.cursor()
+            cursor.execute(sql)
+            row = cursor.fetchone()
+            cursor.close()
+            if not row:
+                raise TracError('Attribute \'%s\' does not exist.' % id,
+                                'Invalid Attribute')
+                                
+            values = row
+        else:
+            # new attrib value, so fill values with blanks
+            values = []
+            for field in fields:
+                values.append('')
+        
+        return [values, fields, types]
+
+    def get_target_attributes(self, target='component'):
+        
+        sql_select = ''
+    
+        meta = self.get_attrib_metadata(target)
+        fields = meta[0]
+        types  = meta[1]
+        table  = meta[2]
+        where  = meta[3]
+        
+        sql_select = string.join(fields, ',')
+        sql = 'SELECT %s ' \
+              'FROM %s ' % (sql_select, table)
+        if where:
+            sql += 'WHERE %s' % where
+        
+        cursor = self.db.cursor()
+        cursor.execute(sql)
+        
+        # FIXME: fetchall should probably not be used.
+        info = cursor.fetchall()
+        cols = cursor.description
+
+        return [cols, info, types]
+
+
+    def render (self):
+        self.perm.assert_permission(perm.TICKET_ADMIN)
+        
+    target = self.args.get('target', 'component')
+        # to highlight the current target on page
+    add_to_hdf(target, self.req.hdf, 'admin.curr_target') 
+        # self.env.log.debug("admin target '%s'" % target)
+
+        action = self.args.get('action', 'view')
+
+        if self.args.has_key('id'):
+            id = urllib.unquote( self.args.get('id', '') )
+            
+        # self.env.log.debug("admin id '%s'" % id)
+
+        
+        if action == 'new':
+            self.render_editor(target, -1)
+        elif action == 'edit':
+            self.render_editor(target, id)
+        elif action == 'delete':
+            self.render_confirm(target, id)
+        elif action == 'commit_changes':
+            self.save_attrib(target, id)
+        elif action == 'confirm_delete':
+            self.delete_attrib(target, id)
+        else:
+            self.render_view(target)
+
+        # menu on left
+        targets = ['component', 'version', 'severity', 'priority', 'status',
+                   'resolution', 'milestone']
+        
+        # add custom fields to the list of targets for admin
+#  # Until they're moved into a db table and out of ini, don't bother with admin
+#        for f in get_custom_fields(self.env):
+#            if f['type'] == 'select' or f['type'] == 'radio':
+#                target = { 'name': f['name'] }
+#                targets.append(target)
+
+        add_to_hdf(targets, self.req.hdf, 'admin.targets')
+
+
+    def render_confirm(self, target, id):
+        
+        self.req.hdf.setValue('title', 'Attribute: %s' % id)
+        self.req.hdf.setValue('admin.mode', 'delete')        
+        
+        add_to_hdf(id, self.req.hdf, 'admin.attrib.name')
+
+        # get choices for retargeting
+        meta = self.get_attrib_metadata(target)
+        table  = meta[2]
+        where  = meta[3]
+                
+        cursor = self.db.cursor()
+        if where:
+            where = "AND %s" % where
+        else:
+            where = ""
+        sql = "SELECT name FROM %s WHERE name != '' %s " \
+              "ORDER BY name" % (table, where)
+        cursor.execute(sql)
+        retargets = []
+        retarget_no = 0
+        while 1:
+            row = cursor.fetchone()
+            if not row:
+                break
+            self.req.hdf.setValue('retargets.%d' % retarget_no, row['name'])
+            retarget_no += 1
+        cursor.close()
+
+    def render_editor(self, target, id=None):
+
+        data = []
+        [values, fields, types] = \
+            self.get_attrib_data(target, id)
+
+        for v, f, t in zip(values, fields, types):
+            if t == 'date':
+                if v == 0 or v == '':
+                    v = ''
+                else:
+                    v = time.strftime('%m/%d/%Y', time.localtime(v))
+            # self.env.log.debug("render_editor: value='%s', field='%s', type='%s'" % (v, f, t))
+            data.append( dict([('fieldname',f),('fieldtype',t),('value',v)]) )
+            
+        if id == -1:
+            self.req.hdf.setValue('title', 'New Attribute')
+            self.req.hdf.setValue('admin.mode', 'new')
+        else:
+            self.req.hdf.setValue('title', 'Attribute: %s' % id)
+            self.req.hdf.setValue('admin.mode', 'edit')
+        
+        add_to_hdf(data, self.req.hdf, 'admin.data')
+        add_to_hdf(id, self.req.hdf, 'admin.attrib.name')
+        add_to_hdf(get_date_format_hint(), self.req.hdf, 'admin.attrib.date_hint')
+
+    def render_view(self, target):
+
+        self.req.hdf.setValue('admin.mode', 'view')
+
+        try:
+            [self.cols, self.rows, self.types] = \
+                self.get_target_attributes(target)
+        except Exception, e:
+            self.error = e
+            self.req.hdf.setValue('attrib.message',
+                                  'Attribute data error: %s' % e)
+            return None
+
+        # Convert the header info to HDF-format
+        idx = 0
+        for col in self.cols:
+            title=col[0].capitalize()
+            prefix = 'attrib.headers.%d' % idx
+            self.req.hdf.setValue('%s.real' % prefix, col[0])
+            self.req.hdf.setValue(prefix, title)
+            
+            idx = idx + 1
+
+        # Convert the rows and cells to HDF-format
+        row_idx = 0
+        for row in self.rows:
+            col_idx = 0
+            numrows = len(row)
+            for cell in row:
+                cell = str(cell)
+                column = self.cols[col_idx][0]
+                type = self.types[col_idx]
+                value = {}
+                value['type'] = type
+                
+                if type == 'date' and cell != 'None' and cell != '0':
+                    t = time.localtime(int(cell))
+                    value['date'] = time.strftime('%m/%d/%Y', t)
+                    value['time'] = time.strftime('%X', t)
+                    value['datetime'] = time.strftime('%c', t)
+                    value['gmt'] = time.strftime('%a, %d %b %Y %H:%M:%S GMT',
+                                                 time.gmtime(int(cell)))
+                        
+                prefix = 'attrib.items.%d.%s' % (row_idx, str(column))
+                self.req.hdf.setValue(prefix, escape(str(cell)))
+                for key in value.keys():
+                    self.req.hdf.setValue(prefix + '.' + key, str(value[key]))
+
+                col_idx += 1
+            row_idx += 1
+        self.req.hdf.setValue('attrib.numrows', str(row_idx))
+
+class AdminUser(Admin):
+    def __init__(self, admin_parent):
+        self.req = admin_parent.req
+    self.perm = admin_parent.perm
+        self.env = admin_parent.env
+        self.db = admin_parent.db
+        self.args = admin_parent.args
+
+    def render (self):
+        self.perm.assert_permission(perm.TRAC_ADMIN)

trac/Milestone.py

@@ -114 +114 @@
-                datestr = self.args.get('date', '')
-                date = 0
-                if datestr:
-self.
+
-            descr = self.args.get('descr', '')
-            if not id:
-                self.create_milestone(name, date, descr)
@@ -125 +125 @@
-        else:
-            self.req.redirect(self.env.href.roadmap())
-
-    def parse_date(self, datestr):
-        seconds = None
-        datestr = datestr.strip()
-        for format in ['%x %X', '%x, %X', '%X %x', '%X, %x', '%x', '%c',
-                       '%b %d, %Y']:
-            try:
-                date = time.strptime(datestr, format)
-                seconds = time.mktime(date)
-                break
-            except ValueError:
-                continue
-        if seconds == None:
-            raise TracError('%s is not a known date format.' % datestr,
-                            'Invalid Date Format')
-        return seconds
-
-    def create_milestone(self, name, date=0, descr=''):
-        self.perm.assert_permission(perm.MILESTONE_CREATE)
-        if not name:

trac/util.py

@@ -128 +128 @@
-    Escapes the given string so that it can be safely used in an SQL
-    statement
-    """
-.replace("\\", "\\\\")
+
-
-def add_to_hdf(obj, hdf, prefix):
-    """
@@ -273 +273 @@
-               .replace('29', 'DD', 1).replace('10', 'MM')
-
-
+def parse_date(datestr):
+    seconds = None
+    datestr = datestr.strip()
+    for format in ['%m/%d/%Y', '%x', '%x %X', '%x, %X', '%X %x', '%X, %x', '%x', '%c',
+                   '%b %d, %Y']:
+        try:
+            date = time.strptime(datestr, format)
+            seconds = time.mktime(date)
+            break
+        except ValueError:
+            continue
+    if seconds == None:
+        raise TracError('%s is not a known date format.' % datestr,
+                        'Invalid Date Format')
+    return seconds
+
-class TracError(Exception):
-    def __init__(self, message, title=None, show_traceback=0):
-        Exception.__init__(self, message)

trac/Href.py

@@ -97 +97 @@
-            href = href + '?show=' + show
-        return href
-
+    def admin(self, type, target):
+        if target == None:
+            target=''
+        href = href_join(self.base, 'admin/%s/%s' % (type, target))
+        return href
+
-    def milestone(self, milestone, action=None):
-        params = []
-        if milestone:

templates/admin.cs

@@ +1 @@
+<?cs set:html.stylesheet = 'css/admin.css' ?>
+<?cs include "header.cs"?>
+<?cs include "macros.cs"?>
+
+<div id="ctxtnav" class="nav">
+ <h2>Admin Navigation</h2>
+ <ul>
+  <?cs if:admin.general_href ?>
+   <li><a href="<?cs var:admin.general_href ?>">General Settings</a></li>
+  <?cs /if ?>
+  <?cs if:admin.ticket_href ?>
+   <li><a href="<?cs var:admin.ticket_href ?>">Ticket Attributes</a></li>
+  <?cs /if ?>
+  <?cs if:admin.user_href ?>
+   <li class="last"><a href="<?cs var:admin.user_href ?>">User Management</a></li>
+  <?cs /if ?>
+ </ul>
+</div>
+
+<?cs if:admin.type == "general" ?>
+ <?cs include:"admin-general.cs" ?>
+<?cs elif:admin.type == "ticket" ?>
+ <?cs include:"admin-ticket.cs" ?>
+<?cs elif:admin.type == "user" ?>
+ <?cs include:"admin-user.cs" ?>
+<?cs /if ?>
+
+
+<div id="help">
+ <strong>Note:</strong> See <a href="<?cs
+   var:trac.href.wiki ?>/TracWebAdmin">TracWebAdmin</a>
+   for help on using the administration pages.
+</div>
+
+
+<?cs include:"footer.cs"?>

templates/header.cs

@@ -115 +115 @@
-  call:navlink("New Ticket", trac.href.newticket, "newticket",
-               trac.acl.TICKET_CREATE, "7") ?><?cs
-  call:navlink("Search", trac.href.search, "search",
-
+
+
+
-</div>
-
-<div id="main">

templates/admin-general.cs

@@ +1 @@
+<div id="content" class="admin">
+    <h1>General Settings</h1>
+
+</div>

templates/admin-user.cs

@@ +1 @@
+<div id="content" class="admin">
+    <h1>User Management</h1>
+
+</div>

templates/admin-ticket.cs

@@ +1 @@
+<div id="content" class="admin">
+    <h1>Ticket Attributes</h1>
+ <table class="admin">
+  <tr>
+   <td class="targets" valign="top">
+    <h3>Edit attributes of type:</h3>
+    <div id="targets_nav">
+     <ul><?cs each:target = admin.targets ?>
+      <li class="<?cs if:target == admin.curr_target ?>curr_target<?cs 
+       else ?>target<?cs /if ?>">
+       <a href="<?cs var:cgi_location ?><?cs var:admin.path ?><?cs 
+       var:target ?>"><?cs var:target ?></a>
+      </li><?cs /each ?>
+     </ul>
+    </div>
+   </td>
+   <td class="attribs" valign="top">
+    <?cs if:admin.mode == "view" ?>
+     <h3>Attributes of type: 
+      <span class="curr_target"><?cs var:admin.curr_target ?></span>
+     </h3>
+     
+     <?cs if attrib.message ?>
+      <div class="error"><?cs var attrib.message ?></div>
+     <?cs else ?>
+      <a class="addnew" href="<?cs 
+       var:cgi_location ?><?cs var:admin.path ?><?cs var:admin.curr_target
+       ?>?action=new">add new <?cs var:admin.curr_target ?></a>
+      <?cs def:attrib_hdr(header) ?>
+      
+      <table id="attriblist" class="listing" style="margin-top: 0.5em;">
+       <thead>
+        <tr>
+         <?cs set numcols = #0 ?>
+         <?cs each header = attrib.headers ?>
+          <?cs if $header ?>
+           <th><?cs var:header ?></th>
+          <?cs /if ?>
+          <?cs set numcols = numcols + #1 ?>
+         <?cs /each ?>
+         <th colspan="2"></th>
+        </tr>
+       </thead>
+      <?cs /def ?>
+ 
+      <?cs def:attrib_cell(class,contents) ?>
+       <td class="<?cs var:$class ?>">
+        <?cs if $contents.type == "date" ?>
+         <?cs var:$contents.date ?>
+        <?cs else ?>
+         <?cs var:$contents ?>
+        <?cs /if ?>
+        
+       </td>
+       <?cs set col = $col + #1 ?>
+      <?cs /def ?>
+     <?cs /if ?>
+      <?cs set idx = #0 ?>
+      <?cs set group = '' ?>
+ 
+
+      <?cs each row = attrib.items ?>
+       <?cs if group != row.__group__ || idx == #0 ?>
+         <?cs if:idx != #0 ?></tbody><?cs /if ?>
+         <?cs set group = row.__group__ ?>
+         <?cs call:attrib_hdr(group) ?>
+         <tbody>
+       <?cs /if ?>
+
+       <?cs set rstem='' ?>
+       <?cs if idx % #2 ?>
+         <?cs set row_class=$rstem+'even' ?>
+       <?cs else ?>
+         <?cs set row_class=$rstem+'odd' ?>
+       <?cs /if ?>
+
+       <tr class="<?cs var: row_class ?>">
+       <?cs set idx = idx + #1 ?>
+       <?cs set col = #0 ?>
+       <?cs each cell = row ?>
+        <?cs if $col == 0 ?>
+         <?cs set link = $cell ?>
+        <?cs /if ?>
+        <?cs call:attrib_cell(name(cell), $cell) ?>
+       <?cs /each ?>
+       <td><a href="<?cs var:cgi_location ?><?cs var:admin.path ?><?cs
+        var:admin.curr_target ?>?id=<?cs var:link ?>&action=edit">edit
+        </a></td>
+       <td><a href="<?cs var:cgi_location ?><?cs var:admin.path ?><?cs
+        var:admin.curr_target ?>?id=<?cs var:link ?>&action=delete">delete
+        </a></td>
+       </tr>
+     <?cs /each ?>
+    </tbody>
+   </table>
+  <?cs if attrib.numrows > 20 ?>
+    <a class="addnew" href="<?cs 
+     var:cgi_location ?><?cs var:admin.path ?><?cs var:admin.curr_target
+     ?>?action=new">add new <?cs var:admin.curr_target ?></a>
+  <?cs /if ?>
+  
+  
+    <?cs elif:admin.mode == "edit" || admin.mode == "new" ?>
+    <h3><?cs var:admin.mode ?> <?cs var:admin.curr_target ?>: <span 
+     class="curr_target">
+     <?cs if:admin.mode == "edit" ?><?cs var:admin.attrib.name ?><?cs /if ?>
+     </span>
+    </h3>
+            <form id="edit" action="<?cs var:cgi_location ?>" method="post">
+            <input type="hidden" name="mode" value="admin" />
+            <input type="hidden" name="target" value="<?cs 
+             var:admin.curr_target ?>" />
+            <input type="hidden" name="id" value="<?cs 
+             var:admin.attrib.name ?>" />
+            <input type="hidden" name="action" value="commit_changes" />
+      <?cs each:fld = admin.data ?>
+       <div class="field">
+        <fieldset class="iefix">
+         <label for="<?cs var:fld.fieldname ?>"><?cs var:fld.fieldname ?><?cs if 
+          fld.fieldtype == "wiki" ?> (you may use <a tabindex="42" href="<?cs
+          var:trac.href.wiki ?>/WikiFormatting">WikiFormatting</a> here):<?cs 
+          /if ?></label><br />
+         <?cs if fld.fieldtype == "string" ?>
+          <input type="text" 
+           id="<?cs var:fld.fieldname ?>" 
+           name="<?cs var:fld.fieldname ?>" 
+           size="32" 
+           value="<?cs var:fld.value ?>" />
+         <?cs elif fld.fieldtype == "date" ?>
+          <input type="text" 
+           id="<?cs var:fld.fieldname ?>" 
+           name="<?cs var:fld.fieldname ?>" 
+           size="32" 
+           value="<?cs var:fld.value ?>" />
+           <em>Format: <?cs var:admin.attrib.date_hint ?></em>
+         <?cs elif fld.fieldtype == "wiki" ?>
+          <textarea 
+           id="<?cs var:fld.fieldname ?>" 
+           name="<?cs var:fld.fieldname ?>" 
+           class="wikitext" 
+           rows="10" cols="78"><?cs var:fld.value ?></textarea>
+         <?cs else ?>
+          invalid type
+         <?cs /if ?>
+        </fieldset>
+       </div>
+      <?cs /each ?>
+      <div class="buttons">
+       <?cs if:admin.mode == "new"
+        ?><input type="submit" name="save" value="Add Attribute" /><?cs
+       else
+        ?><input type="submit" name="save" value="Save Changes" /><?cs
+       /if ?>
+       <input type="submit" name="cancel" value="Cancel" />
+       <?cs if:admin.mode == "edit" ?>
+        <p>Note: Changing the field 'name' will result in all tickets with that
+          attribute being updated to the new value.</p><?cs /if ?>
+      </div>
+      <script type="text/javascript" src="<?cs
+       var:htdocs_location ?>js/wikitoolbar.js"></script>       
+     </form>
+    <?cs elif:admin.mode == "delete" ?>
+    <form id="delete" action="<?cs var:cgi_location ?>" method="post">
+     <input type="hidden" name="mode" value="admin" />
+         <input type="hidden" name="target" value="<?cs 
+          var:admin.curr_target ?>" />
+         <input type="hidden" name="id" value="<?cs var:admin.attrib.name ?>" />
+         <input type="hidden" name="action" value="confirm_delete" />
+     <p><strong>Are you sure you want to delete <?cs var:admin.curr_target ?>:
+      <?cs var:admin.attrib.name ?>?</strong></p>
+     <input type="checkbox" id="chk_retarget" name="chk_retarget" 
+      checked="checked"
+      onclick="enableControl('target', this.checked)"/>
+     <label for="retarget">Retarget associated tickets to 
+      <?cs var:admin.curr_target ?></label>
+     <select name="retarget" id="retarget">
+      <option value="">None</option><?cs
+       each:other = retargets ?><?cs if:other != admin.attrib.name ?>
+        <option><?cs var:other ?></option><?cs 
+       /if ?><?cs /each ?>
+     </select>
+     <div class="buttons">
+      <input type="submit" name="cancel" value="Cancel" />
+      <input type="submit" name="delete" value=
+       "Delete <?cs var:admin.curr_target ?>" />
+     </div>
+    </form>
+    <?cs /if ?>
+   </td>
+  </tr>
+ </table>
+
+
+
+
+</div>