diff --git a/block_course_overview_uwmoodle.php b/block_course_overview_uwmoodle.php index 02c349f43858caefe8983816e89bfa50215342db..e27178f6d9c83c3dca259a7b24857057d7e14fa9 100644 --- a/block_course_overview_uwmoodle.php +++ b/block_course_overview_uwmoodle.php @@ -62,9 +62,7 @@ class block_course_overview_uwmoodle extends block_base { $this->page->requires->jquery_plugin('block_course_overview_uwmoodle-animate-enhanced', 'block_course_overview_uwmoodle'); }else{ $this->page->requires->js('/blocks/course_overview_uwmoodle/js/jquery-ui.min.js'); - //$this->page->requires->css('/blocks/course_overview_uwmoodle/js/jquery-ui.min.css'); } - //$this->page->requires->js('/blocks/course_overview_uwmoodle/js/jquery.animate-enhanced.min.js'); $this->page->requires->js('/blocks/course_overview_uwmoodle/js/course_overview_uwmoodle.js'); } diff --git a/getcourses.php b/getcourses.php index 98920cc018f4dc8d227b50971b41f34f92101684..af6a97cb8b66a8a4173ddc5a3fadc4b8c7563693 100644 --- a/getcourses.php +++ b/getcourses.php @@ -104,7 +104,7 @@ if(confirm_sesskey()) { $returncourse->externalcourse = 0; } $returncourse->url = $courseurl->out(); - + $returncourse->visible = $course->visible; $term->courses[] = $returncourse; } $returntermcourses[] = $term; @@ -126,7 +126,7 @@ if(confirm_sesskey()) { $returncourse->externalcourse = 0; } $returncourse->url = $courseurl->out(); - + $returncourse->visible = $course->visible; $returnothercourses[] = $returncourse; } diff --git a/js/course_overview_uwmoodle.js b/js/course_overview_uwmoodle.js index 619e9c5c0787f30c363319f0f18c47712350453c..01dc21fbe58513e4deec77f42e3d2b3c082c7582 100644 --- a/js/course_overview_uwmoodle.js +++ b/js/course_overview_uwmoodle.js @@ -7,8 +7,13 @@ function create_course_box(course){ externalcourse = ' external-course'; } + var dimmed = ''; + if(course.visible == 0){ + dimmed = ' class="dimmed" '; + } + var coursebox = '<div class="box coursebox"><div class="course_title"><h3 class="title '+ course.lms + '-icon '+ externalcourse + '">'; - coursebox += '<a title="' + course.name + '" href="' + course.url + '">' + course.name + '</a>'; + coursebox += '<a title="' + course.name + '" href="' + course.url + '" ' + dimmed + '>' + course.name + '</a>'; coursebox += '</h3></div></div>'; return coursebox; } @@ -84,6 +89,8 @@ $(document).ready(function(){ } }, 'json'); + }else{ + $('#uwmm_terms_content').accordion({ header: "h2", heightStyle: "content"}); } diff --git a/renderer.php b/renderer.php index f8755ecd8c95fde9df3be996a301a392a44349d6..9cac992cb4fc19f380e62513e55977c82ab37fb2 100644 --- a/renderer.php +++ b/renderer.php @@ -118,11 +118,6 @@ class block_course_overview_uwmoodle_renderer extends plugin_renderer_base { $html .= $this->output->box_end(); } else { foreach ($courses as $key => $course) { - if(get_class($course) == 'external_course'){ - if($course->visible == 0){ - continue; // for now just don't show the course, but we'll have to think about role based viewing - } - } $html .= $this->output->box_start('coursebox'); $html .= html_writer::start_tag('div', array('class' => 'course_title')); @@ -134,12 +129,14 @@ class block_course_overview_uwmoodle_renderer extends plugin_renderer_base { } if(get_class($course) == 'external_course'){ // external courses have their urls already defined $courseurl = new moodle_url($course->courseurl); + $lms = $course->LMS; }else{ $courseurl = new moodle_url('/course/view.php', array('id' => $course->id)); + $lms = "Moodle"; } $coursefullname = format_string($course->fullname, true, $course->id); $link = html_writer::link($courseurl, $coursefullname, $attributes); - $html .= $this->output->heading($link, 3, 'title'); + $html .= $this->output->heading($link, 3, 'title ' . $lms . '-icon'); //$html .= $this->output->box('', 'flush'); $html .= html_writer::end_tag('div'); diff --git a/styles.css b/styles.css index a7ea766d80d0d3f4d3448c8d75c2d23bf64b2231..c2e007a5cce289bbdf3e11059a9663c31f6aa2d3 100644 --- a/styles.css +++ b/styles.css @@ -320,3 +320,6 @@ margin-right: 5px; } +.block_course_overview_uwmoodle .course_title a.dimmed{ + color: #999; +}