← 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-14 00:18:01 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:447
graphic for user database schema

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/dispatch/html.py
52
52
""" % (cgi.escape(titlepart), cgi.escape(req.content_type)))
53
53
    # Write inline JavaScript which gives the client code access to certain
54
54
    # server-side variables.
55
 
    if req.user:
56
 
        username = repr(req.user.login)
 
55
    if req.username:
 
56
        username = repr(req.username)
57
57
    else:
58
58
        username = "null"
59
59
    req.write("""  <script type="text/javascript">
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))
86
86
  <h2>Informatics Virtual Learning Environment</h2>
87
87
""")
88
88
 
89
 
    if req.user:
 
89
    if req.username:
90
90
        # Get the user's nickname from the request session
91
 
        nickname = req.user.nick
 
91
        nickname = req.get_session()['nick']
92
92
        req.write('  <p class="userhello">%s (<span '
93
93
            'class="username">%s</span>) |\n'
94
 
            '    <a href="%s">Settings</a> |\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
 
            (cgi.escape(nickname), cgi.escape(req.user.login),
99
 
             cgi.escape(util.make_path('settings')),
 
97
            (cgi.escape(nickname), cgi.escape(req.username),
100
98
             cgi.escape(get_help_url(req)),
101
99
             cgi.escape(util.make_path('logout'))))
102
100
    else:
112
110
            "app from conf.apps.app_url when placed into production."
113
111
            "</small></p>\n")
114
112
 
115
 
    # If req has a "no_agreement" attribute, then it is because the user has
116
 
    # not signed the agreement; therefore we are displaying the TOS page.
117
 
    # Do not show apps (see dispatch.login).
118
 
    if req.user and not req.user.state == 'no_agreement':
 
113
    if req.username:
119
114
        # Only print app tabs if logged in
120
115
        print_apps_list(req, req.app)
121
116
    req.write('</div>\n<div id="ivlebody">\n')
130
125
def get_help_url(req):
131
126
    """Gets the help URL most relevant to this page, to place as the
132
127
    "help" link at the top of the page."""
133
 
    reqapp = req.app if hasattr(req, 'app') else None
134
 
    if reqapp == 'help':
 
128
    if req.app == 'help':
135
129
        # We're already in help. Link to the exact current page
136
130
        # instead of the generic help page.
137
131
        return req.uri
138
 
    if reqapp is not None and conf.apps.app_url[reqapp].hashelp:
139
 
        help_path = os.path.join('help', reqapp)
 
132
    if conf.apps.app_url[req.app].hashelp:
 
133
        help_path = os.path.join('help', req.app)
140
134
    else:
141
135
        help_path = 'help'
142
136
    return util.make_path(help_path)
145
139
    """Given an app's url name, gets the URL of the icon image for this app,
146
140
    relative to the site root. Returns None if the app has no icon."""
147
141
    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
 
142
    app = conf.apps.app_url[appurl]
153
143
    if small:
154
144
        icon_dir = conf.apps.app_icon_dir_small
155
145
    else: