From d787b6ac52f150073de0835a1d63b1c595e061e8 Mon Sep 17 00:00:00 2001 From: Eugene Oliveros Date: Wed, 30 Aug 2017 15:09:28 +0800 Subject: [PATCH 1/3] Fix untranslated strings --- .../coachreports/coach_reports/hbtemplates/landing.handlebars | 2 +- .../coachreports/static/js/coachreports/coach_reports/views.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars b/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars index 01eb18461c..4f2cb5c011 100644 --- a/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars +++ b/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars @@ -8,7 +8,7 @@ - +

{{#if start_date}}{{ start_date }}{{#if end_date }} → {{ end_date }}{{/if}}{{else}}{{_ "This week" }}{{/if}}

diff --git a/kalite/coachreports/static/js/coachreports/coach_reports/views.js b/kalite/coachreports/static/js/coachreports/coach_reports/views.js index 90ef3a1508..6ca296e555 100644 --- a/kalite/coachreports/static/js/coachreports/coach_reports/views.js +++ b/kalite/coachreports/static/js/coachreports/coach_reports/views.js @@ -321,7 +321,10 @@ var CoachSummaryView = BaseView.extend({ $('#topic-list').multiselect({ + allSelectedText: gettext('All selected'), nonSelectedText: gettext('Default: Overview'), + nSelectedText: gettext('selected'), + filterPlaceholder: gettext('Search'), buttonWidth: '75%', numberDisplayed: 2, maxHeight: 350, From 30182df0bae3dc60568af51ae8c7b927b38f165b Mon Sep 17 00:00:00 2001 From: Eugene Oliveros Date: Wed, 30 Aug 2017 15:17:19 +0800 Subject: [PATCH 2/3] Remove Color Legend and transfer Not attempted --- .../coach_reports/hbtemplates/landing.handlebars | 3 ++- .../hbtemplates/tabular-view.handlebars | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars b/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars index 4f2cb5c011..84f96812de 100644 --- a/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars +++ b/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars @@ -51,7 +51,8 @@ diff --git a/kalite/coachreports/static/js/coachreports/tabular_reports/hbtemplates/tabular-view.handlebars b/kalite/coachreports/static/js/coachreports/tabular_reports/hbtemplates/tabular-view.handlebars index 9db6f87dd6..7789cc232d 100644 --- a/kalite/coachreports/static/js/coachreports/tabular_reports/hbtemplates/tabular-view.handlebars +++ b/kalite/coachreports/static/js/coachreports/tabular_reports/hbtemplates/tabular-view.handlebars @@ -1,15 +1,4 @@
-
-
- -
    -
  • {{_ "In Progress" }}
  • -
  • {{_ "Completed" }}
  • -
  • {{_ "Struggling" }}
  • -
  • {{_ "Not Attempted" }}
  • -
-
-
{{#if learners}} From 266c81b2caf656468cf57ffd06d5ac86829f785d Mon Sep 17 00:00:00 2001 From: Eugene Oliveros Date: Thu, 31 Aug 2017 12:33:22 +0800 Subject: [PATCH 3/3] Use barlegend class instead of legend --- .../coachreports/coach_reports/hbtemplates/landing.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars b/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars index 84f96812de..9816416c60 100644 --- a/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars +++ b/kalite/coachreports/static/js/coachreports/coach_reports/hbtemplates/landing.handlebars @@ -52,7 +52,7 @@
  • {{_ "Struggling" }}
  • {{_ "Completed" }}
  • {{_ "In Progress" }}
  • -
  • {{_ "Not Attempted" }}
  • +
  • {{_ "Not Attempted" }}