Skip to content

Commit aea54f1

Browse files
CrymSonirCrymSonir
authored
Merge pull request #93 from DigiDago/dev
[FIX] - New design and fix for moodle 5
2 parents 9c1518d + db27ec7 commit aea54f1

3 files changed

Lines changed: 37 additions & 74 deletions

File tree

‎templates/coursenav.mustache‎

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -55,48 +55,29 @@
5555
]
5656
}
5757
}}
58-
<div class="section-group" id="accordion" role="tablist" aria-multiselectable="true">
58+
59+
<div class="accordion" id="accordion">
5960
{{#sections}}
60-
<div class="section section-default">
61-
<div class="module-navigation-section-heading" role="tab" id="heading{{number}}">
62-
<div class="section-title">
63-
<ul class="allpagination">
64-
<li class="allsectionnames">
65-
{{#collapse}}
66-
<a href="{{{url}}}">{{{title}}}</a>
67-
{{/collapse}}
68-
{{^collapse}}
69-
{{#onlytitles}}
70-
<a href="{{{url}}}">{{{title}}}</a>
71-
{{/onlytitles}}
72-
{{^onlytitles}}
73-
<a data-toggle="collapse" data-parent="#accordion" href="#collapse{{number}}"
74-
aria-expanded="true" aria-controls="collapse{{number}}">{{{title}}}</a>
75-
{{/onlytitles}}
76-
{{/collapse}}
77-
</li>
78-
{{#collapse}}
79-
<li class="arrowaccordion">
80-
{{#hasmodules}}
81-
<a class="expand-arrow" role="button" data-toggle="collapse"
82-
data-parent="#accordion" href="#collapse{{number}}" aria-expanded="true"
83-
aria-controls="collapse{{number}}">
84-
</a>
85-
{{/hasmodules}}
86-
</li>
87-
{{/collapse}}
88-
</ul>
89-
</div>
90-
</div>
91-
<div id="collapse{{number}}" class="section-collapse collapse {{#selected}}show{{/selected}}"
92-
role="tabsection" aria-labelledby="heading{{number}}">
93-
<div class="section-body">
61+
<div class="accordion-item">
62+
<!-- Titre de la section -->
63+
<h2 class="accordion-header" id="heading{{number}}">
64+
<button class="accordion-button {{^selected}}collapsed{{/selected}}" type="button"
65+
data-bs-toggle="collapse" data-bs-target="#collapse{{number}}" aria-expanded="{{selected}}"
66+
aria-controls="collapse{{number}}">
67+
{{{title}}}
68+
</button>
69+
</h2>
70+
<!-- Contenu de la section -->
71+
<div id="collapse{{number}}" class="accordion-collapse collapse {{#selected}}show{{/selected}}"
72+
aria-labelledby="heading{{number}}" data-bs-parent="#accordion">
73+
<div class="accordion-body p-0">
9474
<ul class="activities">
9575
{{#modules}}
9676
{{^issubsection}}
9777
{{^onlytitles}}
98-
<li>
99-
<a href="{{{url}}}" class="{{active}} {{#label}}modulenavigationlabel{{/label}}" onclick="{{{onclick}}}">
78+
<li class="module {{completeclass}}">
79+
<!-- Nom du module avec completionon -->
80+
<a href="{{{url}}}" {{#onclick}}onclick="{{onclick}}"{{/onclick}} class="p-2 {{active}} {{#label}}modulenavigationlabel{{/label}}">
10081
{{#completionon}}
10182
<div class="completionbox">
10283
<div class="completioncheck {{completeclass}}">

‎templates/subsection.mustache‎

Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,25 @@
11
{{#subsection}}
2-
<div class="section section-default p-1">
3-
<div class="module-navigation-section-heading" role="tab" id="heading{{number}}">
4-
<div class="section-title">
5-
<ul class="allpagination">
6-
<li class="allsectionnames">
7-
{{#collapse}}
8-
<a href="{{{url}}}">{{{title}}}</a>
9-
{{/collapse}}
10-
{{^collapse}}
11-
{{#onlytitles}}
12-
<a href="{{{url}}}">{{{title}}}</a>
13-
{{/onlytitles}}
14-
{{^onlytitles}}
15-
<a data-toggle="collapse" data-parent="#accordion" href="#collapse{{number}}"
16-
aria-expanded="true" aria-controls="collapse{{number}}">{{{title}}}</a>
17-
{{/onlytitles}}
18-
{{/collapse}}
19-
</li>
20-
{{#collapse}}
21-
<li class="arrowaccordion">
22-
{{#hasmodules}}
23-
<a class="expand-arrow" role="button" data-toggle="collapse"
24-
data-parent="#accordion" href="#collapse{{number}}" aria-expanded="true"
25-
aria-controls="collapse{{number}}">
26-
</a>
27-
{{/hasmodules}}
28-
</li>
29-
{{/collapse}}
30-
</ul>
31-
</div>
32-
</div>
33-
<div id="collapse{{number}}" class="section-collapse collapse {{#selected}}show{{/selected}}"
34-
role="tabsection" aria-labelledby="heading{{number}}">
2+
<div class="section section-default m-1">
3+
<!-- En-tête de la section -->
4+
<h3 class="accordion-header" role="tab" id="heading{{number}}">
5+
<button class="accordion-button {{^selected}}collapsed{{/selected}}" type="button"
6+
data-bs-toggle="collapse" data-bs-target="#collapse{{number}}" aria-expanded="{{selected}}"
7+
aria-controls="collapse{{number}}">
8+
{{{title}}}
9+
</button>
10+
</h3>
11+
<!-- Contenu de la section -->
12+
<div id="collapse{{number}}"
13+
class="section-collapse accordion-collapse collapse {{#selected}}show{{/selected}}"
14+
role="tabpanel"
15+
aria-labelledby="heading{{number}}">
3516
<div class="section-body">
36-
<ul class="activities">
17+
<ul class="activities list-group">
3718
{{#modules}}
3819
{{^onlytitles}}
3920
<li>
40-
<a href="{{{url}}}" class="{{active}} {{#label}}modulenavigationlabel{{/label}}" onclick="{{{onclick}}}">
21+
<a href="{{{url}}}" class="{{active}} {{#label}}modulenavigationlabel{{/label}}"
22+
{{#onclick}}onclick="{{onclick}}"{{/onclick}}>
4123
{{#completionon}}
4224
<div class="completionbox">
4325
<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 = 'v4.7.1';
28-
$plugin->version = 2024101401; // YYYYMMDD.
27+
$plugin->release = 'v5.0.0';
28+
$plugin->version = 2025042900; // YYYYMMDD.
2929
$plugin->requires = 2024100100; // Moodle 4.0.5 and above.
3030
$plugin->maturity = MATURITY_STABLE;

0 commit comments

Comments
 (0)