← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/security/login.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/security/login.html
10
10
        Please log in to access your files and assessment.
11
11
      </p>
12
12
 
13
 
      <p py:if="defined('error')" class="error">${error}</p>
14
 
 
15
 
      <form action="${path}" method="post">
16
 
        <table>
17
 
          <tr><td>Username:</td><td><input name="user" type="text" /></td></tr>
18
 
          <tr><td>Password:</td><td><input name="pass" type="password" /></td></tr>
19
 
          <tr><td colspan="2"><input type="submit" value="Login" /></td></tr>
20
 
        </table>
 
13
      <form class="verticalform thin" action="${path}" method="post">
 
14
        <div>
 
15
          <label for="field_username">Username:</label>
 
16
          <input id="field_username" name="user" type="text" />
 
17
        </div>
 
18
        <div>
 
19
          <label for="field_password">Password:</label>
 
20
          <input id="field_password" name="pass" type="password" />
 
21
        </div>
 
22
        <div class="submit form_error" py:if="defined('error')"
 
23
             py:content="error"></div>
 
24
        <div class="submit"><input type="submit" value="Log in" /></div>
21
25
      </form>
 
26
      <p py:if="msie" class="erroraction"><strong>Warning:</strong> You appear
 
27
        to be using Microsoft Internet Explorer. Internet Explorer is not a
 
28
        supported web browser for use in IVLE at this time. Please use another
 
29
        browser. We recommend <a href="http://getfirefox.com">Mozilla
 
30
        Firefox</a> or <a href="http://www.google.com/chrome/">Google
 
31
        Chrome</a>. If you continue, some functionality may not work.</p>
22
32
    </div>
23
33
  </body>
24
34
</html>