';
+
+ for ($i = 1; $i <= 5; $i++) {
+ $blockrowsetting = $layoutrow . $i;
+ $blockrowvalue = $themesettings->$blockrowsetting;
+ if ($blockrowvalue != '0-0-0-0') {
+ $blockrows[] = $blockrowvalue;
+ }
+ }
+
+ foreach ($blockrows as $blockrow) {
+ $blocksequence[] = '+'; // Row start.
+ $vals = explode('-', $blockrow);
+ foreach ($vals as $val) {
+ if ($val > 0) {
+ $blocksequence[] = $val; // Block width.
+ $blockspacescount++;
+ }
+ }
+ $blocksequence[] = '-'; // Row end.
+ }
+ }
+
+ $blockspacesexceeded = false;
+ $blockcount = 0;
+ foreach ($blockcontents as $bc) {
+ if ($bc instanceof block_contents) {
+ if (!$editing) {
+ if (!empty($blocksequence[$blocksequencecount])) {
+ if ($blocksequence[$blocksequencecount] == '+') {
+ $content .= '
'; // End of container.
+ }
+ } else {
+ $content .= html_writer::tag('h2', get_string('blocks'), ['class' => 'sr-only']);
+ }
+
+ return html_writer::tag($tag, $content, $attributes);
+ }
+
+ /**
+ * Renders marketing blocks on front page.
*
* @param string $layoutrow
* @param string $settingname
* @return string Markup.
*/
public function get_marketing_blocks($layoutrow = 'marketlayoutrow', $settingname = 'market') {
+ $themesettings = \theme_adaptable\toolbox::get_settings();
$visiblestate = 3;
- if (!empty($this->page->theme->settings->marketingvisible)) {
- $visiblestate = $this->page->theme->settings->marketingvisible;
+ if (!empty($themesettings->marketingvisible)) {
+ $visiblestate = $themesettings->marketingvisible;
}
if ($visiblestate != 3) {
$loggedin = isloggedin();
@@ -798,13 +1219,21 @@ public function get_marketing_blocks($layoutrow = 'marketlayoutrow', $settingnam
$fields = [];
$blockcount = 0;
- $extramarketclass = $this->page->theme->settings->frontpagemarketoption;
+ $extramarketclass = $themesettings->frontpagemarketoption;
$retval = '';
+ $blocksequencecount++;
+ }
+ $bc->attributes['class'] .= ' col-'.$blocksequence[$blocksequencecount]; // Will be a number.
+ } else {
+ if ((!$blockspacesexceeded) && ($blockcount >= $blockspacescount)) {
+ $blockspacesexceeded = true;
+ html_writer::tag(
+ 'p',
+ get_string('flexibleblocksoverflow', 'theme_adaptable'),
+ ['class' => 'block-region-overflow col-12 text-center font-italic font-weight-bold']
+ );
+ $content .= '
'; // End of flexible-blocks-overflow.
+ }
+ $content .= '';
+ if (is_siteadmin()) {
+ $content .= html_writer::tag(
+ 'p',
+ get_string('flexibleblocksoverflow', 'theme_adaptable'),
+ ['class' => 'block-region-overflow col-12 text-center font-italic font-weight-bold']
+ );
+ }
+ }
+ $bc->attributes['class'] .= ' col-4';
+ }
+ $bc->attributes['notitle'] = true;
+ }
+ $content .= $this->block($bc, $region);
+ $lastblock = $bc->title;
+ $blockcount++;
+ if ((!$editing) && (!$blockspacesexceeded)) {
+ $blocksequencecount++;
+ // Could be a end of row next.
+ if ($blocksequence[$blocksequencecount] == '-') {
+ $content .= '
';
+ $blocksequencecount++;
+ }
+ }
+ } else if ($bc instanceof block_move_target) {
+ $content .= $this->block_move_target($bc, $zones, $lastblock, $region);
+ } else {
+ throw new coding_exception(
+ 'Unexpected type of thing (' . get_class($bc) . ') found in list of block contents.');
+ }
+ }
+
+ if (!$editing) {
+ if ($blockspacesexceeded) {
+ $content .= '';
+ if (is_siteadmin()) {
+ $retval .= html_writer::tag(
+ 'p',
+ get_string('marketingdeprecated', 'theme_adaptable'),
+ ['class' => 'marketing-deprecated col-12 text-center font-italic font-weight-bold']
+ );
+ }
+
for ($i = 1; $i <= 5; $i++) {
$marketrow = $layoutrow . $i;
- $marketrow = $this->page->theme->settings->$marketrow;
+ $marketrow = $themesettings->$marketrow;
if ($marketrow != '0-0-0-0') {
$fields[] = $marketrow;
}
@@ -818,7 +1247,7 @@ public function get_marketing_blocks($layoutrow = 'marketlayoutrow', $settingnam
$retval .= '
';
$blockcount++;
$fieldname = $settingname . $blockcount;
- if (isset($this->page->theme->settings->$fieldname)) {
+ if (isset($themesettings->$fieldname)) {
// Add HTML format.
$retval .= \theme_adaptable\toolbox::get_setting($fieldname, 'format_moodle');
}
@@ -1180,7 +1609,7 @@ protected static function timeaccesscompare($a, $b) {
* @return menu object.
*/
public function navigation_menu_content() {
- global $COURSE;
+ global $CFG, $COURSE;
$menu = new custom_menu();
$access = true;
@@ -1207,7 +1636,7 @@ public function navigation_menu_content() {
$branchlabel = '';
$branchtitle = get_string('home', 'theme_adaptable');
if ($navbardisplayicons) {
- $branchlabel .= '';
+ $branchlabel .= \theme_adaptable\toolbox::getfontawesomemarkup('home', ['fa-lg', 'mr-1']);
}
$branchlabel .= $branchtitle;
@@ -1223,7 +1652,7 @@ public function navigation_menu_content() {
$branchlabel = '';
$branchtitle = get_string('myhome');
if ($navbardisplayicons) {
- $branchlabel .= '';
+ $branchlabel .= \theme_adaptable\toolbox::getfontawesomemarkup('dashboard', ['fa-lg', 'mr-1']);
}
$branchlabel .= $branchtitle;
$branchurl = new moodle_url('/my/index.php');
@@ -1235,7 +1664,7 @@ public function navigation_menu_content() {
$branchlabel = '';
$branchtitle = get_string('courses');
if ($navbardisplayicons) {
- $branchlabel .= '';
+ $branchlabel .= \theme_adaptable\toolbox::getfontawesomemarkup('th', ['fa-lg', 'mr-1']);
}
$branchlabel .= $branchtitle;
$branchurl = new moodle_url('/my/courses.php');
@@ -1247,7 +1676,7 @@ public function navigation_menu_content() {
$branchlabel = '';
$branchtitle = get_string('events', 'theme_adaptable');
if ($navbardisplayicons) {
- $branchlabel .= '';
+ $branchlabel .= \theme_adaptable\toolbox::getfontawesomemarkup('calendar', ['fa-lg', 'mr-1']);
}
$branchlabel .= $branchtitle;
@@ -1302,7 +1731,7 @@ public function navigation_menu_content() {
$branchtitle = get_string('thiscourse', 'theme_adaptable');
if ($navbardisplayicons) {
$branchlabel .=
- \theme_adaptable\toolbox::getfontawesomemarkup('sitemap', ['fa-lg']) . '';
+ \theme_adaptable\toolbox::getfontawesomemarkup('sitemap', ['mr-1', 'fa-lg']) . '';
}
$branchlabel .= $branchtitle;
if ($navbardisplayicons) {
@@ -1329,7 +1758,7 @@ public function navigation_menu_content() {
$branchtitle = get_string('people', 'theme_adaptable');
$branchlabel = \theme_adaptable\toolbox::getfontawesomemarkup(
'users',
- ['icon', 'mr-2'],
+ ['icon', 'mr-1'],
[],
'',
$branchtitle
@@ -1401,7 +1830,7 @@ public function navigation_menu_content() {
}
if ($navbardisplayicons) {
- $helpicon = '';
+ $helpicon = \theme_adaptable\toolbox::getfontawesomemarkup('life-ring', ['fa-lg']);
} else {
$helpicon = '';
}
@@ -1441,6 +1870,36 @@ public function navigation_menu_content() {
}
}
+ // Custom menu.
+ if ((!empty($CFG->custommenuitems)) &&
+ (empty($this->page->theme->settings->disablecustommenu))) {
+ $custommenutitle = \theme_adaptable\toolbox::get_setting('custommenutitle', 'format_plain');
+ $branch = null;
+ if (!empty($custommenutitle)) {
+ $branchlabel = '';
+ $branchtitle = $custommenutitle;
+ if ($navbardisplayicons) {
+ $branchlabel .=
+ \theme_adaptable\toolbox::getfontawesomemarkup('bars', ['mr-1', 'fa-lg']) . '';
+ }
+
+ // Check the option of displaying a sub-menu arrow symbol.
+ if (!empty($this->page->theme->settings->navbardisplaysubmenuarrow)) {
+ $branchlabel .= \theme_adaptable\toolbox::getfontawesomemarkup('caret-down', ['ml-1']);
+ }
+
+ $branchurl = $this->page->url;
+ $branchsort++;
+ $branch = $menu->add($branchlabel, $branchurl, $branchtitle, $branchsort);
+ }
+
+ $menu->add_custom_menu_items($CFG->custommenuitems, current_language(), $branch);
+ }
+
return $menu;
}
@@ -1707,16 +2166,17 @@ protected function get_course_title() {
}
/**
- * Currently not called, but will leave for reference!
- *
- * @param array $headerinfo Array of things, see parent.
- * @param int $headinglevel Heading level, see parent.
+ * Renders the context header for the page.
*
- * @return string Markup.
+ * @param array $headerinfo Heading information.
+ * @param int $headinglevel What 'h' level to make the heading.
+ * @return string A rendered context header.
*/
public function context_header($headerinfo = null, $headinglevel = 1): string {
- $headerinfo = [];
- $headerinfo['heading'] = $this->get_course_title();
+ if (empty($headerinfo)) {
+ $headerinfo = [];
+ $headerinfo['heading'] = $this->get_course_title();
+ }
return parent::context_header($headerinfo, $headinglevel);
}
@@ -2164,8 +2624,7 @@ public function custom_menu_drawer() {
}
/**
- * This renders the bootstrap top menu.
- * This renderer is needed to enable the Bootstrap style navigation.
+ * Render custom menu.
*
* @param custom_menu $menu
* @param string $wrappre
@@ -2174,7 +2633,7 @@ public function custom_menu_drawer() {
*
* @return string
*/
- public function render_custom_menu(custom_menu $menu, $wrappre = '', $wrappost = '', $menuid = '') {
+ public function render_custom_menu(\custom_menu $menu, $wrappre = '', $wrappost = '', $menuid = '') {
if (!$menu->has_children()) {
return '';
}
@@ -2188,6 +2647,7 @@ public function render_custom_menu(custom_menu $menu, $wrappre = '', $wrappost =
}
}
$content = $wrappre . $content . $wrappost;
+
return $content;
}
@@ -2210,6 +2670,7 @@ protected function render_custom_menu_item(custom_menu_item $menunode, $level =
$url = '#';
}
if ($menunode->has_children()) {
+ $submenucount++;
$content = '';
$content .= html_writer::start_tag('a', ['href' => $url,
'class' => 'nav-link dropdown-toggle my-auto', 'role' => 'button',
@@ -2444,6 +2905,42 @@ protected function theme_switch_links() {
return '';
}
+ /**
+ * Get the HTML for blocks in the given region.
+ *
+ * @since Moodle 2.5.1 2.6
+ * @param string $region The region to get HTML for.
+ * @param array $classes Wrapping tag classes.
+ * @param string $tag Wrapping tag.
+ * @param boolean $fakeblocksonly Include fake blocks only.
+ * @return string HTML.
+ */
+ public function blocks($region, $classes = [], $tag = 'aside', $fakeblocksonly = false) {
+ $displayregion = $this->page->apply_theme_region_manipulations($region);
+ $editing = $this->page->user_is_editing();
+ $classes = (array)$classes;
+ $classes[] = 'block-region';
+ $attributes = [
+ 'id' => 'block-region-'.preg_replace('#[^a-zA-Z0-9_\-]+#', '-', $displayregion),
+ 'class' => join(' ', $classes),
+ 'data-blockregion' => $displayregion,
+ 'data-droptarget' => '1',
+ ];
+
+ $content = '';
+ if ($editing) {
+ $content = $this->block_region_title($region);
+ }
+
+ if ($this->page->blocks->region_has_content($displayregion, $this)) {
+ $content .= html_writer::tag('h2', get_string('blocks'), ['class' => 'sr-only']) .
+ $this->blocks_for_region($displayregion, $fakeblocksonly);
+ } else {
+ $content .= html_writer::tag('h2', get_string('blocks'), ['class' => 'sr-only']);
+ }
+ return html_writer::tag($tag, $content, $attributes);
+ }
+
/**
* Output all the blocks in a particular region.
*
diff --git a/classes/output/custom_menu.php b/classes/output/custom_menu.php
new file mode 100644
index 0000000..f48c0f1
--- /dev/null
+++ b/classes/output/custom_menu.php
@@ -0,0 +1,185 @@
+.
+
+/**
+ * Adaptable's custom menu.
+ *
+ * @package theme_adaptable
+ * @copyright 2024 G J Barnard
+ * {@link https://moodle.org/user/profile.php?id=442195}
+ * {@link https://gjbarnard.co.uk}
+ * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
+ */
+
+namespace theme_adaptable\output;
+
+/**
+ * Adaptable's custom menu.
+ */
+class custom_menu extends \custom_menu {
+ /**
+ * Creates the custom menu
+ *
+ * @param string $definition the menu items definition in syntax required by {@link convert_text_to_menu_nodes()}
+ * @param string $currentlanguage the current language code, null disables multilang support
+ */
+ public function __construct($definition = '', $currentlanguage = null) {
+ $this->currentlanguage = $currentlanguage;
+ \custom_menu_item::__construct('root'); // create virtual root element of the menu
+ if (!empty($definition)) {
+ $this->override_children(self::convert_text_to_menu_nodes($definition, $currentlanguage));
+ }
+ }
+
+ /**
+ * Adds the custom menu items to this or another menu.
+ *
+ * @param string $definition The menu items definition in syntax required by {@link convert_text_to_menu_nodes()}.
+ * @param string $currentlanguage The current language code, null disables multilang support.
+ * @param string $menu Other menu to add to (optional).
+ */
+ public function add_custom_menu_items($definition = '', $currentlanguage = null, \custom_menu_item $menu = null) {
+ if (!empty($definition)) {
+ $items = self::convert_text_to_menu_nodes($definition, $currentlanguage);
+ if (empty($menu)) {
+ $this->currentlanguage = $currentlanguage;
+ foreach ($items as $item) {
+ $sort = $this->lastsort + 1;
+ $item->sort = (int)$sort;
+ $this->lastsort = (int)$sort;
+ }
+ $this->children = array_merge($this->children, $items);
+ } else {
+ $menu->currentlanguage = $currentlanguage;
+ $menu->children = array_merge($menu->children, $items);
+ }
+ }
+ }
+
+ /**
+ * Converts a string into a structured array of custom_menu_items which can
+ * then be added to a custom menu.
+ *
+ * Structure:
+ * text|url|title|langs|fontawesome classes or name|capability.
+ * The number of hyphens at the start determines the depth of the item. The
+ * languages are optional, comma separated list of languages the line is for.
+ *
+ * Example structure:
+ * First level first item|http://www.moodle.com/
+ * -Second level first item|http://www.moodle.com/partners/
+ * -Second level second item|http://www.moodle.com/hq/
+ * --Third level first item|http://www.moodle.com/jobs/
+ * -Second level third item|http://www.moodle.com/development/
+ * First level second item|http://www.moodle.com/feedback/
+ * First level third item
+ * English only|http://moodle.com|English only item|en
+ * German only|http://moodle.de|Deutsch|de,de_du,de_kids
+ *
+ *
+ * @param string $text the menu items definition.
+ * @param string $language the language code, null disables multilang support.
+ * @return array Of custom_menu_item instances.
+ */
+ public static function convert_text_to_menu_nodes($text, $language = null) {
+ $root = new custom_menu();
+ $lastitem = $root;
+ $lastdepth = 0;
+ $hiddenitems = [];
+ $lines = explode("\n", $text);
+ foreach ($lines as $linenumber => $line) {
+ $line = trim($line);
+ if (strlen($line) == 0) {
+ continue;
+ }
+ // Parse item settings.
+ $itemtext = null;
+ $itemurl = null;
+ $itemtitle = null;
+ $itemvisible = true;
+ $itemfa = null;
+ $itemshown = true;
+ $settings = explode('|', $line);
+ foreach ($settings as $i => $setting) {
+ $setting = trim($setting);
+ if ($setting !== '') {
+ switch ($i) {
+ case 0: // Menu text.
+ $itemtext = ltrim($setting, '-');
+ break;
+ case 1: // URL.
+ try {
+ $itemurl = new \moodle_url($setting);
+ } catch (\moodle_exception $exception) {
+ // We're not actually worried about this, we don't want to mess up the display
+ // just for a wrongly entered URL.
+ $itemurl = null;
+ }
+ break;
+ case 2: // Title attribute.
+ $itemtitle = $setting;
+ break;
+ case 3: // Language.
+ if (!empty($language)) {
+ $itemlanguages = array_map('trim', explode(',', $setting));
+ $itemvisible &= in_array($language, $itemlanguages);
+ }
+ break;
+ case 4: // Font awesome icon class.
+ $itemfa = $setting;
+ break;
+ case 5: // Capability.
+ global $PAGE;
+ /* Potential capability. Based upon work by..
+ * @copyright 2018 Mathieu Domingo
+ * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
+ */
+ $setting = trim($setting);
+ if (get_capability_info($setting)) {
+ // Valid capability.
+ if (!has_capability($setting, $PAGE->context)) {
+ $itemshown = false;
+ }
+ }
+ break;
+ }
+ }
+ }
+ if ($itemshown) {
+ // Get depth of new item.
+ preg_match('/^(\-*)/', $line, $match);
+ $itemdepth = strlen($match[1]) + 1;
+ // Find parent item for new item.
+ while (($lastdepth - $itemdepth) >= 0) {
+ $lastitem = $lastitem->get_parent();
+ $lastdepth--;
+ }
+ if ($itemfa) {
+ $itemtext = \theme_adaptable\toolbox::getfontawesomemarkup($itemfa, ['mr-1']) . $itemtext;
+ }
+ $lastitem = $lastitem->add($itemtext, $itemurl, $itemtitle, $linenumber + 1);
+ $lastdepth++;
+ if (!$itemvisible) {
+ $hiddenitems[] = $lastitem;
+ }
+ }
+ }
+ foreach ($hiddenitems as $item) {
+ $item->parent->remove_child($item);
+ }
+ return $root->get_children();
+ }
+}
diff --git a/classes/toolbox.php b/classes/toolbox.php
index d8c4760..880de8b 100644
--- a/classes/toolbox.php
+++ b/classes/toolbox.php
@@ -503,12 +503,18 @@ public static function kalturaplugininstalled() {
*/
public static function getfontawesomemarkup($theicon, $classes = [], $attributes = [], $content = '', $title = '') {
if (!empty($theicon)) {
- $fav = self::get_setting('fav');
- if (!empty($fav)) {
- $toolbox = self::get_instance();
- $classes[] = $toolbox->get_fa6_from_fa4($theicon);
+ $theicon = trim($theicon);
+ if (mb_strpos($theicon, ' ') === false) { // No spaces, so find.
+ $fav = self::get_setting('fav');
+ if (!empty($fav)) {
+ $toolbox = self::get_instance();
+ $classes[] = $toolbox->get_fa6_from_fa4($theicon);
+ } else {
+ $classes[] = 'fa fa-' . $theicon;
+ }
} else {
- $classes[] = 'fa fa-' . $theicon;
+ // Spaces so full icon specified.
+ $classes[] = $theicon;
}
}
$attributes['aria-hidden'] = 'true';
@@ -1131,11 +1137,12 @@ public static function apply_template_override($templatename, $data) {
* @return array of the imgblder and totalblocks.
*/
public static function admin_settings_layout_builder($settingpage, $adminsettingname, $admindefaults, $adminchoices) {
- global $CFG, $PAGE;
+ global $OUTPUT;
$totalblocks = 0;
- $imgpath = $CFG->wwwroot . '/theme/adaptable/pix/layout-builder/';
- $imgblder = '';
+ $imgblder = '
Please see the \'Readme\' section on the \'Information\' settings tab for additional information.'; + +$string['informationblocksenabled'] = 'Enable information blocks'; +$string['informationblocksenableddesc'] = 'Set the information blocks in the frontpage.'; +$string['informationblocksvisible'] = 'Show the information blocks when'; +$string['informationblocksvisibledesc'] = 'Show the information blocks when \'Logged out\', \'Logged in\' or \'Logged in or out\'.'; +$string['informationblocksvisibleloggedout'] = 'Logged out'; +$string['informationblocksvisibleloggedin'] = 'Logged in'; +$string['informationblocksvisibleloggedinout'] = 'Logged in or out'; + +$string['informationblocksbuilderheading'] = 'Information block layout builder'; +$string['informationblocksbuilderdesc'] = 'Use the tool below to setup your information blocks. Once defined the blocks will follow the layout when editing is off.'; + +$string['informationblockslayoutrow'] = 'Information block row'; +$string['informationblockslayoutrowdesc'] = 'Add / set the layout for this information block row on front page.'; + // Marketing Blocks & Info Box. $string['marketingsettings'] = 'Marketing blocks'; $string['marketingsettingsheading'] = 'Customize the marketing blocks that appear on the front page.'; @@ -350,7 +375,7 @@ $string['marketingvisibleloggedin'] = 'Logged in'; $string['marketingvisibleloggedinout'] = 'Logged in or out'; -$string['marketingbuilderheading'] = 'Marketing block layout builder'; +$string['marketingbuilderheading'] = 'Marketing block layout builder - deprecated, please transition to using the Information block region'; $string['marketingbuilderdesc'] = 'Use the tool below to setup your marketing blocks. Once defined the block settings will appear further down the page.'; $string['marketlayoutrow'] = 'Marketing block row'; @@ -363,6 +388,8 @@ $string['layoutaddcontentdesc1'] = 'You have configured '; $string['layoutaddcontentdesc2'] = ' marketing blocks. If you are happy with this layout add content to the blocks below.
If you are not happy use the layout builder above to make changes.'; +$string['marketingdeprecated'] = 'Marketing blocks are deprecated, please migrate to using the Information block region.'; + $string['infobox'] = 'Frontpage info box'; $string['infoboxdesc'] = 'Frontpage info block HTML. Please see the \'Readme\' section on the \'Information\' settings tab for additional information.
Note: This element is only used for compatibility with BCU and will be removed in coming versions.'; @@ -372,7 +399,7 @@ $string['infobox2'] = 'Frontpage secondary info box'; $string['infobox2desc'] = 'Frontpage secondary info box. Please see the \'Readme\' section on the \'Information\' settings tab for additional information.
Note: This element is only used for compatibility with BCU and will be removed in coming versions.'; -$string['frontpagemarketenabled'] = 'Enable marketing blocks'; +$string['frontpagemarketenabled'] = 'Enable marketing blocks - deprecated, please transition to using the Information block region'; $string['frontpagemarketenableddesc'] = 'Set the marketing blocks in the frontpage.'; $string['frontpagemarketoption'] = 'Choose style for marketing blocks'; @@ -504,6 +531,8 @@ $string['togglenavigation'] = 'Toggle navigation'; +$string['custommenu'] = 'Custom'; + // Navbar styling. $string['navbardropdownborderradius'] = 'Dropdown menu border radius'; $string['navbardropdownborderradiusdesc'] = 'Controls the border radius for dropdown menus (e.g. rounded corners).'; @@ -577,7 +606,7 @@ // Colours. $string['colorsettings'] = 'Colours'; $string['colorsettingsheading'] = 'Modify the main colours used throughout the theme.'; -$string['colordesc'] = 'You can select the colours that you would like to use throughout the theme. Use Hex or any other standard notation. As an alternate option you can use transparent and inherited as a value'; +$string['colordesc'] = 'You can select the colours that you would like to use throughout the theme. Use Hex or any other standard notation. As an alternate option you can use transparent and inherited as a value.'; $string['linkcolor'] = 'Link colour'; $string['linkcolordesc'] = 'Set the colour of links in the theme, use html hex code.'; @@ -728,14 +757,17 @@ $string['menubkcolor'] = 'Main menu background colour'; $string['menubkcolordesc'] = 'Set a main menu background colour.'; -$string['menubordercolor'] = 'Main menu bottom border colour'; -$string['menubordercolordesc'] = 'Set a main menu border bottom colour.'; +$string['menubkhovercolor'] = 'Main menu background hover colour'; +$string['menubkhovercolordesc'] = 'Set a main menu background hover colour.'; $string['menufontcolor'] = 'Main menu font colour'; $string['menufontcolordesc'] = 'Set a main menu font colour.'; -$string['menuhovercolor'] = 'Main menu hover colour'; -$string['menuhovercolordesc'] = 'Set a main menu hover colour.'; +$string['menufonthovercolor'] = 'Main menu hover colour'; +$string['menufonthovercolordesc'] = 'Set a main menu hover colour.'; + +$string['menubordercolor'] = 'Main menu bottom border colour'; +$string['menubordercolordesc'] = 'Set a main menu border bottom colour.'; $string['mobilemenubkcolor'] = 'Mobile menu background colour'; $string['mobilemenubkcolordesc'] = 'Set the main menu background colour on mobile devices (collapsed).'; @@ -832,9 +864,12 @@ $string['coursesectionactivityquizbgcolordesc'] = 'Set the quiz activity background colour. Type transparent in the box for transparency.'; // Course Index. -$string['courseindexsettings'] = 'Course Index'; +$string['courseindexsettings'] = 'Course index'; $string['courseindexsettingsheading'] = 'Course index settings'; -$string['courseindexsettingsdesc'] = 'Customize the Course Index.'; +$string['courseindexsettingsdesc'] = 'Customize the Course index.'; + +$string['courseindexenabled'] = 'Enabled'; +$string['courseindexenableddesc'] = 'Enable or disable the \'Course Index\'.'; $string['courseindexitemcolor'] = 'Item colour'; $string['courseindexitemcolordesc'] = 'The item colour on the \'Course Index\' in a course.'; @@ -1397,18 +1432,6 @@ $string['targetnewwindow'] = 'New window'; $string['targetsamewindow'] = 'Same window'; -$string['toolsmenu2'] = 'Second tools menu'; -$string['toolsmenu2desc'] = 'You can configure links to be shown under a tools menu. Each line consists of some menu text, a link URL (optional), a tooltip title (optional) and a language code or comma-separated list of codes (optional, for displaying the line to users of the specified language only), separated by pipe characters. You can specify a structure using hyphens. For example:
'; +$string['toolsmenuheadingdesc'] = 'Add a drop down menu to the main navigation bar. You can configure links to be shown under a tools menu (in main navigation bar). In the format of \'text|url|title|langs|fontawesome classes|capability to check\'. Only enter what you require. If you don\'t need something but do need another thing further along then leave it blank but still use the \'|\' delimiter. For example: \'text|url|||fontawesome classes\'. To find the FontAwesome(Free) classes for the icon you wish to use, go to Font Awesome free and search for the icon. You can use the name, such as \'graduation-cap\' or the complete list of classes \'fa-solid fa-graduation-cap\'. For example:
To setup icons enter a delimited list into the "Social Icon List" field below.
This should be in the format: - -url|title|icon - -For example: -
'. + get_string('fontawesomesettingdesc', 'theme_adaptable'), + '', + PARAM_RAW, + '50', + '10' + )); + + $defaultsettingcustomusermenuitems = [ + 'messages,message|/message/index.php|fa-regular fa-comment', + 'privatefiles,moodle|/user/files.php|folder-tree', + ]; + $page->add(new admin_setting_configtextarea( + 'customusermenuitems', + new lang_string('customusermenuitems', 'admin'), + new lang_string('customusermenuitemscoredesc', 'theme_adaptable'), + implode("\n", $defaultsettingcustomusermenuitems), + PARAM_RAW, + '50', + '10' + )); + + $asettings->add($page); +} diff --git a/settings/header_menus.php b/settings/header_menus.php index cb56ac6..10c13b1 100644 --- a/settings/header_menus.php +++ b/settings/header_menus.php @@ -30,7 +30,11 @@ $page->add(new admin_setting_heading( 'theme_adaptable_menus', get_string('menusheading', 'theme_adaptable'), - format_text(get_string('menustitledesc', 'theme_adaptable'), FORMAT_MARKDOWN) + format_text( + get_string('menustitledesc', 'theme_adaptable').'
'. + get_string('fontawesomesettingdesc', 'theme_adaptable'), + FORMAT_MARKDOWN + ) )); // Settings for top header menus. diff --git a/settings/header_social.php b/settings/header_social.php index c9779c5..6d8f921 100644 --- a/settings/header_social.php +++ b/settings/header_social.php @@ -32,7 +32,7 @@ $page->add(new admin_setting_heading( 'theme_adaptable_social', get_string('socialheading', 'theme_adaptable'), - format_text(get_string('socialtitledesc', 'theme_adaptable', 'https://fontawesome.com/search?o=r&m=free'), FORMAT_MARKDOWN) + format_text(get_string('socialtitledesc', 'theme_adaptable'), FORMAT_MARKDOWN) )); $name = 'theme_adaptable/socialsize'; @@ -65,7 +65,7 @@ $name = 'theme_adaptable/socialiconlist'; $title = get_string('socialiconlist', 'theme_adaptable'); $default = ''; - $description = get_string('socialiconlistdesc', 'theme_adaptable'); + $description = get_string('socialiconlistdesc', 'theme_adaptable', 'https://fontawesome.com/search?o=r&m=free'); $setting = new admin_setting_configtextarea($name, $title, $description, $default, PARAM_RAW, '50', '10'); $page->add($setting); diff --git a/settings/information.php b/settings/information.php index b7fe829..3f76e3d 100644 --- a/settings/information.php +++ b/settings/information.php @@ -38,11 +38,11 @@ get_string('settingsinformation', 'theme_adaptable') ); - // Support.md. - $name = 'theme_adaptable/themesupport'; - $title = get_string('themesupport', 'theme_adaptable'); - $description = 'Support.md'; - $setting = new admin_setting_markdown($name, $title, $description, 'Support.md'); + // SupportAndSponsorship.md. + $name = 'theme_adaptable/themesupportsponsorship'; + $title = get_string('themesupportsponsorship', 'theme_adaptable'); + $description = 'SupportAndSponsorship.md'; + $setting = new admin_setting_markdown($name, $title, $description, 'SupportAndSponsorship.md'); $page->add($setting); // Changes.md. diff --git a/settings/information_blocks.php b/settings/information_blocks.php new file mode 100644 index 0000000..010bda2 --- /dev/null +++ b/settings/information_blocks.php @@ -0,0 +1,81 @@ +. + +/** + * Information blocks + * + * @package theme_adaptable + * @copyright 2024 G J Barnard + * {@link https://moodle.org/user/profile.php?id=442195} + * {@link https://gjbarnard.co.uk} + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later. + */ +defined('MOODLE_INTERNAL') || die; + +// Information blocks section. +if ($ADMIN->fulltree) { + $page = new \theme_adaptable\admin_settingspage('theme_adaptable_information_blocks', + get_string('informationblocksettings', 'theme_adaptable')); + + $page->add(new admin_setting_heading( + 'theme_adaptable_information', + get_string('informationsettingsheading', 'theme_adaptable'), + format_text(get_string('informationsettingsdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + )); + + $name = 'theme_adaptable/informationblocksenabled'; + $title = get_string('informationblocksenabled', 'theme_adaptable'); + $description = get_string('informationblocksenableddesc', 'theme_adaptable'); + $setting = new admin_setting_configcheckbox($name, $title, $description, $default, true, false); + $page->add($setting); + + $name = 'theme_adaptable/informationblocksvisible'; + $title = get_string('informationblocksvisible', 'theme_adaptable'); + $description = get_string('informationblocksvisibledesc', 'theme_adaptable'); + $options = [ + 1 => get_string('informationblocksvisibleloggedout', 'theme_adaptable'), + 2 => get_string('informationblocksvisibleloggedin', 'theme_adaptable'), + 3 => get_string('informationblocksvisibleloggedinout', 'theme_adaptable'), + ]; + $setting = new admin_setting_configselect($name, $title, $description, 3, $options); + $page->add($setting); + + $page->add(new admin_setting_heading( + 'theme_adaptable_informationblocksbuilder', + get_string('informationblocksbuilderheading', 'theme_adaptable'), + format_text(get_string('informationblocksbuilderdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + )); + + // Information block region builder. + ['imgblder' => $imgblder, 'totalblocks' => $totalblocks] = \theme_adaptable\toolbox::admin_settings_layout_builder( + $page, + 'informationblockslayoutrow', + $informationblocksbuilderdefaults, + $bootstrap12 + ); + + if ($totalblocks > 0) { + $page->add(new admin_setting_heading( + 'theme_adaptable_informationblocklayoutcheck', + get_string('layoutcheck', 'theme_adaptable'), + format_text(get_string('layoutcheckdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + )); + + $page->add(new admin_setting_heading('theme_adaptable_layoutbuilder', '', $imgblder)); + } + + $asettings->add($page); +} diff --git a/settings/navbar_settings.php b/settings/navbar_settings.php index ad2172b..0584d1e 100644 --- a/settings/navbar_settings.php +++ b/settings/navbar_settings.php @@ -40,12 +40,6 @@ ) ); - $name = 'theme_adaptable/disablecustommenu'; - $title = get_string('disablecustommenu', 'theme_adaptable'); - $description = get_string('disablecustommenudesc', 'theme_adaptable'); - $setting = new admin_setting_configcheckbox($name, $title, $description, false, true, false); - $page->add($setting); - // Sticky Navbar at the top. See issue #278. $name = 'theme_adaptable/stickynavbar'; $title = get_string('stickynavbar', 'theme_adaptable'); diff --git a/settings/navbar_styles.php b/settings/navbar_styles.php index 3953832..501615b 100644 --- a/settings/navbar_styles.php +++ b/settings/navbar_styles.php @@ -53,15 +53,24 @@ $setting->set_updatedcallback('theme_reset_all_caches'); $page->add($setting); - // Main menu hover color. - $name = 'theme_adaptable/menuhovercolor'; - $title = get_string('menuhovercolor', 'theme_adaptable'); - $description = get_string('menuhovercolordesc', 'theme_adaptable'); + // Main menu background hover color. + $name = 'theme_adaptable/menubkhovercolor'; + $title = get_string('menubkhovercolor', 'theme_adaptable'); + $description = get_string('menubkhovercolordesc', 'theme_adaptable'); $previewconfig = null; $setting = new admin_setting_configcolourpicker($name, $title, $description, '#00B3A1', $previewconfig); $setting->set_updatedcallback('theme_reset_all_caches'); $page->add($setting); + // Main menu text color. + $name = 'theme_adaptable/menufonthovercolor'; + $title = get_string('menufonthovercolor', 'theme_adaptable'); + $description = get_string('menufonthovercolordesc', 'theme_adaptable'); + $previewconfig = null; + $setting = new admin_setting_configcolourpicker($name, $title, $description, '#ffffff', $previewconfig); + $setting->set_updatedcallback('theme_reset_all_caches'); + $page->add($setting); + // Main menu bottom border color. $name = 'theme_adaptable/menubordercolor'; $title = get_string('menubordercolor', 'theme_adaptable'); diff --git a/settings/navbar_tools_menu.php b/settings/navbar_tools_menu.php index fa82389..f262074 100644 --- a/settings/navbar_tools_menu.php +++ b/settings/navbar_tools_menu.php @@ -32,7 +32,10 @@ $page->add(new admin_setting_heading( 'theme_adaptable_toolsmenu', get_string('toolsmenu', 'theme_adaptable'), - format_text(get_string('toolsmenuheadingdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + format_text( + get_string('toolsmenuheadingdesc', 'theme_adaptable'), + FORMAT_MARKDOWN + ) )); $name = 'theme_adaptable/enabletoolsmenus'; diff --git a/templates/core_admin/settings.mustache b/templates/core_admin/settings.mustache new file mode 100644 index 0000000..9cd45e6 --- /dev/null +++ b/templates/core_admin/settings.mustache @@ -0,0 +1,67 @@ +{{! + 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
';
+ $themesettings = self::get_settings();
+
for ($i = 1; $i <= 5; $i++) {
$name = 'theme_adaptable/' . $adminsettingname . $i;
$title = get_string($adminsettingname, 'theme_adaptable');
@@ -1146,22 +1153,23 @@ public static function admin_settings_layout_builder($settingpage, $adminsetting
$settingname = $adminsettingname . $i;
- if (!isset($PAGE->theme->settings->$settingname)) {
- $PAGE->theme->settings->$settingname = '0-0-0-0';
+ if (!isset($themesettings->$settingname)) {
+ $themesettings->$settingname = '0-0-0-0';
}
- if ($PAGE->theme->settings->$settingname != '0-0-0-0') {
- $imgblder .= '
';
+ if ($themesettings->$settingname != '0-0-0-0') {
+ $imgurl = $OUTPUT->image_url('layout-builder/'.$themesettings->$settingname, 'theme_adaptable');
+ $imgblder .= '
';
}
- $vals = explode('-', $PAGE->theme->settings->$settingname);
+ $vals = explode('-', $themesettings->$settingname);
foreach ($vals as $val) {
if ($val > 0) {
$totalblocks++;
}
}
}
+ $imgblder .= '
';
return ['imgblder' => $imgblder, 'totalblocks' => $totalblocks];
}
diff --git a/config.php b/config.php
index 36b049d..1cfeeb0 100644
--- a/config.php
+++ b/config.php
@@ -58,6 +58,7 @@
'frnt-market-r',
'frnt-market-s',
'frnt-market-t',
+ 'information',
'news-slider-a',
'course-tab-one-a',
'course-tab-two-a',
diff --git a/db/upgrade.php b/db/upgrade.php
index e8e20cb..f80f3f1 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -76,5 +76,16 @@ function xmldb_theme_adaptable_upgrade($oldversion = 0) {
}
}
+ if ($oldversion < 2023111806) {
+ $value = get_config('theme_adaptable', 'menuhovercolor');
+ if (!empty($value)) {
+ set_config('menubkhovercolor', $value, 'theme_adaptable');
+ // Prevent replacement when upgrade has already happened in a version for an older Moodle!
+ unset_config('menuhovercolor', 'theme_adaptable');
+ }
+
+ upgrade_plugin_savepoint(true, 2023111806, 'theme', 'adaptable');
+ }
+
return true;
}
diff --git a/lang/en/theme_adaptable.php b/lang/en/theme_adaptable.php
index c5e8223..021a0c3 100644
--- a/lang/en/theme_adaptable.php
+++ b/lang/en/theme_adaptable.php
@@ -70,6 +70,7 @@
$string['region-side-post'] = 'Right';
$string['region-side-pre'] = 'Left';
+$string['region-information'] = 'Information';
$string['side-post1'] = 'Side bar in footer';
$string['cachedef_adaptablefontawesomeiconmapping'] = 'Caches font awesome icons';
@@ -118,6 +119,8 @@
$string['orphanedblock'] = 'ORPHANED BLOCK - Originally displays in: {$a}';
+$string['skipblock'] = 'Skip block {$a}';
+
// Settings page headings ******************************************.
$string['settingsmaincolors'] = 'Main colours';
$string['settingsheadercolors'] = 'Header colours';
@@ -147,7 +150,6 @@
$string['dashboardblockregionsettings'] = 'Dashboard block region builder';
$string['coursepageblockregionsettings'] = 'Course page block region builder';
$string['frontpageblocksettings'] = 'Marketing blocks';
-$string['newstickersettings'] = 'News ticker';
$string['frontpageslidersettings'] = 'Frontpage slider';
$string['frontpagecoursesettings'] = 'Frontpage courses list';
$string['frontpagesettingsheading'] = 'Frontpage rendering';
@@ -158,10 +160,12 @@
$string['frontpagerendereroption2'] = 'Tiles w/ overlay';
$string['frontpagerendereroption3'] = 'Moodle default';
$string['frontpagerendereroption4'] = 'Coventry tiles';
+$string['informationblocksettings'] = 'Information blocks';
+$string['newstickersettings'] = 'News ticker';
// Information.
$string['settingsinformation'] = 'Information';
-$string['themesupport'] = 'Support';
+$string['themesupportsponsorship'] = 'Support and sponsorship';
$string['themechanges'] = 'Changes';
$string['themereadme'] = 'Readme';
@@ -339,6 +343,27 @@
$string['sidebaricon'] = 'Show / hide the sidebar';
+// Flexible blocks.
+$string['flexibleblocksoverflow'] = 'Overflow';
+
+// Information Blocks.
+$string['informationsettingsheading'] = 'Customize the information block region that appears on the front page.';
+$string['informationsettingsdesc'] = 'There is a layout builder allowing you to decide how many blocks you need and define your own layout.';
+ if ($themesettings->$settingname != '0-0-0-0') {
+ $imgurl = $OUTPUT->image_url('layout-builder/'.$themesettings->$settingname, 'theme_adaptable');
+ $imgblder .= '';
}
- $vals = explode('-', $PAGE->theme->settings->$settingname);
+ $vals = explode('-', $themesettings->$settingname);
foreach ($vals as $val) {
if ($val > 0) {
$totalblocks++;
}
}
}
+ $imgblder .= 'Please see the \'Readme\' section on the \'Information\' settings tab for additional information.'; + +$string['informationblocksenabled'] = 'Enable information blocks'; +$string['informationblocksenableddesc'] = 'Set the information blocks in the frontpage.'; +$string['informationblocksvisible'] = 'Show the information blocks when'; +$string['informationblocksvisibledesc'] = 'Show the information blocks when \'Logged out\', \'Logged in\' or \'Logged in or out\'.'; +$string['informationblocksvisibleloggedout'] = 'Logged out'; +$string['informationblocksvisibleloggedin'] = 'Logged in'; +$string['informationblocksvisibleloggedinout'] = 'Logged in or out'; + +$string['informationblocksbuilderheading'] = 'Information block layout builder'; +$string['informationblocksbuilderdesc'] = 'Use the tool below to setup your information blocks. Once defined the blocks will follow the layout when editing is off.'; + +$string['informationblockslayoutrow'] = 'Information block row'; +$string['informationblockslayoutrowdesc'] = 'Add / set the layout for this information block row on front page.'; + // Marketing Blocks & Info Box. $string['marketingsettings'] = 'Marketing blocks'; $string['marketingsettingsheading'] = 'Customize the marketing blocks that appear on the front page.'; @@ -350,7 +375,7 @@ $string['marketingvisibleloggedin'] = 'Logged in'; $string['marketingvisibleloggedinout'] = 'Logged in or out'; -$string['marketingbuilderheading'] = 'Marketing block layout builder'; +$string['marketingbuilderheading'] = 'Marketing block layout builder - deprecated, please transition to using the Information block region'; $string['marketingbuilderdesc'] = 'Use the tool below to setup your marketing blocks. Once defined the block settings will appear further down the page.'; $string['marketlayoutrow'] = 'Marketing block row'; @@ -363,6 +388,8 @@ $string['layoutaddcontentdesc1'] = 'You have configured '; $string['layoutaddcontentdesc2'] = ' marketing blocks. If you are happy with this layout add content to the blocks below.
If you are not happy use the layout builder above to make changes.'; +$string['marketingdeprecated'] = 'Marketing blocks are deprecated, please migrate to using the Information block region.'; + $string['infobox'] = 'Frontpage info box'; $string['infoboxdesc'] = 'Frontpage info block HTML. Please see the \'Readme\' section on the \'Information\' settings tab for additional information.
Note: This element is only used for compatibility with BCU and will be removed in coming versions.'; @@ -372,7 +399,7 @@ $string['infobox2'] = 'Frontpage secondary info box'; $string['infobox2desc'] = 'Frontpage secondary info box. Please see the \'Readme\' section on the \'Information\' settings tab for additional information.
Note: This element is only used for compatibility with BCU and will be removed in coming versions.'; -$string['frontpagemarketenabled'] = 'Enable marketing blocks'; +$string['frontpagemarketenabled'] = 'Enable marketing blocks - deprecated, please transition to using the Information block region'; $string['frontpagemarketenableddesc'] = 'Set the marketing blocks in the frontpage.'; $string['frontpagemarketoption'] = 'Choose style for marketing blocks'; @@ -504,6 +531,8 @@ $string['togglenavigation'] = 'Toggle navigation'; +$string['custommenu'] = 'Custom'; + // Navbar styling. $string['navbardropdownborderradius'] = 'Dropdown menu border radius'; $string['navbardropdownborderradiusdesc'] = 'Controls the border radius for dropdown menus (e.g. rounded corners).'; @@ -577,7 +606,7 @@ // Colours. $string['colorsettings'] = 'Colours'; $string['colorsettingsheading'] = 'Modify the main colours used throughout the theme.'; -$string['colordesc'] = 'You can select the colours that you would like to use throughout the theme. Use Hex or any other standard notation. As an alternate option you can use transparent and inherited as a value'; +$string['colordesc'] = 'You can select the colours that you would like to use throughout the theme. Use Hex or any other standard notation. As an alternate option you can use transparent and inherited as a value.'; $string['linkcolor'] = 'Link colour'; $string['linkcolordesc'] = 'Set the colour of links in the theme, use html hex code.'; @@ -728,14 +757,17 @@ $string['menubkcolor'] = 'Main menu background colour'; $string['menubkcolordesc'] = 'Set a main menu background colour.'; -$string['menubordercolor'] = 'Main menu bottom border colour'; -$string['menubordercolordesc'] = 'Set a main menu border bottom colour.'; +$string['menubkhovercolor'] = 'Main menu background hover colour'; +$string['menubkhovercolordesc'] = 'Set a main menu background hover colour.'; $string['menufontcolor'] = 'Main menu font colour'; $string['menufontcolordesc'] = 'Set a main menu font colour.'; -$string['menuhovercolor'] = 'Main menu hover colour'; -$string['menuhovercolordesc'] = 'Set a main menu hover colour.'; +$string['menufonthovercolor'] = 'Main menu hover colour'; +$string['menufonthovercolordesc'] = 'Set a main menu hover colour.'; + +$string['menubordercolor'] = 'Main menu bottom border colour'; +$string['menubordercolordesc'] = 'Set a main menu border bottom colour.'; $string['mobilemenubkcolor'] = 'Mobile menu background colour'; $string['mobilemenubkcolordesc'] = 'Set the main menu background colour on mobile devices (collapsed).'; @@ -832,9 +864,12 @@ $string['coursesectionactivityquizbgcolordesc'] = 'Set the quiz activity background colour. Type transparent in the box for transparency.'; // Course Index. -$string['courseindexsettings'] = 'Course Index'; +$string['courseindexsettings'] = 'Course index'; $string['courseindexsettingsheading'] = 'Course index settings'; -$string['courseindexsettingsdesc'] = 'Customize the Course Index.'; +$string['courseindexsettingsdesc'] = 'Customize the Course index.'; + +$string['courseindexenabled'] = 'Enabled'; +$string['courseindexenableddesc'] = 'Enable or disable the \'Course Index\'.'; $string['courseindexitemcolor'] = 'Item colour'; $string['courseindexitemcolordesc'] = 'The item colour on the \'Course Index\' in a course.'; @@ -1397,18 +1432,6 @@ $string['targetnewwindow'] = 'New window'; $string['targetsamewindow'] = 'Same window'; -$string['toolsmenu2'] = 'Second tools menu'; -$string['toolsmenu2desc'] = 'You can configure links to be shown under a tools menu. Each line consists of some menu text, a link URL (optional), a tooltip title (optional) and a language code or comma-separated list of codes (optional, for displaying the line to users of the specified language only), separated by pipe characters. You can specify a structure using hyphens. For example:
-Moodle community|https://moodle.org --Moodle free support|https://moodle.org/support --Moodle development|https://moodle.org/development ---Moodle Docs|http://docs.moodle.org|Moodle Docs ---German Moodle Docs|http://docs.moodle.org/de|Documentation in German|de -Moodle.com|http://moodle.com/ -'; - -$string['toolsmenulabel'] = 'Tools'; -$string['toolsmenulabel2'] = 'Tools two'; $string['events'] = 'Events'; $string['future'] = 'Future'; $string['hiddencourses'] = 'Hidden courses'; @@ -1439,28 +1462,36 @@ $string['tickertext'] = 'News ticker text'; $string['tickertextdesc'] = 'Add news ticker text in list format. See the read me for more info.'; -$string['newmenu1trigger'] = 'Top menu dropdown 1 trigger word'; -$string['newmenu1triggerdesc'] = 'Set a top menu Dropdown 1 trigger word. Font awesome icons can be used'; - $string['menusheading'] = 'Configure navigation for link menus in the upper header'; -$string['menustitledesc'] = 'Tools menus (in navbar) and top menus (upper header) can be restricted based on custom profile fields (optional). To add a restriction enter the name of the profile field and expected value. Menu Structure follows the common Moodle format:
-Moodle community|https://moodle.org --Moodle free support|https://moodle.org/support --Moodle development|https://moodle.org/development ---Moodle Docs|http://docs.moodle.org|Moodle Docs ---German Moodle Docs|http://docs.moodle.org/de|Documentation in German|de -Moodle.com|http://moodle.com/ --'; +$string['menustitledesc'] = 'Top menus can be restricted based on custom profile fields (optional). To add a restriction enter the name of the profile field and expected value.'; $string['menusession'] = 'Store access details in session'; $string['menusessiondesc'] = 'For performance reasons it is suggested this is enabled. You may want to disable when testing.'; +$string['menusessionttl'] = 'Minutes to store access rules in session'; +$string['menusessionttldesc'] = 'Number of minutes after which menu access rules are refreshed in the users session.'; + +// Custom menus. +$string['headernavbarcustommenuheading'] = 'Custom menu'; +$string['headernavbarcustommenuheadingdesc'] = 'The custom menu as set by the core \'custommenuitems\' setting, duplicated below.'; + $string['disablecustommenu'] = 'Disable Moodle custom menu'; $string['disablecustommenudesc'] = 'Disable Moodle custom menus in the navigation bar (will still render in other themes you may have installed).'; -$string['menusessionttl'] = 'Minutes to store access rules in session'; -$string['menusessionttldesc'] = 'Number of minutes after which menu access rules are refreshed in the users session.'; +$string['custommenutitle'] = 'Custom menu title'; +$string['custommenutitledesc'] = 'Set the title of the custom menu title that will contain all of the custom menus on the navbar. If empty then each top level entry will create a new menu on the navbar.'; + +$string['headernavbarcustommenucoreheading'] = 'Core settings'; +$string['headernavbarcustommenucoreheadingdesc'] = 'Duplicated for convenience.'; + +$string['custommenuitemscoredesc'] = 'A custom menu may be configured here. Enter each menu item on a new line. Lines starting with a hyphen will appear as menu items in the previous top level menu and ### makes a divider.'; +$string['customusermenuitemscoredesc'] = 'You can configure the contents of the user menu (with the exception of the log out link, which is automatically added). Each line is separated by pipe characters and consists of 1) a string in "langstringname, componentname" form or as plain text, 2) a URL, and 3) a Font Awesome icon name or CSS classes (optional). Dividers can be used by adding a line of one or more # characters where desired. To find the FontAwesome(Free) classes for the icon you wish to use, go to Font Awesome free and search for the icon. You can use the name, such as \'graduation-cap\' or the complete list of classes \'fa-solid fa-graduation-cap\'. For example: +
+messages,message|/message/index.php|fa-regular fa-comment +privatefiles,moodle|/user/files.php|folder-tree ++Note: The default core value may contain duplicates, please adjust as desired. +'; // Tool menus. $string['newmenudesc'] = 'Configure links to be shown under a top header menu.'; @@ -1471,9 +1502,6 @@ $string['menusdesc'] = ''; -$string['newmenu2trigger'] = 'Top menu dropdown 2 trigger word'; -$string['newmenu2triggerdesc'] = 'Set a top menu dropdown 2 trigger word. Font awesome icons can be used.'; - $string['enablemenus'] = 'Enable menus'; $string['enablemenusdesc'] = 'It is recommended you leave this off if menus are not in use for preformance reasons.'; @@ -1505,7 +1533,7 @@ $string['topmenuscountdesc'] = 'Set the number of top menus you want to add to the theme header.'; $string['menusheadingvisibility'] = 'General settings for top menu visibility'; -$string['menusheadingvisibilitydesc'] = 'The following settings allow you to control where menus appear and optionally allow users to customise their settings'; +$string['menusheadingvisibilitydesc'] = 'The following settings allow you to control where menus appear and optionally allow users to customise their settings.'; $string['newmenuheading'] = 'Top menu'; $string['newmenu'] = 'Top menu dropdown'; @@ -1520,41 +1548,38 @@ $string['toolsmenuscountdesc'] = 'Set the number of tools menus you want to add to the main navigation bar.'; $string['toolsmenuheading'] = 'Tools menu'; -$string['toolsmenuheadingdesc'] = 'Add a drop down menu to the main navigation bar. You can configure links to be shown under a tools menu (in main navigation bar). - The format is similar to that used for Moodle custom menus but allows you to add Font Awesome icons to menu items:
-<span class="fa-solid fa-videoa"></span> Record Screen|https://mysite.localhost|Record Screen -<span class="fa-regular fa-image"></span> ThinkStock|https://mysite.localhost|ThinkStock -<span class="fa-regular fa-clock"></span> Exam Clock|https://mysite.localhost|Exam Clock -
'; +$string['toolsmenuheadingdesc'] = 'Add a drop down menu to the main navigation bar. You can configure links to be shown under a tools menu (in main navigation bar). In the format of \'text|url|title|langs|fontawesome classes|capability to check\'. Only enter what you require. If you don\'t need something but do need another thing further along then leave it blank but still use the \'|\' delimiter. For example: \'text|url|||fontawesome classes\'. To find the FontAwesome(Free) classes for the icon you wish to use, go to Font Awesome free and search for the icon. You can use the name, such as \'graduation-cap\' or the complete list of classes \'fa-solid fa-graduation-cap\'. For example:
+Record Screen|https://mysite.localhost|Record Screen||video +Photos|https://mysite.localhost|Photos||fa-solid fa-image +Exam Clock|https://mysite.localhost|Exam Clock|en|clock +Cloc arholiad|https://mysite.localhost|Cloc arholiad|cy|clock +'; + +$string['fontawesomesettingdesc'] = 'The format of each line is \'text|url|title|langs|fontawesome classes|capability to check\'. Only enter what you require. If you don\'t need something but do need another thing further along then leave it blank but still use the \'|\' delimiter. For example: \'text|url|||fontawesome classes\'. To find the FontAwesome(Free) classes for the icon you wish to use, go to Font Awesome free and search for the icon. You can use the name, such as \'graduation-cap\' or the complete list of classes \'fa-solid fa-graduation-cap\'. For example:
+Courses +-All courses|/course/ +-Course search|/course/search.php +-### +-FAQ|https://example.org/faq +-Exam Clock|https://mysite.localhost|Exam Clock|en|clock +-Cloc arholiad|https://mysite.localhost|Cloc arholiad|cy|clock +Educators|https://mysite.localhost|Educators only|en|graduation-cap|moodle/course:manageactivities +'; + $string['toolsmenuheadingindex'] = 'Tools menu {$a}'; -$string['toolsmenu'] = 'Tools menu dropdown'; +$string['toolsmenu'] = 'Tools menu'; $string['toolsmenudesc'] = 'Add the links here.'; $string['toolsmenutitle'] = 'Tools menu title'; $string['toolsmenutitledefault'] = 'Tools'; $string['toolsmenutitledesc'] = 'Add the title of the menu you would like to display in the main navigation bar.'; -$string['toolsmenulabel'] = 'Tools menu'; - $string['toolsmenufield'] = 'Custom profile field name=Value (optional)'; $string['toolsmenufielddesc'] = 'Add access rule using for custom profile field eg: usertype=student.'; // Social settings. $string['socialsettings'] = 'Header social'; $string['socialheading'] = 'Social icon settings'; -$string['socialtitledesc'] = 'You can disable the sitewide search box and enable social icons / links in its place.
To setup icons enter a delimited list into the "Social Icon List" field below.
This should be in the format: - -url|title|icon - -For example: -
-https://example.com/course/search.php|Search Moodle|fa-search -https://facebook.com/|Facebook|fa-square-facebook -https://X.com/|X|fa-square-x-twitter -https://twitter.com/|Twitter|fa-square-twitter -https://instagram.com|Instagram|fa-square-instagram -https://example.com|My Web|fa-globe --For reference you can find the full list of Font Awesome Icons see \'here\'.'; +$string['socialtitledesc'] = 'You can disable the sitewide search box and enable social icons / links in its place. To setup icons enter a delimited list into the "Social Icon List" field below.'; $string['socialsize'] = 'Set the font size of the social icons'; $string['socialsizedesc'] = 'For a better view, the size needs to be 5px greater than the desired actual size.'; @@ -1574,7 +1599,20 @@ $string['socialicondesc'] = 'Set Font Awesome icon for example: fa-facebook.'; $string['socialiconlist'] = 'Social icon list'; -$string['socialiconlistdesc'] = 'Enter a delimited list to setup the social icons / links you need using the format: url|title|icon.'; +$string['socialiconlistdesc'] = 'Enter a delimited list to setup the social icons / links you need. This should be in the format: + +url|title|icon + +For example: +
+https://example.com/course/search.php|Search Moodle|search +https://facebook.com/|Facebook|fa-brands fa-facebook-f +https://X.com/|X|fa-brands fa-x-twitter +https://twitter.com/|Twitter|fa-brands fa-twitter +https://instagram.com|Instagram|fa-brands fa-instagram +https://example.com|My Web|globe ++Where the Font Awesome icon can be its name or CSS classes. For reference you can find the full list of Font Awesome Icons see \'here\'.'; // Templates. $string['templatessettings'] = 'Templates'; diff --git a/lib.php b/lib.php index ad6001b..071a955 100644 --- a/lib.php +++ b/lib.php @@ -274,7 +274,8 @@ function theme_adaptable_process_scss($scss, $theme) { '[[setting:topmenufontsize]]' => '14px', '[[setting:menubkcolor]]' => '#ffffff', '[[setting:menufontcolor]]' => '#444444', - '[[setting:menuhovercolor]]' => '#00B3A1', + '[[setting:menubkhovercolor]]' => '#00B3A1', + '[[setting:menufonthovercolor]]' => '#ffffff', '[[setting:menubordercolor]]' => '#00B3A1', '[[setting:mobilemenubkcolor]]' => '#F9F9F9', '[[setting:navbardropdownborderradius]]' => '0', diff --git a/pix/layout-builder/12-0-0-0.png b/pix/layout-builder/12-0-0-0.png index b406866..c476e28 100644 Binary files a/pix/layout-builder/12-0-0-0.png and b/pix/layout-builder/12-0-0-0.png differ diff --git a/pix/layout-builder/12-0-0-0.svg b/pix/layout-builder/12-0-0-0.svg new file mode 100644 index 0000000..7a1af68 --- /dev/null +++ b/pix/layout-builder/12-0-0-0.svg @@ -0,0 +1,56 @@ + + + + diff --git a/pix/layout-builder/3-3-3-3.png b/pix/layout-builder/3-3-3-3.png index 9248eb9..8034a3d 100644 Binary files a/pix/layout-builder/3-3-3-3.png and b/pix/layout-builder/3-3-3-3.png differ diff --git a/pix/layout-builder/3-3-3-3.svg b/pix/layout-builder/3-3-3-3.svg new file mode 100644 index 0000000..94f26be --- /dev/null +++ b/pix/layout-builder/3-3-3-3.svg @@ -0,0 +1,86 @@ + + + + diff --git a/pix/layout-builder/3-3-6-0.png b/pix/layout-builder/3-3-6-0.png index b3bd1fa..889bea1 100644 Binary files a/pix/layout-builder/3-3-6-0.png and b/pix/layout-builder/3-3-6-0.png differ diff --git a/pix/layout-builder/3-3-6-0.svg b/pix/layout-builder/3-3-6-0.svg new file mode 100644 index 0000000..8d7a498 --- /dev/null +++ b/pix/layout-builder/3-3-6-0.svg @@ -0,0 +1,76 @@ + + + + diff --git a/pix/layout-builder/3-6-3-0.png b/pix/layout-builder/3-6-3-0.png index c725820..dd0846a 100644 Binary files a/pix/layout-builder/3-6-3-0.png and b/pix/layout-builder/3-6-3-0.png differ diff --git a/pix/layout-builder/3-6-3-0.svg b/pix/layout-builder/3-6-3-0.svg new file mode 100644 index 0000000..5ef686d --- /dev/null +++ b/pix/layout-builder/3-6-3-0.svg @@ -0,0 +1,76 @@ + + + + diff --git a/pix/layout-builder/3-9-0-0.png b/pix/layout-builder/3-9-0-0.png index 487e8da..03d3538 100644 Binary files a/pix/layout-builder/3-9-0-0.png and b/pix/layout-builder/3-9-0-0.png differ diff --git a/pix/layout-builder/3-9-0-0.svg b/pix/layout-builder/3-9-0-0.svg new file mode 100644 index 0000000..1b124e4 --- /dev/null +++ b/pix/layout-builder/3-9-0-0.svg @@ -0,0 +1,68 @@ + + + + diff --git a/pix/layout-builder/4-4-4-0.png b/pix/layout-builder/4-4-4-0.png index 66f04ff..52e576c 100644 Binary files a/pix/layout-builder/4-4-4-0.png and b/pix/layout-builder/4-4-4-0.png differ diff --git a/pix/layout-builder/4-4-4-0.svg b/pix/layout-builder/4-4-4-0.svg new file mode 100644 index 0000000..64d429b --- /dev/null +++ b/pix/layout-builder/4-4-4-0.svg @@ -0,0 +1,79 @@ + + + + diff --git a/pix/layout-builder/4-8-0-0.png b/pix/layout-builder/4-8-0-0.png index 1272f57..de0993f 100644 Binary files a/pix/layout-builder/4-8-0-0.png and b/pix/layout-builder/4-8-0-0.png differ diff --git a/pix/layout-builder/4-8-0-0.svg b/pix/layout-builder/4-8-0-0.svg new file mode 100644 index 0000000..8be8b27 --- /dev/null +++ b/pix/layout-builder/4-8-0-0.svg @@ -0,0 +1,68 @@ + + + + diff --git a/pix/layout-builder/5-7-0-0.png b/pix/layout-builder/5-7-0-0.png index 2b8b076..a73dc00 100644 Binary files a/pix/layout-builder/5-7-0-0.png and b/pix/layout-builder/5-7-0-0.png differ diff --git a/pix/layout-builder/5-7-0-0.svg b/pix/layout-builder/5-7-0-0.svg new file mode 100644 index 0000000..60d9336 --- /dev/null +++ b/pix/layout-builder/5-7-0-0.svg @@ -0,0 +1,66 @@ + + + + diff --git a/pix/layout-builder/6-3-3-0.png b/pix/layout-builder/6-3-3-0.png index 192253b..5ce2bf7 100644 Binary files a/pix/layout-builder/6-3-3-0.png and b/pix/layout-builder/6-3-3-0.png differ diff --git a/pix/layout-builder/6-3-3-0.svg b/pix/layout-builder/6-3-3-0.svg new file mode 100644 index 0000000..45e6175 --- /dev/null +++ b/pix/layout-builder/6-3-3-0.svg @@ -0,0 +1,79 @@ + + + + diff --git a/pix/layout-builder/6-6-0-0.png b/pix/layout-builder/6-6-0-0.png index 038a8ea..54d2668 100644 Binary files a/pix/layout-builder/6-6-0-0.png and b/pix/layout-builder/6-6-0-0.png differ diff --git a/pix/layout-builder/6-6-0-0.svg b/pix/layout-builder/6-6-0-0.svg new file mode 100644 index 0000000..981a650 --- /dev/null +++ b/pix/layout-builder/6-6-0-0.svg @@ -0,0 +1,68 @@ + + + + diff --git a/pix/layout-builder/7-5-0-0.png b/pix/layout-builder/7-5-0-0.png index c85f9b1..9f76d13 100644 Binary files a/pix/layout-builder/7-5-0-0.png and b/pix/layout-builder/7-5-0-0.png differ diff --git a/pix/layout-builder/7-5-0-0.svg b/pix/layout-builder/7-5-0-0.svg new file mode 100644 index 0000000..b401df8 --- /dev/null +++ b/pix/layout-builder/7-5-0-0.svg @@ -0,0 +1,68 @@ + + + + diff --git a/pix/layout-builder/8-4-0-0.png b/pix/layout-builder/8-4-0-0.png index bac0520..d7c2c56 100644 Binary files a/pix/layout-builder/8-4-0-0.png and b/pix/layout-builder/8-4-0-0.png differ diff --git a/pix/layout-builder/8-4-0-0.svg b/pix/layout-builder/8-4-0-0.svg new file mode 100644 index 0000000..99c0c66 --- /dev/null +++ b/pix/layout-builder/8-4-0-0.svg @@ -0,0 +1,66 @@ + + + + diff --git a/pix/layout-builder/9-3-0-0.png b/pix/layout-builder/9-3-0-0.png index 6df7dfd..e6dc433 100644 Binary files a/pix/layout-builder/9-3-0-0.png and b/pix/layout-builder/9-3-0-0.png differ diff --git a/pix/layout-builder/9-3-0-0.svg b/pix/layout-builder/9-3-0-0.svg new file mode 100644 index 0000000..d2e5956 --- /dev/null +++ b/pix/layout-builder/9-3-0-0.svg @@ -0,0 +1,66 @@ + + + + diff --git a/scss/settings/adaptable.scss b/scss/settings/adaptable.scss index 371bc26..66ed585 100644 --- a/scss/settings/adaptable.scss +++ b/scss/settings/adaptable.scss @@ -461,9 +461,17 @@ a.component-expand .badge { margin-top: 20px; } +.flexibleblocks, #marketblocks { background-color: [[setting:marketblocksbackgroundcolor]]; padding-bottom: 10px; + + h3 { + font-size: 24px; + font-weight: normal; + line-height: 48px; + margin: 10px auto; + } } #marketblocks .internalmarket { @@ -473,23 +481,36 @@ a.component-expand .badge { text-align: center; } -.marketimage { +.marketimage { // Deprecated. border: 0; display: block; width: 100%; } -#marketblocks h3 { - font-size: 24px; - font-weight: normal; - line-height: 48px; - margin: 10px auto; -} - +.flexiblerow, .marketrow { margin-top: 20px; } +.editing-flexible-blocks, +.flexible-blocks-overflow { + column-gap: 0.25rem; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: start; + + .block { + flex: 0 0 calc(25% - 0.5rem); + max-width: 25%; + } +} + +.flexible-blocks-overflow { + margin-right: -15px; + margin-left: -15px; +} + img.emoticon { height: [[setting:emoticonsize]]; width: [[setting:emoticonsize]]; diff --git a/scss/settings/blocks.scss b/scss/settings/blocks.scss index 1c78a25..8e5da60 100644 --- a/scss/settings/blocks.scss +++ b/scss/settings/blocks.scss @@ -289,22 +289,41 @@ text-decoration: none; } -.block .calendar-controls .previous:before { - content: "\f053"; // chevron-left <- chevron-left. - font-family: "Font Awesome 6 Free"; -} - -.block .calendar-controls .next:before { - content: "\f054"; // chevron-right <- chevron-right. - font-family: "Font Awesome 6 Free"; +.block .calendar-controls { + .previous, + .next { + font-size: 0.8rem; + margin-top: 0.125rem; + .arrow { + display: none; + } + &:before, + &:after { + font-family: "Font Awesome 6 Free"; + font-weight: 900; + } + } + .previous { + &:before { + content: "\f053"; // chevron-left. + } + } + .next { + &:after { + content: "\f054"; // chevron-right. + } + } } -.block .calendar-controls .previous .arrow, -.block .calendar-controls .next .arrow { - display: none; +@media (min-width: 768px) { + section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper { + .previous, + .next { + font-size: .8rem; + } + } } - // Comments block. .block_comments div.content li { list-style-type: none; diff --git a/scss/settings/menu.scss b/scss/settings/menu.scss index a5ceb3a..412f70a 100644 --- a/scss/settings/menu.scss +++ b/scss/settings/menu.scss @@ -92,7 +92,8 @@ #adaptable-page-header-wrapper #main-navbar ul.navbar-nav > li > a.nav-link:hover, #adaptable-page-header-wrapper #main-navbar li div.nav-link:hover, #adaptable-page-header-wrapper #main-navbar li #editingbutton input[type="submit"]:hover { - background-color: [[setting:menuhovercolor]]; + background-color: [[setting:menubkhovercolor]]; + color: [[setting:menufonthovercolor]]; } #adaptable-page-header-wrapper #main-navbar .input-group { @@ -121,7 +122,8 @@ #adaptable-page-header-wrapper .above-header .nav-link > .fa, #adaptable-page-header-wrapper .above-header .nav-link > .fas, -#adaptable-page-header-wrapper .above-header .navbar-nav > li > a { +#adaptable-page-header-wrapper .above-header .navbar-nav > li > a, +#adaptable-page-header-wrapper .above-header .navbar-nav > li .usermenu .dropdown-toggle { color: [[setting:headertextcolor]]; } diff --git a/settings.php b/settings.php index e0d469e..8355113 100644 --- a/settings.php +++ b/settings.php @@ -58,25 +58,27 @@ include(dirname(__FILE__) . '/settings/footer.php'); include(dirname(__FILE__) . '/settings/frontpage_courses.php'); include(dirname(__FILE__) . '/settings/frontpage_slider.php'); - include(dirname(__FILE__) . '/settings/news_ticker.php'); include(dirname(__FILE__) . '/settings/header.php'); include(dirname(__FILE__) . '/settings/header_menus.php'); include(dirname(__FILE__) . '/settings/header_social.php'); include(dirname(__FILE__) . '/settings/header_user.php'); + include(dirname(__FILE__) . '/settings/information_blocks.php'); include(dirname(__FILE__) . '/settings/layout.php'); include(dirname(__FILE__) . '/settings/layout_responsive.php'); include(dirname(__FILE__) . '/settings/login.php'); include(dirname(__FILE__) . '/settings/marketing_blocks.php'); include(dirname(__FILE__) . '/settings/navbar_settings.php'); include(dirname(__FILE__) . '/settings/navbar_mycourses.php'); - include(dirname(__FILE__) . '/settings/navbar_tools_menu.php'); include(dirname(__FILE__) . '/settings/navbar_links.php'); include(dirname(__FILE__) . '/settings/navbar_styles.php'); + include(dirname(__FILE__) . '/settings/news_ticker.php'); + include(dirname(__FILE__) . '/settings/navbar_tools_menu.php'); include(dirname(__FILE__) . '/settings/print.php'); include(dirname(__FILE__) . '/settings/templates.php'); include(dirname(__FILE__) . '/settings/user.php'); include(dirname(__FILE__) . '/settings/custom_css.php'); include(dirname(__FILE__) . '/settings/custom_js.php'); + include(dirname(__FILE__) . '/settings/custom_menus.php'); } $ADMIN->add('theme_adaptable', $asettings); require(dirname(__FILE__) . '/settings/importexport_settings.php'); diff --git a/settings/array_definitions.php b/settings/array_definitions.php index aaa1af4..eb2e90c 100644 --- a/settings/array_definitions.php +++ b/settings/array_definitions.php @@ -249,6 +249,7 @@ $bootstrap12defaults = ['3-3-3-3', '4-4-4-0', '3-3-3-3', '0-0-0-0', '0-0-0-0']; + $informationblocksbuilderdefaults = ['3-3-3-3', '0-0-0-0', '0-0-0-0', '0-0-0-0', '0-0-0-0']; $marketingfooterbuilderdefaults = ['3-3-3-3', '0-0-0-0', '0-0-0-0', '0-0-0-0', '0-0-0-0']; // Adaptable Tabbed Layout changes. 0 signifies the course content or dashboard main content. diff --git a/settings/course_index.php b/settings/course_index.php index 7c3e00a..fb351cc 100644 --- a/settings/course_index.php +++ b/settings/course_index.php @@ -39,6 +39,13 @@ format_text(get_string('courseindexsettingsdesc', 'theme_adaptable'), FORMAT_MARKDOWN) )); + // Enabled. + $name = 'theme_adaptable/courseindexenabled'; + $title = get_string('courseindexenabled', 'theme_adaptable'); + $description = get_string('courseindexenableddesc', 'theme_adaptable'); + $setting = new admin_setting_configcheckbox($name, $title, $description, true); + $page->add($setting); + // Item. $name = 'theme_adaptable/courseindexitemcolor'; $title = get_string('courseindexitemcolor', 'theme_adaptable'); diff --git a/settings/custom_js.php b/settings/custom_js.php index 27c0d88..5dde9da 100644 --- a/settings/custom_js.php +++ b/settings/custom_js.php @@ -55,6 +55,7 @@ ['accepted_types' => '*.js', 'maxfiles' => 8, 'maxbytes' => 65536, 'areamaxbytes' => (65536 * 8)] ); $setting->set_owner($page); + $setting->set_updatedcallback('theme_reset_all_caches'); $page->add($setting); $name = 'theme_adaptable/jssection'; diff --git a/settings/custom_menus.php b/settings/custom_menus.php new file mode 100644 index 0000000..125bd80 --- /dev/null +++ b/settings/custom_menus.php @@ -0,0 +1,89 @@ +. + +/** + * Custom Menus + * + * @package theme_adaptable + * @copyright 2024 G J Barnard + * {@link https://moodle.org/user/profile.php?id=442195} + * {@link https://gjbarnard.co.uk} + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later. + */ + +defined('MOODLE_INTERNAL') || die; + +// Custom CSS section. +if ($ADMIN->fulltree) { + $page = new \theme_adaptable\admin_settingspage('theme_adaptable_custommenu', + get_string('headernavbarcustommenuheading', 'theme_adaptable')); + + // Custom menu section. + $page->add(new admin_setting_heading( + 'theme_adaptable_custommenu_heading', + get_string('headernavbarcustommenuheading', 'theme_adaptable'), + format_text( + get_string('headernavbarcustommenuheadingdesc', 'theme_adaptable'), + FORMAT_MARKDOWN + ) + )); + + $name = 'theme_adaptable/disablecustommenu'; + $title = get_string('disablecustommenu', 'theme_adaptable'); + $description = get_string('disablecustommenudesc', 'theme_adaptable'); + $setting = new admin_setting_configcheckbox($name, $title, $description, false, true, false); + $page->add($setting); + + $name = 'theme_adaptable/custommenutitle'; + $title = get_string('custommenutitle', 'theme_adaptable'); + $description = get_string('custommenutitledesc', 'theme_adaptable'); + $default = ''; + $setting = new admin_setting_configtext($name, $title, $description, $default, PARAM_TEXT); + $page->add($setting); + + $page->add(new admin_setting_heading( + 'theme_adaptable_custommenucore', + get_string('headernavbarcustommenucoreheading', 'theme_adaptable'), + format_text(get_string('headernavbarcustommenucoreheadingdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + )); + + $page->add(new admin_setting_configtextarea( + 'custommenuitems', + new lang_string('custommenuitems', 'admin'), + get_string('custommenuitemscoredesc', 'theme_adaptable').'
'. + get_string('fontawesomesettingdesc', 'theme_adaptable'), + '', + PARAM_RAW, + '50', + '10' + )); + + $defaultsettingcustomusermenuitems = [ + 'messages,message|/message/index.php|fa-regular fa-comment', + 'privatefiles,moodle|/user/files.php|folder-tree', + ]; + $page->add(new admin_setting_configtextarea( + 'customusermenuitems', + new lang_string('customusermenuitems', 'admin'), + new lang_string('customusermenuitemscoredesc', 'theme_adaptable'), + implode("\n", $defaultsettingcustomusermenuitems), + PARAM_RAW, + '50', + '10' + )); + + $asettings->add($page); +} diff --git a/settings/header_menus.php b/settings/header_menus.php index cb56ac6..10c13b1 100644 --- a/settings/header_menus.php +++ b/settings/header_menus.php @@ -30,7 +30,11 @@ $page->add(new admin_setting_heading( 'theme_adaptable_menus', get_string('menusheading', 'theme_adaptable'), - format_text(get_string('menustitledesc', 'theme_adaptable'), FORMAT_MARKDOWN) + format_text( + get_string('menustitledesc', 'theme_adaptable').'
'. + get_string('fontawesomesettingdesc', 'theme_adaptable'), + FORMAT_MARKDOWN + ) )); // Settings for top header menus. diff --git a/settings/header_social.php b/settings/header_social.php index c9779c5..6d8f921 100644 --- a/settings/header_social.php +++ b/settings/header_social.php @@ -32,7 +32,7 @@ $page->add(new admin_setting_heading( 'theme_adaptable_social', get_string('socialheading', 'theme_adaptable'), - format_text(get_string('socialtitledesc', 'theme_adaptable', 'https://fontawesome.com/search?o=r&m=free'), FORMAT_MARKDOWN) + format_text(get_string('socialtitledesc', 'theme_adaptable'), FORMAT_MARKDOWN) )); $name = 'theme_adaptable/socialsize'; @@ -65,7 +65,7 @@ $name = 'theme_adaptable/socialiconlist'; $title = get_string('socialiconlist', 'theme_adaptable'); $default = ''; - $description = get_string('socialiconlistdesc', 'theme_adaptable'); + $description = get_string('socialiconlistdesc', 'theme_adaptable', 'https://fontawesome.com/search?o=r&m=free'); $setting = new admin_setting_configtextarea($name, $title, $description, $default, PARAM_RAW, '50', '10'); $page->add($setting); diff --git a/settings/information.php b/settings/information.php index b7fe829..3f76e3d 100644 --- a/settings/information.php +++ b/settings/information.php @@ -38,11 +38,11 @@ get_string('settingsinformation', 'theme_adaptable') ); - // Support.md. - $name = 'theme_adaptable/themesupport'; - $title = get_string('themesupport', 'theme_adaptable'); - $description = 'Support.md'; - $setting = new admin_setting_markdown($name, $title, $description, 'Support.md'); + // SupportAndSponsorship.md. + $name = 'theme_adaptable/themesupportsponsorship'; + $title = get_string('themesupportsponsorship', 'theme_adaptable'); + $description = 'SupportAndSponsorship.md'; + $setting = new admin_setting_markdown($name, $title, $description, 'SupportAndSponsorship.md'); $page->add($setting); // Changes.md. diff --git a/settings/information_blocks.php b/settings/information_blocks.php new file mode 100644 index 0000000..010bda2 --- /dev/null +++ b/settings/information_blocks.php @@ -0,0 +1,81 @@ +. + +/** + * Information blocks + * + * @package theme_adaptable + * @copyright 2024 G J Barnard + * {@link https://moodle.org/user/profile.php?id=442195} + * {@link https://gjbarnard.co.uk} + * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later. + */ +defined('MOODLE_INTERNAL') || die; + +// Information blocks section. +if ($ADMIN->fulltree) { + $page = new \theme_adaptable\admin_settingspage('theme_adaptable_information_blocks', + get_string('informationblocksettings', 'theme_adaptable')); + + $page->add(new admin_setting_heading( + 'theme_adaptable_information', + get_string('informationsettingsheading', 'theme_adaptable'), + format_text(get_string('informationsettingsdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + )); + + $name = 'theme_adaptable/informationblocksenabled'; + $title = get_string('informationblocksenabled', 'theme_adaptable'); + $description = get_string('informationblocksenableddesc', 'theme_adaptable'); + $setting = new admin_setting_configcheckbox($name, $title, $description, $default, true, false); + $page->add($setting); + + $name = 'theme_adaptable/informationblocksvisible'; + $title = get_string('informationblocksvisible', 'theme_adaptable'); + $description = get_string('informationblocksvisibledesc', 'theme_adaptable'); + $options = [ + 1 => get_string('informationblocksvisibleloggedout', 'theme_adaptable'), + 2 => get_string('informationblocksvisibleloggedin', 'theme_adaptable'), + 3 => get_string('informationblocksvisibleloggedinout', 'theme_adaptable'), + ]; + $setting = new admin_setting_configselect($name, $title, $description, 3, $options); + $page->add($setting); + + $page->add(new admin_setting_heading( + 'theme_adaptable_informationblocksbuilder', + get_string('informationblocksbuilderheading', 'theme_adaptable'), + format_text(get_string('informationblocksbuilderdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + )); + + // Information block region builder. + ['imgblder' => $imgblder, 'totalblocks' => $totalblocks] = \theme_adaptable\toolbox::admin_settings_layout_builder( + $page, + 'informationblockslayoutrow', + $informationblocksbuilderdefaults, + $bootstrap12 + ); + + if ($totalblocks > 0) { + $page->add(new admin_setting_heading( + 'theme_adaptable_informationblocklayoutcheck', + get_string('layoutcheck', 'theme_adaptable'), + format_text(get_string('layoutcheckdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + )); + + $page->add(new admin_setting_heading('theme_adaptable_layoutbuilder', '', $imgblder)); + } + + $asettings->add($page); +} diff --git a/settings/navbar_settings.php b/settings/navbar_settings.php index ad2172b..0584d1e 100644 --- a/settings/navbar_settings.php +++ b/settings/navbar_settings.php @@ -40,12 +40,6 @@ ) ); - $name = 'theme_adaptable/disablecustommenu'; - $title = get_string('disablecustommenu', 'theme_adaptable'); - $description = get_string('disablecustommenudesc', 'theme_adaptable'); - $setting = new admin_setting_configcheckbox($name, $title, $description, false, true, false); - $page->add($setting); - // Sticky Navbar at the top. See issue #278. $name = 'theme_adaptable/stickynavbar'; $title = get_string('stickynavbar', 'theme_adaptable'); diff --git a/settings/navbar_styles.php b/settings/navbar_styles.php index 3953832..501615b 100644 --- a/settings/navbar_styles.php +++ b/settings/navbar_styles.php @@ -53,15 +53,24 @@ $setting->set_updatedcallback('theme_reset_all_caches'); $page->add($setting); - // Main menu hover color. - $name = 'theme_adaptable/menuhovercolor'; - $title = get_string('menuhovercolor', 'theme_adaptable'); - $description = get_string('menuhovercolordesc', 'theme_adaptable'); + // Main menu background hover color. + $name = 'theme_adaptable/menubkhovercolor'; + $title = get_string('menubkhovercolor', 'theme_adaptable'); + $description = get_string('menubkhovercolordesc', 'theme_adaptable'); $previewconfig = null; $setting = new admin_setting_configcolourpicker($name, $title, $description, '#00B3A1', $previewconfig); $setting->set_updatedcallback('theme_reset_all_caches'); $page->add($setting); + // Main menu text color. + $name = 'theme_adaptable/menufonthovercolor'; + $title = get_string('menufonthovercolor', 'theme_adaptable'); + $description = get_string('menufonthovercolordesc', 'theme_adaptable'); + $previewconfig = null; + $setting = new admin_setting_configcolourpicker($name, $title, $description, '#ffffff', $previewconfig); + $setting->set_updatedcallback('theme_reset_all_caches'); + $page->add($setting); + // Main menu bottom border color. $name = 'theme_adaptable/menubordercolor'; $title = get_string('menubordercolor', 'theme_adaptable'); diff --git a/settings/navbar_tools_menu.php b/settings/navbar_tools_menu.php index fa82389..f262074 100644 --- a/settings/navbar_tools_menu.php +++ b/settings/navbar_tools_menu.php @@ -32,7 +32,10 @@ $page->add(new admin_setting_heading( 'theme_adaptable_toolsmenu', get_string('toolsmenu', 'theme_adaptable'), - format_text(get_string('toolsmenuheadingdesc', 'theme_adaptable'), FORMAT_MARKDOWN) + format_text( + get_string('toolsmenuheadingdesc', 'theme_adaptable'), + FORMAT_MARKDOWN + ) )); $name = 'theme_adaptable/enabletoolsmenus'; diff --git a/templates/core_admin/settings.mustache b/templates/core_admin/settings.mustache new file mode 100644 index 0000000..9cd45e6 --- /dev/null +++ b/templates/core_admin/settings.mustache @@ -0,0 +1,67 @@ +{{! + 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