Merge pull request #5511 from mrpau/hotfix/5510-unify-color-legends-o…

…n-teach-page Remove color legends
learningequality · Aug 31, 2017 · bdddd9e · bdddd9e
2 parents c8ad9ff + 266c81b
commit bdddd9e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 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
@@ -8,7 +8,7 @@
 					<select id="topic-list" multiple="multiple">
 					</select>
 				</div>
-				<button id="topic-list-submit" type="button" class="btn btn-primary btn-md">Submit</button>
+				<button id="topic-list-submit" type="button" class="btn btn-primary btn-md">{{_ "Submit" }}</button>
 			</div>
 		</div>
 		<h3>{{#if start_date}}{{ start_date }}{{#if end_date }} → {{ end_date }}{{/if}}{{else}}{{_ "This week" }}{{/if}}</h3>
@@ -51,7 +51,8 @@
 				        <ul id="legend">
 				        	<li class="barlegend"><div class="struggling"></div><span>{{_ "Struggling" }}</span></li>
 				            <li class="barlegend"><div class="complete"></div><span>{{_ "Completed" }}</span></li>
-				       		<li class="barlegend"><div class="partial"></div><span>{{_ "In Progress" }}</span></li>
+                            <li class="barlegend"><div class="partial"></div><span>{{_ "In Progress" }}</span></li>
+                            <li class="barlegend"><div class="not-attempted"></div><span>{{_ "Not Attempted" }}</span></li>
 			        	</ul>
 		        	</div>
 		        </div>

diff --git 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,

diff --git a/...e/coachreports/static/js/coachreports/tabular_reports/hbtemplates/tabular-view.handlebars b/...e/coachreports/static/js/coachreports/tabular_reports/hbtemplates/tabular-view.handlebars
@@ -1,15 +1,4 @@
 <div>
-    <div class="row">
-        <div class="col-md-6 col-xs-12">
-        <label id="legendMargin" for="legend">{{_ "Color legend"}}</label>
-            <ul id="legend">
-                <li class="legend"><div class="partial"></div><span>{{_ "In Progress" }}</span></li>
-                <li class="legend"><div class="complete"></div><span>{{_ "Completed" }}</span></li>
-                <li class="legend"><div class="struggling"></div><span>{{_ "Struggling" }}</span></li>
-                <li class="legend"><div class="not-attempted"></div><span>{{_ "Not Attempted" }}</span></li>
-            </ul>
-        </div>
-    </div>
     <div class="row">
         <div class="col-md-12">
             {{#if learners}}