Mercurial > bitten > bitten-test
changeset 164:a9cddfae3c09
Adapt to Trac [http://projects.edgewall.com/trac/changeset/2132 r2132].
| author | cmlenz |
|---|---|
| date | Sat, 27 Aug 2005 11:15:59 +0000 |
| parents | 634be6cbb808 |
| children | 1c24bb7aebac |
| files | bitten/trac_ext/templates/bitten_build.cs bitten/trac_ext/web_ui.py |
| diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/trac_ext/templates/bitten_build.cs +++ b/bitten/trac_ext/templates/bitten_build.cs @@ -1,4 +1,6 @@ <?cs include:"header.cs" ?> + <script type="text/javascript" src="<?cs + var:chrome.href ?>/bitten/tabset.js"></script> <div id="ctxtnav" class="nav"></div> <div id="content" class="build"> <h1><?cs var:title ?></h1> @@ -10,8 +12,6 @@ var:build.slave.os ?> <?cs var:build.slave.os.version ?><?cs if:build.slave.machine ?> on <?cs var:build.slave.machine ?><?cs /if ?>)</p> - <script type="text/javascript" src="<?cs - var:htdocs_location ?>tabset.js"></script> <p class="time">Completed: <?cs var:build.started ?> (<?cs var:build.started_delta ?> ago)<br />Took: <?cs var:build.duration ?></p><?cs each:step = build.steps ?>
--- a/bitten/trac_ext/web_ui.py +++ b/bitten/trac_ext/web_ui.py @@ -58,11 +58,11 @@ # ITemplatesProvider methods - def get_htdocs_dir(self): - return pkg_resources.resource_filename(__name__, 'htdocs') + def get_htdocs_dirs(self): + return [('bitten', pkg_resources.resource_filename(__name__, 'htdocs'))] - def get_templates_dir(self): - return pkg_resources.resource_filename(__name__, 'templates') + def get_templates_dirs(self): + return [pkg_resources.resource_filename(__name__, 'templates')] class BuildConfigController(Component): @@ -138,7 +138,7 @@ else: self._render_overview(req) - add_stylesheet(req, 'bitten.css') + add_stylesheet(req, 'bitten/bitten.css') return 'bitten_config.cs', None # Internal methods @@ -434,7 +434,7 @@ }) req.hdf['build.steps'] = steps - add_stylesheet(req, 'bitten.css') + add_stylesheet(req, 'bitten/bitten.css') return 'bitten_build.cs', None # ITimelineEventProvider methods @@ -445,7 +445,7 @@ def get_timeline_events(self, req, start, stop, filters): if 'build' in filters: - add_stylesheet(req, 'bitten.css') + add_stylesheet(req, 'bitten/bitten.css') db = self.env.get_db_cnx() cursor = db.cursor() cursor.execute("SELECT b.id,b.config,c.label,b.rev,p.name,b.slave," @@ -605,6 +605,6 @@ xml_href = self.env.href.buildreport(build.id, step.name, report_type, format='xml') add_link(req, 'alternate', xml_href, 'XML', 'text/xml') - add_stylesheet(req, 'css/code.css') + add_stylesheet(req, 'common/css/code.css') template = req.hdf.parse(self.template_cs) return template, None