← Back to branch summary

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

« back to all changes in this revision

Viewing changes to www/media/common/tos.js

  • Committer: Matt Giuca
  • Date: 2009-01-19 17:28:59 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: matt.giuca@gmail.com-20090119172859-htjq3rfpp0fhtpc9
ivle.worksheet: Added calculate_score. This is a nice clean Storm port of
    ivle.db.calculate_worksheet_score.
tutorial: Replaced use of ivle.db.calculate_worksheet_score with
    ivle.worksheet.calculate_score.
    Guess What!! Removed this module's dependency on ivle.db! Hooray!
    (Note: tutorialservice still depends on it).
bin/ivle-marks: Updated this script to use ivle.worksheet_calculate_score.
    Note that this DOES NOT execute properly -- it seems it didn't even
    before my changes (tries to call db.get_users). Not my fault; I'm
    committing and going to bed!
ivle.db: Removed calculate_worksheet_score.
    As this removes the dependency on get_problem_status, removed that too!
    Almost all the worksheet stuff is gone now!

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/media/common/tos.js
99
99
    tos_acceptbuttons.appendChild(dom_make_text_elem("p",
100
100
        "Error connecting to server. Please try again later. "));
101
101
    }
102
 
    else if (response.response == 'error')
103
 
    {
104
 
    tos_acceptbuttons.appendChild(dom_make_text_elem("p",
105
 
        "Error activating user: " + response.message));
106
 
    }
107
102
    else
108
103
    {
109
104
        /* Refresh the page; as the user is now (apparently) logged in */
110
 
        window.location.href = parse_url(window.location.href).args["url"] || "/";
 
105
        window.location.href = window.location.href;
111
106
    }
112
107
}
113
108
 
114
109
function decline_license()
115
110
{
116
111
    /* Redirect to the logout page */
117
 
    window.location.href = app_path("+logout");
 
112
    window.location.href = app_path("logout");
118
113
}