Index: trac/attachment.py =================================================================== --- trac/attachment.py (revision 3821) +++ trac/attachment.py (working copy) @@ -34,7 +34,6 @@ from trac.web import HTTPBadRequest, IRequestHandler from trac.web.chrome import add_link, add_stylesheet, INavigationContributor from trac.wiki.api import IWikiSyntaxProvider -from trac.wiki.formatter import wiki_to_html, wiki_to_oneliner class InvalidAttachment(TracError): @@ -254,29 +253,6 @@ return fd -# Templating utilities - -def attachments_data(env, req, db, parent_type, parent_id): - return [attachment_data(env, req, db, attachment) for attachment - in Attachment.select(env, parent_type, parent_id, db)] - -def attachment_data(env, req, db, attachment): - # FIXME: pretty close to the attachment itself... so pass directly - # the attachment - if not db: - db = env.get_db_cnx() - description = wiki_to_oneliner(attachment.description, env, db) - return { - 'filename': attachment.filename, - 'description': Markup(description.strip()), - 'author': attachment.author, - 'ipnr': attachment.ipnr, - 'size': attachment.size, - 'date': attachment.time, - 'href': attachment.href(req) - } - - class AttachmentModule(Component): implements(IEnvironmentSetupParticipant, IRequestHandler, @@ -363,8 +339,8 @@ data = { 'mode': 'list', 'parent': parent_data(parent_type, last_segment), - 'attachments': attachments_data(self.env, req, None, - parent_type, last_segment), + 'attachments': Attachment.select(self.env, + parent_type, last_segment) } return 'attachment.html', data, None if not last_segment: @@ -426,15 +402,7 @@ self.get_history(start, stop, type): title = html(html.EM(os.path.basename(filename)), ' attached to ', display(id)) - if format == 'rss': - descr = wiki_to_html(descr or '--', self.env, req, db, - absurls=True) - href = req.abs_href - else: - descr = wiki_to_oneliner(descr, self.env, db, shorten=True) - title += Markup(' by %s', author) - href = req.href - yield('attachment', href.attachment(type, id, filename), title, + yield('attachment', req.href.attachment(type, id, filename), title, time, author, descr) # Internal methods @@ -533,14 +501,8 @@ req.check_modified(attachment.time) - # Render HTML view - att_data = attachment_data(self.env, req, None, attachment) - # Override the 'oneliner' - att_data['description'] = wiki_to_html(attachment.description, - self.env, req) - data = {'mode': 'view', 'title': attachment.title, - 'attachment': att_data} + 'attachment': attachment} perm_map = {'ticket': 'TICKET_ADMIN', 'wiki': 'WIKI_DELETE'} if req.perm.has_permission(perm_map[attachment.parent_type]): Index: trac/ticket/web_ui.py =================================================================== --- trac/ticket/web_ui.py (revision 3821) +++ trac/ticket/web_ui.py (working copy) @@ -19,7 +19,7 @@ from StringIO import StringIO import time -from trac.attachment import attachments_data, Attachment, AttachmentModule +from trac.attachment import Attachment, AttachmentModule from trac.config import BoolOption, Option from trac.core import * from trac.ticket import Milestone, Ticket, TicketSystem, ITicketManipulator @@ -31,8 +31,8 @@ from trac.web import IRequestHandler from trac.web.chrome import add_link, add_stylesheet, INavigationContributor, \ Chrome -from trac.wiki import wiki_to_html, wiki_to_oneliner from trac.mimeview.api import Mimeview, IContentConverter +from trac.wiki import wiki_to_html, wiki_to_oneliner class InvalidTicket(TracError): @@ -107,10 +107,6 @@ ticket.values['reporter'] = get_reporter_id(req, 'reporter') data['ticket'] = ticket - if 'description' in ticket.values: - description = wiki_to_html(ticket['description'], self.env, req, db) - data['preview'] = description - field_names = [field['name'] for field in ticket.fields if not field.get('custom')] if 'owner' in field_names: @@ -265,8 +261,7 @@ comment = req.args.get('comment') if comment: data['comment'] = comment - # Wiki format a preview of comment - data['preview'] = wiki_to_html(comment, self.env, req, db) + data['preview'] = True else: data['reassign_owner'] = req.authname # Store a timestamp in order to detect "mid air collisions" @@ -445,9 +440,6 @@ change_summary = {} # wikify comment if 'comment' in change: - comment = change['comment'] - change['comment'] = unicode(wiki_to_html( - comment, self.env, req, db, absurls=True)) change_summary['added'] = ['comment'] for field, values in change['fields'].iteritems(): if field == 'description': @@ -462,12 +454,7 @@ change['title'] = '; '.join(['%s %s' % (', '.join(v), k) for k, v \ in change_summary.iteritems()]) - data = { - 'id': ticket.id, - 'description': wiki_to_html(ticket['description'], self.env, req, - db, absurls=True), - 'changes': changes, - } + data = {'ticket': ticket, 'changes': changes} template = Chrome(self.env).load_template('ticket.rss', req, data) return template.generate(**data).render('xml'), 'application/rss+xml' @@ -558,8 +545,6 @@ data['fields'].append(field) data['reporter_id'] = reporter_id - data['description'] = wiki_to_html(ticket['description'], self.env, req, - db) # FIXME: get rid of this once datetime branch is merged data['opened'] = ticket.time_created @@ -587,7 +572,6 @@ comment = '' if 'comment' in change: comment = change['comment'] - change['comment'] = wiki_to_html(comment, self.env, req, db) if change['permanent']: cnum = change['cnum'] # keep track of replies threading @@ -611,8 +595,8 @@ # -- Ticket Attachments - data['attachments'] = attachments_data(self.env, req, db, 'ticket', - ticket.id) + data['attachments'] = Attachment.select(self.env, 'ticket', ticket.id, + db) if req.perm.has_permission('TICKET_APPEND'): data['attach_href'] = req.href.attachment('ticket', ticket.id) Index: trac/ticket/report.py =================================================================== --- trac/ticket/report.py (revision 3821) +++ trac/ticket/report.py (working copy) @@ -27,7 +27,7 @@ from trac.util.html import html from trac.web.api import IRequestHandler, RequestDone from trac.web.chrome import add_link, add_stylesheet, INavigationContributor -from trac.wiki import wiki_to_html, IWikiSyntaxProvider, Formatter +from trac.wiki import IWikiSyntaxProvider, Formatter class ReportModule(Component): @@ -232,12 +232,8 @@ title = '{%i} %s' % (id, title) data = {'action': 'view', 'title': title, - 'report': - {'id': id, 'title': title, - 'description': wiki_to_html(description, self.env, req, db, - absurls=(format == 'rss')), - 'can': perms}} - + 'report': {'id': id, 'title': title, + 'description': description, 'can': perms}} try: cols, results = self.execute_report(req, db, id, sql, args) except Exception, e: @@ -318,10 +314,7 @@ row['id'] = value # Special casing based on column name col = col.strip('_') - if col == 'description': - cell['parsed'] = wiki_to_html(value, self.env, req, db, - absurls=(format == 'rss')) - elif col == 'reporter': + if col == 'reporter': if '@' in value: cell['author'] = value elif value in email_map: Index: trac/ticket/roadmap.py =================================================================== --- trac/ticket/roadmap.py (revision 3821) +++ trac/ticket/roadmap.py (working copy) @@ -29,7 +29,7 @@ from trac.Timeline import ITimelineEventProvider from trac.web import IRequestHandler from trac.web.chrome import add_link, add_stylesheet, INavigationContributor -from trac.wiki import wiki_to_html, wiki_to_oneliner, IWikiSyntaxProvider +from trac.wiki import IWikiSyntaxProvider def get_tickets_for_milestone(env, db, milestone, field='component'): @@ -87,14 +87,14 @@ } def milestone_to_hdf(env, db, req, milestone): + ### FIXME: should use the Milestone object directly safe_name = None if milestone.exists: safe_name = milestone.name.replace('/', '%2F') hdf = {'name': milestone.name, 'exists': milestone.exists, 'href': req.href.milestone(safe_name)} if milestone.description: - hdf['description_source'] = milestone.description - hdf['description'] = wiki_to_html(milestone.description, env, req, db) + hdf['description'] = milestone.description if milestone.due: hdf['due'] = milestone.due hdf['due_date'] = format_date(milestone.due) @@ -317,15 +317,7 @@ (start, stop,)) for completed, name, description in cursor: title = Markup('Milestone %s completed', name) - if format == 'rss': - href = req.abs_href.milestone(name) - message = wiki_to_html(description, self.env, req, db, - absurls=True) - else: - href = req.href.milestone(name) - message = wiki_to_oneliner(description, self.env, db, - shorten=True) - yield 'milestone', href, title, completed, None, message or '--' + yield 'milestone', href, title, completed, None, description # IRequestHandler methods Index: trac/ticket/query.py =================================================================== --- trac/ticket/query.py (revision 3821) +++ trac/ticket/query.py (working copy) @@ -29,7 +29,6 @@ from trac.web.chrome import add_link, add_script, add_stylesheet, \ INavigationContributor, Chrome from trac.wiki.api import IWikiSyntaxProvider, parse_args -from trac.wiki.formatter import wiki_to_html, wiki_to_oneliner from trac.wiki.macros import WikiMacroBase # TODO: should be moved in .api from trac.mimeview.api import Mimeview, IContentConverter @@ -405,13 +404,7 @@ groups.setdefault(value, []).append(ticket) if not groupsequence or groupsequence[-1] != value: groupsequence.append(value) - if field == 'time': - ticket[field] = value - elif field == 'description': - ticket[field] = \ - wiki_to_html(value or '', self.env, req, db) - else: - ticket[field] = value + ticket[field] = value groupsequence = [(value, groups[value]) for value in groupsequence] return {'query': self, @@ -639,10 +632,6 @@ for result in results: if result['reporter'].find('@') == -1: result['reporter'] = '' - if result['description']: - result['description'] = wiki_to_html(result['description'], - self.env, req, db, - absurls=True) query_href = req.abs_href.query(group=query.group, groupdesc=query.groupdesc and 1 or None, verbose=query.verbose and 1 or None, Index: trac/versioncontrol/web_ui/util.py =================================================================== --- trac/versioncontrol/web_ui/util.py (revision 3821) +++ trac/versioncontrol/web_ui/util.py (working copy) @@ -24,7 +24,6 @@ from trac.util.html import escape, html, Markup from trac.util.text import shorten_line from trac.versioncontrol.api import NoSuchNode, NoSuchChangeset -from trac.wiki import wiki_to_html, wiki_to_oneliner __all__ = ['get_changes', 'get_path_links', 'get_path_rev_line', 'get_existing_node', 'render_node_property'] @@ -41,33 +40,24 @@ wiki_format = env.config['changeset'].getbool('wiki_format_messages') message = changeset.message or '--' - absurls = (format == 'rss') - if wiki_format: - shortlog = wiki_to_oneliner(message, env, db, - shorten=True, absurls=absurls) - else: + if not wiki_format: shortlog = Markup.escape(shorten_line(message)) + else: + shortlog = message if full: - if wiki_format: - message = wiki_to_html(message, env, req, db, - absurls=absurls, escape_newlines=True) - else: + if not wiki_format: message = html.PRE(message) else: message = shortlog - if format == 'rss': - if isinstance(shortlog, Markup): - shortlog = u' '.join(shortlog.striptags().splitlines()) - message = unicode(message) - changes[rev] = { 'date_seconds': changeset.date, 'date': format_datetime(changeset.date), 'age': pretty_timedelta(changeset.date), 'author': changeset.author or 'anonymous', - 'message': message, 'shortlog': shortlog, + 'message': message, + 'shortlog': shortlog, } return changes Index: trac/versioncontrol/web_ui/changeset.py =================================================================== --- trac/versioncontrol/web_ui/changeset.py (revision 3821) +++ trac/versioncontrol/web_ui/changeset.py (working copy) @@ -39,8 +39,7 @@ from trac.versioncontrol.web_ui.util import render_node_property from trac.web import IRequestHandler, RequestDone from trac.web.chrome import INavigationContributor, add_link, add_stylesheet -from trac.wiki import wiki_to_html, wiki_to_oneliner, IWikiSyntaxProvider, \ - Formatter +from trac.wiki import IWikiSyntaxProvider, Formatter class ChangesetModule(Component): @@ -202,10 +201,7 @@ if chgset: chgset = repos.get_changeset(new) message = chgset.message or '--' - if self.wiki_format_messages: - message = wiki_to_html(message, self.env, req, - escape_newlines=True) - else: + if not self.wiki_format_messages: message = html.PRE(message) req.check_modified(chgset.date, [ style, ''.join(options), repos.name, @@ -293,10 +289,9 @@ title = _changeset_title(rev) properties = [] for name, value, wikiflag, htmlclass in chgset.get_properties(): - if wikiflag: - value = wiki_to_html(value or '', self.env, req) properties.append({'name': name, 'value': value, - 'htmlclass': htmlclass}) + 'htmlclass': htmlclass, + 'wiki_formatting': wikiflag}) data['changeset'] = { 'revision': chgset.rev, @@ -619,19 +614,13 @@ repos = self.env.get_repository(req.authname) for chgset in repos.get_changesets(start, stop): message = chgset.message or '--' - if wiki_format: - shortlog = wiki_to_oneliner(message, self.env, db, - shorten=True) - else: + if not wiki_format: shortlog = shorten_line(message) if format == 'rss': title = Markup('Changeset [%s]: %s', chgset.rev, shortlog) href = req.abs_href.changeset(chgset.rev) - if wiki_format: - message = wiki_to_html(message, self.env, req, db, - absurls=True) - else: + if not wiki_format: message = html.PRE(message) else: title = Markup('Changeset [%s] by %s', chgset.rev, @@ -639,14 +628,13 @@ href = req.href.changeset(chgset.rev) if wiki_format: + # FIXME: if self.timeline_long_messages: - message = wiki_to_html(message, self.env, req, db, - absurls=True) - else: - message = wiki_to_oneliner(message, self.env, db, - shorten=True) + pass + # FIXME: should set the shorten flag on the event, + # see timeline.html else: - message = shortlog + message = Markup.escape(shortlog) if show_files and req.perm.has_permission('BROWSER_VIEW'): files = [] Index: trac/versioncontrol/web_ui/browser.py =================================================================== --- trac/versioncontrol/web_ui/browser.py (revision 3821) +++ trac/versioncontrol/web_ui/browser.py (working copy) @@ -27,11 +27,11 @@ from trac.util import sorted, embedded_numbers from trac.util.datefmt import http_date from trac.util.html import escape, html, Markup -from trac.web import IRequestHandler, RequestDone -from trac.web.chrome import add_link, add_stylesheet, INavigationContributor -from trac.wiki import wiki_to_html, IWikiSyntaxProvider from trac.versioncontrol.api import NoSuchChangeset from trac.versioncontrol.web_ui.util import * +from trac.web.api import IRequestHandler, RequestDone +from trac.web.chrome import add_link, add_stylesheet, INavigationContributor +from trac.wiki.api import IWikiSyntaxProvider CHUNK_SIZE = 4096 @@ -204,10 +204,7 @@ changeset = repos.get_changeset(node.rev) message = changeset.message or '--' - if self.config['changeset'].getbool('wiki_format_messages'): - message = wiki_to_html(message, self.env, req, - escape_newlines=True) - else: + if not self.config['changeset'].getbool('wiki_format_messages'): message = html.PRE(message) # add ''Plain Text'' alternate link if needed Index: trac/About.py =================================================================== --- trac/About.py (revision 3821) +++ trac/About.py (working copy) @@ -95,10 +95,9 @@ def _render_plugins(self, req): try: - from trac.wiki.formatter import wiki_to_html import inspect def getdoc(obj): - return wiki_to_html(inspect.getdoc(obj), self.env, req) + return inspect.getdoc(obj) except: def getdoc(obj): return obj.__doc__ @@ -112,7 +111,7 @@ continue plugin = {'name': component.__name__} if component.__doc__: - plugin['description'] = Markup(getdoc(component)) + plugin['description'] = getdoc(component) module = sys.modules[component.__module__] plugin['module'] = module.__name__ @@ -128,7 +127,7 @@ 'interface': xtnpt.interface.__name__, 'module': xtnpt.interface.__module__}) if xtnpt.interface.__doc__: - xtnpts[-1]['description'] = Markup(getdoc(xtnpt.interface)) + xtnpts[-1]['description'] = getdoc(xtnpt.interface) extensions = [] for extension in ComponentMeta._registry.get(xtnpt.interface, []): if self.env.is_component_enabled(extension): Index: trac/wiki/web_ui.py =================================================================== --- trac/wiki/web_ui.py (revision 3821) +++ trac/wiki/web_ui.py (working copy) @@ -20,7 +20,7 @@ import re import StringIO -from trac.attachment import attachments_data, Attachment, AttachmentModule +from trac.attachment import Attachment, AttachmentModule from trac.core import * from trac.perm import IPermissionRequestor from trac.Search import ISearchSource, search_to_sql, shorten_result @@ -33,7 +33,6 @@ from trac.web import HTTPNotFound, IRequestHandler from trac.wiki.api import IWikiPageManipulator, WikiSystem from trac.wiki.model import WikiPage -from trac.wiki.formatter import wiki_to_html, wiki_to_oneliner from trac.mimeview.api import Mimeview, IContentConverter @@ -243,7 +242,7 @@ if version == new_version: date = t author = a or 'anonymous' - comment = wiki_to_html(c or '--', self.env, req, db) + comment = c ipnr = i or '' else: if version < new_version: @@ -335,11 +334,6 @@ 'edit_rows': editrows, 'scroll_bar_pos': req.args.get('scroll_bar_pos', '') }) - if action == 'preview': - data.update({ - 'page_html': wiki_to_html(page.text, self.env, req, db), - 'comment_html': wiki_to_oneliner(comment, self.env, db) - }) return 'wiki_edit.html', data, None def _render_history(self, req, db, page): @@ -361,7 +355,7 @@ 'version': version, 'date': date, 'author': author, - 'comment': wiki_to_oneliner(comment or '', self.env, db), + 'comment': comment, 'ipnr': ipnr }) data['history'] = history @@ -384,27 +378,21 @@ if page.name == 'WikiStart': data['title'] = '' - page_html = comment_html = attach_href = '' + attach_href = '' latest_page = WikiPage(self.env, page.name) - if page.exists: - page_html = wiki_to_html(page.text, self.env, req, db) - if version: - comment_html = wiki_to_oneliner(page.comment or '--', - self.env, db) - else: + if not page.exists: if not req.perm.has_permission('WIKI_CREATE'): raise HTTPNotFound('Page %s not found', page.name) - page_html = html.P('Describe "%s" here' % data['page_name']) + page.text = 'Describe "`%s`" here' % data['page_name'] # Show attachments - attachments = attachments_data(self.env, req, db, 'wiki', page.name) + attachments = Attachment.select(self.env, 'wiki', page.name, db) if req.perm.has_permission('WIKI_MODIFY'): attach_href = req.href.attachment('wiki', page.name) data.update({'action': 'view', - 'page_html': page_html, - 'comment_html': comment_html, + 'version': version, 'latest_version': latest_page.version, 'attachments': attachments, 'attach_href': attach_href, @@ -432,17 +420,11 @@ for t,name,comment,author,version in cursor: title = Markup('%s edited by %s', wiki.format_page_name(name), author) - diff_link = html.A('diff', href=href.wiki(name, action='diff', - version=version)) - if format == 'rss': - comment = wiki_to_html(comment or '--', self.env, req, db, - absurls=True) - else: - comment = wiki_to_oneliner(comment, self.env, db, - shorten=True) if version > 1: - comment = html(comment, ' (', diff_link, ')') - yield 'wiki', href.wiki(name), title, t, author, comment + link = href.wiki(name, action='diff', version=version) + else: + link = href.wiki(name) + yield 'wiki', link, title, t, author, comment # Attachments def display(id): Index: trac/wiki/tests/formatter.py =================================================================== --- trac/wiki/tests/formatter.py (revision 3821) +++ trac/wiki/tests/formatter.py (working copy) @@ -129,7 +129,7 @@ class OneLinerTestCase(WikiTestCase): def formatter(self): - return OneLinerFormatter(self.env) # TODO: self.req + return OneLinerFormatter(self.env, self.req) def suite(data=None, setup=None, file=__file__): Index: trac/wiki/formatter.py =================================================================== --- trac/wiki/formatter.py (revision 3821) +++ trac/wiki/formatter.py (working copy) @@ -861,8 +861,8 @@ """ flavor = 'oneliner' - def __init__(self, env, absurls=False, db=None): - Formatter.__init__(self, env, None, absurls, db) + def __init__(self, env, req, absurls=False, db=None): + Formatter.__init__(self, env, req, absurls, db) # Override a few formatters to disable some wiki syntax in "oneliner"-mode def _list_formatter(self, match, fullmatch): return match @@ -1009,7 +1009,7 @@ if not wikitext: return Markup() out = StringIO() - OneLinerFormatter(env, absurls, db).format(wikitext, out, shorten) + OneLinerFormatter(env, None, absurls, db).format(wikitext, out, shorten) return Markup(out.getvalue()) def wiki_to_outline(wikitext, env, db=None, Index: trac/web/chrome.py =================================================================== --- trac/web/chrome.py (revision 3821) +++ trac/web/chrome.py (working copy) @@ -17,9 +17,10 @@ import __builtin__ import os import re +from StringIO import StringIO from genshi import Markup -from genshi.builder import tag +from genshi.builder import tag, Fragment from genshi.output import DocType from genshi.template import TemplateLoader, MarkupTemplate, TextTemplate @@ -32,7 +33,8 @@ format_time, http_date from trac.web.api import IRequestHandler, HTTPNotFound from trac.web.href import Href -from trac.wiki import IWikiSyntaxProvider +from trac.wiki.api import IWikiSyntaxProvider +from trac.wiki.formatter import Formatter, OneLinerFormatter def add_link(req, rel, href, title=None, mimetype=None, classname=None): """Add a link to the HDF data set that will be inserted as element in @@ -419,7 +421,30 @@ data['format_date'] = format_date data['format_time'] = format_time data['http_date'] = http_date - + + def wiki_to_html(text, absurls=False, escape_newlines=False): + if not text: + return Markup() + if isinstance(text, (Fragment, Markup)): + return text + out = StringIO() + Formatter(self.env, req, absurls).format(text, out, + escape_newlines) + return Markup(out.getvalue()) + + def wiki_to_oneliner(text, absurls=False, shorten=False): + if not text: + return Markup() + if isinstance(text, (Fragment, Markup)): + return text + out = StringIO() + OneLinerFormatter(self.env, req, absurls).format(text, out, + shorten) + return Markup(out.getvalue()) + + data['wiki_to_html'] = wiki_to_html + data['wiki_to_oneliner'] = wiki_to_oneliner + ## debugging tools from pprint import pformat data['pprint'] = pformat Index: templates/ticket_view.html =================================================================== --- templates/ticket_view.html (revision 3821) +++ templates/ticket_view.html (working copy) @@ -69,7 +69,7 @@ (last modified by ${description_author}) - ${description} + ${wiki_to_html(ticket.description)} @@ -122,7 +122,7 @@ -
${change.comment}
+
${wiki_to_html(change.comment)}
@@ -149,7 +149,7 @@
Comment Preview - ${preview} + ${wiki_to_html(comment)}
Index: templates/report.rss =================================================================== --- templates/report.rss (revision 3821) +++ templates/report.rss (working copy) @@ -28,7 +28,7 @@ #$row.id: $cell.value - unicode($cell.parsed) + ${unicode(wiki_to_html($cell.value, absurls=True))} Index: templates/browser.html =================================================================== --- templates/browser.html (revision 3821) +++ templates/browser.html (working copy) @@ -78,7 +78,7 @@ in trac.versioncontrol.web_ui.util.get_changes --> $change.author: - $change.message + ${wiki_to_oneliner(change.message)} @@ -95,7 +95,7 @@ - $file.message + ${wiki_to_html(file.message)} Index: templates/macros.html =================================================================== --- templates/macros.html (revision 3821) +++ templates/macros.html (working copy) @@ -22,7 +22,7 @@ - 'selector' is a boolean variable - 'name is the name of the option - 'text' is the displayed text, defaults to 'name' - - 'id' optional id for the checkbox, if different from 'name' + - 'id' optional id for the checkbox, if different from 'name' --> @@ -43,7 +43,7 @@ @@ -57,8 +57,8 @@ - - We take care to not insert any extra space. --> - - ${cnt == 1 and ('1 '+noun) or '%d %ss' % (cnt, noun)} @@ -69,7 +69,7 @@ ${ pretty_size(size) } - +
  • - + ← @@ -115,7 +115,7 @@
  • $label
  • - → + → Next $change → @@ -167,7 +167,7 @@ Try downloading the file instead. - HTML preview not available. + HTML preview not available. To view, download the file. @@ -182,9 +182,9 @@ --> - $attachment.filename - (${sizeinfo(attachment.size)}) - added by $attachment.author - ${dateinfo(attachment.date)} ago. + $attachment.filename + (${sizeinfo(attachment.size)}) - added by $attachment.author + ${dateinfo(attachment.time)} ago. @@ -192,7 +192,7 @@
    • ${show_one_attachment(attachment)} - $attachment.description + ${wiki_to_oneliner(attachment.description)}
    @@ -202,7 +202,7 @@
    ${show_one_attachment(attachment)}
    -
    $attachment.description
    +
    ${wiki_to_oneliner(attachment.description)}
    Index: templates/wiki_history.html =================================================================== --- templates/wiki_history.html (revision 3821) +++ templates/wiki_history.html (working copy) @@ -47,7 +47,7 @@ ${format_datetime(item.date)} $item.author - $item.comment + ${wiki_to_oneliner(item.comment, shorten=True)} Index: templates/milestone_view.html =================================================================== --- templates/milestone_view.html (revision 3821) +++ templates/milestone_view.html (working copy) @@ -87,7 +87,7 @@
    -
    ${milestone.description}
    +
    ${wiki_to_html(milestone.description)}
    Index: templates/ticket_new.html =================================================================== --- templates/ticket_new.html (revision 3821) +++ templates/ticket_new.html (working copy) @@ -8,7 +8,7 @@ New Ticket @@ -34,11 +34,11 @@

    - -
    + +
    Description Preview - ${preview} + ${wiki_to_html(ticket.description)}
    @@ -85,7 +85,7 @@ - +

    - +
    Index: templates/revisionlog.html =================================================================== --- templates/revisionlog.html (revision 3821) +++ templates/revisionlog.html (working copy) @@ -116,11 +116,11 @@ $change.date $change.author - ${not verbose and change.message or ''} + ${not verbose and wiki_to_oneliner(change.message, shorten=True) or ''} - $change.message + ${wiki_to_html(change.message)} Index: templates/revisionlog.rss =================================================================== --- templates/revisionlog.rss (revision 3821) +++ templates/revisionlog.rss (working copy) @@ -16,10 +16,10 @@ $change.author ${format_datetime(change.date_seconds)} - Revision $item.rev: $change.shortlog + Revision $item.rev: ${u' '.join(change.shortlog.striptags().splitlines())}) ${abs_href.changeset(rev, path)} ${abs_href.changeset(item.rev, item.path)} - $change.message + ${unicode(wiki_to_html(change.message, absurls=True))} Log Index: templates/report_view.html =================================================================== --- templates/report_view.html (revision 3821) +++ templates/report_view.html (working copy) @@ -5,7 +5,7 @@ ($numrows matches) -
    $report.description
    +
    ${wiki_to_html(report.description)}
    @@ -108,7 +108,7 @@ - $cell.parsed + ${wiki_to_html(cell.value)} Index: templates/timeline.html =================================================================== --- templates/timeline.html (revision 3821) +++ templates/timeline.html (working copy) @@ -36,10 +36,12 @@

    $day:

    -
    - ${event.time} ${event.title} -
    -
    ${event.message}
    +
    + ${event.time} ${event.title} +
    +
    + ${wiki_to_oneliner(event.message, shorten)} +
    Index: templates/wiki_edit.html =================================================================== --- templates/wiki_edit.html (revision 3821) +++ templates/wiki_edit.html (working copy) @@ -33,12 +33,12 @@ - +
    Preview of future version ${page.version+1} (modified by $author)
    $comment_html
    ${wiki_to_html(comment)}
    Preview (skip) -
    $page_html
    +
    ${wiki_to_html(page.text)}
    @@ -63,8 +63,7 @@

    +$page.text

    @@ -82,7 +82,7 @@

    +${milestone.description}

    Index: templates/query_div.html =================================================================== --- templates/query_div.html (revision 3821) +++ templates/query_div.html (working copy) @@ -56,7 +56,7 @@

    Reported by $result.reporter, ${dateinfo(result.time)} ago${result.description and ':' or ''}

    -

    $result.description

    + ${wiki_to_html(result.description)} Index: templates/query.rss =================================================================== --- templates/query.rss (revision 3821) +++ templates/query.rss (working copy) @@ -17,7 +17,7 @@ #$result.id: $result.summary ${http_date(result.time)} $result.reporter - ${unicode(result.description)} + ${unicode(wiki_to_html(result.description, absurls=True))} Results $href#changelog