Skip to content

Commit bdddd9e

Browse files
authored
Merge pull request #5511 from mrpau/hotfix/5510-unify-color-legends-on-teach-page
Remove color legends
2 parents c8ad9ff + 266c81b commit bdddd9e

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<select id="topic-list" multiple="multiple">
99
</select>
1010
</div>
11-
<button id="topic-list-submit" type="button" class="btn btn-primary btn-md">Submit</button>
11+
<button id="topic-list-submit" type="button" class="btn btn-primary btn-md">{{_ "Submit" }}</button>
1212
</div>
1313
</div>
1414
<h3>{{#if start_date}}{{ start_date }}{{#if end_date }}{{ end_date }}{{/if}}{{else}}{{_ "This week" }}{{/if}}</h3>
@@ -51,7 +51,8 @@
5151
<ul id="legend">
5252
<li class="barlegend"><div class="struggling"></div><span>{{_ "Struggling" }}</span></li>
5353
<li class="barlegend"><div class="complete"></div><span>{{_ "Completed" }}</span></li>
54-
<li class="barlegend"><div class="partial"></div><span>{{_ "In Progress" }}</span></li>
54+
<li class="barlegend"><div class="partial"></div><span>{{_ "In Progress" }}</span></li>
55+
<li class="barlegend"><div class="not-attempted"></div><span>{{_ "Not Attempted" }}</span></li>
5556
</ul>
5657
</div>
5758
</div>

kalite/coachreports/static/js/coachreports/coach_reports/views.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,10 @@ var CoachSummaryView = BaseView.extend({
321321

322322

323323
$('#topic-list').multiselect({
324+
allSelectedText: gettext('All selected'),
324325
nonSelectedText: gettext('Default: Overview'),
326+
nSelectedText: gettext('selected'),
327+
filterPlaceholder: gettext('Search'),
325328
buttonWidth: '75%',
326329
numberDisplayed: 2,
327330
maxHeight: 350,

kalite/coachreports/static/js/coachreports/tabular_reports/hbtemplates/tabular-view.handlebars

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
<div>
2-
<div class="row">
3-
<div class="col-md-6 col-xs-12">
4-
<label id="legendMargin" for="legend">{{_ "Color legend"}}</label>
5-
<ul id="legend">
6-
<li class="legend"><div class="partial"></div><span>{{_ "In Progress" }}</span></li>
7-
<li class="legend"><div class="complete"></div><span>{{_ "Completed" }}</span></li>
8-
<li class="legend"><div class="struggling"></div><span>{{_ "Struggling" }}</span></li>
9-
<li class="legend"><div class="not-attempted"></div><span>{{_ "Not Attempted" }}</span></li>
10-
</ul>
11-
</div>
12-
</div>
132
<div class="row">
143
<div class="col-md-12">
154
{{#if learners}}

0 commit comments

Comments
 (0)