Changeset 6384
- Timestamp:
- Jan 9, 2008, 9:33:16 AM (16 years ago)
- Location:
- trunk/trac
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/trac/ticket/templates/query.rss
r6139 r6384 9 9 <description>$project.descr</description> 10 10 <language>en-US</language> 11 <image py:if="chrome.logo.src ">11 <image py:if="chrome.logo.src_abs"> 12 12 <title>$project.name</title> 13 <url>$chrome.logo.src </url>13 <url>$chrome.logo.src_abs</url> 14 14 <link>$query_href</link> 15 15 </image> -
trunk/trac/ticket/templates/report.rss
r6172 r6384 9 9 <description>Trac Report - $report.description</description> 10 10 <language>en-us</language> 11 <image py:if="chrome.logo.src ">11 <image py:if="chrome.logo.src_abs"> 12 12 <title>$project.name</title> 13 <url>$chrome.logo.src </url>13 <url>$chrome.logo.src_abs</url> 14 14 <link>${abs_href.report(report.id != -1 and report.id or '')}</link> 15 15 </image> -
trunk/trac/ticket/templates/ticket.rss
r6139 r6384 9 9 <description>${unicode(wiki_to_html(context, ticket.description))}</description> 10 10 <language>en-us</language> 11 <image py:if=" 'src' in chrome.logo">11 <image py:if="chrome.logo.src_abs"> 12 12 <title>$project.name</title> 13 <url>$chrome.logo.src </url>13 <url>$chrome.logo.src_abs</url> 14 14 <link>${abs_href.ticket(ticket.id)}</link> 15 15 </image> -
trunk/trac/timeline/templates/timeline.rss
r6158 r6384 10 10 <language>en-US</language> 11 11 <generator>Trac ${trac.version}</generator> 12 <image py:if="chrome.logo.src ">12 <image py:if="chrome.logo.src_abs"> 13 13 <title>${project.name}</title> 14 <url>${ 15 chrome.logo.src_abs and chrome.logo.src_abs or abs_href(chrome.logo.src) 16 }</url> 14 <url>${chrome.logo.src_abs}</url> 17 15 <link>${abs_href.timeline()}</link> 18 16 </image> -
trunk/trac/versioncontrol/templates/revisionlog.rss
r6139 r6384 10 10 <language>en-US</language> 11 11 <generator>Trac ${trac.version}</generator> 12 <image py:if="chrome.logo ">12 <image py:if="chrome.logo.src_abs"> 13 13 <title>${project.name}</title> 14 <url>${chrome.logo.src }</url>14 <url>${chrome.logo.src_abs}</url> 15 15 <link>$log_href</link> 16 16 </image> -
trunk/trac/web/chrome.py
r6379 r6384 437 437 438 438 # Logo image 439 chrome['logo'] = self.get_logo_data(req.href )439 chrome['logo'] = self.get_logo_data(req.href, req.abs_href) 440 440 441 441 # Navigation links … … 510 510 return icon 511 511 512 def get_logo_data(self, href): 512 def get_logo_data(self, href, abs_href=None): 513 # TODO: Possibly, links to 'common/' could use chrome.htdocs_location 513 514 logo = {} 514 515 logo_src = self.logo_src 515 516 if logo_src: 516 logo_src_abs = logo_src.startswith('http://') or \ 517 logo_src.startswith('https://') 518 if not logo_src.startswith('/') and not logo_src_abs: 519 if '/' in logo_src: 520 logo_src = href.chrome(logo_src) 521 else: 522 logo_src = href.chrome('common', logo_src) 517 abs_href = abs_href or href 518 if logo_src.startswith('http://') or \ 519 logo_src.startswith('https://') or \ 520 logo_src.startswith('/'): 521 # Nothing further can be calculated 522 logo_src_abs = logo_src 523 elif '/' in logo_src: 524 # Like 'common/trac_banner.png' or 'site/my_banner.png' 525 logo_src_abs = abs_href.chrome(logo_src) 526 logo_src = href.chrome(logo_src) 527 else: 528 # Like 'trac_banner.png' 529 logo_src_abs = abs_href.chrome('common', logo_src) 530 logo_src = href.chrome('common', logo_src) 523 531 width = self.logo_width > -1 and self.logo_width or None 524 532 height = self.logo_height > -1 and self.logo_height or None -
trunk/trac/web/tests/chrome.py
r5514 r6384 69 69 info = Chrome(self.env).prepare_request(req) 70 70 assert 'src' not in info['logo'] 71 assert 'src_abs' not in info['logo'] 71 72 72 73 # Test with a relative path to the logo image … … 74 75 info = Chrome(self.env).prepare_request(req) 75 76 self.assertEqual('/trac.cgi/chrome/common/foo.png', info['logo']['src']) 77 self.assertEqual('http://example.org/trac.cgi/chrome/common/foo.png', 78 info['logo']['src_abs']) 79 80 # Test with a location in project htdocs 81 self.env.config.set('header_logo', 'src', 'site/foo.png') 82 info = Chrome(self.env).prepare_request(req) 83 self.assertEqual('/trac.cgi/chrome/site/foo.png', info['logo']['src']) 84 self.assertEqual('http://example.org/trac.cgi/chrome/site/foo.png', 85 info['logo']['src_abs']) 76 86 77 87 # Test with a server-relative path to the logo image … … 79 89 info = Chrome(self.env).prepare_request(req) 80 90 self.assertEqual('/img/foo.png', info['logo']['src']) 91 self.assertEqual('/img/foo.png', info['logo']['src_abs']) 81 92 82 93 # Test with an absolute path to the logo image … … 85 96 info = Chrome(self.env).prepare_request(req) 86 97 self.assertEqual('http://www.example.org/foo.png', info['logo']['src']) 98 self.assertEqual('http://www.example.org/foo.png', info['logo']['src_abs']) 87 99 88 100 def test_default_links(self):
Note:
See TracChangeset
for help on using the changeset viewer.