Skip to content

Commit 4f07aa3

Browse files
CrymSonirCrymSonir
authored
Merge pull request #94 from DigiDago/dev
[PIMDEV-835] - Fix issues onesection no display subsection correct way
2 parents aea54f1 + 5b681e8 commit 4f07aa3

5 files changed

Lines changed: 58 additions & 41 deletions

File tree

‎block_course_modulenavigation.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function applicable_formats() {
9090
* @throws moodle_exception
9191
*/
9292
public function get_content() {
93-
global $DB;
93+
global $DB, $CFG;
9494

9595
if (!is_null($this->content)) {
9696
return $this->content;
@@ -189,8 +189,15 @@ public function get_content() {
189189
$template->courseurl = $courseurl->out();
190190
$sectionnums = [];
191191

192+
$onesection = isset($this->config->onesection) && $this->config->onesection == 1;
193+
192194
foreach ($sections as $section) {
193195
$i = $section->section;
196+
197+
if ($onesection && $i != $selected && !$inactivity) {
198+
// If we're not in an activity and we want only one section, we skip other sections.
199+
}
200+
194201
$sectionnums[] = $section->section;
195202
if (!$section->uservisible) {
196203
if ($section->visible == 0 || !$section->available) {

‎scss/course_modulenavigation.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $section-default-color: #ddd;
2929
.allpagination .prev,
3030
.pagination .next,
3131
.allpagination .next {
32-
width: 10%;
32+
flex: 0 0 auto;
3333
}
3434

3535
.pagination .prev a,
@@ -45,7 +45,7 @@ $section-default-color: #ddd;
4545
.allpagination .allsectionames {
4646
border: 0;
4747
border-radius: $section-border-radius;
48-
width: 90%;
48+
flex: 1 1 auto;
4949
}
5050

5151
.pagination .expand-arrow,

‎templates/coursenav_onesection.mustache‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -58,54 +58,65 @@
5858
"coursename" : "Toto is a course name"
5959
}
6060
}}
61-
<div class="section-group onesection" id="accordion" role="tablist" aria-multiselectable="false">
61+
<div class="accordion onesection" id="accordion">
6262
<div class="backtocourse">
6363
<a href="{{{courseurl}}}" class="tocourse">{{coursename}}</a>
6464
</div>
6565
{{#sections}}
6666
{{#selected}}
67-
<div class="section section-default">
68-
<div class="module-navigation-section-heading" role="tab" id="heading{{number}}">
69-
<div class="section-title">
70-
<ul class="pagination">
67+
<div class="accordion-item">
68+
<!-- Titre de la section -->
69+
<h2 class="accordion-header" id="heading{{number}}">
70+
<div class="accordion-button d-flex align-items-center justify-content-between p-0">
71+
<ul class="pagination mb-0 w-100">
7172
{{#hasprev}}
7273
<li class="prev {{prevclass}}">
73-
<a href="{{prevurl}}" aria-label="Previous">
74+
<a href="{{prevurl}}" aria-label="Previous" class="p-2">
7475
<span aria-hidden="true">&laquo;</span>
7576
</a>
7677
</li>
7778
{{/hasprev}}
78-
<li class="sectionname">
79-
<a href="{{currurl}}" aria-lable="Current">
80-
{{title}}
81-
</a>
79+
<li class="sectionname flex-grow-1 text-center">
80+
<a href="{{currurl}}" aria-label="Current" class="p-2 d-block w-100">
81+
{{{title}}}
82+
</a>
83+
</li>
8284
{{#hasnext}}
8385
<li class="next {{nextclass}}">
84-
<a href="{{nexturl}}" aria-label="Next">
86+
<a href="{{nexturl}}" aria-label="Next" class="p-2">
8587
<span aria-hidden="true">&raquo;</span>
8688
</a>
8789
</li>
8890
{{/hasnext}}
8991
</ul>
9092
</div>
91-
</div>
92-
<div id="collapse" class="section-collapse" aria-labelledby="heading">
93-
<div class="section-body">
94-
<ul class="activities list-group">
93+
</h2>
94+
<div id="collapse{{number}}" class="accordion-collapse collapse show"
95+
aria-labelledby="heading{{number}}" data-bs-parent="#accordion">
96+
<div class="accordion-body p-0">
97+
<ul class="activities">
9598
{{#modules}}
96-
<li>
97-
<a href="{{{url}}}" class="{{active}}">
98-
{{#completionon}}
99-
<div class="completionbox">
100-
<div class="completioncheck {{completeclass}}">
99+
{{^issubsection}}
100+
{{^onlytitles}}
101+
<li class="module {{completeclass}}">
102+
<!-- Nom du module avec completionon -->
103+
<a href="{{{url}}}" {{#onclick}}onclick="{{onclick}}"{{/onclick}} class="p-2 {{active}} {{#label}}modulenavigationlabel{{/label}}">
104+
{{#completionon}}
105+
<div class="completionbox">
106+
<div class="completioncheck {{completeclass}}">
107+
</div>
108+
</div>
109+
{{/completionon}}
110+
<div class="activityname">
111+
{{{name}}}
101112
</div>
102-
</div>
103-
{{/completionon}}
104-
<div class="activityname">
105-
{{{name}}}
106-
</div>
107-
</a>
108-
</li>
113+
</a>
114+
</li>
115+
{{/onlytitles}}
116+
{{/issubsection}}
117+
{{#issubsection}}
118+
{{> block_course_modulenavigation/subsection }}
119+
{{/issubsection}}
109120
{{/modules}}
110121
</ul>
111122
</div>

‎templates/subsection.mustache‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{#subsection}}
2-
<div class="section section-default m-1">
2+
<div class="accordion-item m-1">
33
<!-- En-tête de la section -->
4-
<h3 class="accordion-header" role="tab" id="heading{{number}}">
4+
<h3 class="accordion-header" id="heading{{number}}">
55
<button class="accordion-button {{^selected}}collapsed{{/selected}}" type="button"
66
data-bs-toggle="collapse" data-bs-target="#collapse{{number}}" aria-expanded="{{selected}}"
77
aria-controls="collapse{{number}}">
@@ -10,16 +10,15 @@
1010
</h3>
1111
<!-- Contenu de la section -->
1212
<div id="collapse{{number}}"
13-
class="section-collapse accordion-collapse collapse {{#selected}}show{{/selected}}"
14-
role="tabpanel"
13+
class="accordion-collapse collapse {{#selected}}show{{/selected}}"
1514
aria-labelledby="heading{{number}}">
16-
<div class="section-body">
17-
<ul class="activities list-group">
15+
<div class="accordion-body p-0">
16+
<ul class="activities">
1817
{{#modules}}
1918
{{^onlytitles}}
20-
<li>
21-
<a href="{{{url}}}" class="{{active}} {{#label}}modulenavigationlabel{{/label}}"
22-
{{#onclick}}onclick="{{onclick}}"{{/onclick}}>
19+
<li class="module {{completeclass}}">
20+
<!-- Nom du module avec completionon -->
21+
<a href="{{{url}}}" {{#onclick}}onclick="{{onclick}}"{{/onclick}} class="p-2 {{active}} {{#label}}modulenavigationlabel{{/label}}">
2322
{{#completionon}}
2423
<div class="completionbox">
2524
<div class="completioncheck {{completeclass}}">

‎version.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
defined('MOODLE_INTERNAL') || die();
2525

2626
$plugin->component = 'block_course_modulenavigation';
27-
$plugin->release = 'v5.0.0';
28-
$plugin->version = 2025042900; // YYYYMMDD.
27+
$plugin->release = 'v5.2.0';
28+
$plugin->version = 2026041600; // YYYYMMDD.
2929
$plugin->requires = 2024100100; // Moodle 4.0.5 and above.
3030
$plugin->maturity = MATURITY_STABLE;

0 commit comments

Comments
 (0)