mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-76212-401-nav' of https://github.com/kevpercy/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Paul Holden 2023-04-17 11:50:54 +01:00
commit df4f8dd322
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
8 changed files with 51 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grade/report/singleview/index.php
View File

@ -121,7 +121,7 @@ if ($itemtype == 'user') {
true, null, null, $report->screen->item, $actionbar);
} else {
print_grade_page_head($course->id, 'report', 'singleview', $reportname, false, $button,
true, null, null, null, $actionbar, false);
true, null, null, null, $actionbar);
}
if ($data = data_submitted()) {

31
grade/report/singleview/templates/action_bar.mustache
View File

@ -73,36 +73,35 @@
<div class="container-fluid tertiary-navigation full-width-bottom-border">
<div class="row">
{{#generalnavselector}}
<div class="navitem">
<div class="navitem order-1">
{{>core/tertiary_navigation_selector}}
</div>
<div class="navitem-divider"></div>
<div class="navitem-divider d-none d-sm-flex order-1"></div>
{{/generalnavselector}}
{{#groupselector}}
<div class="navitem">
<div class="navitem order-2">
{{{.}}}
</div>
<div class="navitem-divider"></div>
<div class="navitem-divider d-none d-sm-flex order-2"></div>
{{/groupselector}}
{{#itemselector}}
<div class="navitem">
<div class="navitem order-3">
{{{.}}}
</div>
<div class="navitem-divider"></div>
<div class="navitem-divider d-none d-sm-flex order-3"></div>
{{/itemselector}}
{{#pagetoggler}}
<div class="d-flex ml-auto">
<div class="d-flex row ml-0 ml-sm-auto order-4 px-0">
{{#bulkactions}}
<div class="navitem-divider"></div>
<div class="navitem">{{{bulkactions}}}</div>
{{#js}}
require(['gradereport_singleview/bulkactions'], function(bulkactions) {
bulkactions.init();
});
{{/js}}
<div class="d-flex navitem ml-0 ml-sm-auto mr-3">{{{bulkactions}}}</div>
{{#js}}
require(['gradereport_singleview/bulkactions'], function(bulkactions) {
bulkactions.init();
});
{{/js}}
<div class="navitem-divider d-none d-sm-flex"></div>
{{/bulkactions}}
<div class="navitem-divider"></div>
<div class="navitem">
<div class="d-flex navitem ml-0 mr-auto mr-sm-0 ml-sm-auto">
{{>gradereport_singleview/page_toggler}}
</div>
</div>

2
grade/report/singleview/templates/grade_item_selector.mustache
View File

@ -33,7 +33,7 @@
<button aria-expanded="false" data-toggle="dropdown" class="btn dropdown-toggle d-flex text-left align-items-center p-0" data-courseid="{{courseid}}" aria-label="{{#str}} selectagrade, gradereport_singleview {{/str}}">
<div class="align-items-center d-flex">
{{#selectedoption}}
<div class="d-block pr-3">
<div class="d-block pr-3 text-truncate">
<span class="d-block small">
{{#str}} selectagrade, gradereport_singleview {{/str}}
</span>

2
grade/report/singleview/templates/page_toggler.mustache
View File

@ -28,7 +28,7 @@
"gradeselectactive": "true"
}
}}
<div class="page-toggler d-flex">
<div class="page-toggler d-block d-sm-flex text-nowrap">
{{#displaylabel}}
<p class="my-auto mr-3 text-uppercase">{{#str}}viewby, gradereport_singleview{{/str}}</p>
{{/displaylabel}}

2
grade/templates/user_selector.mustache
View File

@ -50,7 +50,7 @@
<span class="userinitials"></span>
{{/image}}
</div>
<div class="selected-option-info d-block pr-3">
<div class="selected-option-info d-block pr-3 text-truncate">
<span class="selected-option-text p-0 font-weight-bold">
{{text}}
</span>

15
theme/boost/scss/moodle/tertiarynavigation.scss
View File

@ -38,7 +38,7 @@
}
.row {
column-gap: 20px;
column-gap: 10px;
}
.tertiary-navigation-selector {
@ -53,6 +53,13 @@
.navitem-divider:not(:last-child) {
margin-right: 20px;
}
// Constrain the width of each tertiary buttons triggering element.
.btn {
& > div {
max-width: 200px;
}
}
}
@include media-breakpoint-down(sm) {
@ -63,6 +70,12 @@
}
}
@include media-breakpoint-down(xs) {
.tertiary-navigation .page-toggler > p {
font-size: 80%;
}
}
@media print {
.tertiary-navigation {
display: none;

10
theme/boost/style/moodle.css
View File

@ -27349,7 +27349,7 @@ div.editor_atto_toolbar button .icon {
margin-bottom: 25px;
}
.tertiary-navigation .row {
column-gap: 20px;
column-gap: 10px;
}
.tertiary-navigation .tertiary-navigation-selector .dropdown-toggle {
padding: 0;
@ -27360,12 +27360,20 @@ div.editor_atto_toolbar button .icon {
.tertiary-navigation .navitem-divider:not(:last-child) {
margin-right: 20px;
}
.tertiary-navigation .btn > div {
max-width: 200px;
}
@media (max-width: 767.98px) {
.tertiary-navigation .mform {
padding-left: initial;
}
}
@media (max-width: 575.98px) {
.tertiary-navigation .page-toggler > p {
font-size: 80%;
}
}
@media print {
.tertiary-navigation {
display: none;

10
theme/classic/style/moodle.css
View File

@ -27283,7 +27283,7 @@ div.editor_atto_toolbar button .icon {
margin-bottom: 25px;
}
.tertiary-navigation .row {
column-gap: 20px;
column-gap: 10px;
}
.tertiary-navigation .tertiary-navigation-selector .dropdown-toggle {
padding: 0;
@ -27294,12 +27294,20 @@ div.editor_atto_toolbar button .icon {
.tertiary-navigation .navitem-divider:not(:last-child) {
margin-right: 20px;
}
.tertiary-navigation .btn > div {
max-width: 200px;
}
@media (max-width: 767.98px) {
.tertiary-navigation .mform {
padding-left: initial;
}
}
@media (max-width: 575.98px) {
.tertiary-navigation .page-toggler > p {
font-size: 80%;
}
}
@media print {
.tertiary-navigation {
display: none;