← 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

  • Committer: William Grant
  • Date: 2009-06-29 01:55:55 UTC
  • mto: This revision was merged to the branch mainline in revision 1322.
  • Revision ID: grantw@unimelb.edu.au-20090629015555-49xxv0piiieunx8e
Add docs on configuring Apache.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/base/xhtml.py
37
37
    """
38
38
 
39
39
    template = 'template.html'
40
 
 
41
40
    plugin_scripts = {}
42
41
    plugin_styles = {}
43
 
    scripts_init = []
44
 
 
45
42
    allow_overlays = True
46
43
    overlay_blacklist = []
47
44
 
67
64
        tmpl = loader.load(app_template)
68
65
        app = self.filter(tmpl.generate(viewctx), viewctx)
69
66
 
70
 
        view_scripts = []
71
67
        for plugin in self.plugin_scripts:
72
68
            for path in self.plugin_scripts[plugin]:
73
 
                view_scripts.append(media_url(req, plugin, path))
 
69
                req.scripts.append(media_url(req, plugin, path))
74
70
 
75
 
        view_styles = []
76
71
        for plugin in self.plugin_styles:
77
72
            for path in self.plugin_styles[plugin]:
78
 
                view_styles.append(media_url(req, plugin, path))
 
73
                req.styles.append(media_url(req, plugin, path))
79
74
 
80
75
        # Global template
81
76
        ctx = genshi.template.Context()
82
 
 
83
 
        overlay_bits = self.render_overlays(req) if req.user else [[]]*4
84
 
        ctx['overlays'] = overlay_bits[0]
 
77
        # XXX: Leave this here!! (Before req.styles is read)
 
78
        ctx['overlays'] = self.render_overlays(req) if req.user else []
85
79
 
86
80
        ctx['styles'] = [media_url(req, CorePlugin, 'ivle.css')]
87
 
        ctx['styles'] += view_styles
88
 
        ctx['styles'] += overlay_bits[1]
 
81
        ctx['styles'] += req.styles
89
82
 
90
83
        ctx['scripts'] = [media_url(req, CorePlugin, path) for path in
91
84
                           ('util.js', 'json2.js', 'md5.js')]
92
85
        ctx['scripts'].append(media_url(req, '+external/jquery', 'jquery.js'))
93
 
        ctx['scripts'] += view_scripts
94
 
        ctx['scripts'] += overlay_bits[2]
 
86
        ctx['scripts'] += req.scripts
95
87
 
96
 
        ctx['scripts_init'] = self.scripts_init + overlay_bits[3]
 
88
        ctx['scripts_init'] = req.scripts_init
97
89
        ctx['app_template'] = app
98
90
        ctx['title_img'] = media_url(req, CorePlugin,
99
91
                                     "images/chrome/title.png")
157
149
        scripts_init.
158
150
        """
159
151
        overlays = []
160
 
        styles = []
161
 
        scripts = []
162
 
        scripts_init = []
163
152
        if not self.allow_overlays:
164
 
            return (overlays, styles, scripts, scripts_init)
 
153
            return overlays
165
154
 
166
155
        for plugin in req.config.plugin_index[OverlayPlugin]:
167
156
            for overclass in plugin.overlays:
171
160
                #TODO: Re-factor this to look nicer
172
161
                for mplugin in overlay.plugin_scripts:
173
162
                    for path in overlay.plugin_scripts[mplugin]:
174
 
                        scripts.append(media_url(req, mplugin, path))
 
163
                        req.scripts.append(media_url(req, mplugin, path))
175
164
 
176
165
                for mplugin in overlay.plugin_styles:
177
166
                    for path in overlay.plugin_styles[mplugin]:
178
 
                        styles.append(media_url(req, mplugin, path))
 
167
                        req.styles.append(media_url(req, mplugin, path))
179
168
 
180
 
                scripts_init += overlay.plugin_scripts_init
 
169
                req.scripts_init += overlay.plugin_scripts_init
181
170
 
182
171
                overlays.append(overlay.render(req))
183
 
        return (overlays, styles, scripts, scripts_init)
 
172
        return overlays
184
173
 
185
174
    @classmethod
186
175
    def get_error_view(cls, e):