Merge pull request #75 from WisdmLabs/dev40

Merge dev40 to stable 40
WisdmLabs · Mar 20, 2023 · ada3092 · ada3092
2 parents 4ae53d7 + 88fca17
commit ada3092
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 28 deletions.
diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,11 @@
 CHANGES LOG
 
+Version 4.1.1
+=============
+Fix   - Input field editable text visibility when background image is available on section cards.
+Tweak - Next/Prev button design changes.
+Tweak - Minor design updates on card width of section and activities. 
+
 Version 4.1.0
 =============
 

diff --git a/renderer.php b/renderer.php
@@ -138,6 +138,7 @@ public function section_title_without_link($section, $course) {
      * @return array associative array with previous and next section link
      */
     public function get_nav_links($course, $sections, $sectionno) {
+        global $CFG;
         // FIXME: This is really evil and should by using the navigation API.
         $course = course_get_format($course)->get_course();
         $canviewhidden = has_capability('moodle/course:viewhiddensections', context_course::instance($course->id))
@@ -147,12 +148,19 @@ public function get_nav_links($course, $sections, $sectionno) {
         $back = $sectionno - 1;
         while ($back > 0 and empty($links['previous'])) {
             if ($canviewhidden || $sections[$back]->uservisible) {
-                $params = array('class' => 'btn btn-inverse btn-sm');
+                $params = array('class' => 'btn btn-inverse btn-sm ');
+                $previouslink = html_writer::tag('span', "&#8249;", array('class' => 'larrow mr-1 font-size-16'));
+                if ($CFG->theme == 'remui') {
+                    $params = array('class' => 'btn btn-inverse btn-sm d-flex align-items-center');
+                    $previouslink = html_writer::tag('span', "", array('class' => 'larrow mr-1 font-size-16 edw-icon edw-icon-Left-Arrow'));
+                }
                 $prevsectionname = get_section_name($course, $sections[$back]);
                 if (!$sections[$back]->visible) {
                     $params = array('class' => 'dimmed_text btn btn-inverse btn-sm');
+                    if ($CFG->theme == 'remui') {
+                        $params = array('class' => 'dimmed_text btn btn-inverse btn-sm d-flex align-items-center');
+                    }
                 }
-                $previouslink = html_writer::tag('span', "&#10229;", array('class' => 'larrow mr-1'));
                 $previouslink .=
                 (core_text::strlen($prevsectionname) > 15) ? core_text::substr($prevsectionname, 0, 15)."..." : $prevsectionname;
                 $links['previous'] = html_writer::link(course_get_url($course, $back), $previouslink, $params);
@@ -165,13 +173,21 @@ public function get_nav_links($course, $sections, $sectionno) {
         while ($forward <= $numsections and empty($links['next'])) {
             if ($canviewhidden || $sections[$forward]->uservisible) {
                 $params = array('class' => 'btn btn-inverse btn-sm');
+                $nextlinkarrowcontent = html_writer::tag('span', "&#8250;", array('class' => 'rarrow ml-1 font-size-16'));
+                if ($CFG->theme == 'remui') {
+                    $params = array('class' => 'btn btn-inverse btn-sm d-flex align-items-center');
+                    $nextlinkarrowcontent = html_writer::tag('span', "", array('class' => 'rarrow ml-1 font-size-16 edw-icon edw-icon-Right-Arrow'));
+                }
                 if (!$sections[$forward]->visible) {
                     $params = array('class' => 'dimmed_text btn btn-inverse btn-sm');
+                    if ($CFG->theme == 'remui') {
+                        $params = array('class' => 'dimmed_text btn btn-inverse btn-sm d-flex align-items-center');
+                    }
                 }
                 $nextsectionname = get_section_name($course, $sections[$forward]);
                 $nextlink =
                 (core_text::strlen($nextsectionname) > 15) ? core_text::substr($nextsectionname, 0, 15)."..." : $nextsectionname;
-                $nextlink .= html_writer::tag('span', "&#10230;", array('class' => 'rarrow ml-1'));
+                $nextlink .= $nextlinkarrowcontent;
                 $links['next'] = html_writer::link(course_get_url($course, $forward), $nextlink, $params);
             }
             $forward++;

diff --git a/scss/card-layout.scss b/scss/card-layout.scss
@@ -39,7 +39,7 @@
                     background-color: transparent ;
                     box-shadow: none ;
                 }
-                .text-muted .fa-cog,.icon {
+                .text-muted .fa-cog,.dropdown-toggle .icon {
                     color: $white;
                 }
             }
@@ -183,8 +183,11 @@
     &.all-section-format {
         .sections:not(.generalsection-container.sections) {
             display: grid;
-            grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+            grid-template-columns: repeat(auto-fill, minmax($card-min-width-1, 1fr));
             gap: $gap-24;
+            @media (min-width:1440px) {
+                grid-template-columns: repeat(auto-fill, minmax($card-min-width-2, $card-min-width-2));
+            }
             // margin-top: 48px;
             .section:not(#section-0) {
                 // flex: 1 1 calc(25% - 24px);
@@ -286,11 +289,10 @@
                     .wdm-section-summary *,
                     .section-activities-summary {
                         color: $white !important;
-
                     }
                     .sectionname{
-                        .ignoredirty,.editinstructions{
-                            color:$heading-color;
+                        .ignoredirty,.ignoredirty.form-control,.editinstructions{
+                            color:$heading-color !important;
                         }
 
                         .badge{
@@ -461,15 +463,18 @@
         .activity-cards,
         .activity-cards.section {
             display: grid;
-            grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+            grid-template-columns: repeat(auto-fill, minmax($card-min-width-1, 1fr));
+            @media (min-width:1200px) {
+                grid-template-columns: repeat(auto-fill, minmax($card-min-width-2, 1fr));
+            }
             gap: $gap-24;
             padding: 0 !important;
             width: 100%;
             margin: 0;
             position: relative;
 
             @media (max-width:425px) {
-                grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+                grid-template-columns: repeat(auto-fill, minmax($card-min-width-1, 1fr));
             }
 
             .activity {
@@ -648,10 +653,11 @@
 &:not(.limitedwidth) {
     .remui-format-card.all-section-format {
         .showhideactivity .general-section-activities  {
-            .activity:nth-child(n+6) {
+            .activity:nth-child(n+5) {
                 display: none !important;
             }
             @media only screen and (max-width: 1439px) {
+
                 .activity:nth-child(n+5) {
                     display: none !important;
                 }
@@ -667,12 +673,26 @@
 }
 &.limitedwidth {
     .remui-format-card.all-section-format {
+        & .sections{
+            @media (min-width:1440px) {
+                grid-template-columns: repeat(auto-fill, minmax($card-min-width-1,1fr)) !important;
+            }
+        }
+        .general-section-activities{
+            @media (min-width:1440px) {
+                grid-template-columns: repeat(auto-fill, minmax($card-min-width-1,1fr)) !important;
+            }
+        }
         .showhideactivity .general-section-activities  {
 		.activity:nth-child(n+4) {
 		    display: none !important;
 		}
         }
     }
+    .activity-cards,
+    .activity-cards.section {
+        grid-template-columns: repeat(auto-fill, minmax($card-min-width-1, 1fr)) !important;
+    }
 }
 
 .remui-format-card.all-section-format {

diff --git a/scss/styles.scss b/scss/styles.scss
@@ -238,14 +238,16 @@ body#page-course-view-remuiformat {
     .activity.activity-wrapper .activity-item .description .activity-dates .description-inner div {
         line-height: 22px;
     }
-    .activityiconcontainer {
-        border-radius: $border-radius-16;
-        margin-right: 0 !important;
-        height: 80px;
-        width: 80px;
-        .activityinstance img {
-            width: $activity-icon-width !important;
-            height: $activity-icon-height !important;
+    #page{
+        .activityiconcontainer {
+            border-radius: $border-radius-16;
+            margin-right: 0 !important;
+            height: 80px;
+            width: 80px;
+            .activityinstance img {
+                width: $activity-icon-width !important;
+                height: $activity-icon-height !important;
+            }
         }
     }
     .course-section-header{
@@ -425,7 +427,10 @@ body#page-course-view-remuiformat {
 
                         .general-section-activities {
                             display: grid;
-                            grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+                            grid-template-columns: repeat(auto-fill, minmax($card-min-width-1, 1fr));
+                            @media (min-width:1440px) {
+                                grid-template-columns: repeat(auto-fill, minmax($card-min-width-2, $card-min-width-2));
+                            }
                             gap: $gap-24;
                             // flex-wrap: wrap;
                             padding: 0px;
@@ -812,4 +817,8 @@ body#page-course-view-remuiformat {
         max-height: $summary-max-height;
         overflow: auto;
     }
+
+    .font-size-16{
+        font-size: 16px;
+    }
 }
diff --git a/scss/variables.scss b/scss/variables.scss
@@ -53,6 +53,8 @@ $activity-icon-height:28px;
 $activity-icon-width:28px;
 $summary-max-height:300px;
 
+$card-min-width-1:240px;
+$card-min-width-2:302px;
 .p-24{
     padding: 24px;
 }

diff --git a/styles.css b/styles.css
@@ -57,7 +57,7 @@ body#page-course-view-remuiformat.editing .remui-format-card .dark .action-menu-
   box-shadow: none;
 }
 
-body#page-course-view-remuiformat.editing .remui-format-card .dark .action-menu-trigger .text-muted .fa-cog, body#page-course-view-remuiformat.editing .remui-format-card .dark .action-menu-trigger .icon {
+body#page-course-view-remuiformat.editing .remui-format-card .dark .action-menu-trigger .text-muted .fa-cog, body#page-course-view-remuiformat.editing .remui-format-card .dark .action-menu-trigger .dropdown-toggle .icon {
   color: #fff;
 }
 
@@ -158,6 +158,12 @@ body#page-course-view-remuiformat .remui-format-card.all-section-format .section
   gap: 24px;
 }
 
+@media (min-width: 1440px) {
+  body#page-course-view-remuiformat .remui-format-card.all-section-format .sections:not(.generalsection-container.sections) {
+    grid-template-columns: repeat(auto-fill, minmax(302px, 302px));
+  }
+}
+
 body#page-course-view-remuiformat .remui-format-card.all-section-format .sections:not(.generalsection-container.sections) .section:not(#section-0) {
   border: unset;
   border-radius: 8px;
@@ -257,8 +263,8 @@ body#page-course-view-remuiformat .remui-format-card.all-section-format .section
   color: #fff !important;
 }
 
-body#page-course-view-remuiformat .remui-format-card.all-section-format .section .single-card.dark .sectionname .ignoredirty, body#page-course-view-remuiformat .remui-format-card.all-section-format .section .single-card.dark .sectionname .editinstructions {
-  color: #313848;
+body#page-course-view-remuiformat .remui-format-card.all-section-format .section .single-card.dark .sectionname .ignoredirty, body#page-course-view-remuiformat .remui-format-card.all-section-format .section .single-card.dark .sectionname .ignoredirty.form-control, body#page-course-view-remuiformat .remui-format-card.all-section-format .section .single-card.dark .sectionname .editinstructions {
+  color: #313848 !important;
 }
 
 body#page-course-view-remuiformat .remui-format-card.all-section-format .section .single-card.dark .sectionname .badge {
@@ -441,6 +447,13 @@ body#page-course-view-remuiformat .remui-format-card.single-section-format .acti
   position: relative;
 }
 
+@media (min-width: 1200px) {
+  body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards,
+  body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section {
+    grid-template-columns: repeat(auto-fill, minmax(302px, 1fr));
+  }
+}
+
 @media (max-width: 425px) {
   body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards,
   body#page-course-view-remuiformat .remui-format-card.single-section-format .activity-cards.section {
@@ -657,7 +670,7 @@ body#page-course-view-remuiformat .remui-format-card .single-card a:hover {
   text-decoration: none;
 }
 
-body#page-course-view-remuiformat:not(.limitedwidth) .remui-format-card.all-section-format .showhideactivity .general-section-activities .activity:nth-child(n+6) {
+body#page-course-view-remuiformat:not(.limitedwidth) .remui-format-card.all-section-format .showhideactivity .general-section-activities .activity:nth-child(n+5) {
   display: none !important;
 }
 
@@ -673,10 +686,27 @@ body#page-course-view-remuiformat:not(.limitedwidth) .remui-format-card.all-sect
   }
 }
 
+@media (min-width: 1440px) {
+  body#page-course-view-remuiformat.limitedwidth .remui-format-card.all-section-format .sections {
+    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)) !important;
+  }
+}
+
+@media (min-width: 1440px) {
+  body#page-course-view-remuiformat.limitedwidth .remui-format-card.all-section-format .general-section-activities {
+    grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)) !important;
+  }
+}
+
 body#page-course-view-remuiformat.limitedwidth .remui-format-card.all-section-format .showhideactivity .general-section-activities .activity:nth-child(n+4) {
   display: none !important;
 }
 
+body#page-course-view-remuiformat.limitedwidth .activity-cards,
+body#page-course-view-remuiformat.limitedwidth .activity-cards.section {
+  grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)) !important;
+}
+
 @media only screen and (max-width: 1023px) {
   body#page-course-view-remuiformat .remui-format-card.all-section-format .showhideactivity .general-section-activities .activity:nth-child(n+3) {
     display: none !important;
@@ -1380,14 +1410,14 @@ body#page-course-view-remuiformat .activity.activity-wrapper .activity-item .des
   line-height: 22px;
 }
 
-body#page-course-view-remuiformat .activityiconcontainer {
+body#page-course-view-remuiformat #page .activityiconcontainer {
   border-radius: 16px;
   margin-right: 0 !important;
   height: 80px;
   width: 80px;
 }
 
-body#page-course-view-remuiformat .activityiconcontainer .activityinstance img {
+body#page-course-view-remuiformat #page .activityiconcontainer .activityinstance img {
   width: 28px !important;
   height: 28px !important;
 }
@@ -1588,6 +1618,12 @@ body#page-course-view-remuiformat .course-content .sections #section-0 .general-
   max-width: unset;
 }
 
+@media (min-width: 1440px) {
+  body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities {
+    grid-template-columns: repeat(auto-fill, minmax(302px, 302px));
+  }
+}
+
 body#page-course-view-remuiformat .course-content .sections #section-0 .general-section .activities-wrapper .general-section-activities .activity {
   padding: 24px;
   background: #fff;
@@ -1948,3 +1984,7 @@ body#page-course-view-remuiformat .contentafterlink {
   max-height: 300px;
   overflow: auto;
 }
+
+body#page-course-view-remuiformat .font-size-16 {
+  font-size: 16px;
+}
diff --git a/version.php b/version.php
@@ -23,8 +23,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023021600;                    // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release   = '4.1.0';
+$plugin->version   = 2023032000;                    // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release   = '4.1.1';
 $plugin->requires  = 2022041900;                    // Requires this Moodle version (Moodle V4.0).
 $plugin->maturity  = MATURITY_STABLE;
 $plugin->component = 'format_remuiformat';          // Full name of the plugin (used for diagnostics).