← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/base/xhtml.py

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/base/xhtml.py
48
48
        for key in kwargs:
49
49
            setattr(self, key, kwargs[key])
50
50
 
51
 
    def filter(self, stream, ctx):
52
 
        return stream
53
 
 
54
51
    def render(self, req):
55
52
        req.content_type = 'text/html' # TODO: Detect application/xhtml+xml
56
53
 
64
61
                        inspect.getmodule(self).__file__), self.template) 
65
62
        loader = genshi.template.TemplateLoader(".", auto_reload=True)
66
63
        tmpl = loader.load(app_template)
67
 
        app = self.filter(tmpl.generate(viewctx), viewctx)
 
64
        app = tmpl.generate(viewctx)
68
65
 
69
66
        for plugin in self.plugin_scripts:
70
67
            for path in self.plugin_scripts[plugin]:
83
80
        ctx['styles'] += req.styles
84
81
 
85
82
        ctx['scripts'] = [media_url(req, CorePlugin, path) for path in
86
 
                           ('util.js', 'json2.js', 'md5.js')]
87
 
        ctx['scripts'].append(media_url(req, '+external/jquery', 'jquery.js'))
 
83
                           ('util.js', 'json2.js', 'md5.js', 'jquery.js')]
88
84
        ctx['scripts'] += req.scripts
89
85
 
90
86
        ctx['scripts_init'] = req.scripts_init