← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/admin/templates/user-edit.html

  • Committer: David Coles
  • Date: 2010-08-30 03:26:13 UTC
  • Revision ID: coles.david@gmail.com-20100830032613-d14vng0jkelniu3l
python-console: Fix globals broken with new JSON library.

simplejson always returns unicode strings. cJSON would return ordinary strings 
if possible. cPickle.loads() only accepts strings. At present we use pickle 
version 0 so they should all works as ASCII strings. Higher versions of pickle 
are not plain ASCII and are likely to break this and so this should be fixed 
at some point.

Also replaced unconditional exception with one that catches Pickle errors. Not 
sure the best way to report failures of these functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/templates/user-edit.html
1
1
<html xmlns="http://www.w3.org/1999/xhtml"
2
2
      xmlns:py="http://genshi.edgewall.org/">
3
3
  <head>
4
 
    <title>Edit profile - ${user.nick}</title>
 
4
    <title>Edit profile - ${context.nick}</title>
5
5
  </head>
6
6
  <body>
7
 
    <h1>Edit profile of ${user.nick}</h1>
 
7
    <h1>Edit profile of ${context.nick}</h1>
8
8
    <div id="ivle_padding">
 
9
      <div class="contextactions">
 
10
        <a py:if="req.user.admin" class="manageaction" href="/~${context.login}/+admin">Administer user</a>
 
11
        <a py:if="context.passhash" class="keyaction" href="/~${context.login}/+changepassword">Change password</a>
 
12
        <a py:if="req.user.admin" class="keyaction" href="/~${context.login}/+resetpassword">Reset password</a>
 
13
      </div>
9
14
      <p>
10
 
        ${user.fullname} (<b>${user.login}</b><py:if test="user.studentid"> / ${user.studentid}</py:if>)
11
 
        <a py:if="user.passhash" href="/~${user.login}/+changepassword">(change password)</a>
12
 
        <a py:if="req.user.admin" href="/~${user.login}/+resetpassword">(reset password)</a>
13
 
        <a py:if="req.user.admin" href="/~${user.login}/+admin">(administer)</a>
 
15
        ${context.fullname} (<b>${context.login}</b><py:if test="context.studentid"> / ${context.studentid}</py:if>)
14
16
      </p>
15
17
    
16
 
      <p py:if="user.admin">Privilege: <strong>IVLE administrator</strong></p>
 
18
      <p py:if="context.admin">Privilege: <strong>IVLE administrator</strong></p>
17
19
 
18
20
      <form class="verticalform" action="" method="post">
19
21
        <div>
26
28
          <input type="text" name="email" id="email" size="40" />
27
29
          <span py:if="'email' in errors" class="form_error">${errors.email}</span>
28
30
        </div>
29
 
        <p><input type="submit" value="Save Changes" /></p>
 
31
        <div>
 
32
          <label for="svn_pass">Subversion URL:</label>
 
33
          ${svn_url}
 
34
          <a class="helpaction" href="/+help/Files/Subversion#external" title="What's this?"></a>
 
35
        </div>
 
36
        <div>
 
37
          <label for="svn_pass">Subversion password:</label>
 
38
          <!-- Hidden from view for security reasons -->
 
39
          <span id="svn_pass" style="display: none">${svn_pass}</span>
 
40
          <a id="svn_pass_show" class="fakelink"
 
41
              onclick="$('#svn_pass').show(); $('#svn_pass_show').hide(); $('#svn_pass_hide').show()">(show)</a>
 
42
          <a id="svn_pass_hide" class="fakelink" style="display: none"
 
43
              onclick="$('#svn_pass').hide(); $('#svn_pass_show').show(); $('#svn_pass_hide').hide()">(hide)</a>
 
44
        </div>
 
45
        <div class="submit form_error" py:if="defined('error_value')" py:content="error_value" />
 
46
        <div class="submit"><input type="submit" value="Save" /></div>
30
47
      </form>
31
48
 
32
 
      <h3 py:if="user.pass_exp or user.acct_exp">Notices</h3>
33
 
      <p py:if="user.pass_exp">
 
49
      <h3 py:if="context.pass_exp or context.acct_exp">Notices</h3>
 
50
      <p py:if="context.pass_exp">
34
51
        Your password will expire
35
 
        <span title="${format_datetime(user.pass_exp)}">${format_datetime_short(user.pass_exp)}</span>.
 
52
        <span title="${format_datetime(context.pass_exp)}">${format_datetime_short(context.pass_exp)}</span>.
36
53
        You should change it before then to avoid having your account
37
54
        disabled.
38
55
      </p>
39
 
      <p py:if="user.acct_exp">
 
56
      <p py:if="context.acct_exp">
40
57
        Your IVLE account will expire
41
 
        <span title="${format_datetime(user.acct_exp)}">${format_datetime_short(user.acct_exp)}</span>.
 
58
        <span title="${format_datetime(context.acct_exp)}">${format_datetime_short(context.acct_exp)}</span>.
42
59
      </p>
43
60
    </div>
44
61
  </body>