Bug fixes - DES-871, DES-869, DES-872, DES-868, DES-874, DES-870.

bdecentgmbh · Jun 19, 2024 · b432c9e · b432c9e
1 parent 34cd986
commit b432c9e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/classes/output/courseformat/state/section.php b/classes/output/courseformat/state/section.php
@@ -53,7 +53,7 @@ public function export_for_template(\renderer_base $output): stdClass {
                 $indexcollapsed = true;
             }
         }
-        $sectionurlinfo = course_get_url($course, $section->section, ['navigation' => true]);
+        $sectionurlinfo = course_get_url($course, $section->section, ['navigation' => false]);
         $sectionurl = '';
         if ($sectionurlinfo instanceof moodle_url) {
             $sectionurl = $sectionurlinfo->out(false);

diff --git a/settings.php b/settings.php
@@ -147,6 +147,32 @@
         get_string('modtrimlength_desc', 'format_designer'), 23, PARAM_INT);
     $activitypage->add($setting);
 
+    // Activity elements list to manage the visibility - Activity page continue.
+    $elements = [
+        'icon' => 1,
+        'visits' => 4,
+        'calltoaction' => 4,
+        'title' => 1,
+        'description' => 1,
+        'modname' => 4,
+        'completionbadge' => 1,
+    ];
+    $choice = [
+        1 => get_string('show'),
+        0 => get_string('hide'),
+        2 => get_string('showonhover', 'format_designer'),
+        3 => get_string('hideonhover', 'format_designer'),
+        4 => get_string('remove'),
+    ];
+    foreach ($elements as $element => $defaultvalue) {
+        $name = 'format_designer/activityelements_'.$element;
+        $title = get_string('activity:'.$element, 'format_designer');
+        $desc = '';
+        $default = ['value' => $defaultvalue, 'fix' => 0];
+        $setting = new admin_setting_configselect_with_advanced($name, $title, $desc, $default, $choice);
+        $activitypage->add($setting);
+    }
+
     if (format_designer_has_pro()
          && file_exists($CFG->dirroot.'/local/designer/setting.php')) {
         require_once($CFG->dirroot.'/local/designer/setting.php');

diff --git a/styles.css b/styles.css
@@ -189,7 +189,6 @@
     margin-top: 10px;
 }
 .format-designer .course-content ul.designer.course-type-flow li.section .availability-section-block + div {
-    max-height: 66%;
     overflow: hidden;
     text-overflow: ellipsis;
     -webkit-box-orient: vertical;
@@ -3085,6 +3084,8 @@ body.format-designer.editing .designer .section .content .section.card-layout li
 }
 .format-designer .course-content ul.designer.course-type-flow {
     margin-top: 30px;
+    display: flex;
+    flex-wrap: wrap;
 }
 .format-designer .course-content ul.course-type-flow.designer .section.main .section-content-wrapper {
     display: contents;
@@ -3330,12 +3331,15 @@ li.section.main.section-background-color:not(.section-header-image)
     }
     .format-designer .course-content ul.designer.course-type-flow li.section ul.section.img-text li.activity.flow-card-small {
         width: 320px;
+        max-width: 320px;
     }
     .format-designer .course-content ul.designer.course-type-flow li.section ul.section.img-text li.activity.flow-card-medium {
         width: 360px;
+        max-width: 360px;
     }
     .format-designer .course-content ul.designer.course-type-flow li.section ul.section.img-text li.activity.flow-card-large {
         width: 400px;
+        max-width: 400px;
     }
     .format-designer .designer.course-type-flow .section .content .section.card-layout li.activity.flow-card-small .card.card-list {
         min-height: 320px;

diff --git a/templates/course_time_management.mustache b/templates/course_time_management.mustache
@@ -52,7 +52,7 @@
     </div>
     {{/showcompletiondate}}
 
-    {{#course.enrolmentenddate}}
+    {{#enrolmentenddate}}
     <div class="course-expire-date">
         <h6><i class="fa fa-sign-out"></i> {{#str}} courseexpirationdate, format_designer {{/str}} </h6>
         {{#enrolmentenddate}}
@@ -62,7 +62,7 @@
         <h3>-/-</h3>
         {{/enrolmentenddate}}
     </div>
-    {{/course.enrolmentenddate}}
+    {{/enrolmentenddate}}
 
     {{#statuscoursestaffinfo}}
         <div id="courseStaffinfoControls" class="carousel slide" data-ride="carousel">

diff --git a/version.php b/version.php
@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024061400;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2024061900;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2020061500;        // Requires this Moodle version.
 $plugin->component = 'format_designer';  // Full name of the plugin (used for diagnostics).
 $plugin->release = 'Version 1.5';