| 1 | *** 0.7.1/trac/Timeline.py 2004-07-09 12:22:15.000000000 +1000 |
|---|
| 2 | --- trunk/trac/Timeline.py 2004-07-09 12:22:20.000000000 +1000 |
|---|
| 3 | *************** |
|---|
| 4 | *** 21,27 **** |
|---|
| 5 | |
|---|
| 6 | from util import * |
|---|
| 7 | from Module import Module |
|---|
| 8 | ! from Wiki import wiki_to_oneliner |
|---|
| 9 | import perm |
|---|
| 10 | |
|---|
| 11 | import time |
|---|
| 12 | --- 21,27 ---- |
|---|
| 13 | |
|---|
| 14 | from util import * |
|---|
| 15 | from Module import Module |
|---|
| 16 | ! from Wiki import wiki_to_oneliner, wiki_to_html |
|---|
| 17 | import perm |
|---|
| 18 | |
|---|
| 19 | import time |
|---|
| 20 | *************** |
|---|
| 21 | *** 108,113 **** |
|---|
| 22 | --- 108,115 ---- |
|---|
| 23 | msg = item['message'] |
|---|
| 24 | item['shortmsg'] = escape(shorten_line(msg)) |
|---|
| 25 | item['msg_nowiki'] = escape(msg) |
|---|
| 26 | + item['msg_escwiki'] = escape(wiki_to_html(msg, self.req.hdf, |
|---|
| 27 | + self.env)) |
|---|
| 28 | item['message'] = wiki_to_oneliner(msg, self.req.hdf, |
|---|
| 29 | self.env) |
|---|
| 30 | |
|---|
| 31 | *** 0.7.1/templates/timeline_rss.cs 2004-07-09 12:22:15.000000000 +1000 |
|---|
| 32 | --- trunk/templates/timeline_rss.cs 2004-07-09 12:22:20.000000000 +1000 |
|---|
| 33 | *************** |
|---|
| 34 | *** 30,48 **** |
|---|
| 35 | <?cs each:item = $timeline.items ?> |
|---|
| 36 | <?cs if:item.type == #1 ?><!-- Changeset --> |
|---|
| 37 | <?cs call:rss_item('Changeset', |
|---|
| 38 | ! 'Changeset ['+$item.idata+']: '+$item.shortmsg, |
|---|
| 39 | ! $item.changeset_href, $item.msg_nowiki) ?> |
|---|
| 40 | <?cs elif:item.type == #2 ?><!-- New ticket --> |
|---|
| 41 | <?cs call:rss_item('Ticket', |
|---|
| 42 | ! 'Ticket #'+$item.idata+' created: '+$item.shortmsg, |
|---|
| 43 | $item.ticket_href, $item.message) ?> |
|---|
| 44 | <?cs elif:item.type == #3 ?><!-- Closed ticket --> |
|---|
| 45 | <?cs call:rss_item('Ticket', |
|---|
| 46 | ! 'Ticket #'+$item.idata+' resolved: '+$item.shortmsg, |
|---|
| 47 | $item.ticket_href, $item.message) ?> |
|---|
| 48 | <?cs elif:item.type == #4 ?><!-- Reopened ticket --> |
|---|
| 49 | <?cs call:rss_item('Ticket', |
|---|
| 50 | ! '#'+$item.idata+' reopened: '+$item.shortmsg, |
|---|
| 51 | $item.ticket_href, $item.message) ?> |
|---|
| 52 | <?cs elif:item.type == #5 ?><!-- Wiki change --> |
|---|
| 53 | <?cs call:rss_item('Wiki', |
|---|
| 54 | --- 30,48 ---- |
|---|
| 55 | <?cs each:item = $timeline.items ?> |
|---|
| 56 | <?cs if:item.type == #1 ?><!-- Changeset --> |
|---|
| 57 | <?cs call:rss_item('Changeset', |
|---|
| 58 | ! 'Changeset ['+$item.idata+'] by '+$item.author, |
|---|
| 59 | ! $item.changeset_href, $item.msg_escwiki) ?> |
|---|
| 60 | <?cs elif:item.type == #2 ?><!-- New ticket --> |
|---|
| 61 | <?cs call:rss_item('Ticket', |
|---|
| 62 | ! 'Ticket #'+$item.idata+' created by '+$item.author, |
|---|
| 63 | $item.ticket_href, $item.message) ?> |
|---|
| 64 | <?cs elif:item.type == #3 ?><!-- Closed ticket --> |
|---|
| 65 | <?cs call:rss_item('Ticket', |
|---|
| 66 | ! 'Ticket #'+$item.idata+' resolved by '+$item.author, |
|---|
| 67 | $item.ticket_href, $item.message) ?> |
|---|
| 68 | <?cs elif:item.type == #4 ?><!-- Reopened ticket --> |
|---|
| 69 | <?cs call:rss_item('Ticket', |
|---|
| 70 | ! '#'+$item.idata+' reopened by '+$item.author, |
|---|
| 71 | $item.ticket_href, $item.message) ?> |
|---|
| 72 | <?cs elif:item.type == #5 ?><!-- Wiki change --> |
|---|
| 73 | <?cs call:rss_item('Wiki', |
|---|
