First batch of data, and modification to take them into account
Also optimized fonts, after discovering (when having all photos in one page) they were too heavy.
This commit is contained in:
@ -5,8 +5,8 @@ jQuery(document).ready(function($)
|
||||
paramYear = (urlParams.get('years') == null ? urlParams.getAll('year') : urlParams.getAll('years'));
|
||||
paramMonth = (urlParams.get('months') == null ? urlParams.getAll('month') : urlParams.getAll('months'));
|
||||
paramDimension = (urlParams.get('dimensions') == null ? urlParams.getAll('dimension') : urlParams.getAll('dimensions'));
|
||||
paramGenre = (urlParams.get('genres') == null ? urlParams.getAll('genre') : urlParams.getAll('genres'));
|
||||
paramTheme = (urlParams.get('themes') == null ? urlParams.getAll('theme') : urlParams.getAll('themes'));
|
||||
paramCategory = (urlParams.get('categories') == null ? urlParams.getAll('category') : urlParams.getAll('categories'));
|
||||
paramPlace = (urlParams.get('places') == null ? urlParams.getAll('place') : urlParams.getAll('places'));
|
||||
paramTag = (urlParams.get('tags') == null ? urlParams.getAll('tag') : urlParams.getAll('tags'));
|
||||
paramPhoto = (urlParams.get('photos') == null ? urlParams.getAll('photo') : urlParams.getAll('photos'));
|
||||
@ -19,9 +19,9 @@ jQuery(document).ready(function($)
|
||||
/** MENU **/
|
||||
/**********/
|
||||
|
||||
var dimensions = [];
|
||||
//var dimensions = [];
|
||||
var genres = [];
|
||||
var themes = [];
|
||||
var categories = [];
|
||||
var places = [];
|
||||
var tags = [];
|
||||
|
||||
@ -29,12 +29,12 @@ jQuery(document).ready(function($)
|
||||
{
|
||||
for (i of data)
|
||||
{
|
||||
if (dimensions.indexOf(i.dimension) === -1 && i.dimension != "" && i.dimension != "—")
|
||||
dimensions.push(i.dimension);
|
||||
/*if (dimensions.indexOf(i.dimension) === -1 && i.dimension != "" && i.dimension != "—")
|
||||
dimensions.push(i.dimension);*/
|
||||
if (genres.indexOf(i.genre) === -1 && i.genre != "" && i.genre != "—")
|
||||
genres.push(i.genre);
|
||||
if (themes.indexOf(i.theme) === -1 && i.theme != "" && i.theme != "—")
|
||||
themes.push(i.theme);
|
||||
if (categories.indexOf(i.category) === -1 && i.category != "" && i.category != "—")
|
||||
categories.push(i.category);
|
||||
if (places.indexOf(i.place) === -1 && i.place != "" && i.place != "—")
|
||||
places.push(i.place);
|
||||
if (tags.indexOf(i.tags) === -1 && i.tags != "" && i.tags != "—")
|
||||
@ -49,17 +49,23 @@ jQuery(document).ready(function($)
|
||||
}
|
||||
}
|
||||
|
||||
dimensions.sort();
|
||||
//dimensions.sort();
|
||||
genres.sort();
|
||||
themes.sort();
|
||||
categories.sort();
|
||||
places.sort();
|
||||
tags.sort();
|
||||
|
||||
for (dimension of dimensions)
|
||||
/*for (dimension of dimensions)
|
||||
{
|
||||
html = '<span><input type="checkbox" id="' + dimension + '" name="dimension" value="' + dimension + '"></input>\n';
|
||||
html += '<label for="' + dimension + '">' + dimension + '</label></span>';
|
||||
$(".box.dimensions .item-cont").append(html);
|
||||
}*/
|
||||
for (genre of genres)
|
||||
{
|
||||
html = '<span><input type="checkbox" id="' + genre + '" name="genre" value="' + genre + '"></input>\n';
|
||||
html += '<label for="' + genre + '">' + genre + '</label></span>';
|
||||
$(".box.genres .item-cont").append(html);
|
||||
}
|
||||
for (theme of themes)
|
||||
{
|
||||
@ -67,23 +73,23 @@ jQuery(document).ready(function($)
|
||||
html += '<label for="' + theme + '">' + theme + '</label></span>';
|
||||
$(".box.themes .item-cont").append(html);
|
||||
}
|
||||
for (category of categories)
|
||||
{
|
||||
html = '<span><input type="checkbox" id="' + category + '" name="category" value="' + category + '"></input>\n';
|
||||
html += '<label for="' + category + '">' + category + '</label></span>';
|
||||
$(".box.categories .item-cont").append(html);
|
||||
}
|
||||
//$(".box.places select").append('<option value="none">Aucun</option');
|
||||
for (place of places)
|
||||
{
|
||||
html = '<span><input type="checkbox" id="' + place + '" name="place" value="' + place + '"></input>\n';
|
||||
html += '<label for="'+place+'">' + place + '</label></span>';
|
||||
$(".box.places .item-cont").append(html);
|
||||
|
||||
//$(".box.places select").append('<option value="' + place + '">' + place + '</option');
|
||||
}
|
||||
//$(".box.tags select").append('<option value="none">Aucun</option');
|
||||
for (tag of tags)
|
||||
{
|
||||
html = '<span><input type="checkbox" id="' + tag + '" name="tag" value="' + tag + '"></input>\n';
|
||||
html += '<label for="'+tag+'">' + tag + '</label></span>';
|
||||
$(".box.tags .item-cont").append(html);
|
||||
|
||||
//$(".box.tags select").append('<option value="' + tag + '">' + tag + '</option');
|
||||
}
|
||||
|
||||
// populate checkboxes depending on URL
|
||||
@ -107,8 +113,8 @@ jQuery(document).ready(function($)
|
||||
checkBoxSelector("years", "year", paramYear)
|
||||
checkBoxSelector("months", "month", paramMonth);
|
||||
checkBoxSelector("dimensions", "dimension", paramDimension);
|
||||
checkBoxSelector("genres", "genre", paramGenre);
|
||||
checkBoxSelector("themes", "theme", paramTheme);
|
||||
checkBoxSelector("categories", "category", paramCategory);
|
||||
checkBoxSelector("places", "place", paramPlace);
|
||||
checkBoxSelector("tags", "tag", paramTag);
|
||||
checkBoxSelector("photos", "photo", paramPhoto);
|
||||
@ -138,8 +144,8 @@ jQuery(document).ready(function($)
|
||||
AllCheckBoxSelector("years", "year");
|
||||
AllCheckBoxSelector("months", "month");
|
||||
AllCheckBoxSelector("dimensions", "dimension");
|
||||
AllCheckBoxSelector("genres", "genre");
|
||||
AllCheckBoxSelector("themes", "theme");
|
||||
AllCheckBoxSelector("categories", "category");
|
||||
AllCheckBoxSelector("places", "place");
|
||||
AllCheckBoxSelector("tags", "tag");
|
||||
AllCheckBoxSelector("photos", "photo");
|
||||
@ -199,26 +205,42 @@ jQuery(document).ready(function($)
|
||||
function checkMonth(month)
|
||||
{
|
||||
if (paramMonth == "all") return true;
|
||||
if (paramMonth.includes("01") && month == "janvier") return true;
|
||||
if (paramMonth.includes("02") && month == "février") return true;
|
||||
if (paramMonth.includes("03") && month == "mars") return true;
|
||||
if (paramMonth.includes("04") && month == "avril") return true;
|
||||
if (paramMonth.includes("05") && month == "mai") return true;
|
||||
if (paramMonth.includes("06") && month == "juin") return true;
|
||||
if (paramMonth.includes("07") && month == "juillet") return true;
|
||||
if (paramMonth.includes("08") && month == "août") return true;
|
||||
if (paramMonth.includes("09") && month == "septembre") return true;
|
||||
if (paramMonth.includes("10") && month == "octobre") return true;
|
||||
if (paramMonth.includes("11") && month == "novembre") return true;
|
||||
if (paramMonth.includes("12") && month == "décembre") return true;
|
||||
if (paramMonth.includes("01") && month == "Janvier") return true;
|
||||
if (paramMonth.includes("02") && month == "Février") return true;
|
||||
if (paramMonth.includes("03") && month == "Mars") return true;
|
||||
if (paramMonth.includes("04") && month == "Avril") return true;
|
||||
if (paramMonth.includes("05") && month == "Mai") return true;
|
||||
if (paramMonth.includes("06") && month == "Juin") return true;
|
||||
if (paramMonth.includes("07") && month == "Juillet") return true;
|
||||
if (paramMonth.includes("08") && month == "Août") return true;
|
||||
if (paramMonth.includes("09") && month == "Septembre") return true;
|
||||
if (paramMonth.includes("10") && month == "Octobre") return true;
|
||||
if (paramMonth.includes("11") && month == "Novembre") return true;
|
||||
if (paramMonth.includes("12") && month == "Décembre") return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
function checkDimension(dimension)
|
||||
{
|
||||
if (paramDimension == "all")
|
||||
if (paramDimension == "all") return true;
|
||||
if (paramDimension.includes("18") && dimension.split("x")[0] >= 18 && dimension.split("x")[0] <= 19) return true;
|
||||
if (paramDimension.includes("20") && dimension.split("x")[0] >= 20 && dimension.split("x")[0] <= 29) return true;
|
||||
if (paramDimension.includes("30") && dimension.split("x")[0] >= 30 && dimension.split("x")[0] <= 39) return true;
|
||||
if (paramDimension.includes("40") && dimension.split("x")[0] >= 40 && dimension.split("x")[0] <= 49) return true;
|
||||
if (paramDimension.includes("50") && dimension.split("x")[0] >= 50 && dimension.split("x")[0] <= 59) return true;
|
||||
if (paramDimension.includes("60") && dimension.split("x")[0] >= 60 && dimension.split("x")[0] <= 69) return true;
|
||||
if (paramDimension.includes("70") && dimension.split("x")[0] >= 70 && dimension.split("x")[0] <= 79) return true;
|
||||
if (paramDimension.includes("80") && dimension.split("x")[0] >= 80 && dimension.split("x")[0] <= 89) return true;
|
||||
if (paramDimension.includes("90") && dimension.split("x")[0] >= 90 && dimension.split("x")[0] <= 99) return true;
|
||||
if (paramDimension.includes("100") && dimension.split("x")[0] >= 100 && dimension.split("x")[0] <= 109) return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
function checkGenre(genre)
|
||||
{
|
||||
if (paramGenre == "all")
|
||||
return true;
|
||||
if (paramDimension.includes(dimension))
|
||||
if (paramGenre.includes(genre))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
@ -232,15 +254,6 @@ jQuery(document).ready(function($)
|
||||
return false;
|
||||
}
|
||||
|
||||
function checkCategory(category)
|
||||
{
|
||||
if (paramCategory == "all")
|
||||
return true;
|
||||
if (paramCategory.includes(category))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
function checkPlace(place)
|
||||
{
|
||||
if (paramPlace == "all")
|
||||
@ -285,6 +298,7 @@ jQuery(document).ready(function($)
|
||||
function generateTable()
|
||||
{
|
||||
hasResult = false;
|
||||
numberOfItem = 0;
|
||||
|
||||
for (i of data)
|
||||
{
|
||||
@ -297,8 +311,8 @@ jQuery(document).ready(function($)
|
||||
if (paramYear != "") res &&= checkYear(i.year);
|
||||
if (paramMonth != "") res &&= checkMonth(i.month);
|
||||
if (paramDimension != "") res &&= checkDimension(i.dimension);
|
||||
if (paramGenre != "") res &&= checkGenre(i.genre);
|
||||
if (paramTheme != "") res &&= checkTheme(i.theme);
|
||||
if (paramCategory != "") res &&= checkCategory(i.category);
|
||||
if (paramPlace != "") res &&= checkPlace(i.place);
|
||||
if (paramTag != "") res &&= checkTag(i.tags);
|
||||
if (paramPhoto != "") res &&= checkPhoto(i.photo);
|
||||
@ -308,6 +322,7 @@ jQuery(document).ready(function($)
|
||||
continue;
|
||||
|
||||
hasResult = true;
|
||||
numberOfItem++;
|
||||
|
||||
// table
|
||||
$("table").css("display", "block");
|
||||
@ -315,10 +330,10 @@ jQuery(document).ready(function($)
|
||||
result = "<tr>";
|
||||
result += "<td>" + i.number + "</td>";
|
||||
result += "<td>" + i.title + "</td>";
|
||||
result += "<td>" + i.year + "</td>";
|
||||
result += "<td>" + (i.month != "—" ? i.month + " " : "") + i.year + "</td>";
|
||||
result += "<td>" + i.dimension + "</td>";
|
||||
result += "<td>" + i.genre + "</td>";
|
||||
result += "<td>" + i.theme + "</td>";
|
||||
result += "<td>" + i.category + "</td>";
|
||||
result += "<td>" + i.place + "</td>";
|
||||
result += "<td>" + i.tags + "</td>";
|
||||
|
||||
@ -354,6 +369,7 @@ jQuery(document).ready(function($)
|
||||
}
|
||||
$("#gallery").append(paintingHtml);
|
||||
}
|
||||
$(".explorer .result").append("La recherche donne un résultat de <strong>" + numberOfItem + " éléments</strong>.");
|
||||
return hasResult;
|
||||
}
|
||||
|
||||
@ -368,9 +384,13 @@ jQuery(document).ready(function($)
|
||||
$(".style-select").show();
|
||||
$("article.explorer h2").removeClass("active")
|
||||
$("form").slideUp(200);
|
||||
$("article.explorer p.result").css("display", "block");
|
||||
}
|
||||
else
|
||||
{
|
||||
$("article.explorer p.no-result").css("display", "block");
|
||||
$("article.explorer p.result").css("display", "none");
|
||||
}
|
||||
|
||||
// on mobile, show only the first item slided down
|
||||
if ($(window).width() <= 600)
|
||||
@ -414,6 +434,8 @@ jQuery(document).ready(function($)
|
||||
caption: function(instance, item)
|
||||
{
|
||||
var idx = item.opts.fancyboxIndex - 1; // painting number
|
||||
if (item.opts.fancyboxIndex >= 1000)
|
||||
idx = item.opts.fancyboxIndex - 1000 + 383 - 1; // inédit: index starts at 1000 // 383: total number of paintings except inédit
|
||||
return '\
|
||||
<div id="info">\
|
||||
<span class="info"><a href="painting.html?number=' + data[idx].number + '">ℹ︎</span></a></span>\
|
||||
|
||||
Reference in New Issue
Block a user