Ticket #3849: webadmin-genshi-titles.diff

perm.py

@@ -61 +61 @@
                 req.redirect(req.href.admin(cat, page))
         
         perms.sort()
-        data = {'actions': perm.get_actions(),
+        data = {'title': 'Admin: Permissions', 'actions': perm.get_actions(),
                 'perms': [{'subject': p[0], 'action': p[1], 'key': '%s:%s' % p}
                           for p in perms]}
         return 'admin_perm.html', data, None

ticket.py

@@ -51 +51 @@
 
             data = {'component': {'name': comp.name,
                                   'owner': comp.owner,
-                                  'description': comp.description}}
+                                  'description': comp.description},
+                    'title': 'Admin: %s component' % comp.name}
         else:
             if req.method == 'POST':
                 # Add Component
@@ -87 +88 @@
 
             default = self.config.get('ticket', 'default_component')
             data = {'components': ticket.Component.select(self.env),
-                    'default': default}
+                    'default': default, 'title': 'Admin: Components'}
             
         if self.config.getbool('ticket', 'restrict_owner'):
             perm = PermissionSystem(self.env)
@@ -142 +143 @@
                 elif req.args.get('cancel'):
                     req.redirect(req.href.admin(cat, page))
 
-            data = {'milestone': mil}
+            data = {'milestone': mil, 'title': 'Admin: %s milestone' % mil.name}
         else:
             if req.method == 'POST':
                 # Add Milestone
@@ -177 +178 @@
                         req.redirect(req.href.admin(cat, page))
 
             data = {'milestones': ticket.Milestone.select(self.env),
-                    'default': self.config.get('ticket', 'default_milestone')}
+                    'default': self.config.get('ticket', 'default_milestone'),
+                    'title': 'Admin: Milestones'}
 
         return 'admin_milestone.html', data, None
 
@@ -208 +210 @@
                     req.redirect(req.href.admin(cat, page))
                 elif req.args.get('cancel'):
                     req.redirect(req.href.admin(cat, page))
-            data = {'version': ver}
+            data = {'version': ver, 'title': 'Admin: %s version' % ver.name}
         else:
             if req.method == 'POST':
                 # Add Version
@@ -243 +245 @@
                         req.redirect(req.href.admin(cat, page))
 
             data = {'versions': ticket.Version.select(self.env),
-                    'default': self.config.get('ticket', 'default_version')}
+                    'default': self.config.get('ticket', 'default_version'),
+                    'title': 'Admin: Tickets'}
         return 'admin_version.html', data, None
 
 
@@ -264 +267 @@
     def process_admin_request(self, req, cat, page, path_info):
         req.perm.assert_permission('TICKET_ADMIN')
         data = {'label_singular': self._label[0],
-                'label_plural': self._label[1]}
+                'label_plural': self._label[1],
+                'title': 'Admin: %s' % self._label[1]}
         # Detail view?
         if path_info:
             enum = self._enum_cls(self.env, path_info)

basics.py

@@ -38 +38 @@
 
         data = {'project': {'name': self.config.get('project', 'name'),
                             'description': self.config.get('project', 'descr'),
-                            'url': self.config.get('project', 'url')}}
+                            'url': self.config.get('project', 'url')},
+                'title': 'Admin: Basic Settings'}
         return 'admin_basics.html', data, None

logging.py

@@ -94 +94 @@
 
         data = {'log': {'type': log_type, 'types': log_types,
                         'level': log_level, 'levels': log_levels,
-                        'file': log_file, 'dir': log_dir}}
+                        'file': log_file, 'dir': log_dir},
+                'title': 'Admin: Logging'}
 
         return 'admin_log.html', data, None