← Back to branch summary

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

« back to all changes in this revision

Viewing changes to www/dispatch/html.py

  • Committer: stevenbird
  • Date: 2008-02-19 21:17:21 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:512
Renaming of problems to exercises (initial commit).
Fix up module naming (exercises sometimes called tutorials).

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/dispatch/html.py
61
61
    username = %s;
62
62
  </script>
63
63
""" % (repr(conf.root_dir), username))
64
 
    iconurl = get_icon_url(req.app, small=True)
 
64
    iconurl = get_icon_url(req.app)
65
65
    if iconurl:
66
66
        req.write("""  <link rel="shortcut icon" href="%s" />
67
67
""" % cgi.escape(iconurl))
89
89
    if req.user:
90
90
        # Get the user's nickname from the request session
91
91
        nickname = req.user.nick
92
 
        req.write('  <p class="userhello"><span id="usernick">%s</span> '
93
 
            '(<span class="username">%s</span>) |\n'
94
 
            '    <a href="%s">Settings</a> |\n'
 
92
        req.write('  <p class="userhello">%s (<span '
 
93
            'class="username">%s</span>) |\n'
95
94
            '    <a href="%s">Help</a> |\n'
96
 
            '    <a href="%s">Sign out</a>\n'
 
95
            '    <a href="%s">Logout</a>\n'
97
96
            '  </p>\n' %
98
97
            (cgi.escape(nickname), cgi.escape(req.user.login),
99
 
             cgi.escape(util.make_path('settings')),
100
98
             cgi.escape(get_help_url(req)),
101
99
             cgi.escape(util.make_path('logout'))))
102
100
    else:
108
106
    # If the "debuginfo" app is installed, display a warning to the admin to
109
107
    # make sure it is removed in production.
110
108
    if "debuginfo" in conf.apps.app_url:
111
 
        req.write("  <p><small>Warning: debuginfo is enabled. Set "
112
 
            "enable_debuginfo = False in lib/conf/apps.py, when placing IVLE "
113
 
            "into production.</small></p>\n")
 
109
        req.write("  <p><small>Warning: debuginfo is enabled. Remove this "
 
110
            "app from conf.apps.app_url when placed into production."
 
111
            "</small></p>\n")
114
112
 
115
113
    # If req has a "no_agreement" attribute, then it is because the user has
116
114
    # not signed the agreement; therefore we are displaying the TOS page.
145
143
    """Given an app's url name, gets the URL of the icon image for this app,
146
144
    relative to the site root. Returns None if the app has no icon."""
147
145
    if appurl is None: return None
148
 
    try:
149
 
        app = conf.apps.app_url[appurl]
150
 
    except KeyError:
151
 
        # Due to navigating to a bad app
152
 
        return None
 
146
    app = conf.apps.app_url[appurl]
153
147
    if small:
154
148
        icon_dir = conf.apps.app_icon_dir_small
155
149
    else: