comparison mercurial/hgweb/hgwebdir_mod.py @ 11649:48163c39e1f1 stable

hgwebdir: use template paths configured in the hgrc (issue2281)
author Christian Fischer <christian@fi12.de>
date Mon, 12 Jul 2010 16:07:58 +0200
parents 258c98567aff
children 8f8a7976f4bc
comparison
equal deleted inserted replaced
11646:91af149b5cd7 11649:48163c39e1f1
84 self.repos = repos 84 self.repos = repos
85 self.ui = u 85 self.ui = u
86 encoding.encoding = self.ui.config('web', 'encoding', 86 encoding.encoding = self.ui.config('web', 'encoding',
87 encoding.encoding) 87 encoding.encoding)
88 self.style = self.ui.config('web', 'style', 'paper') 88 self.style = self.ui.config('web', 'style', 'paper')
89 self.templatepath = self.ui.config('web', 'templates', None)
89 self.stripecount = self.ui.config('web', 'stripes', 1) 90 self.stripecount = self.ui.config('web', 'stripes', 1)
90 if self.stripecount: 91 if self.stripecount:
91 self.stripecount = int(self.stripecount) 92 self.stripecount = int(self.stripecount)
92 self._baseurl = self.ui.config('web', 'baseurl') 93 self._baseurl = self.ui.config('web', 'baseurl')
93 self.lastrefresh = time.time() 94 self.lastrefresh = time.time()
313 styles = ( 314 styles = (
314 req.form.get('style', [None])[0], 315 req.form.get('style', [None])[0],
315 config('web', 'style'), 316 config('web', 'style'),
316 'paper' 317 'paper'
317 ) 318 )
318 style, mapfile = templater.stylemap(styles) 319 style, mapfile = templater.stylemap(styles, self.templatepath)
319 if style == styles[0]: 320 if style == styles[0]:
320 vars['style'] = style 321 vars['style'] = style
321 322
322 start = url[-1] == '?' and '&' or '?' 323 start = url[-1] == '?' and '&' or '?'
323 sessionvars = webutil.sessionvars(vars, start) 324 sessionvars = webutil.sessionvars(vars, start)