keb/ginou
1
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

Merge branch 'dev' into other-works

Browse Source
This commit is contained in:
Théo Marchal 2022-08-17 13:34:44 +02:00
commit 3400db36b9
17 changed files with 244 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
biographie.html
View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/favicon.png">
<link rel="stylesheet" href="styles/main.css" media="screen">
<script src="plugins/jquery-3.5.1.min.js"></script>
<script src="plugins/jquery-3.6.0.min.js"></script>
<script src="scripts/menu.js"></script>
</head>
<body>

2
data.json
View File

File diff suppressed because one or more lines are too long

2
divers.html
View File

@ -12,7 +12,7 @@
<link rel="stylesheet" href="styles/pagination.css" media="screen">
<link rel="stylesheet" href="plugins/pagination.css" media="screen">
<link rel="stylesheet" href="plugins/jquery.fancybox.min.css" media="screen">
<script src="plugins/jquery-3.5.1.min.js"></script>
<script src="plugins/jquery-3.6.0.min.js"></script>
<script src="plugins/jquery.fancybox.min.js"></script>
<script src="plugins/pagination.min.js"></script>
<script src="scripts/menu.js"></script>

2
explorer.html
View File

@ -12,7 +12,7 @@
<link rel="stylesheet" href="styles/pagination.css" media="screen">
<link rel="stylesheet" href="plugins/jquery.fancybox.min.css" media="screen">
<link rel="stylesheet" href="plugins/pagination.css" media="screen">
<script src="plugins/jquery-3.5.1.min.js"></script>
<script src="plugins/jquery-3.6.0.min.js"></script>
<script src="plugins/jquery.fancybox.min.js"></script>
<script src="plugins/pagination.min.js"></script>
<script src="scripts/menu.js"></script>

2
index.html
View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/favicon.png">
<link rel="stylesheet" href="styles/main.css" media="screen">
<script src="plugins/jquery-3.5.1.min.js"></script>
<script src="plugins/jquery-3.6.0.min.js"></script>
<script src="scripts/menu.js"></script>
</head>
<body>

7
informations.html
View File

@ -8,9 +8,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/favicon.png">
<link rel="stylesheet" href="styles/main.css" media="screen">
<link rel="stylesheet" href="plugins/chart.min.css" media="screen">
<script src="plugins/jquery-3.5.1.min.js"></script>
<script src="plugins/chart.bundle.min.js"></script>
<script src="plugins/jquery-3.6.0.min.js"></script>
<script src="plugins/chart-3.9.1.min.js"></script>
<script src="scripts/menu.js"></script>
<script src="scripts/informations.js"></script>
</head>
@ -64,7 +63,7 @@
<h4>Explorer</h4>
<p>Cette rubrique quant à elle est interactive et permet de visualiser l'ensemble des peintures de Ginou. En effet, elle regorge d'options pour pouvoir choisir précisément les tableaux à afficher. Par exemple, il est possible de créer un filtre pour voir tous les tableaux de chiens dont la photo est de bonne qualité réalisés un mois de février&#8239;: il suffit de sélectionner ces options et de cliquer sur le bouton <strong>Générer</strong>. Bien évidemment, il est possible qu'il n'existe pas de tableau réunissant ces critères, ce qui sera alors indiqué.<br>
Le résultat affiché sera sous la forme d'une liste, mais il est également possible de l'afficher sous forme d'une galerie (comme dans la rubrique Exposition) en cliquant sur le bouton en haut à droite. Dans ce mode, les tableaux n'ayant pas de photo disponible montreront une icône indiquant que la photo est manquante.</p>
Le résultat affiché sera sous la forme d'une liste, mais il est également possible de l'afficher sous forme d'une galerie (comme dans la rubrique Peinture) en cliquant sur le bouton en haut à droite. Dans ce mode, les tableaux n'ayant pas de photo disponible montreront une icône indiquant que la photo est manquante.</p>
<h4>Suppléments</h4>
<p>Cette page regroupe diverses photos et informations en complément de la biographie&#8239;: une vue de son atelier, des photos d'expositions, des coupures de presse, ainsi que des statistiques intéressantes (on peut remarquer que le printemps l'inspirait&#8239;!). N'hésitez pas à nous contacter si vous avez un document, une photo, des coupures de presse, tout ce qui peut être en relation avec l'art de Ginou.</p>

2
painting.html
View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/favicon.png">
<link rel="stylesheet" href="styles/main.css" media="screen">
<script src="plugins/jquery-3.5.1.min.js"></script>
<script src="plugins/jquery-3.6.0.min.js"></script>
<script src="scripts/menu.js"></script>
<script src="scripts/painting.js"></script>
</head>

2
peinture.html
View File

@ -12,7 +12,7 @@
<link rel="stylesheet" href="styles/pagination.css" media="screen">
<link rel="stylesheet" href="plugins/pagination.css" media="screen">
<link rel="stylesheet" href="plugins/jquery.fancybox.min.css" media="screen">
<script src="plugins/jquery-3.5.1.min.js"></script>
<script src="plugins/jquery-3.6.0.min.js"></script>
<script src="plugins/jquery.fancybox.min.js"></script>
<script src="plugins/pagination.min.js"></script>
<script src="scripts/menu.js"></script>

13
plugins/chart-3.9.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
plugins/chart.bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
plugins/chart.min.css vendored
View File

@ -1 +0,0 @@
@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}

2
plugins/jquery-3.5.1.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
plugins/jquery-3.6.0.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

8
scripts/divers.js
View File

@ -5,8 +5,12 @@ jQuery(document).ready(function($)
infobar: false,
toolbar: true,
smallBtn: false,
buttons : [ "close" ],
arrows: true,
buttons: ["arrowLeft", "arrowRight", "close"],
arrows: false,
transitionEffect: "fade",
baseClass: 'fancybox-custom-layout',
mobile: {
preventCaptionOverlap: true,
},
});
});

61
scripts/informations.js
View File

@ -50,6 +50,9 @@ jQuery(document).ready(function($)
gatherYear(tens, 2010, 2020);
}
Chart.defaults.font.family = "'Rubik', Helvetica";
Chart.defaults.color = "#000000";
var canvasPhoto = document.getElementById("photo").getContext('2d');
var chartPhoto = new Chart(canvasPhoto, {
type: 'bar',
@ -83,40 +86,60 @@ jQuery(document).ready(function($)
}]
},
options: {
tooltips: {
mode: 'index',
intersect: false
plugins: {
tooltip: {
mode: 'index',
intersect: false,
titleFont: {
size: 14
},
bodyFont: {
size: 14
},
},
legend: {
display: false,
position: "bottom",
},
},
responsive: true,
scales: {
yAxes: [{
y: {
ticks: {
font: {
size: 14
},
beginAtZero: true
}, gridLines: {
display: true
},
scaleLabel: {
grid: {
lineWidth: 0
},
title: {
display: true,
labelString: 'Tableaux'
text: 'Tableaux',
font: {
size: 16
}
},
stacked: true,
}],
xAxes: [{
gridLines: {
display: false
},
x: {
ticks: {
font: {
size: 14
},
},
grid: {
lineWidth: 0
},
stacked: true,
}]
},
legend: {
display: false,
position: "bottom",
},
},
animation: {
duration: 0
},
responsiveAnimationDuration: 0
}
responsiveAnimationDuration: 0,
},
});
});
});

278
scripts/stats.js
View File

@ -1,128 +1,172 @@
jQuery(document).ready(function($)
{
var canvasMonth = document.getElementById("month").getContext('2d');
var chartMonth = new Chart(canvasMonth, {
type: 'bar',
data: {
labels: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
datasets: [{
label: 'nombre de tableaux',
data: [11, 30, 40, 34, 50, 33, 27, 24, 17, 26, 37, 19],
backgroundColor: '#2589BD',
borderColor: '#187795',
borderWidth: 1
}]
},
options: {
scales: {
yAxes: [{
ticks: {
beginAtZero: true
}, gridLines: {
display: false
},
scaleLabel: {
display: true,
labelString: 'Tableaux'
}
}],
xAxes: [{
gridLines: {
display: false
}
}]
},
legend: {
display: false
},
animation: {
duration: 0
},
responsiveAnimationDuration: 0
}
});
document.fonts.ready.then(function() {
Chart.defaults.font.family = "'Rubik', Helvetica";
Chart.defaults.color = "#000000";
var canvasYear = document.getElementById("year").getContext('2d');
var chartYear = new Chart(canvasYear, {
type: 'bar',
data: {
labels: ["1956 - 1959", "1960 - 1969", "1970 - 1979", "1980 - 1989", "1990 - 1999", "2000 - 2009", "2010 - 2016"],
datasets: [{
label: 'nombre de tableaux',
data: [24, 16, 7, 57, 117, 112, 52],
backgroundColor: '#2589BD',
borderColor: '#187795',
borderWidth: 1
}]
},
options: {
scales: {
yAxes: [{
ticks: {
beginAtZero: true
}, gridLines: {
display: false
},
scaleLabel: {
display: true,
labelString: 'Tableaux'
}
}],
xAxes: [{
gridLines: {
display: false
}
var canvasMonth = document.getElementById("month").getContext('2d');
var chartMonth = new Chart(canvasMonth, {
type: 'bar',
data: {
labels: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"],
datasets: [{
label: 'nombre de tableaux',
data: [11, 30, 40, 34, 50, 33, 27, 24, 17, 26, 37, 19],
backgroundColor: '#2589BD',
}]
},
legend: {
display: false
},
animation: {
duration: 0
},
responsiveAnimationDuration: 0
}
});
options: {
plugins: {
tooltip: {
mode: 'index',
intersect: false,
titleFont: {
size: 13
},
bodyFont: {
size: 13
},
},
legend: {
display: false,
position: "bottom",
},
},
scales: {
y: {
ticks: {
beginAtZero: true
},
grid: {
lineWidth: 0
},
title: {
display: true,
text: 'Tableaux'
}
},
xAxes: {
grid: {
lineWidth: 0
},
}
},
animation: {
duration: 0
},
responsiveAnimationDuration: 0
}
});
var canvasDimension = document.getElementById("dimension").getContext('2d');
var chartDimension = new Chart(canvasDimension, {
type: 'bar',
data: {
labels: ["Histoire", "Nature morte", "Paysage", "Portrait", "Scène"],
datasets: [{
label: 'nombre de tableaux',
data: [2, 42, 173, 59, 107],
backgroundColor: '#2589BD',
borderColor: '#187795',
borderWidth: 1
}]
},
options: {
scales: {
yAxes: [{
ticks: {
beginAtZero: true
}, gridLines: {
display: false
},
scaleLabel: {
display: true,
labelString: 'Tableaux'
}
}],
xAxes: [{
gridLines: {
display: false
}
var canvasYear = document.getElementById("year").getContext('2d');
var chartYear = new Chart(canvasYear, {
type: 'bar',
data: {
labels: ["1956 - 1959", "1960 - 1969", "1970 - 1979", "1980 - 1989", "1990 - 1999", "2000 - 2009", "2010 - 2016"],
datasets: [{
label: 'nombre de tableaux',
data: [24, 16, 7, 57, 117, 112, 52],
backgroundColor: '#2589BD',
}]
},
legend: {
display: false
options: {
plugins: {
tooltip: {
mode: 'index',
intersect: false,
titleFont: {
size: 13
},
bodyFont: {
size: 13
},
},
legend: {
display: false,
position: "bottom",
},
},
scales: {
y: {
ticks: {
beginAtZero: true
},
grid: {
lineWidth: 0
},
title: {
display: true,
text: 'Tableaux'
}
},
x: {
grid: {
lineWidth: 0
},
}
},
animation: {
duration: 0
},
responsiveAnimationDuration: 0
}
});
var canvasDimension = document.getElementById("dimension").getContext('2d');
var chartDimension = new Chart(canvasDimension, {
type: 'bar',
data: {
labels: ["Histoire", "Nature morte", "Paysage", "Portrait", "Scène"],
datasets: [{
label: 'nombre de tableaux',
data: [2, 42, 173, 59, 107],
backgroundColor: '#2589BD',
}]
},
animation: {
duration: 0
},
responsiveAnimationDuration: 0
}
options: {
plugins: {
tooltip: {
mode: 'index',
intersect: false,
titleFont: {
size: 13
},
bodyFont: {
size: 13
},
},
legend: {
display: false,
position: "bottom",
},
},
responsive: true,
scales: {
y: {
ticks: {
beginAtZero: true
},
grid: {
lineWidth: 0
},
title: {
display: true,
text: 'Tableaux'
},
stacked: true,
},
x: {
grid: {
lineWidth: 0
},
stacked: true,
}
},
animation: {
duration: 0
},
responsiveAnimationDuration: 0
}
});
});
});

11
styles/main.css
View File

@ -26,6 +26,10 @@ a {
color:#38686A;
}
a:hover {
color:#2589BD;
}
.gallery a, nav a {
text-decoration:none;
}
@ -373,6 +377,10 @@ article .gallery img {
/* Painting */
article.painting {
width:unset;
}
article.painting .container {
display:flex;
flex-direction:row;
@ -391,13 +399,14 @@ article.painting .container img {
}
article.painting .container ul.metadata {
width:15vw;
display:block;
margin:auto;
margin-left:0;
position:absolute;
bottom:0;
list-style-type:square;
padding-left: 1.5rem;
list-style-position:outside;
}
article.painting .container ul.metadata .metadata-help {