← 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-03-18 00:12:26 UTC
  • mfrom: (1164 trunk)
  • mto: This revision was merged to the branch mainline in revision 1290.
  • Revision ID: grantw@unimelb.edu.au-20090318001226-fm6rh01lfezetk3x
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/base/xhtml.py
83
83
        ctx['styles'] += req.styles
84
84
 
85
85
        ctx['scripts'] = [media_url(req, CorePlugin, path) for path in
86
 
                           ('util.js', 'json2.js', 'md5.js', 'jquery.js')]
 
86
                           ('util.js', 'json2.js', 'md5.js')]
 
87
        ctx['scripts'].append(media_url(req, '+external/jquery', 'jquery.js'))
87
88
        ctx['scripts'] += req.scripts
88
89
 
89
90
        ctx['scripts_init'] = req.scripts_init