moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-59612-master' of git://github.com/junpataleta/moodle

Browse source
This commit is contained in:
David Monllao 2017-07-31 13:59:55 +02:00
commit 707f9beae1
16 changed files with 285 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
theme/boost/templates/columns1.mustache
View file

@ -58,6 +58,7 @@
<div class="card card-block">
{{{ output.course_content_header }}}
{{{ output.main_content }}}
{{{ output.activity_navigation }}}
{{{ output.course_content_footer }}}
</div>
</section>

1
theme/boost/templates/columns2.mustache
View file

@ -82,6 +82,7 @@
{{/hasregionmainsettingsmenu}}
{{{ output.course_content_header }}}
{{{ output.main_content }}}
{{{ output.activity_navigation }}}
{{{ output.course_content_footer }}}
</div>
</section>

1
theme/bootstrapbase/layout/columns1.php
View file

@ -63,6 +63,7 @@ echo $OUTPUT->doctype() ?>
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->activity_navigation();
echo $OUTPUT->course_content_footer();
?>
</section>

1
theme/bootstrapbase/layout/columns3.php
View file

@ -69,6 +69,7 @@ echo $OUTPUT->doctype() ?>
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->activity_navigation();
echo $OUTPUT->course_content_footer();
?>
</section>

1
theme/clean/layout/columns1.php
View file

@ -65,6 +65,7 @@ echo $OUTPUT->doctype() ?>
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->activity_navigation();
echo $OUTPUT->course_content_footer();
?>
</section>

1
theme/clean/layout/columns3.php
View file

@ -76,6 +76,7 @@ echo $OUTPUT->doctype() ?>
<?php
echo $OUTPUT->course_content_header();
echo $OUTPUT->main_content();
echo $OUTPUT->activity_navigation();
echo $OUTPUT->course_content_footer();
?>
</section>

2
theme/upgrade.txt
View file

@ -9,6 +9,8 @@ information provided here is intended especially for theme designer.
the first one was renamed to loginform.mustache - see MDL-58970.
* The Boost flat navigation nodes now have several data-attributes which let plugin developers
access properties from the underlying navigation nodes in the browser - see MDL-59425.
* Navigation between activities via a previous and next link was added to Boost, Clean and Bootstrapbase. This
is made possible by a new function core_renderer->activity_navigation().
=== 3.3 ===