Accessing a test by Calendar, ‘Close Window And Exit’ button in the wrong place

Child of SAM-1318

If a student access to a evaluation through its event of the Calendar (fig.1) the behavior is a little bit different than in the normal way through the Test&Quizzes tool.

In the Calendar path it'll opens a new tab or window. In this case, after the 'Submit for Grading' action, the page shows a 'Close Window and Exit" button (fig_2.png). If the student pushes the button the page will be closed and the test will be lost. There is no alert message in this case (fig_exit_alert)
We think this button should be in the next page, the page which appears at the end of the process (fig.3)

In addition with this, in this last page it would be perfect if it could shows the "Continue" button, to go to the Test&Quizzes page to read the grades and the feedback. This ‘Continue’ doesn’t appear here in the new tab.

Tested in:
https://qa10.longsight.com/portal