From 934c878eaa2bd2139cf2b5fe0cfeb21ce0d5d982 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Tue, 5 Jul 2011 15:16:44 +0100
Subject: [PATCH] MDL-26165 quiz submit are-you-sure is potentially confusing.

---
 mod/quiz/accessrules.php  |  3 ++-
 mod/quiz/lang/en/quiz.php |  3 ++-
 mod/quiz/renderer.php     | 10 ++++------
 mod/quiz/summary.php      |  1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/mod/quiz/accessrules.php b/mod/quiz/accessrules.php
index 054fdb9c444..107eae631e6 100644
--- a/mod/quiz/accessrules.php
+++ b/mod/quiz/accessrules.php
@@ -231,7 +231,8 @@ class quiz_access_manager {
         if (!$unfinished) {
             $strconfirmstartattempt = $this->confirm_start_attempt_message();
             if ($strconfirmstartattempt) {
-                $button->add_confirm_action($strconfirmstartattempt);
+                $button->add_action(new confirm_action($strconfirmstartattempt, null,
+                        get_string('startattempt', 'quiz')));
             }
         }
 
diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php
index deaf6a7ac03..479579c870e 100644
--- a/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@ -175,7 +175,7 @@ $string['configshufflewithin'] = 'If you enable this option, then the parts maki
 $string['configtimelimit'] = 'Default time limit for quizzes in minutes. 0 mean no time limit.';
 $string['configtimelimitsec'] = 'Default time limit for quizzes in seconds. 0 mean no time limit.';
 $string['configurerandomquestion'] = 'Configure question';
-$string['confirmclose'] = 'You are about to close this attempt. Once you close the attempt you will no longer be able to change your answers.';
+$string['confirmclose'] = 'Once you submit, you will no longer be able to change your answers for this attempt.';
 $string['confirmserverdelete'] = 'Are you sure you want to remove the server <b>{$a}</b> from the list?';
 $string['confirmstartattemptlimit'] = 'Number of attempts allowed:  {$a}. You are about to start a new attempt.  Do you wish to proceed?';
 $string['confirmstartattempttimelimit'] = 'This quiz has a time limit and is limited to {$a} attempt(s). You are about to start a new attempt.  Do you wish to proceed?';
@@ -719,6 +719,7 @@ $string['sorttypealpha'] = 'Sort by type, name';
 $string['specificapathnotonquestion'] = 'The specified file path is not on the specified question';
 $string['specificquestionnotonquiz'] = 'Specified question is not on the specified quiz';
 $string['startagain'] = 'Start again';
+$string['startattempt'] = 'Start attempt';
 $string['startedon'] = 'Started on';
 $string['startnewpreview'] = 'Start a new preview';
 $string['statenotloaded'] = 'The state for question {$a} has not been loaded from the database';
diff --git a/mod/quiz/renderer.php b/mod/quiz/renderer.php
index ed5d2da79f8..e3213228702 100644
--- a/mod/quiz/renderer.php
+++ b/mod/quiz/renderer.php
@@ -547,7 +547,6 @@ class mod_quiz_renderer extends plugin_renderer_base {
         $output .= $this->countdown_timer();
 
         // Finish attempt button.
-        $output .= $this->container_start('submitbtns mdl-align');
         $options = array(
             'attempt' => $attemptobj->get_attemptid(),
             'finishattempt' => 1,
@@ -560,12 +559,11 @@ class mod_quiz_renderer extends plugin_renderer_base {
                 new moodle_url($attemptobj->processattempt_url(), $options),
                 get_string('submitallandfinish', 'quiz'));
         $button->id = 'responseform';
-        $button->add_confirm_action(get_string('confirmclose', 'quiz'));
+        $button->add_action(new confirm_action(get_string('confirmclose', 'quiz'), null,
+                get_string('submitallandfinish', 'quiz')));
 
-        $output .= $this->container_start('controls');
-        $output .= $this->render($button);
-        $output .= $this->container_end();
-        $output .= $this->container_end();
+        $output .= $this->container($this->container($this->render($button),
+                'controls'), 'submitbtns mdl-align');
 
         return $output;
     }
diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php
index 0024f4223bc..40a765fbc24 100644
--- a/mod/quiz/summary.php
+++ b/mod/quiz/summary.php
@@ -103,4 +103,3 @@ echo $output->summary_page($attemptobj, $displayoptions);
 // Finish the page
 $accessmanager->show_attempt_timer_if_needed($attemptobj->get_attempt(), time());
 echo $OUTPUT->footer();
-