Index: setup.py =================================================================== --- setup.py (revision 5204) +++ setup.py (working copy) @@ -85,5 +85,6 @@ trac.web.auth = trac.web.auth trac.wiki.macros = trac.wiki.macros trac.wiki.web_ui = trac.wiki.web_ui + trac.themes = trac.web.theming """, ) Index: trac/htdocs/css/admin.css =================================================================== --- trac/htdocs/css/admin.css (revision 5204) +++ trac/htdocs/css/admin.css (working copy) @@ -1,62 +1,53 @@ -#content.admin h1 { float: left; } +#x-trac #content.admin h1 { float: left; } -#tabs { background: #f7f7f0; border: 1px solid black; - border-color: #ccc #666 #666 #ccc; clear: left; +#x-trac #tabs { border: 1px solid black; clear: left; margin: 1em 0 2em; padding: .5em 0 0; float: left; width: 12em; } -#tabs ul { list-style: none; margin: 0 0 .5em; padding: 0; } -#tabs li { color: #999; font-size: 90%; font-weight: bold; margin: 0; +#x-trac #tabs ul { list-style: none; margin: 0 0 .5em; padding: 0; } +#x-trac #tabs li { font-size: 90%; font-weight: bold; margin: 0; padding: 0.1em 5px; } -#tabs li li { color: #000; font-size: 110%; font-weight: normal; +#x-trac #tabs li li { font-size: 110%; font-weight: normal; margin: 0 -3px; padding: 1px 0 1px 10px; } -#tabs li li.active { background: #ddc; border: 1px solid; - border-color: #ccc #000 #666 #ccc; padding: 0 0 0 9px; -} -#tabs :link, #tabs :visited { border: none; display: block } -#tabs :link:hover, #tabs :visited:hover { background: transparent; - color: #000; -} +#x-trac #tabs li li.active { border: 1px solid black; padding: 0 0 0 9px; } +#x-trac #tabs :link, #x-trac #tabs :visited { border: none; display: block } +#x-trac #tabs :link:hover, #x-trac #tabs :visited:hover { background: transparent; } -#tabcontent { padding: 0.4em 2em; margin-left: 12em; min-height: 300px; } -#tabcontent h2 { color: #333; margin-top: 0; } -p.help { color: #666; font-size: 90%; margin: 1em .5em .5em; } +#x-trac #tabcontent { padding: 0.4em 2em; margin-left: 12em; min-height: 300px; } +#x-trac #tabcontent h2 { margin-top: 0; } +#x-trac p.help { font-size: 90%; margin: 1em .5em .5em; } -#enumlist tbody td { vertical-align: middle; } +#x-trac #enumlist tbody td { vertical-align: middle; } -form.addnew { clear: right; float: right; margin: -2em 0 4em; width: 33% } -form.mod { margin-top: 1em; } -form.mod .field { margin: .5em 0; } -form .field em { color: #888; font-size: smaller } -form .field .disabled em { color: #d7d7d7 } +#x-trac form.addnew { clear: right; float: right; margin: -2em 0 4em; width: 33% } +#x-trac form.mod { margin-top: 1em; } +#x-trac form.mod .field { margin: .5em 0; } +#x-trac form .field em { color: font-size: smaller } -table.listing { clear: none; width: 64% } -table.listing .sel, table.listing .default { text-align: center; width: 1% } +#x-trac table.listing { clear: none; width: 64% } +#x-trac table.listing .sel, #x-trac table.listing .default { text-align: center; width: 1% } /* Plugins panel */ -form#addplug { width: 35% } -.plugin { background: #f7f7f7; border: 1px solid #d7d7d7; margin: 0 0 2em; +#x-trac form#addplug { width: 35% } +#x-trac .plugin { border: 1px solid black; margin: 0 0 2em; padding: 2px .5em; text-align: left; width: 60%; } -.plugin h3 { background: url(../expanded.png) 0 50% no-repeat; +#x-trac .plugin h3 { background-position: 0 50%; background-repeat: no-repeat; margin: .5em 0 0; padding-left: 16px; } -.collapsed h3 { background-image: url(../collapsed.png); } -.plugin .buttons { margin-top: 0; text-align: right } -.plugin .uninstall { margin-top: -2em; padding: 0 } -.plugin .summary, .plugin .info { color: #999; font-size: 80%; - padding-left: 16px; -} -.plugin .summary { margin: -.5em 0 .5em } -.plugin .info { margin: 1em 0 .5em; } -.plugin .info dt { float: left; width: 7em; } -.plugin .info dd { padding: 0; margin: 0; } -.plugin .listing { width: 100% } -.collapsed .info, .collapsed .listing, .collapsed .update { display: none } -.plugin .listing td { background: #fff } -.plugin .listing .name p { color: #999; font-size: 80%; margin: 0 } +#x-trac .plugin .buttons { margin-top: 0; text-align: right } +#x-trac .plugin .uninstall { margin-top: -2em; padding: 0 } +#x-trac .plugin .summary, +#x-trac .plugin .info { font-size: 80%; padding-left: 16px; } +#x-trac .plugin .summary { margin: -.5em 0 .5em } +#x-trac .plugin .info { margin: 1em 0 .5em; } +#x-trac .plugin .info dt { float: left; width: 7em; } +#x-trac .plugin .info dd { padding: 0; margin: 0; } +#x-trac .plugin .listing { width: 100% } +#x-trac .collapsed .info, #x-trac .collapsed .listing, #x-trac .collapsed .update { display: none } +#x-trac .plugin .listing .name p { font-size: 80%; margin: 0 } /* Perm Panel */ -#permlist div { width: 13em; float: left; } -fieldset tr.field th { text-align: right; } +#x-trac #permlist div { width: 13em; float: left; } +#x-trac fieldset tr.field th { text-align: right; } Index: trac/htdocs/css/about.css =================================================================== --- trac/htdocs/css/about.css (revision 5204) +++ trac/htdocs/css/about.css (working copy) @@ -1,18 +1,19 @@ /* About page */ -#content.about p.copyright { color: #999; font-size: 90%; } -#content.about h2 { margin-top: 2em; } -#content.about table { margin-top: 0; width: auto; } -#content.about table th, #content.about table td { font-size: 90%; } +#x-trac #content.about p.copyright { font-size: 90%; } +#x-trac #content.about h2 { margin-top: 2em; } +#x-trac #content.about table { margin-top: 0; width: auto; } +#x-trac #content.about table th, #content.about table td { font-size: 90%; } -#content.about th { background: #f7f7f0; font-weight: bold; text-align: right; +#x-trac #content.about th { + font-weight: bold; + text-align: right; vertical-align: top; } -#content.about #config th { text-align: left; } -#content.about #config th.section { text-align: right; } -#content.about #config th, #content.about #config td { border: 1px solid #ddd; - padding: 3px; -} -#content.about #config td.value { font-family: monospace; } -#content.about #config tr.modified td.value { font-weight: bold; } -#content.about #config td.doc { padding: 3px 1em; } +#x-trac #content.about #config th { text-align: left; } +#x-trac #content.about #config th.section { text-align: right; } +#x-trac #content.about #config th, +#x-trac #content.about #config td { padding: 3px; } +#x-trac #content.about #config td.value { font-family: monospace; } +#x-trac #content.about #config tr.modified td.value { font-weight: bold; } +#x-trac #content.about #config td.doc { padding: 3px 1em; } Index: trac/htdocs/css/report.css =================================================================== --- trac/htdocs/css/report.css (revision 5204) +++ trac/htdocs/css/report.css (working copy) @@ -1,92 +1,86 @@ @import url(code.css); -h1 .numrows, h2 .numrows { +#x-trac h1 .numrows, #x-trac h2 .numrows { margin-left: 1em; - color: #999; font-size: 65%; font-weight: normal; } -h2 { - background: #f7f7f7; - border-bottom: 1px solid #d7d7d7; +#x-trac h2 { margin: 2em 0 0; padding: 0 .33em; } -#report-descr { margin: 0 2em; font-size: 90% } -#report-notfound { margin: 2em; font-size: 110% } -#content.report .field { margin: 1em 0; } -#content.report .field label { padding-bottom: .3em; } +#x-trac #report-descr { margin: 0 2em; font-size: 90% } +#x-trac #report-notfound { margin: 2em; font-size: 110% } +#x-trac #content.report .field { margin: 1em 0; } +#x-trac #content.report .field label { padding-bottom: .3em; } -#query { clear: right } -#query fieldset, #query fieldset input, #query fieldset select { font-size: 11px } -#query fieldset { margin-top: 1em } -#query .option, #query .option input, #query .option select { font-size: 11px } -#query .option { float: left; line-height: 2em; margin: .9em 2.5em 0 .5em; padding: 0 0 .1em } -#query .buttons { float: right; margin-top: .5em } -#query .buttons input { margin: .5em } -#query hr { clear: both; margin: 0; visibility: hidden } +#x-trac #query { clear: right } +#x-trac #query fieldset, #x-trac #query fieldset input, #x-trac #query fieldset select { font-size: 11px } +#x-trac #query fieldset { margin-top: 1em } +#x-trac #query .option, #x-trac #query .option input, #x-trac #query .option select { font-size: 11px } +#x-trac #query .option { float: left; line-height: 2em; margin: .9em 2.5em 0 .5em; padding: 0 0 .1em } +#x-trac #query .buttons { float: right; margin-top: .5em } +#x-trac #query .buttons input { margin: .5em } +#x-trac #query hr { clear: both; margin: 0; visibility: hidden } -#filters table { width: 100% } -#filters tr { height: 2em } -#filters th, #filters td { padding: 0 .2em; vertical-align: middle } -#filters th { font-size: 11px; text-align: right; white-space: nowrap; } -#filters td label { font-size: 11px } -#filters td.mode { text-align: right } -#filters td.filter { width: 100% } -#filters td.filter label { padding-right: 1em } -#filters td.actions { text-align: right; white-space: nowrap } +#x-trac #filters table { width: 100% } +#x-trac #filters tr { height: 2em } +#x-trac #filters th, #x-trac #filters td { padding: 0 .2em; vertical-align: middle } +#x-trac #filters th { font-size: 11px; text-align: right; white-space: nowrap; } +#x-trac #filters td label { font-size: 11px } +#x-trac #filters td.mode { text-align: right } +#x-trac #filters td.filter { width: 100% } +#x-trac #filters td.filter label { padding-right: 1em } +#x-trac #filters td.actions { text-align: right; white-space: nowrap } /* Styles for the report list and the report results table (extends the styles for "table.listing") */ -.reports td.title { width: 100% } -.reports tbody td :link, .reports tbody td :visited, -.tickets tbody td :link, .tickets tbody td :visited { display: block } -.tickets { border-bottom: none } -.tickets thead th { text-transform: capitalize; white-space: nowrap; } -.tickets tbody td, .reports tbody td { padding: .1em .5em !important } -.tickets tbody td a, .reports tbody td a { border-bottom: none } -.tickets tbody td.id :link, .tickets tbody td.id :visited { +#x-trac .reports td.title { width: 100% } +#x-trac .reports tbody td :link, #x-trac .reports tbody td :visited, +#x-trac .tickets tbody td :link, .#x-trac .tickets tbody td :visited { display: block } +#x-trac .tickets { border-bottom: none } +#x-trac .tickets thead th { text-transform: capitalize; white-space: nowrap; } +#x-trac .tickets tbody td, #x-trac .reports tbody td { padding: .1em .5em !important } +#x-trac .tickets tbody td a, #x-trac .reports tbody td a { border-bottom: none } +#x-trac .tickets tbody td.id :link, #x-trac .tickets tbody td.id :visited { font-weight: bold; } -.tickets tbody tr:hover { background: #eed; color: #000 } -.tickets tr.color1-odd { background: #fdc; border-color: #e88; color: #a22 } -.tickets tr.color1-even { background: #fed; border-color: #e99; color: #a22 } -.tickets tr.color2-odd { background: #ffb; border-color: #eea; color: #880 } -.tickets tr.color2-even { background: #ffd; border-color: #dd8; color: #880 } -.tickets tr.color3-odd { background: #fbfbfb; border-color: #ddd; color: #444 } -.tickets tr.color3-even { background: #f6f6f6; border-color: #ccc; color: #333 } -.tickets tr.color4-odd { background: #e7ffff; border-color: #cee; color: #099 } -.tickets tr.color4-even { background: #dff; border-color: #bee; color: #099 } -.tickets tr.color5-odd { background: #e7eeff; border-color: #cde; color: #469 } -.tickets tr.color5-even { background: #dde7ff; border-color: #cde; color: #469 } -.tickets tr.color6-odd { background: #f0f0f0; border-color: #ddd; color: #888 } -.tickets tr.color6-even { background: #f7f7f7; border-color: #ddd; color: #888 } -.tickets tr.color6-odd a, .color6-even a { color: #b66 } -.tickets tbody tr.fullrow td, .tickets tbody td.fullrow { +#x-trac .tickets tr.color1-odd { background: #fdc; border-color: #e88; color: #a22 } +#x-trac .tickets tr.color1-even { background: #fed; border-color: #e99; color: #a22 } +#x-trac .tickets tr.color2-odd { background: #ffb; border-color: #eea; color: #880 } +#x-trac .tickets tr.color2-even { background: #ffd; border-color: #dd8; color: #880 } +#x-trac .tickets tr.color3-odd { background: #fbfbfb; border-color: #ddd; color: #444 } +#x-trac .tickets tr.color3-even { background: #f6f6f6; border-color: #ccc; color: #333 } +#x-trac .tickets tr.color4-odd { background: #e7ffff; border-color: #cee; color: #099 } +#x-trac .tickets tr.color4-even { background: #dff; border-color: #bee; color: #099 } +#x-trac .tickets tr.color5-odd { background: #e7eeff; border-color: #cde; color: #469 } +#x-trac .tickets tr.color5-even { background: #dde7ff; border-color: #cde; color: #469 } +#x-trac .tickets tr.color6-odd { background: #f0f0f0; border-color: #ddd; color: #888 } +#x-trac .tickets tr.color6-even { background: #f7f7f7; border-color: #ddd; color: #888 } +#x-trac .tickets tr.color6-odd a, #x-trac .color6-even a { color: #b66 } +#x-trac .tickets tbody tr.fullrow td, #x-trac .tickets tbody td.fullrow { border: none; - color: #333; - background: transparent; padding: 0 1em 2em 2em !important; font-size: 85%; } -.tickets tbody tr.fullrow:hover { background: transparent !important } -.tickets .fullrow :link, .tickets .fullrow :visited { display: inline } -.tickets .fullrow .meta { color: #999; margin-bottom: -.5em; margin-left: -1em } -.tickets .fullrow hr { display: none } +#x-trac .tickets tbody tr.fullrow:hover { background: transparent !important } +#x-trac .tickets .fullrow :link, #x-trac .tickets .fullrow :visited { display: inline } +#x-trac .tickets .fullrow .meta { margin-bottom: -.5em; margin-left: -1em } +#x-trac .tickets .fullrow hr { display: none } /* Query results table */ -table.tickets tbody tr.added td { font-weight: bold } -table.tickets tbody tr.changed td { font-style: italic } -table.tickets tbody tr.removed td { color: #999 } -table.tickets tbody tr.prio1 { background: #fdc; border-color: #e88 } -table.tickets tbody tr.even.prio1 { background: #fed; border-color: #e99 } -table.tickets tbody tr.prio2 { background: #ffb; border-color: #eea } -table.tickets tbody tr.even.prio2 { background: #ffd; border-color: #dd8 } -table.tickets tbody tr.prio3 { background: #fbfbfb; border-color: #ddd } -table.tickets tbody tr.even.prio3 { background: #f6f6f6; border-color: #ccc } -table.tickets tbody tr.prio4 { background: #e7ffff; border-color: #cee } -table.tickets tbody tr.even.prio4 { background: #dff; border-color: #bee } -table.tickets tbody tr.prio5 { background: #e7eeff; border-color: #cde } -table.tickets tbody tr.even.prio5 { background: #dde7ff } -table.tickets tbody tr.prio6 { background: #f0f0f0; border-color: #ddd } -table.tickets tbody tr.even.prio6 { background: #f7f7f7 } +#x-trac table.tickets tbody tr.added td { font-weight: bold } +#x-trac table.tickets tbody tr.changed td { font-style: italic } +#x-trac table.tickets tbody tr.removed td { color: #999 } +#x-trac table.tickets tbody tr.prio1 { background: #fdc; border-color: #e88 } +#x-trac table.tickets tbody tr.even.prio1 { background: #fed; border-color: #e99 } +#x-trac table.tickets tbody tr.prio2 { background: #ffb; border-color: #eea } +#x-trac table.tickets tbody tr.even.prio2 { background: #ffd; border-color: #dd8 } +#x-trac table.tickets tbody tr.prio3 { background: #fbfbfb; border-color: #ddd } +#x-trac table.tickets tbody tr.even.prio3 { background: #f6f6f6; border-color: #ccc } +#x-trac table.tickets tbody tr.prio4 { background: #e7ffff; border-color: #cee } +#x-trac table.tickets tbody tr.even.prio4 { background: #dff; border-color: #bee } +#x-trac table.tickets tbody tr.prio5 { background: #e7eeff; border-color: #cde } +#x-trac table.tickets tbody tr.even.prio5 { background: #dde7ff } +#x-trac table.tickets tbody tr.prio6 { background: #f0f0f0; border-color: #ddd } +#x-trac table.tickets tbody tr.even.prio6 { background: #f7f7f7 } Index: trac/htdocs/css/prefs.css =================================================================== --- trac/htdocs/css/prefs.css (revision 5204) +++ trac/htdocs/css/prefs.css (working copy) @@ -1,25 +1,15 @@ -#content.prefs #tabs { list-style: none; margin: 2em 1em 0; padding: 1px; } -#content.prefs #tabs li { background: #e6e6e6; border: 1px solid; - border-color: #ccc #666 #ccc #ccc; color: #666; position: relative; +#x-trac #content.prefs #tabs { list-style: none; margin: 2em 1em 0; padding: 1px; } +#x-trac #content.prefs #tabs li { border: 1px solid black; bottom: -1px; float: left; font-size: 90%; margin: 0 .5em; - padding: .2em 1em .3em; + padding: .2em 1em .3em; position: relative; } -#content.prefs #tabs :link, #content.prefs #tabs :visited { - border: none; color: #999; +#x-trac #content.prefs #tabs :link:hover, #x-trac #content.prefs #tabs :visited:hover { + background: transparent; } -#content.prefs #tabs :link:hover, #content.prefs #tabs :visited:hover { - background: transparent; color: #333; -} -#content.prefs #tabs li.active { background: #fff; - border-bottom: 1px solid #fff; -} -#content.prefs #tabs #tab_advanced { float: right; } -#content.prefs #tabcontent { background: url(../vgradient.png) 0 1px repeat-x; - border-top: 1px solid #ccc; clear: left; padding: 20px 5px; -} -* html #content.prefs #tabcontent { padding-top: 0; } +#x-trac #content.prefs #tabs #tab_advanced { float: right; } +#x-trac #content.prefs #tabcontent { clear: left; padding: 20px 5px; } -#content.prefs div.field { margin-bottom: 1em; } -#content.prefs tr.field th { text-align: right; vertical-align: middle; +#x-trac #content.prefs div.field { margin-bottom: 1em; } +#x-trac #content.prefs tr.field th { text-align: right; vertical-align: middle; white-space: nowrap; } Index: trac/templates/layout.html =================================================================== --- trac/templates/layout.html (revision 5204) +++ trac/templates/layout.html (working copy) @@ -36,23 +36,18 @@ - + + + + ${navigation('metanav')} ${navigation('mainnav')}
@@ -65,17 +60,17 @@ +
- + - + Index: trac/templates/trac_site.html =================================================================== --- trac/templates/trac_site.html (revision 0) +++ trac/templates/trac_site.html (revision 0) @@ -0,0 +1,29 @@ + + + ${select('*')} + + + +
+ + ${select('div[@id="mainnav"]')} + +
+ ${select('div[@id="main"]/*')} + ${select('div[@id="altlinks"]')} +
+ + ${select('div[@id="footer"]')} +
+ + Index: trac/web/theming.py =================================================================== --- trac/web/theming.py (revision 0) +++ trac/web/theming.py (revision 0) @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- +# +# Copyright (C) 2004-2006 Edgewall Software +# Copyright (C) 2007 Armin Ronacher +# All rights reserved. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://trac.edgewall.org/wiki/TracLicense. +# +# This software consists of voluntary contributions made by many +# individuals. For the exact contribution history, see the revision +# history and logs, available at http://trac.edgewall.org/log/. +# +# Author: Daniel Lundin +# Christopher Lenz + +from trac.core import Interface, Component, implements + + +class IThemeProvider(Interface): + """ + The interface for all theme providers. Pretty basic, + just provides the most important things + """ + + def get_theme_htdocs_name(): + """ + Return the name of the htdocs folder. Every theme + can implement the `ITemplateProvider` in order to + get it's own theme folder, however there are two + special ones: + + - `common` the trac htdocs folder + - `site` the htdocs folder in the trac instance + """ + + def get_theme_site_template(): + """ + Return the name of the theme site template that is + used. The site template places the interface + elements and overrides them. + """ + + +class CustomTheme(Component): + implements(IThemeProvider) + + # IThemeProvider + def get_theme_htdocs_id(self): + return 'site' + + def get_theme_site_template(self): + return 'site.html' + + +class TracTheme(Component): + implements(IThemeProvider) + + # IThemeProvider + def get_theme_htdocs_id(self): + return 'common' + + def get_theme_site_template(self): + return 'trac_site.html' + + +class ThemeController(object): + """ + Class passed to the templates in order to help the + designer. + """ + + def __init__(self, req, theme): + self.req = req + self.theme = theme + + def get_chrome_url(self, *files): + return self.req.href.chrome(self.theme.get_theme_htdocs_id(), *files) + + def get_theme_site_template(self): + return self.theme.get_theme_site_template() Index: trac/web/chrome.py =================================================================== --- trac/web/chrome.py (revision 5204) +++ trac/web/chrome.py (working copy) @@ -43,6 +43,7 @@ from trac.web.href import Href from trac.wiki import IWikiSyntaxProvider from trac.wiki.formatter import format_to_html, format_to_oneliner +from trac.web.theming import ThemeController, IThemeProvider def add_link(req, rel, href, title=None, mimetype=None, classname=None): @@ -165,6 +166,10 @@ (''since 0.11'')""") + theme = ExtensionOption('trac', 'theme', + IThemeProvider, 'TracTheme', + """Name of the theme trac should use.""") + auto_reload = Option('trac', 'auto_reload', False, """Automatically reload template files after modification.""") @@ -253,7 +258,9 @@ try: fileobj.write(""" - + """) finally: fileobj.close() @@ -363,6 +370,7 @@ add_link(fakereq, 'icon', src, mimetype=mimetype) add_link(fakereq, 'shortcut icon', src, mimetype=mimetype) + # Logo image chrome['logo'] = self.get_logo_data(req.href) @@ -460,6 +468,7 @@ 'version': VERSION, 'homepage': 'http://trac.edgewall.org/', # FIXME: use setup data 'systeminfo': self.env.systeminfo, + 'theme': ThemeController(req, self.theme) } d['project'] = { 'name': self.env.project_name,