From 4c7f377d9b0b8b92ba430a7e665401566bef1c66 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Fri, 8 Jun 2012 11:46:59 +0100
Subject: [PATCH] MDL-33612 quiz: Improve page title 'Editing quiz'

Include the quiz name in the title. Also, add two missing format_string
calls around $quiz->name.
---
 mod/quiz/edit.php         | 10 +++-------
 mod/quiz/lang/en/quiz.php |  2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 503999fd7f9..b6cce6fb3d7 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -145,10 +145,6 @@ $quizhasattempts = quiz_has_attempts($quiz->id);
 
 $PAGE->set_url($thispageurl);
 
-$pagetitle = get_string('editingquiz', 'quiz');
-if ($quiz_reordertool) {
-    $pagetitle = get_string('orderingquiz', 'quiz');
-}
 // Get the course object and related bits.
 $course = $DB->get_record('course', array('id' => $quiz->course));
 if (!$course) {
@@ -412,7 +408,7 @@ $PAGE->requires->skip_link_to('questionbank',
         get_string('skipto', 'access', get_string('questionbank', 'question')));
 $PAGE->requires->skip_link_to('quizcontentsblock',
         get_string('skipto', 'access', get_string('questionsinthisquiz', 'quiz')));
-$PAGE->set_title($pagetitle);
+$PAGE->set_title(get_string('editingquizx', 'quiz', format_string($quiz->name)));
 $PAGE->set_heading($course->fullname);
 $node = $PAGE->settingsnav->find('mod_quiz_edit', navigation_node::TYPE_SETTING);
 if ($node) {
@@ -498,10 +494,10 @@ if ($quiz_reordertool) {
 }
 
 if ($quiz_reordertool) {
-    echo $OUTPUT->heading_with_help(get_string('orderingquiz', 'quiz') . ': ' . $quiz->name,
+    echo $OUTPUT->heading_with_help(get_string('orderingquizx', 'quiz', format_string($quiz->name)),
             'orderandpaging', 'quiz');
 } else {
-    echo $OUTPUT->heading(get_string('editingquiz', 'quiz') . ': ' . $quiz->name, 2);
+    echo $OUTPUT->heading(get_string('editingquizx', 'quiz', format_string($quiz->name)), 2);
     echo $OUTPUT->help_icon('editingquiz', 'quiz', get_string('basicideasofquiz', 'quiz'));
 }
 quiz_print_status_bar($quiz);
diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php
index dd4645fa33d..3fe11f0647f 100644
--- a/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@ -246,6 +246,7 @@ $string['editingquiz_help'] = 'When creating a quiz, the main concepts are:
 * The question bank, which stores copies of all questions organised into categories
 * Random questions -  A student gets different questions each time they attempt the quiz and different students can get different questions';
 $string['editingquiz_link'] = 'mod/quiz/edit';
+$string['editingquizx'] = 'Editing quiz: {$a}';
 $string['editoverride'] = 'Edit override';
 $string['editqcats'] = 'Edit questions categories';
 $string['editquestions'] = 'Edit questions';
@@ -513,6 +514,7 @@ To add page breaks after particular questions, tick the checkboxes next to the q
 
 To arrange the questions over a number of pages, click the Repaginate button and select the desired number of questions per page.';
 $string['orderingquiz'] = 'Order and paging';
+$string['orderingquizx'] = 'Order and paging: {$a}';
 $string['outof'] = '{$a->grade} out of a maximum of {$a->maxgrade}';
 $string['outofpercent'] = '{$a->grade} out of a maximum of {$a->maxgrade} ({$a->percent}%)';
 $string['outofshort'] = '{$a->grade}/{$a->maxgrade}';