Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New snippets for Spanish lesson index #625

Merged
merged 10 commits into from
Feb 19, 2018
6 changes: 6 additions & 0 deletions _data/snippets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ difficulty:
difficulty
es:
dificultad
all-lessons:
en: All Lessons
es: Todas las lecciones
filtering-results:
en: Filtering Results
es: Filtradas por

# lesson headers
editor:
Expand Down
5 changes: 4 additions & 1 deletion _includes/lesson-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@
<li id="sort-by-difficulty" class="sort" data-sort="difficulty">{{site.data.snippets.sort-by-difficulty[page.lang]}}</li>
</ul>

<h2 class="results-title">Filtering Results: <span id="results-value">All lessons </span><span id="current-sort" class="sort-desc">{{site.data.snippets.date[page.lang]}}</span></h2>
<input id="date-sort-text" type="hidden" label="{{site.data.snippets.date[page.lang]}}">
<input id="difficulty-sort-text" type="hidden" label="{{site.data.snippets.difficulty[page.lang]}}">

<h2 class="results-title">{{ site.data.snippets.filtering-results[page.lang] }}: <span id="results-value">{{ site.data.snippets.all-lessons[page.lang] }} </span> <span id="current-sort" class="sort-desc">{{site.data.snippets.date[page.lang]}}</span></h2>

<ul class="list">
{% for lesson in alllessons %}
Expand Down
17 changes: 10 additions & 7 deletions js/lessonfilter.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
---


function resetSort() {
$('#current-sort').text(" {{site.data.snippets.date[page.lang]}} ");
$('#current-sort').removeClass().addClass("sort-desc");
$("#sort-by-date").removeClass().addClass("sort desc my-asc");
$("#sort-by-difficulty").removeClass().addClass("sort my-desc");
Expand Down Expand Up @@ -32,11 +30,11 @@ function applySortFromURI(uri,featureList) {

// Update filter header and restore defaults to other button
if (sortType == "date") {
$('#current-sort').text(" {{site.data.snippets.date[page.lang]}} ");
$('#current-sort').text(dateSort);
$('#sort-by-difficulty').removeClass().addClass("sort my-asc");
}
else {
$('#current-sort').text(" {{site.data.snippets.difficulty[page.lang]}} ");
$('#current-sort').text(difficultySort);
$('#sort-by-date').removeClass().addClass("sort my-desc");
}
}
Expand Down Expand Up @@ -89,7 +87,7 @@ function wireButtons() {
$('.filter').children().removeClass("current");

// Reset filter results header
$('#results-value').text('All lessons');
$('#results-value').text($('#results-value').text());

// Reset uri to remove query params
uri.search("");
Expand Down Expand Up @@ -123,11 +121,11 @@ function wireButtons() {
// Update filter results header to show current sorting (date or difficulty)
// Reset the other (non-pressed) button to its default sort arrow.
if (sortType == "date") {
$('#current-sort').text(" {{site.data.snippets.date[page.lang]}} ");
$('#current-sort').text(dateSort);
$('#sort-by-difficulty').removeClass().addClass("sort my-asc");
}
else {
$('#current-sort').text(" {{site.data.snippets.difficulty[page.lang]}} ");
$('#current-sort').text(difficultySort);
$('#sort-by-date').removeClass().addClass("sort my-desc");
}

Expand Down Expand Up @@ -196,6 +194,11 @@ function wireButtons() {
All below code runs on each page load
****************************************/

// set labels based on the current language

var dateSort = $('#date-sort-text').attr('label');
var difficultySort = $('#difficulty-sort-text').attr("label");

// Look for URI query params
var params = uri.search(true);
var filter = params.activity ? params.activity : params.topic;
Expand Down