Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/an…

…dyjdavis/moodle

admin/lib.php

@@ -32,8 +32,8 @@
  */
 function admin_page_type_list($pagetype, $parentcontext, $currentcontext) {
     $array = array(
-        'admin-setting-*' => get_string('page-admin-setting-x', 'pagetype'),
-        $pagetype => get_string('page-admin-setting', 'pagetype')
+        'admin-*' => get_string('page-admin-x', 'pagetype'),
+        $pagetype => get_string('page-admin-current', 'pagetype')
     );
     return $array;
 }

blocks/edit_form.php

@@ -99,8 +99,8 @@ function definition() {
         $contextoptions = array();
         if ( ($parentcontext->contextlevel == CONTEXT_COURSE && $parentcontext->instanceid == SITEID) ||
             ($parentcontext->contextlevel == CONTEXT_SYSTEM)) {        // Home page
-            if ($bits[0] == 'tag' || ($bits[0] == 'admin' && $bits[1] == 'setting')) {
-                // tag and admin settings always use system context
+            if ($bits[0] == 'tag' || $bits[0] == 'admin') {
+                // tag and admin pages always use system context
                 // the contexts options don't make differences, so we use
                 // page type patterns only
                 $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE);

course/report/completion/lib.php

@@ -55,7 +55,7 @@ function completion_page_type_list($pagetype, $parentcontext, $currentcontext) {
     $array = array(
         '*' => get_string('page-x', 'pagetype'),
         'course-report-*' => get_string('page-course-report-x', 'pagetype'),
-        'course-report-completion-*' => get_string('pluginpagetype',  'coursereport_completion')
+        'course-report-completion-index' => get_string('pluginpagetype',  'coursereport_completion')
     );
     return $array;
 }

course/report/log/lang/en/coursereport_log.php

@@ -27,5 +27,5 @@
 $string['log:view'] = 'View course logs';
 $string['log:viewlive'] = 'View live logs';
 $string['log:viewtoday'] = 'View today\'s logs';
-$string['pluginpagetype'] = 'Log course report';
+$string['pluginpagetype'] = 'Logs course report';
 $string['pluginname'] = 'Logs';

course/report/log/lib.php

@@ -548,7 +548,8 @@ function log_page_type_list($pagetype, $parentcontext, $currentcontext) {
     $array = array(
         '*' => get_string('page-x', 'pagetype'),
         'course-report-*' => get_string('page-course-report-x', 'pagetype'),
-        'course-report-log-*' => get_string('pluginpagetype',  'coursereport_log')
+        'course-report-log-index' => get_string('pluginpagetype',  'coursereport_log')
+        //course-report-log-live not included as theres no blocks on the live log page
     );
     return $array;
 }

course/report/outline/lang/en/coursereport_outline.php

@@ -24,5 +24,5 @@
  */
 
 $string['outline:view'] = 'View course activity report';
-$string['pluginpagetype'] = 'Course activity report';
+$string['pluginpagetype'] = 'Activity course report';
 $string['pluginname'] = 'Course activity';

course/report/outline/lib.php

@@ -49,7 +49,7 @@ function outline_page_type_list($pagetype, $parentcontext, $currentcontext) {
     $array = array(
         '*' => get_string('page-x', 'pagetype'),
         'course-report-*' => get_string('page-course-report-x', 'pagetype'),
-        'course-report-outline-*' => get_string('pluginpagetype',  'coursereport_outline')
+        'course-report-outline-index' => get_string('pluginpagetype',  'coursereport_outline')
     );
     return $array;
 }

course/report/participation/lib.php

@@ -49,7 +49,7 @@ function participation_page_type_list($pagetype, $parentcontext, $currentcontext
     $array = array(
         '*' => get_string('page-x', 'pagetype'),
         'course-report-*' => get_string('page-course-report-x', 'pagetype'),
-        'course-report-participation-*' => get_string('pluginpagetype',  'coursereport_participation')
+        'course-report-participation-index' => get_string('pluginpagetype',  'coursereport_participation')
     );
     return $array;
 }

course/report/progress/lang/en/coursereport_progress.php

@@ -24,5 +24,5 @@
  */
 
 $string['pluginname'] = 'Activity completion';
-$string['pluginpagetype'] = 'Progress course report';
+$string['pluginpagetype'] = 'Activity completion report';
 $string['progress:view'] = 'View activity completion reports';

course/report/progress/lib.php

@@ -60,7 +60,7 @@ function progress_page_type_list($pagetype, $parentcontext, $currentcontext) {
     $array = array(
         '*' => get_string('page-x', 'pagetype'),
         'course-report-*' => get_string('page-course-report-x', 'pagetype'),
-        'course-report-progress-*' => get_string('pluginpagetype',  'coursereport_progress')
+        'course-report-progress-index' => get_string('pluginpagetype',  'coursereport_progress')
     );
     return $array;
 }

course/report/stats/lib.php

@@ -102,7 +102,7 @@ function stats_page_type_list($pagetype, $parentcontext, $currentcontext) {
     $array = array(
         '*' => get_string('page-x', 'pagetype'),
         'course-report-*' => get_string('page-course-report-x', 'pagetype'),
-        'course-report-stats-*' => get_string('pluginpagetype',  'coursereport_stats')
+        'course-report-stats-index' => get_string('pluginpagetype',  'coursereport_stats')
     );
     return $array;
 }

lang/en/pagetype.php

@@ -23,8 +23,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['page-admin-setting'] = 'The current admin setting page';
-$string['page-admin-setting-x'] = 'Any admin setting page';
+$string['page-admin-current'] = 'The current site administration page';
+$string['page-admin-x'] = 'Any site administration page';
 $string['page-course-view-x'] = 'Any type of course main page';
 $string['page-course-x'] = 'Any course page';
 $string['page-course-report-x'] = 'Any course report';

mod/glossary/lang/en/glossary.php

@@ -220,6 +220,8 @@
 $string['numberofentries'] = 'Number of entries';
 $string['onebyline'] = '(one per line)';
 $string['page-mod-glossary-x'] = 'Any glossary module page';
+$string['page-mod-glossary-edit'] = 'Glossary add/edit entry page';
+$string['page-mod-glossary-view'] = 'View glossary edit page';
 $string['pluginadministration'] = 'Glossary administration';
 $string['pluginname'] = 'Glossary';
 $string['popupformat'] = 'Popup format';

mod/glossary/lib.php

@@ -2862,6 +2862,9 @@ function glossary_comment_validate($comment_param) {
  * @param stdClass $currentcontext Current context of block
  */
 function glossary_page_type_list($pagetype, $parentcontext, $currentcontext) {
-    $module_pagetype = array('mod-glossary-*'=>get_string('page-mod-glossary-x', 'glossary'));
+    $module_pagetype = array(
+        'mod-glossary-*'=>get_string('page-mod-glossary-x', 'glossary'),
+        'mod-glossary-view'=>get_string('page-mod-glossary-view', 'glossary'),
+        'mod-glossary-edit'=>get_string('page-mod-glossary-edit', 'glossary'));
     return $module_pagetype;
 }

mod/glossary/view.php

@@ -62,7 +62,6 @@
 }
 
 /// setting the defaut number of entries per page if not set
-
 if ( !$entriesbypage = $glossary->entbypage ) {
     $entriesbypage = $CFG->glossary_entbypage;
 }

mod/lesson/edit.php

@@ -48,6 +48,7 @@
 $lessonoutput = $PAGE->get_renderer('mod_lesson');
 $PAGE->navbar->add(get_string('edit'));
 echo $lessonoutput->header($lesson, $cm, $mode);
+
 if (!$lesson->has_pages()) {
     // There are no pages; give teacher some options
     require_capability('mod/lesson:edit', $context);

mod/lesson/lang/en/lesson.php

@@ -310,7 +310,9 @@
 $string['overview'] = 'Overview';
 $string['overview_help'] = 'A lesson is made up of a number of pages and optionally content pages. A page contains some content and usually ends with a question. Associated with each answer to the question is a jump. The jump can be relative, such as this page or next page, or absolute, specifying any one of the pages in the lesson. A content page is a page containing a set of links to other pages in the lesson, for example a Table of Contents.';
 $string['page'] = 'Page: {$a}';
-$string['page-mod-lesson-x'] = 'Any lesson module page';
+$string['page-mod-lesson-x'] = 'Any lesson page';
+$string['page-mod-lesson-view'] = 'View or preview lesson page';
+$string['page-mod-lesson-edit'] = 'Edit lesson page';
 $string['pagecontents'] = 'Page contents';
 $string['pages'] = 'Pages';
 $string['pagetitle'] = 'Page title';

mod/lesson/lib.php

@@ -990,6 +990,9 @@ function lesson_get_file_info($browser, $areas, $course, $cm, $context, $fileare
  * @param stdClass $currentcontext Current context of block
  */
 function lesson_page_type_list($pagetype, $parentcontext, $currentcontext) {
-    $module_pagetype = array('mod-lesson-*'=>get_string('page-mod-lesson-x', 'lesson'));
+    $module_pagetype = array(
+        'mod-lesson-*'=>get_string('page-mod-lesson-x', 'lesson'),
+        'mod-lesson-view'=>get_string('page-mod-lesson-view', 'lesson'),
+        'mod-lesson-edit'=>get_string('page-mod-lesson-edit', 'lesson'));
     return $module_pagetype;
 }

mod/quiz/lang/en/quiz.php

@@ -489,6 +489,7 @@
 $string['overrideuser'] = 'Override user';
 $string['overrideusereventname'] = '{$a->quiz} - Override';
 $string['page-mod-quiz-x'] = 'Any quiz module page';
+$string['page-mod-quiz-edit'] = 'Edit quiz page';
 $string['pagesize'] = 'Attempts shown per page:';
 $string['parent'] = 'Parent';
 $string['parentcategory'] = 'Parent category';

mod/quiz/lib.php

@@ -1711,6 +1711,8 @@ function mod_quiz_question_pluginfile($course, $context, $component,
  * @param stdClass $currentcontext Current context of block
  */
 function quiz_page_type_list($pagetype, $parentcontext, $currentcontext) {
-    $module_pagetype = array('mod-quiz-*'=>get_string('page-mod-quiz-x', 'quiz'));
+    $module_pagetype = array(
+        'mod-quiz-*'=>get_string('page-mod-quiz-x', 'quiz'),
+        'mod-quiz-edit'=>get_string('page-mod-quiz-edit', 'quiz'));
     return $module_pagetype;
 }