← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/tos/media/tos.js

  • Committer: Matt Giuca
  • Date: 2010-07-22 02:12:36 UTC
  • mfrom: (1812.1.13 late-submit)
  • Revision ID: matt.giuca@gmail.com-20100722021236-k8kt4cqdtywzpk24
https://launchpad.net/bugs/598346
Merge from trunk late-submit.
Students may now submit projects after the deadline, but they are warned that the submission is late.
Lecturers are now given data on which submissions were made late, and how many days.
(LP: #598346)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/tos/media/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
    }
102
107
    else
103
108
    {
104
109
        /* Refresh the page; as the user is now (apparently) logged in */
105
 
        window.location.href = window.location.href;
 
110
        window.location.href = parse_url(window.location.href).args["url"] || "/";
106
111
    }
107
112
}
108
113
 
109
114
function decline_license()
110
115
{
111
116
    /* Redirect to the logout page */
112
 
    window.location.href = app_path("logout");
 
117
    window.location.href = app_path("+logout");
113
118
}