Skip to content

Commit

Permalink
Merge pull request #45 from NHSLeadership/develop
Browse files Browse the repository at this point in the history 
Release 2023081801
  • Loading branch information
@AndyMCole
AndyMCole authored Aug 21, 2023
2 parents 3b2cb92 + 89c27fe commit aa7ccab
Show file tree
Hide file tree
Showing 15 changed files with 573 additions and 251 deletions.
1 change: 1 addition & 0 deletions classes/output/core_renderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public function header()
// }
// $html = str_replace('nhsuk-header__default', 'nhsuk-header__light', $html);
// $html = str_replace('navbar__default', 'navbar__light', $html);

return $html;
}

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nhsla/moodle-nhse",
"type": "moodle-theme",
"version": "2023081001",
"version": "2023081801",
"require": {
"composer/installers": "~1.0"
},
Expand Down
255 changes: 129 additions & 126 deletions config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

$THEME->doctype = 'html5';
$THEME->name = 'nhse';
$THEME->version = '2023081001';
$THEME->version = '2023081801';
$THEME->parents = ['boost'];
$THEME->regions = [];
$THEME->sheets = [];
Expand All @@ -58,135 +58,135 @@
};

$THEME->layouts = [
// // Most backwards compatible layout without the blocks.
// 'base' => array(
// 'file' => 'drawers.php',
// 'regions' => array(),
// ),
// // Standard layout with blocks.
// 'standard' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// ),
// // Main course page.
// 'course' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// 'options' => array('langmenu' => true),
// ),
// 'coursecategory' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// ),
// // Part of course, typical for modules - default page layout if $cm specified in require_login().
// 'incourse' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// ),
// // The site home page.
// 'frontpage' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// 'options' => array('nonavbar' => true),
// ),
// // Server administration scripts.
// 'admin' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// ),
// // My courses page.
// 'mycourses' => array(
// 'file' => 'drawers.php',
// 'regions' => ['side-pre'],
// 'defaultregion' => 'side-pre',
// 'options' => array('nonavbar' => true),
// ),
// // My dashboard page.
// 'mydashboard' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// 'options' => array('nonavbar' => true, 'langmenu' => true),
// ),
// // My public page.
// 'mypublic' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// ),
// Most backwards compatible layout without the blocks.
'base' => array(
'file' => 'drawers.php',
'regions' => array(),
),
// Standard layout with blocks.
'standard' => array(
'file' => 'drawers.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
// Main course page.
'course' => array(
'file' => 'drawers.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
'options' => array('langmenu' => true),
),
'coursecategory' => array(
'file' => 'drawers.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
// Part of course, typical for modules - default page layout if $cm specified in require_login().
'incourse' => array(
'file' => 'drawers.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
// The site home page.
'frontpage' => array(
'file' => 'drawers.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
'options' => array('nonavbar' => true),
),
// Server administration scripts.
'admin' => array(
'file' => 'drawers.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
// My courses page.
'mycourses' => array(
'file' => 'drawers.php',
'regions' => ['side-pre'],
'defaultregion' => 'side-pre',
'options' => array('nonavbar' => true),
),
// My dashboard page.
'mydashboard' => array(
'file' => 'drawers.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
'options' => array('nonavbar' => true, 'langmenu' => true),
),
// My public page.
'mypublic' => array(
'file' => 'drawers.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
'login' => array(
'file' => 'login.php',
'regions' => array(),
'options' => array('langmenu' => true),
),
// // Pages that appear in pop-up windows - no navigation, no blocks, no header and bare activity header.
// 'popup' => array(
// 'file' => 'columns1.php',
// 'regions' => array(),
// 'options' => array(
// 'nofooter' => true,
// 'nonavbar' => true,
// 'activityheader' => [
// 'notitle' => true,
// 'nocompletion' => true,
// 'nodescription' => true
// ]
// )
// ),
// // No blocks and minimal footer - used for legacy frame layouts only!
// 'frametop' => array(
// 'file' => 'columns1.php',
// 'regions' => array(),
// 'options' => array(
// 'nofooter' => true,
// 'nocoursefooter' => true,
// 'activityheader' => [
// 'nocompletion' => true
// ]
// ),
// ),
// // Embeded pages, like iframe/object embeded in moodleform - it needs as much space as possible.
// 'embedded' => array(
// 'file' => 'embedded.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// ),
// // Used during upgrade and install, and for the 'This site is undergoing maintenance' message.
// // This must not have any blocks, links, or API calls that would lead to database or cache interaction.
// // Please be extremely careful if you are modifying this layout.
// 'maintenance' => array(
// 'file' => 'maintenance.php',
// 'regions' => array(),
// ),
// // Should display the content and basic headers only.
// 'print' => array(
// 'file' => 'columns1.php',
// 'regions' => array(),
// 'options' => array('nofooter' => true, 'nonavbar' => false, 'noactivityheader' => true),
// ),
// // The pagelayout used when a redirection is occuring.
// 'redirect' => array(
// 'file' => 'embedded.php',
// 'regions' => array(),
// ),
// // The pagelayout used for reports.
// 'report' => array(
// 'file' => 'drawers.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre',
// ),
// // The pagelayout used for safebrowser and securewindow.
// 'secure' => array(
// 'file' => 'secure.php',
// 'regions' => array('side-pre'),
// 'defaultregion' => 'side-pre'
// )
// Pages that appear in pop-up windows - no navigation, no blocks, no header and bare activity header.
'popup' => array(
'file' => 'reports.php',
'regions' => array(),
'options' => array(
'nofooter' => true,
'nonavbar' => true,
'activityheader' => [
'notitle' => true,
'nocompletion' => true,
'nodescription' => true
]
)
),
// No blocks and minimal footer - used for legacy frame layouts only!
'frametop' => array(
'file' => 'columns1.php',
'regions' => array(),
'options' => array(
'nofooter' => true,
'nocoursefooter' => true,
'activityheader' => [
'nocompletion' => true
]
),
),
// Embeded pages, like iframe/object embeded in moodleform - it needs as much space as possible.
'embedded' => array(
'file' => 'embedded.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
// Used during upgrade and install, and for the 'This site is undergoing maintenance' message.
// This must not have any blocks, links, or API calls that would lead to database or cache interaction.
// Please be extremely careful if you are modifying this layout.
'maintenance' => array(
'file' => 'maintenance.php',
'regions' => array(),
),
// Should display the content and basic headers only.
'print' => array(
'file' => 'columns1.php',
'regions' => array(),
'options' => array('nofooter' => true, 'nonavbar' => false, 'noactivityheader' => true),
),
// The pagelayout used when a redirection is occuring.
'redirect' => array(
'file' => 'embedded.php',
'regions' => array(),
),
// The pagelayout used for reports.
'report' => array(
'file' => 'columns1.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
// The pagelayout used for safebrowser and securewindow.
'secure' => array(
'file' => 'secure.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre'
)
];

$THEME->enable_dock = false;
Expand All @@ -199,7 +199,10 @@
$THEME->addblockposition = BLOCK_ADDBLOCK_POSITION_FLATNAV;
$THEME->iconsystem = \core\output\icon_system::FONTAWESOME;
$THEME->haseditswitch = true;
$THEME->usescourseindex = true;
// A new theme config 'removedprimarynavitems' allows a theme to customise primary navigation by specifying the list of items to remove.
//$THEME->removedprimarynavitems = []
// A new theme config 'usescourseindex' allows a theme to specify whether it implements and uses course index, shows modules pagination if unset or false
$THEME->usescourseindex = getenv("USES_COURSE_INDEX");

// Control displaying nhse titles (Boost is set to true).
$THEME->activityheaderconfig = [
Expand Down
4 changes: 2 additions & 2 deletions lang/en/theme_nhse.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
$string['brandcolor_desc'] = 'The accent colour.';
$string['bootswatch'] = 'Bootswatch';
$string['bootswatch_desc'] = 'A bootswatch is a set of Bootstrap variables and css to style Bootstrap';
$string['choosereadme'] = 'Boost is a modern highly-customisable theme. This theme is intended to be used directly, or as a parent theme when creating new themes utilising Bootstrap 4.';
$string['choosereadme'] = 'The NHSE is a modern highly-customisable theme based on Moodle Boost ans .';
$string['configtitle'] = 'NHSE';
$string['copyright'] = 'Copyright notice';
$string['copyright_desc'] = 'Anything you add here will be prepended with © and the year';
Expand Down Expand Up @@ -80,7 +80,7 @@
$string['preset_desc'] = 'Pick a preset to broadly change the look of the theme.';
$string['presetfiles'] = 'Additional theme preset files';
$string['presetfiles_desc'] = 'Preset files can be used to dramatically alter the appearance of the theme. See <a href="https://docs.moodle.org/dev/Boost_Presets">Boost presets</a> for information on creating and sharing your own preset files, and see the <a href="https://archive.moodle.net/boost">Presets repository</a> for presets that others have shared.';
$string['privacy:metadata'] = 'The Boost theme does not store any personal data about any user.';
$string['privacy:metadata'] = 'The NHSE theme does not store any personal data about any user.';
$string['previoussection'] = 'Previous';
$string['privacy:metadata'] = 'The Moodle NHSE theme does not store any personal data about any user.';
$string['privacy:metadata:preference:draweropenblock'] = 'The user\'s preference for hiding or showing the drawer with blocks.';
Expand Down
41 changes: 41 additions & 0 deletions layout/reports.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?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/>.

/**
* A one column layout for the boost theme.
*
* @package theme_boost
* @copyright 2016 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();

$bodyattributes = $OUTPUT->body_attributes([]);
$templatecontext = [
'sitename' => format_string($SITE->shortname, true, ['context' => context_course::instance(SITEID), "escape" => false]),
'output' => $OUTPUT,
'bodyattributes' => $bodyattributes,
];

if (empty($PAGE->layout_options['noactivityheader'])) {
$header = $PAGE->activityheader;
$renderer = $PAGE->get_renderer('core');
$templatecontext['headercontent'] = $header->export_for_template($renderer);
}

echo $OUTPUT->render_from_template('theme_nhse/reports', $templatecontext);

Loading

0 comments on commit aa7ccab

Please sign in to comment.