Fordson Version 1.3.1 version update

dbnschools · Apr 16, 2019 · f9909ee · f9909ee
1 parent 3acd136
commit f9909ee
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,13 @@ Click on the button to "Clone or Download" https://github.com/dbnschools/moodle-
 
 # Versions and Updates
 
+## Moodle 3.6 Fordson v3.6 release 1.3.1
+* Many CSS Styling fixes when using the defaults for the new Perception Preset.
+* When using Fordson custom dashboards (teacher & student) we added the ability to include the full Moodle Course Menu - the edit cog.  When turned on it will appear in the upper right of the teacher course management panel as well as the student panel.  This is useful if you use a 3rd party plugin and it injects a link into the main course menu.  Fordson can now display the default Moodle Course Menu within the teacher and student dashboard panels.
+* Fixed break point for blocks on quiz and other modules/pages.  
+* Fixed issue with footer and eLearning Preset
+* Added multilanguage support for course tooltips on site home page
+
 ## Moodle 3.6 Fordson v3.6 release 1.3
 * New default preset: Perception.
 * New default settings for presets when installing brand new.  Defaults now work best with Perception preset.  Please be sure to re-configure your Fordson Presets after updating!

diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php
@@ -222,7 +222,7 @@ public function view_available_courses($id = 0, $courses = null, $totalcount = n
                                 
                                 ';
                             if ($PAGE->theme->settings->titletooltip) {
-                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . $course->fullname . '"';
+                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . format_string($course->fullname) . '"';
                             }
                             else {
                                 $tooltiptext = '';
@@ -260,7 +260,7 @@ public function view_available_courses($id = 0, $courses = null, $totalcount = n
                         }
                         if ($PAGE->theme->settings->coursetilestyle == 3) {
                             if ($PAGE->theme->settings->titletooltip) {
-                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . $course->fullname . '"';
+                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . format_string($course->fullname) . '"';
                             }
                             else {
                                 $tooltiptext = '';
@@ -298,7 +298,7 @@ public function view_available_courses($id = 0, $courses = null, $totalcount = n
                             <div class="class-box4">
                                 ';
                             if ($PAGE->theme->settings->titletooltip) {
-                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . $course->fullname . '"';
+                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . format_string($course->fullname) . '"';
                             }
                             else {
                                 $tooltiptext = '';
@@ -342,7 +342,7 @@ public function view_available_courses($id = 0, $courses = null, $totalcount = n
                                 'class' => $course->visible ? 'col-12 d-flex flex-sm-row flex-column class-fullbox hoverhighlight coursevisible' : 'col-12 d-flex flex-sm-row flex-column class-fullbox hoverhighlight coursedimmed1'
                             ));
                             if ($PAGE->theme->settings->titletooltip) {
-                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . $course->fullname . '"';
+                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . format_string($course->fullname) . '"';
                             }
                             else {
                                 $tooltiptext = '';
@@ -383,7 +383,7 @@ public function view_available_courses($id = 0, $courses = null, $totalcount = n
                         }
                         if ($PAGE->theme->settings->coursetilestyle == 6) {
                             if ($PAGE->theme->settings->titletooltip) {
-                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . $course->fullname . '"';
+                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . format_string($course->fullname) . '"';
                             }
                             else {
                                 $tooltiptext = '';
@@ -430,7 +430,7 @@ public function view_available_courses($id = 0, $courses = null, $totalcount = n
                         }
                         if ($PAGE->theme->settings->coursetilestyle == 7) {
                             if ($PAGE->theme->settings->titletooltip) {
-                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . $course->fullname . '"';
+                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . format_string($course->fullname) . '"';
                             }
                             else {
                                 $tooltiptext = '';
@@ -471,7 +471,7 @@ public function view_available_courses($id = 0, $courses = null, $totalcount = n
                         if ($PAGE->theme->settings->coursetilestyle == 8) {
 
                             if ($PAGE->theme->settings->titletooltip) {
-                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . $course->fullname . '"';
+                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . format_string($course->fullname) . '"';
                             }
                             else {
                                 $tooltiptext = '';
@@ -501,7 +501,7 @@ public function view_available_courses($id = 0, $courses = null, $totalcount = n
                         }
                         if ($PAGE->theme->settings->coursetilestyle == 9) {
                             if ($PAGE->theme->settings->titletooltip) {
-                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . $course->fullname . '"';
+                                $tooltiptext = 'data-toggle="tooltip" data-placement= "top" title="' . format_string($course->fullname) . '"';
                             }
                             else {
                                 $tooltiptext = '';

diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
@@ -1144,14 +1144,12 @@ public function teacherdashmenu() {
                 $togglebuttonstudent = get_string('studentdashbutton', 'theme_fordson');
             }
         }
-        $haseditcog = $PAGE->theme->settings->courseeditingcog;
-        $editcog = html_writer::div($this->context_header_settings_menu() , 'pull-xs-right context-header-settings-menu');
         $siteadmintitle = get_string('siteadminquicklink', 'theme_fordson');
         $siteadminurl = new moodle_url('/admin/search.php');
         $hasadminlink = is_siteadmin();
         $course = $this->page->course;
         // Send to template.
-        $dashmenu = ['showincourseonly' => $showincourseonly, 'togglebutton' => $togglebutton, 'togglebuttonstudent' => $togglebuttonstudent, 'hasteacherdash' => $hasteacherdash, 'hasstudentdash' => $hasstudentdash, 'haspermission' => $haspermission, 'hasadminlink' => $hasadminlink, 'siteadmintitle' => $siteadmintitle, 'siteadminurl' => $siteadminurl, 'haseditcog' => $haseditcog, 'editcog' => $editcog, ];
+        $dashmenu = ['showincourseonly' => $showincourseonly, 'togglebutton' => $togglebutton, 'togglebuttonstudent' => $togglebuttonstudent, 'hasteacherdash' => $hasteacherdash, 'hasstudentdash' => $hasstudentdash, 'haspermission' => $haspermission, 'hasadminlink' => $hasadminlink, 'siteadmintitle' => $siteadmintitle, 'siteadminurl' => $siteadminurl, ];
         // Attach easy enrollment links if active.
         if ($globalhaseasyenrollment && $coursehaseasyenrollment) {
             $dashmenu['dashmenu'][] = array(
@@ -1170,6 +1168,8 @@ public function teacherdash() {
         $togglebuttonstudent = '';
         $hasteacherdash = '';
         $hasstudentdash = '';
+        $haseditcog = $PAGE->theme->settings->courseeditingcog;
+        $editcog = html_writer::div($this->context_header_settings_menu() , 'pull-xs-right context-header-settings-menu');
         if (isloggedin() && ISSET($COURSE->id) && $COURSE->id > 1) {
             $course = $this->page->course;
             $context = context_course::instance($course->id);
@@ -1465,7 +1465,9 @@ public function teacherdash() {
         $hascourseadminshow = $PAGE->theme->settings->showcourseadminstudents == 1;
         $hascompetency = get_config('core_competency', 'enabled');
         // Send to template.
-        $dashlinks = ['showincourseonly' => $showincourseonly, 'haspermission' => $haspermission, 'courseactivities' => $courseactivities, 'togglebutton' => $togglebutton, 'togglebuttonstudent' => $togglebuttonstudent, 'userlinkstitle' => $userlinks, 'userlinksdesc' => $userlinksdesc, 'qbanktitle' => $qbank, 'activitylinkstitle' => $activitylinkstitle, 'activitylinkstitle_desc' => $activitylinkstitle_desc, 'qbankdesc' => $qbankdesc, 'badgestitle' => $badges, 'badgesdesc' => $badgesdesc, 'coursemanagetitle' => $coursemanage, 'coursemanagedesc' => $coursemanagedesc, 'coursemanagementmessage' => $coursemanagementmessage, 'progress' => $progress, 'gradeslink' => $gradeslink, 'gradeslinkstudent' => $gradeslinkstudent, 'hascourseinfogroup' => $hascourseinfogroup, 'courseinfo' => $courseinfo, 'hascoursestaffgroup' => $hascoursestaff, 'courseteachers' => $courseteachers, 'courseother' => $courseother, 'mygradestext' => $mygradestext, 'studentdashboardtextbox' => $studentdashboardtextbox, 'hasteacherdash' => $hasteacherdash, 'teacherdash' => array(
+        $haseditcog = $PAGE->theme->settings->courseeditingcog;
+        $editcog = html_writer::div($this->context_header_settings_menu() , 'pull-xs-right context-header-settings-menu');
+        $dashlinks = ['showincourseonly' => $showincourseonly, 'haspermission' => $haspermission, 'courseactivities' => $courseactivities, 'togglebutton' => $togglebutton, 'togglebuttonstudent' => $togglebuttonstudent, 'userlinkstitle' => $userlinks, 'userlinksdesc' => $userlinksdesc, 'qbanktitle' => $qbank, 'activitylinkstitle' => $activitylinkstitle, 'activitylinkstitle_desc' => $activitylinkstitle_desc, 'qbankdesc' => $qbankdesc, 'badgestitle' => $badges, 'badgesdesc' => $badgesdesc, 'coursemanagetitle' => $coursemanage, 'coursemanagedesc' => $coursemanagedesc, 'coursemanagementmessage' => $coursemanagementmessage, 'progress' => $progress, 'gradeslink' => $gradeslink, 'gradeslinkstudent' => $gradeslinkstudent, 'hascourseinfogroup' => $hascourseinfogroup, 'courseinfo' => $courseinfo, 'hascoursestaffgroup' => $hascoursestaff, 'courseteachers' => $courseteachers, 'courseother' => $courseother, 'mygradestext' => $mygradestext, 'studentdashboardtextbox' => $studentdashboardtextbox, 'hasteacherdash' => $hasteacherdash, 'haseditcog'=>$haseditcog, 'editcog'=> $editcog, 'teacherdash' => array(
             'hasquestionpermission' => $hasquestionpermission,
             'hasbadgepermission' => $hasbadgepermission,
             'hascoursepermission' => $hascoursepermission,

diff --git a/layout/course.php b/layout/course.php
@@ -80,9 +80,9 @@
 $PAGE->requires->js('/theme/fordson/javascript/scrolltotop.js');
 $PAGE->requires->js('/theme/fordson/javascript/scrollspy.js');
 $PAGE->requires->js('/theme/fordson/javascript/blockslider.js');
-$PAGE->requires->js('/theme/fordson/javascript/cardimg.js');
+//$PAGE->requires->js('/theme/fordson/javascript/cardimg.js');
 
-if ($PAGE->theme->settings->preset != 'Spectrum-Achromatic') {
+if (isset($PAGE->theme->settings->preset) && $PAGE->theme->settings->preset != 'Spectrum-Achromatic') {
     $PAGE->requires->js('/theme/fordson/javascript/courseblock.js');
 }
 

diff --git a/scss/pagelayout/layout1.scss b/scss/pagelayout/layout1.scss
@@ -46,13 +46,14 @@ div#learningcontent {
 
 #region-main {
     border: 1px solid $border-color;
-    background-color: initial;
+    padding: 1rem;
+    background-color: $card-bg;
 }
 
 .pagelayout-mydashboard #region-main {
     border: 0 !important;
-    padding: 1rem;
     background-color: $card-bg;
+    padding: 1rem;
     margin-top: 0;
 }
 
@@ -88,8 +89,8 @@ div#learningcontent {
 	    z-index: 0;
 	}
 	.withimage , .default, .customimage {
-	    -webkit-mask-image: linear-gradient(to top,transparent 0%,rgba(255, 255, 255, 0.9) 100%);
-    	mask-image: linear-gradient(to top,transparent 0%,rgba(255, 255, 255, 0.9) 100%);
+	    -webkit-mask-image: linear-gradient(to top,transparent 0%,rgba(255, 255, 255, 0.9) 70%);
+    	mask-image: linear-gradient(to top,transparent 0%,rgba(255, 255, 255, 0.9) 70%);
 	}
 	@if $showheadergradient == 1 {
 		.headerbkg {
@@ -156,7 +157,8 @@ div#learningcontent {
 	    border-bottom: 1px solid $gray-500;
 	    //border-top: 7px solid $white;
 	    //border-radius: $border-radius $border-radius 0 0;
-	    background-color: rgba($headerbackgroundcolor, 0.8);
+	    background-color: rgba($headerbackgroundcolor, 0.95);
+	    box-shadow: inset 0px -8px 10px -5px rgba($primary, 0.3);
 	}
 
 	[data-region="drawer-toggle"] .btn {
@@ -221,7 +223,7 @@ div#learningcontent {
 		margin-bottom: 1rem;
 	}
 
-	.pagelayout-incourse .m-b-1, .m-y-1 {
+	.m-b-1.activity-navigation {
     	margin-bottom: 0rem!important;
 	}
 

diff --git a/scss/preset/Perception.scss b/scss/preset/Perception.scss
@@ -47,7 +47,7 @@ $navbar-fhs-active-color:           $dark !default;
 $navbar-fhs-hover-color:            darken($navbar-fhs-color, 10%) !default;
 $navbar-fhs-disabled-color:         $dark !default;
 
-$topnavbarbg:                       $white !default;
+$topnavbarbg:                       rgba($white, .95) !default;
 $teachernavbarcolor:                #f7e671 !default;
 $studentnavbarcolor:                $topnavbarbg !default;
 
@@ -61,7 +61,7 @@ $perception-base:       #14a9fe !default;
 $sectionnamehighlight:  $teal;
 $border-radius:         4px !default;
 $activityhover:         darken($card-bg, 7%) !default;
-$headerbackgroundcolor: #ffffff !default;
+$headerbackgroundcolor: #ecf3f7 !default;
 $dpsaccentcolor:        #44d4a6 !default;
 
 // Fonts
@@ -344,10 +344,10 @@ div#myoverview_timeline_courses .list-group-item {
 }
 
 
-.path-course-view .completionprogress {
+/*.path-course-view .completionprogress {
     float: initial;
     bottom: 20px;
-}
+}*/
 
 .activity-navigation {
     background-color: $perception-base;
@@ -598,6 +598,7 @@ div#fordsonlogin {
     border-width: 7px 1px 1px 1px;
     border-style: solid;
     border-color: $perception-base $gray-300 $gray-300 $gray-300;
+    margin-top: 1rem;
 }
 .forumpost {
     border-width: 1px 1px 7px 1px;
@@ -618,3 +619,12 @@ div#fordsonlogin {
 .iconset .btn.btn-secondary:hover {
     border-bottom: 7px solid $dpsaccentcolor;
 }
+
+
+// Style changes for REMUI Course Formats to fit with Perception Style
+#page-course-view-remuiformat .general-single-card.py-10 {
+    box-shadow: none;
+}
+#page-course-view-remuiformat.pagelayout-course .container-fluid #region-main {
+    background: transparent;
+}
diff --git a/scss/preset/e-Learner.scss b/scss/preset/e-Learner.scss
@@ -121,7 +121,17 @@ body {
     border: 0;
 }
 #region-main {
+    background-color: $card-bg !important;
+}
+.pagelayout-login #region-main {
+    background-color: transparent!important;
+}
+
+.pagelayout-mydashboard #region-main {
+    border: inherit;
+    padding: 1rem;
     background-color: $card-bg;
+    margin-top: 0;
 }
 
 .course-content .current::before {
@@ -137,8 +147,6 @@ a#blocksliderbutton {
 }
 
 div#learningcontent {
-    position: relative;
-    margin-top: 0;
     background-color: $elearningcontentbkg !important;
     padding: 2rem !important;
 }

diff --git a/scss/styles.scss b/scss/styles.scss
@@ -14,7 +14,7 @@
 * Block Width
 **/
 
-@media screen and (min-width: 991px) {
+@media screen and (min-width: 1200px) {
     #region-main.has-blocks {
         width: calc(100% - #{$blockwidthfordson});
     }
@@ -23,7 +23,7 @@
     }
 }
 
-@media screen and (min-width: 991px) {
+@media screen and (min-width: 1200px) {
     [data-region="blocks-column"] {
         width: calc(#{$blockwidthfordson} - 30px);
     }
@@ -105,7 +105,6 @@ body#page-login-index, body#page-login-signup{
 
 div#fordsonlogin {
     background-color: $card-bg;
-    height: 100%;
 }
 
 .fpinstructions {

diff --git a/templates/teacherdash.mustache b/templates/teacherdash.mustache
@@ -14,14 +14,16 @@
 
         <div class="teacherdashboard">
         <div class="container-fluid">
-
+        {{#haseditcog}}
+            <div class="editcogbutton">{{{editcog}}}</div>
+        {{/haseditcog}}
                 <div class="coursemanagementmessage">{{{coursemanagementmessage}}}</div>
 
                 <div class="row">
                 <div class="col-md-3 activities">
                     <div class="dashtitle">
                         <h3 class="card-title"><i class="fa fa-check-square-o dashicon"></i>{{{activitylinkstitle}}}</h3>
-                        <p>{{{activitylinkstitle_desc}}}</p>   
+                        <p>{{{activitylinkstitle_desc}}}</p>
                     </div>
                     <div class="list-group">
                     {{{courseactivities}}}
@@ -123,7 +125,9 @@
 
         <div class="studentdashboard">
         <div class="container-fluid">
-
+        {{#haseditcog}}
+            <div class="editcogbutton">{{{editcog}}}</div>
+        {{/haseditcog}}
             <div class="row">
                     {{#studentdashboardtextbox}}
                     <div class="col-md-8">

diff --git a/templates/teacherdashmenu.mustache b/templates/teacherdashmenu.mustache
@@ -26,9 +26,4 @@
     <div class="siteadminlink nav-item nav-link">
         <a href="{{{siteadminurl}}}" data-tooltip="tooltip" data-placement= "bottom" title="{{{siteadmintitle}}}" class="btn btn-secondary fhs-tooltip"><i class="fa fa-sitemap" aria-hidden="true"></i></a>
     </div>
-{{/hasadminlink}}
-
-{{#haseditcog}}
-    <div class="editcogbutton">{{{editcog}}}</div>
-{{/haseditcog}}
-
+{{/hasadminlink}}
diff --git a/version.php b/version.php
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019111002;
-$plugin->release  = 'Moodle 3.6 Fordson v3.6 release 1.3';
+$plugin->version   = 2019111003;
+$plugin->release  = 'Moodle 3.6 Fordson v3.6 release 1.3.1';
 $plugin->maturity  = MATURITY_STABLE;
 $plugin->requires  = 2018112800;
 $plugin->component = 'theme_fordson';