Mercurial > hg
comparison mercurial/hgweb/hgwebdir_mod.py @ 18191:e4f17956f45a stable
hgwebdir: honor web.templates and web.static for static files (issue3734)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 22 Dec 2012 18:11:51 -0600 |
parents | d51364b318ea |
children | 2c1276825e93 |
comparison
equal
deleted
inserted
replaced
18157:52581d2b98ac | 18191:e4f17956f45a |
---|---|
182 if virtual.startswith('static/') or 'static' in req.form: | 182 if virtual.startswith('static/') or 'static' in req.form: |
183 if virtual.startswith('static/'): | 183 if virtual.startswith('static/'): |
184 fname = virtual[7:] | 184 fname = virtual[7:] |
185 else: | 185 else: |
186 fname = req.form['static'][0] | 186 fname = req.form['static'][0] |
187 static = templater.templatepath('static') | 187 static = self.ui.config("web", "static", None, |
188 untrusted=False) | |
189 if not static: | |
190 tp = self.templatepath or templater.templatepath() | |
191 if isinstance(tp, str): | |
192 tp = [tp] | |
193 static = [os.path.join(p, 'static') for p in tp] | |
188 return (staticfile(static, fname, req),) | 194 return (staticfile(static, fname, req),) |
189 | 195 |
190 # top-level index | 196 # top-level index |
191 elif not virtual: | 197 elif not virtual: |
192 req.respond(HTTP_OK, ctype) | 198 req.respond(HTTP_OK, ctype) |