Skip to content

Commit

Permalink
Merge pull request #2 from lsuits/develop
Browse files Browse the repository at this point in the history
merging develop into stable master
  • Loading branch information
rrusso authored Mar 10, 2017
2 parents 6a7a364 + 7807465 commit 59f344d
Show file tree
Hide file tree
Showing 30 changed files with 14,125 additions and 51 deletions.
14 changes: 14 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks("grunt-contrib-sass");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-contrib-clean");
grunt.loadNpmTasks("grunt-contrib-copy");

grunt.initConfig({
sass: {
Expand All @@ -19,6 +20,19 @@ module.exports = function (grunt) {
}
}
},
copy: {
main: {
files: [
{
expand: true,
src: ['node_modules/chart.js/dist/Chart.js', 'node_modules/chart.js/dist/Chart.min.js'],
dest: 'amd/src/',
flatten: true,
filter: 'isFile'
},
],
},
},
watch: {
files: '**/*.sass',
tasks: ['sass']
Expand Down
14 changes: 4 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,14 @@ Currently, the front-facing method of the URL generator class will accept a cour

```
// Add CAS links
if (class_exists('local_cas_help_links_url_generator')) {
$help_url_array = \local_cas_help_links_url_generator::getUrlArrayForCourse($course);
if ($help_url_array['display']) {
$html .= '<a class="btn cas_help" href="' . $help_url_array['url'] . '" target="_blank">' . $help_url_array['label'] . '</a>';
}
if (class_exists('local_cas_help_links_button_renderer')) {
$html .= \local_cas_help_links_button_renderer::get_html_for_course($course, ['class' => 'btn cas_help']);
}
```
AND in the welcome area
```
// Add CAS links
if (class_exists('local_cas_help_links_url_generator')) {
$help_url_array = \local_cas_help_links_url_generator::getUrlForUser($user_id);
if ($help_url_array['display']) {
$output .= '<a class="btn cas_edit_help" href="' . $help_url_array['url'] . '" target="_blank">' . $help_url_array['label'] . '</a>';
}
if (class_exists('local_cas_help_links_button_renderer')) {
$output .= \local_cas_help_links_button_renderer::get_html_for_user_id($user_id, ['class' => 'btn cas_edit_help']);
}
```
14 changes: 14 additions & 0 deletions amd/build/Chart.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions amd/build/semesterUsageChart.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 59f344d

Please sign in to comment.