Compare commits
No commits in common. "46729478a686f3b5e6b3d50d59c732704c96d0b5" and "962b085d942b5ecc2fc8354207a111c244fdf405" have entirely different histories.
46729478a6
...
962b085d94
@ -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.6.0.min.js"></script>
|
||||
<script src="plugins/jquery-3.5.1.min.js"></script>
|
||||
<script src="scripts/menu.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -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.6.0.min.js"></script>
|
||||
<script src="plugins/jquery-3.5.1.min.js"></script>
|
||||
<script src="plugins/jquery.fancybox.min.js"></script>
|
||||
<script src="plugins/pagination.min.js"></script>
|
||||
<script src="scripts/menu.js"></script>
|
||||
|
||||
@ -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.6.0.min.js"></script>
|
||||
<script src="plugins/jquery-3.5.1.min.js"></script>
|
||||
<script src="plugins/jquery.fancybox.min.js"></script>
|
||||
<script src="plugins/pagination.min.js"></script>
|
||||
<script src="scripts/menu.js"></script>
|
||||
|
||||
@ -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.6.0.min.js"></script>
|
||||
<script src="plugins/jquery-3.5.1.min.js"></script>
|
||||
<script src="scripts/menu.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -8,8 +8,9 @@
|
||||
<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.6.0.min.js"></script>
|
||||
<script src="plugins/chart-3.9.1.min.js"></script>
|
||||
<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="scripts/menu.js"></script>
|
||||
<script src="scripts/informations.js"></script>
|
||||
</head>
|
||||
@ -63,7 +64,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 : 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 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>
|
||||
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>
|
||||
|
||||
<h4>Suppléments</h4>
|
||||
<p>Cette page regroupe diverses photos et informations en complément de la biographie : 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 !). 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>
|
||||
|
||||
@ -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.6.0.min.js"></script>
|
||||
<script src="plugins/jquery-3.5.1.min.js"></script>
|
||||
<script src="scripts/menu.js"></script>
|
||||
<script src="scripts/painting.js"></script>
|
||||
</head>
|
||||
|
||||
@ -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.6.0.min.js"></script>
|
||||
<script src="plugins/jquery-3.5.1.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
13
plugins/chart-3.9.1.min.js
vendored
File diff suppressed because one or more lines are too long
7
plugins/chart.bundle.min.js
vendored
Normal file
7
plugins/chart.bundle.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
plugins/chart.min.css
vendored
Normal file
1
plugins/chart.min.css
vendored
Normal file
@ -0,0 +1 @@
|
||||
@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
Normal file
2
plugins/jquery-3.5.1.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
2
plugins/jquery-3.6.0.min.js
vendored
2
plugins/jquery-3.6.0.min.js
vendored
File diff suppressed because one or more lines are too long
@ -5,12 +5,8 @@ jQuery(document).ready(function($)
|
||||
infobar: false,
|
||||
toolbar: true,
|
||||
smallBtn: false,
|
||||
buttons: ["arrowLeft", "arrowRight", "close"],
|
||||
arrows: false,
|
||||
buttons : [ "close" ],
|
||||
arrows: true,
|
||||
transitionEffect: "fade",
|
||||
baseClass: 'fancybox-custom-layout',
|
||||
mobile: {
|
||||
preventCaptionOverlap: true,
|
||||
},
|
||||
});
|
||||
});
|
||||
@ -50,9 +50,6 @@ 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',
|
||||
@ -86,60 +83,40 @@ jQuery(document).ready(function($)
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
plugins: {
|
||||
tooltip: {
|
||||
tooltips: {
|
||||
mode: 'index',
|
||||
intersect: false,
|
||||
titleFont: {
|
||||
size: 14
|
||||
intersect: false
|
||||
},
|
||||
bodyFont: {
|
||||
size: 14
|
||||
responsive: true,
|
||||
scales: {
|
||||
yAxes: [{
|
||||
ticks: {
|
||||
beginAtZero: true
|
||||
}, gridLines: {
|
||||
display: true
|
||||
},
|
||||
scaleLabel: {
|
||||
display: true,
|
||||
labelString: 'Tableaux'
|
||||
},
|
||||
stacked: true,
|
||||
}],
|
||||
xAxes: [{
|
||||
gridLines: {
|
||||
display: false
|
||||
},
|
||||
stacked: true,
|
||||
}]
|
||||
},
|
||||
legend: {
|
||||
display: false,
|
||||
position: "bottom",
|
||||
},
|
||||
},
|
||||
responsive: true,
|
||||
scales: {
|
||||
y: {
|
||||
ticks: {
|
||||
font: {
|
||||
size: 14
|
||||
},
|
||||
beginAtZero: true
|
||||
},
|
||||
grid: {
|
||||
lineWidth: 0
|
||||
},
|
||||
title: {
|
||||
display: true,
|
||||
text: 'Tableaux',
|
||||
font: {
|
||||
size: 16
|
||||
}
|
||||
},
|
||||
stacked: true,
|
||||
},
|
||||
x: {
|
||||
ticks: {
|
||||
font: {
|
||||
size: 14
|
||||
},
|
||||
},
|
||||
grid: {
|
||||
lineWidth: 0
|
||||
},
|
||||
stacked: true,
|
||||
},
|
||||
},
|
||||
animation: {
|
||||
duration: 0
|
||||
},
|
||||
responsiveAnimationDuration: 0,
|
||||
},
|
||||
responsiveAnimationDuration: 0
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
136
scripts/stats.js
136
scripts/stats.js
@ -1,9 +1,5 @@
|
||||
jQuery(document).ready(function($)
|
||||
{
|
||||
document.fonts.ready.then(function() {
|
||||
Chart.defaults.font.family = "'Rubik', Helvetica";
|
||||
Chart.defaults.color = "#000000";
|
||||
|
||||
var canvasMonth = document.getElementById("month").getContext('2d');
|
||||
var chartMonth = new Chart(canvasMonth, {
|
||||
type: 'bar',
|
||||
@ -13,43 +9,31 @@ jQuery(document).ready(function($)
|
||||
label: 'nombre de tableaux',
|
||||
data: [11, 30, 40, 34, 50, 33, 27, 24, 17, 26, 37, 19],
|
||||
backgroundColor: '#2589BD',
|
||||
borderColor: '#187795',
|
||||
borderWidth: 1
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
plugins: {
|
||||
tooltip: {
|
||||
mode: 'index',
|
||||
intersect: false,
|
||||
titleFont: {
|
||||
size: 13
|
||||
},
|
||||
bodyFont: {
|
||||
size: 13
|
||||
},
|
||||
},
|
||||
legend: {
|
||||
display: false,
|
||||
position: "bottom",
|
||||
},
|
||||
},
|
||||
scales: {
|
||||
y: {
|
||||
yAxes: [{
|
||||
ticks: {
|
||||
beginAtZero: true
|
||||
}, gridLines: {
|
||||
display: false
|
||||
},
|
||||
grid: {
|
||||
lineWidth: 0
|
||||
},
|
||||
title: {
|
||||
scaleLabel: {
|
||||
display: true,
|
||||
text: 'Tableaux'
|
||||
labelString: 'Tableaux'
|
||||
}
|
||||
},
|
||||
xAxes: {
|
||||
grid: {
|
||||
lineWidth: 0
|
||||
},
|
||||
}],
|
||||
xAxes: [{
|
||||
gridLines: {
|
||||
display: false
|
||||
}
|
||||
}]
|
||||
},
|
||||
legend: {
|
||||
display: false
|
||||
},
|
||||
animation: {
|
||||
duration: 0
|
||||
@ -67,43 +51,31 @@ jQuery(document).ready(function($)
|
||||
label: 'nombre de tableaux',
|
||||
data: [24, 16, 7, 57, 117, 112, 52],
|
||||
backgroundColor: '#2589BD',
|
||||
borderColor: '#187795',
|
||||
borderWidth: 1
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
plugins: {
|
||||
tooltip: {
|
||||
mode: 'index',
|
||||
intersect: false,
|
||||
titleFont: {
|
||||
size: 13
|
||||
},
|
||||
bodyFont: {
|
||||
size: 13
|
||||
},
|
||||
},
|
||||
legend: {
|
||||
display: false,
|
||||
position: "bottom",
|
||||
},
|
||||
},
|
||||
scales: {
|
||||
y: {
|
||||
yAxes: [{
|
||||
ticks: {
|
||||
beginAtZero: true
|
||||
}, gridLines: {
|
||||
display: false
|
||||
},
|
||||
grid: {
|
||||
lineWidth: 0
|
||||
},
|
||||
title: {
|
||||
scaleLabel: {
|
||||
display: true,
|
||||
text: 'Tableaux'
|
||||
labelString: 'Tableaux'
|
||||
}
|
||||
},
|
||||
x: {
|
||||
grid: {
|
||||
lineWidth: 0
|
||||
},
|
||||
}],
|
||||
xAxes: [{
|
||||
gridLines: {
|
||||
display: false
|
||||
}
|
||||
}]
|
||||
},
|
||||
legend: {
|
||||
display: false
|
||||
},
|
||||
animation: {
|
||||
duration: 0
|
||||
@ -121,46 +93,31 @@ jQuery(document).ready(function($)
|
||||
label: 'nombre de tableaux',
|
||||
data: [2, 42, 173, 59, 107],
|
||||
backgroundColor: '#2589BD',
|
||||
borderColor: '#187795',
|
||||
borderWidth: 1
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
plugins: {
|
||||
tooltip: {
|
||||
mode: 'index',
|
||||
intersect: false,
|
||||
titleFont: {
|
||||
size: 13
|
||||
},
|
||||
bodyFont: {
|
||||
size: 13
|
||||
},
|
||||
},
|
||||
legend: {
|
||||
display: false,
|
||||
position: "bottom",
|
||||
},
|
||||
},
|
||||
responsive: true,
|
||||
scales: {
|
||||
y: {
|
||||
yAxes: [{
|
||||
ticks: {
|
||||
beginAtZero: true
|
||||
}, gridLines: {
|
||||
display: false
|
||||
},
|
||||
grid: {
|
||||
lineWidth: 0
|
||||
},
|
||||
title: {
|
||||
scaleLabel: {
|
||||
display: true,
|
||||
text: 'Tableaux'
|
||||
},
|
||||
stacked: true,
|
||||
},
|
||||
x: {
|
||||
grid: {
|
||||
lineWidth: 0
|
||||
},
|
||||
stacked: true,
|
||||
labelString: 'Tableaux'
|
||||
}
|
||||
}],
|
||||
xAxes: [{
|
||||
gridLines: {
|
||||
display: false
|
||||
}
|
||||
}]
|
||||
},
|
||||
legend: {
|
||||
display: false
|
||||
},
|
||||
animation: {
|
||||
duration: 0
|
||||
@ -169,4 +126,3 @@ jQuery(document).ready(function($)
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
@ -26,10 +26,6 @@ a {
|
||||
color:#38686A;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
color:#2589BD;
|
||||
}
|
||||
|
||||
.gallery a, nav a {
|
||||
text-decoration:none;
|
||||
}
|
||||
@ -377,10 +373,6 @@ article .gallery img {
|
||||
|
||||
/* Painting */
|
||||
|
||||
article.painting {
|
||||
width:unset;
|
||||
}
|
||||
|
||||
article.painting .container {
|
||||
display:flex;
|
||||
flex-direction:row;
|
||||
@ -399,14 +391,13 @@ 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 {
|
||||
|
||||
@ -162,13 +162,13 @@
|
||||
|
||||
<div id="stats">
|
||||
<div class="stat">
|
||||
<canvas id="month"></canvas>
|
||||
<canvas id="month" width="400" height="200"></canvas>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<canvas id="year"></canvas>
|
||||
<canvas id="year" width="400" height="200"></canvas>
|
||||
</div>
|
||||
<div class="stat">
|
||||
<canvas id="dimension"></canvas>
|
||||
<canvas id="dimension" width="400" height="200"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user