Skip to content

Commit

Permalink
Merge branch 'MDL-63337-master-fix' of https://github.com/junpataleta…
Browse files Browse the repository at this point in the history
  • Loading branch information
stronk7 committed Oct 15, 2018
2 parents 6bcf1e7 + c99b103 commit 77d7f5e
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion blocks/myoverview/amd/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ function(
COURSES_VIEW: '[data-region="courses-view"]',
COURSES_VIEW_CONTENT: '[data-region="course-view-content"]'
};

/**
* Initialise all of the modules for the overview block.
*
*
* @param {object} root The root element for the overview block.
*/
var init = function(root) {
Expand Down
6 changes: 3 additions & 3 deletions blocks/myoverview/amd/src/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function(

/**
* Intialise the courses list and cards views on page load.
*
*
* @param {object} root The root element for the courses view.
* @param {object} content The content element for the courses view.
*/
Expand Down Expand Up @@ -166,10 +166,10 @@ function(
/**
* Reset the courses views to their original
* state on first page load.
*
*
* This is called when configuration has changed for the event lists
* to cause them to reload their data.
*
*
* @param {object} root The root element for the timeline view.
* @param {object} content The content element for the timeline view.
*/
Expand Down
4 changes: 2 additions & 2 deletions blocks/myoverview/amd/src/view_nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function(

/**
* Event listener for the Display filter (cards, list).
*
*
* @param {object} root The root element for the overview block
* @param {object} viewRoot The root element for displaying courses.
* @param {object} viewContent content The content element for the courses view.
Expand Down Expand Up @@ -93,7 +93,7 @@ function(
/**
* Initialise the timeline view navigation by adding event listeners to
* the navigation elements.
*
*
* @param {object} root The root element for the myoverview block
* @param {object} viewRoot The root element for the myoverview block
* @param {object} viewContent The content element for the myoverview block
Expand Down
2 changes: 1 addition & 1 deletion blocks/myoverview/templates/no-courses.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
alt="{{#str}} nocourses, block_myoverview {{/str}}"
role="presentation">
<p class="text-muted mt-3">{{#str}} nocourses, block_myoverview {{/str}}</p>
</div>
</div>
2 changes: 1 addition & 1 deletion blocks/myoverview/templates/placeholder-course.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
</div>
<div class="bg-pulse-grey w-100" style="height: 3rem">
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions blocks/myoverview/templates/progress-bar.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
}}

<div class="progress">
<div class="progress-bar bar" role="progressbar" aria-valuenow="{{progress}}" style="width: {{progress}}%" aria-valuemin="0" aria-valuemax="100"></div>
<div class="progress-bar bar" role="progressbar" aria-valuenow="{{progress}}" style="width: {{progress}}%" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<div class="small">
<span class="sr-only">{{#str}}aria:courseprogress, block_myoverview{{/str}}</span>
<strong>{{progress}}%</strong> {{#str}}complete, block_myoverview{{/str}}
</div>
<strong>{{progress}}%</strong> {{#str}}complete, block_myoverview{{/str}}
</div>
4 changes: 2 additions & 2 deletions blocks/myoverview/templates/view-list.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
]
}
}}
}}

<ul class="list-group" role="list">
{{#courses}}
Expand All @@ -52,4 +52,4 @@
</div>
</li>
{{/courses}}
</ul>
</ul>

0 comments on commit 77d7f5e

Please sign in to comment.