Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine

Conflicts:
	lib/db/upgrade.php
	mod/quiz/lib.php

theme/afterburner/config.php

@@ -0,0 +1,133 @@
+<?php
+
+$THEME->name = 'afterburner';
+
+$THEME->parents = array('base');
+
+$THEME->sheets = array(
+    'afterburner_layout',   /** Must come first: Page layout **/
+    'afterburner_styles',   /** Must come second: default styles **/
+    'afterburner_menu',
+    'afterburner_blocks',
+    'afterburner_mod',
+    'afterburner_calendar',
+    'afterburner_dock',
+    'rtl'
+);
+
+$THEME->parents_exclude_sheets = array(
+    'base'=>array(
+        'pagelayout',
+        'dock'
+    ),
+);
+$THEME->editor_sheets = array('editor');
+
+$THEME->layouts = array(
+    // Most backwards compatible layout without the blocks - this is the layout used by default
+    'base' => array(
+        'file' => 'default.php',
+        'regions' => array(),
+    ),
+    // Standard layout with blocks, this is recommended for most pages with default information
+    'standard' => array(
+        'file' => 'default.php',
+        'regions' => array('side-pre', 'side-post'),
+        'defaultregion' => 'side-post',
+    ),
+    // Main course page
+    'course' => array(
+        'file' => 'default.php',
+        'regions' => array('side-pre', 'side-post'),
+        'defaultregion' => 'side-post',
+        'options' => array('langmenu'=>true),
+    ),
+    'coursecategory' => array(
+        'file' => 'default.php',
+        'regions' => array('side-pre', 'side-post'),
+        'defaultregion' => 'side-post',
+    ),
+    // part of course, typical for modules - default page layout if $cm specified in require_login()
+    'incourse' => array(
+        'file' => 'default.php',
+        'regions' => array('side-pre', 'side-post'),
+        'defaultregion' => 'side-post',
+    ),
+    // The site home page.
+    'frontpage' => array(
+        'file' => 'default.php',
+        'regions' => array('side-pre', 'side-post'),
+        'defaultregion' => 'side-post',
+    ),
+    // Server administration scripts.
+    'admin' => array(
+        'file' => 'default.php',
+        'regions' => array('side-pre'),
+        'defaultregion' => 'side-pre',
+    ),
+    // My dashboard page
+    'mydashboard' => array(
+        'file' => 'default.php',
+        'regions' => array('side-post'),
+        'defaultregion' => 'side-post',
+        'options' => array('langmenu'=>true),
+    ),
+    // My public page
+    'mypublic' => array(
+        'file' => 'default.php',
+        'regions' => array('side-pre'),
+        'defaultregion' => 'side-pre',
+    ),
+    'login' => array(
+        'file' => 'default.php',
+        'regions' => array(),
+        'options' => array('langmenu'=>true),
+    ),
+
+    // Pages that appear in pop-up windows - no navigation, no blocks, no header.
+    'popup' => array(
+        'file' => 'default.php',
+        'regions' => array(),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nologininfo'=>true),
+    ),
+    // No blocks and minimal footer - used for legacy frame layouts only!
+    'frametop' => array(
+        'file' => 'default.php',
+        'regions' => array(),
+        'options' => array('nofooter'=>true),
+    ),
+    // Embedded pages, like iframe/object embeded in moodleform - it needs as much space as possible
+    'embedded' => array(
+        'file' => 'embedded.php',
+        'regions' => array()
+    ),
+    // Used during upgrade and install, and for the 'This site is undergoing maintenance' message.
+    // This must not have any blocks, and it is good idea if it does not have links to
+    // other places - for example there should not be a home link in the footer...
+    'maintenance' => array(
+        'file' => 'default.php',
+        'regions' => array(),
+        'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
+    ),
+    // Should display the content and basic headers only.
+    'print' => array(
+        'file' => 'default.php',
+        'regions' => array(),
+        'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>false, 'nocustommenu'=>true),
+    ),
+    // The pagelayout used when a redirection is occuring.
+    'redirect' => array(
+        'file' => 'embedded.php',
+        'regions' => array()
+    ),
+    // The pagelayout used for reports
+    'report' => array(
+        'file' => 'default.php',
+        'regions' => array('side-pre'),
+        'defaultregion' => 'side-pre',
+    ),
+);
+
+$THEME->enable_dock = true;
+
+$THEME->rendererfactory = 'theme_overridden_renderer_factory';

theme/afterburner/lang/en/theme_afterburner.php

@@ -0,0 +1,55 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Strings for component 'theme_afterburner', language 'en'
+ *
+ * @package   theme_afterburner
+ * @copyright 2011
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['pluginname'] = 'Afterburner';
+$string['region-side-post'] = 'Right';
+$string['region-side-pre'] = 'Left';
+$string['choosereadme'] = '
+<div class="clearfix">
+ <div class="theme_screenshot">
+
+  <h2>Afterburner</h2>
+  <img src="afterburner/pix/screenshot.jpg" />
+
+  <h3>Theme Discussion Forum:</h3>
+  <p><a href="http://moodle.org/mod/forum/view.php?id=46">http://moodle.org/mod/forum/view.php?id=46</a></p>
+
+  <h3>Theme Credits</h3>
+  <p><a href="http://docs.moodle.org/en/Theme_credits">http://docs.moodle.org/en/Theme_credits</a></p>
+
+  <h3>Theme Documentation:</h3>
+  <p><a href="http://docs.moodle.org/en/Themes">http://docs.moodle.org/en/Themes</a></p><h3>Report a bug:</h3><p><a href="http://tracker.moodle.org">http://tracker.moodle.org</a></p>
+ </div>
+ <div class="theme_description">
+  <h2>About</h2>
+  <p>Afterburner is a three-column, fluid-width theme coded for Moodle 2.0. It makes use of custom menus that appear below the site title on every page. An added function, which allows users to login and logout, has now been integrated into the custom menu for this theme.</p>
+  <h2>Parents</h2>
+  <p>This theme is built on Base, a parent theme included in the Moodle core. If you wish to modify aspects of this theme, beyond the settings offered, we advise creating a new theme using this theme and Base theme as parent themes, so any updates to these parent themes, in the core, will find their way into your new theme.</p>
+  <h2>Credits</h2>
+  <p>This design was originally created for Moodle 1.9 by Patrick Malley of NewSchool Learning (www.newschoollearning.com)from an original design by Rocket Themes (www.rockettheme.com) before being ported to Moodle 2.0 by Mary Evans of NewSchool Learning (contact@newschoollearning.com).</p>
+  <h2>License</h2>
+  <p>This, and all other themes included in the Moodle core, are licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a>.</p>
+ </div>
+</div>';

theme/afterburner/layout/default.php

@@ -0,0 +1,128 @@
+<?php
+
+$hasheading = ($PAGE->heading);
+$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
+$hasfooter = (empty($PAGE->layout_options['nofooter']));
+$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT));
+$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT));
+$haslogininfo = (empty($PAGE->layout_options['nologininfo']));
+
+$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT));
+$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT));
+
+$custommenu = $OUTPUT->custom_menu();
+$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
+
+$bodyclasses = array();
+if ($showsidepre && !$showsidepost) {
+    $bodyclasses[] = 'side-pre-only';
+} else if ($showsidepost && !$showsidepre) {
+    $bodyclasses[] = 'side-post-only';
+} else if (!$showsidepost && !$showsidepre) {
+    $bodyclasses[] = 'content-only';
+}
+if ($hascustommenu) {
+    $bodyclasses[] = 'has_custom_menu';
+}
+
+echo $OUTPUT->doctype() ?>
+<html <?php echo $OUTPUT->htmlattributes() ?>>
+<head>
+    <title><?php echo $PAGE->title ?></title>
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
+    <?php echo $OUTPUT->standard_head_html() ?>
+</head>
+
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
+<?php echo $OUTPUT->standard_top_of_body_html() ?>
+<div id="page-wrapper">
+  <div id="page">
+   <?php if ($hasheading || $hasnavbar) { ?>
+    <div id="page-header">
+        <?php if ($hasheading) { ?>
+         <div id="logo">
+         </div>
+         <div class="headermenu"><?php
+            if ($haslogininfo) {
+                echo $OUTPUT->login_info();
+            }
+            if (!empty($PAGE->layout_options['langmenu'])) {
+                echo $OUTPUT->lang_menu();
+            }
+            echo $PAGE->headingmenu
+            ?></div>
+        <?php } ?>
+    </div>
+<?php } ?>
+<!-- END OF HEADER -->
+<!-- START CUSTOMMENU AND NAVBAR -->
+    <div id="navcontainer">
+        <?php if ($hascustommenu) { ?>
+                <div id="custommenu" class="javascript-disabled"><?php echo $custommenu; ?></div>
+        <?php } ?>
+
+    </div>
+
+        <?php if ($hasnavbar) { ?>
+            <div class="navbar clearfix">
+                <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
+                <div class="navbutton"> <?php echo $PAGE->button; ?></div>
+            </div>
+        <?php } ?>
+
+<!-- END OF CUSTOMMENU AND NAVBAR -->
+    <div id="page-content">
+       <div id="region-main-box">
+           <div id="region-post-box">
+              <div id="region-main-wrap">
+                 <div id="region-main-pad">
+                   <div id="region-main">
+                     <div class="region-content">
+                            <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+                     </div>
+                   </div>
+                 </div>
+               </div>
+
+                <?php if ($hassidepre) { ?>
+                <div id="region-pre" class="block-region">
+                   <div class="region-content">
+                        <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
+                   </div>
+                </div>
+                <?php } ?>
+
+                <?php if ($hassidepost) { ?>
+                <div id="region-post" class="block-region">
+                   <div class="region-content">
+                        <?php echo $OUTPUT->blocks_for_region('side-post') ?>
+                   </div>
+                </div>
+                <?php } ?>
+            </div>
+        </div>
+    </div>
+
+    <!-- START OF FOOTER -->
+    <?php if ($hasfooter) { ?>
+    <div id="page-footer" class="clearfix">
+
+        <div class="footer-left">
+            <a href="http://moodle.org" title="Moodle">
+                <img src="<?php echo $OUTPUT->pix_url('footer/moodle-logo','theme')?>" alt="Moodle logo" />
+            </a>
+        </div>
+
+        <div class="footer-right">
+            <?php echo $OUTPUT->login_info();?>
+        </div>
+
+        <?php echo $OUTPUT->standard_footer_html(); ?>
+    </div>
+    <?php } ?>
+    <div class="clearfix"></div>
+</div>
+</div>
+<?php echo $OUTPUT->standard_end_of_body_html() ?>
+</body>
+</html>

theme/afterburner/layout/embedded.php

@@ -0,0 +1,23 @@
+<?php echo $OUTPUT->doctype() ?>
+<html <?php echo $OUTPUT->htmlattributes() ?>>
+<head>
+    <title><?php echo $PAGE->title ?></title>
+    <link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
+    <?php echo $OUTPUT->standard_head_html() ?>
+</head>
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
+<?php echo $OUTPUT->standard_top_of_body_html() ?>
+
+<div id="page">
+
+<!-- END OF HEADER -->
+
+    <div id="content" class="clearfix">
+        <?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
+    </div>
+
+<!-- START OF FOOTER -->
+</div>
+<?php echo $OUTPUT->standard_end_of_body_html() ?>
+</body>
+</html>