diff --git a/classes/output/courseformat/content.php b/classes/output/courseformat/content.php
index 198cbf81884a0253bba2e5ca0976c0481d12b1a7..e14b553e903581e1e19e2db5a703649023c529b5 100644
--- a/classes/output/courseformat/content.php
+++ b/classes/output/courseformat/content.php
@@ -64,7 +64,7 @@ class content extends content_base {
//$data->student=$progress['student'];
//$data->summary=$progress['summary'];
//$course_infos=$header->get_data($cpl);
-
+
return $data;
}
@@ -80,6 +80,9 @@ class content extends content_base {
$course_data=[];
$course_data['student']=false;
//if user is a student
+ $format = course_get_format($COURSE);
+ $formatoptions = $format->get_format_options();
+
if(!has_capability('course/iena:suivi', $context = \context_course::instance($COURSE->id), $USER->id) &&$infos["progress"]){
$course_data['progress_total']=$infos['progress']->total;
@@ -103,8 +106,9 @@ class content extends content_base {
}
$course_data['student']=true;
}
-
+
$course_data['summary']=$COURSE->summary;
+ $course_data['enableclickicons']=$formatoptions['enableclickicons'];
return $course_data;
}
diff --git a/classes/output/courseformat/content/section/header.php b/classes/output/courseformat/content/section/header.php
index 0b9cb238543ea612aae88f44ad449aedc59566a7..843f6a552afdc4a2564052cbdbe7e7ab1d0720b0 100644
--- a/classes/output/courseformat/content/section/header.php
+++ b/classes/output/courseformat/content/section/header.php
@@ -64,6 +64,7 @@ class header extends header_base{
else{
$data->progress=$this->get_progress_student($course->id, $section, $course);
}
+
return $data;
}
diff --git a/format.php b/format.php
index 4a23a59d00cce9cbe98718c79683ce3df0d76db8..de2beb39bc16bcc75347f2166cbb2dd1818c2b04 100644
--- a/format.php
+++ b/format.php
@@ -94,6 +94,7 @@ if (!empty($displaysection)) {
}
$outputclass = $format->get_output_classname('content');
$widget = new $outputclass($format);
+
echo $renderer->render($widget);
// Include course format js module.
diff --git a/lang/en/format_iena.php b/lang/en/format_iena.php
index 342a03fd10d73de9f30a64a904fb8c3f2fe7f885..84f30210609b0c899c3aedc49ba763e01b86aee4 100644
--- a/lang/en/format_iena.php
+++ b/lang/en/format_iena.php
@@ -118,4 +118,6 @@ $string['allActivitiesLabel']="All activities";
$string['completion']="completion";
$string['filter']="Filter";
$string['messagesSent']="Messages sent";
-$string['messagesNotSent']="An error occured: the messages could not be sent";
\ No newline at end of file
+$string['messagesNotSent']="An error occured: the messages could not be sent";
+$string['enable_icon_click']="Enable clicks on student progress";
+$string['enable_icon_click_help']="By default, students can access directly their activies by clicking on their bubbles in their progress dashboard. You can disable these links so they can't have access to them out of context.";
diff --git a/lang/fr/format_iena.php b/lang/fr/format_iena.php
index 32e9d09b06beb92f9767ee8229ccdfb76d3df4a5..c853f7808e384a6f78ff0b8345eaea9edfc528f1 100644
--- a/lang/fr/format_iena.php
+++ b/lang/fr/format_iena.php
@@ -119,5 +119,5 @@ $string['completion']="achèvement";
$string['filter']="Filtre";
$string['messagesSent']="Message(s) envoyé(s)";
$string['messagesNotSent']="Une erreur s'est produite : le()s message(s) n'ont pas été envoyé(s)";
-
-
+$string['enable_icon_click']="Activer les pastilles cliquables";
+$string['enable_icon_click_help']="Par défaut, les étudiants peuvent accéder directement aux activités en cliquant sur leur pastille dans leur interface de progression. Vous pouvez désactiver ces liens pour que les étudiants ne puissent pas accéder aux ressources en dehors d'un certain contexte.";
diff --git a/lib.php b/lib.php
index 57d0dc67b7cd682a30483f5ce68a8588bd8ee026..36bdc9d8cab139e2e3b793dc8ac633f6f99579d9 100644
--- a/lib.php
+++ b/lib.php
@@ -44,6 +44,11 @@ class format_iena extends format_topics {
'default' => 1,
'type' => PARAM_INT,
);
+
+ $courseformatoptions['enableclickicons'] = array(
+ 'default'=> 1,
+ 'type' => PARAM_INT,
+ );
//}
if ($foreditform && !isset($courseformatoptions['coursedisplay']['label'])) {
$choicetab = array();
@@ -59,6 +64,13 @@ class format_iena extends format_topics {
'element_type' => 'select',
'element_attributes' => array($choicetab),
);
+ $courseformatoptions['enableclickicons'] = array(
+ 'label' => get_string('enable_icon_click', 'format_iena'),
+ 'element_type' => 'select',
+ 'element_attributes' => array($choicetab),
+ 'help'=> 'enable_icon_click',
+ 'help_component'=>'format_iena',
+ );
$courseformatoptions = array_merge_recursive($courseformatoptions, $courseformatoptionsedit);
}
return $courseformatoptions;
diff --git a/styles.css b/styles.css
index bbc4785e5feb45f4f864feea4a937c4ff9129780..79e1dc298ea2aca44cf7f229e2689c0b14902897 100644
--- a/styles.css
+++ b/styles.css
@@ -819,7 +819,7 @@ th.th-rotate > div > span {
}
.section-progress span.icon-progress::after, .iena-progress-legend span.icon-progress::after{
font-size: small;
- line-height: 17px!important;
+ line-height: 16px!important;
}
diff --git a/templates/courseformat/content.mustache b/templates/courseformat/content.mustache
index 3c35596e84e8caedda0a46df2a1589f1f3a9453a..1b5c3d5fcc7bdc450488637a28b5504f882293c0 100644
--- a/templates/courseformat/content.mustache
+++ b/templates/courseformat/content.mustache
@@ -205,10 +205,18 @@
<div class="iena-prog-bubble iena-h-prog-mod-item state-{{completion}}">
<span class="icon-progress"></span>
+ {{#enableclickicons}}
<a href="{{url}}" class="iena-prog-link">
<span class="popover-module">{{name}}</span>
</a>
+ {{/enableclickicons}}
+ {{^enableclickicons}}
+ <div class="iena-prog-link">
+
+ <span class="popover-module">{{name}}</span>
+ </div>
+ {{/enableclickicons}}
</div>
{{/modules}}
</div>