|
a/Allura/allura/lib/app_globals.py |
|
b/Allura/allura/lib/app_globals.py |
|
... |
|
... |
| 300 |
self.resource_manager.register(ew.JSLink('allura/' + href, **kw))
|
300 |
self.resource_manager.register(ew.JSLink('allura/' + href, **kw))
|
| 301 |
|
301 |
|
| 302 |
def register_app_css(self, href, **kw):
|
302 |
def register_app_css(self, href, **kw):
|
| 303 |
app = kw.pop('app', c.app)
|
303 |
app = kw.pop('app', c.app)
|
| 304 |
self.resource_manager.register(
|
304 |
self.resource_manager.register(
|
| 305 |
ew.CSSLink('tool/%s/%s' % (app.config.tool_name, href), **kw))
|
305 |
ew.CSSLink('tool/%s/%s' % (app.config.tool_name.lower(), href), **kw))
|
| 306 |
|
306 |
|
| 307 |
def register_app_js(self, href, **kw):
|
307 |
def register_app_js(self, href, **kw):
|
| 308 |
app = kw.pop('app', c.app)
|
308 |
app = kw.pop('app', c.app)
|
| 309 |
self.resource_manager.register(
|
309 |
self.resource_manager.register(
|
| 310 |
ew.JSLink('tool/%s/%s' % (app.config.tool_name, href), **kw))
|
310 |
ew.JSLink('tool/%s/%s' % (app.config.tool_name.lower(), href), **kw))
|
| 311 |
|
311 |
|
| 312 |
def register_theme_css(self, href, **kw):
|
312 |
def register_theme_css(self, href, **kw):
|
| 313 |
self.resource_manager.register(ew.CSSLink(self.theme_href(href), **kw))
|
313 |
self.resource_manager.register(ew.CSSLink(self.theme_href(href), **kw))
|
| 314 |
|
314 |
|
| 315 |
def register_theme_js(self, href, **kw):
|
315 |
def register_theme_js(self, href, **kw):
|
|
... |
|
... |
| 340 |
def app_static(self, resource, app=None):
|
340 |
def app_static(self, resource, app=None):
|
| 341 |
base = config['static.url_base']
|
341 |
base = config['static.url_base']
|
| 342 |
app = app or c.app
|
342 |
app = app or c.app
|
| 343 |
if base.startswith(':'):
|
343 |
if base.startswith(':'):
|
| 344 |
base = request.scheme + base
|
344 |
base = request.scheme + base
|
| 345 |
return (base + app.config.tool_name + '/' + resource)
|
345 |
return (base + app.config.tool_name.lower() + '/' + resource)
|
| 346 |
|
346 |
|
| 347 |
def set_project(self, pid_or_project):
|
347 |
def set_project(self, pid_or_project):
|
| 348 |
if isinstance(pid_or_project, M.Project):
|
348 |
if isinstance(pid_or_project, M.Project):
|
| 349 |
c.project = pid_or_project
|
349 |
c.project = pid_or_project
|
| 350 |
elif isinstance(pid_or_project, basestring):
|
350 |
elif isinstance(pid_or_project, basestring):
|