diff --git a/assets/css/photos.css b/assets/css/photos.css index eaccd2b..46ddfcf 100644 --- a/assets/css/photos.css +++ b/assets/css/photos.css @@ -106,7 +106,6 @@ max-width: none; max-height: none; transform: translate(-50%, -50%); - cursor: move; box-shadow: 0 0 5px #000; } diff --git a/assets/css/score.css b/assets/css/score.css index c2e3377..70fc837 100644 --- a/assets/css/score.css +++ b/assets/css/score.css @@ -24,6 +24,14 @@ margin: 0; } +#main-score { + display: block; +} + +#main-score .title-image { + display: none; +} + .score-display { background: none; border-radius: 10px; diff --git a/assets/images/planning.png b/assets/images/planning.png index 951fc86..c453cbf 100644 Binary files a/assets/images/planning.png and b/assets/images/planning.png differ diff --git a/assets/scripts/photosScript.js b/assets/scripts/photosScript.js index 5eb8eb6..61259d0 100644 --- a/assets/scripts/photosScript.js +++ b/assets/scripts/photosScript.js @@ -6,6 +6,12 @@ let photoOverlay = $("#photo-overlay"); let headerTop = $("#header-top"); let sideNav = $("#menuSidenav"); let loading = $("#loading"); +var move_photo = false; +var grab_offsetX = 0; +var grab_offsetY = 0; + +var idle_time = 0; +var scaling = false; $(document).ready( function () { @@ -39,10 +45,12 @@ $(document).ready( if (new_height > $(window).height() || new_width > $(window).width()){ showcase.css('left', new_left +'px'); showcase.css('top', new_top +'px'); + showcase.css('cursor', 'move'); } else{ showcase.css('left', $(window).width()/2 +'px'); showcase.css('top', $(window).height()/2 +'px'); + showcase.css('cursor', 'default'); } @@ -52,6 +60,50 @@ $(document).ready( } ); +$(document).mousemove(function () { + idle_time = 0; +}); + +showcase.mousemove(function(event){ + + if (showcase.height() > $(window).height() || showcase.width() > $(window).width) { + showcase.css('cursor', 'move'); + if (move_photo){ + let cursorY = event.pageY - $(window).scrollTop(); + let offsetX = event.pageX - (showcase.position().left + showcase.width()/2); + let offsetY = cursorY - (showcase.position().top + showcase.height()/2); + + let new_left = showcase.position().left + showcase.width()/2 + offsetX - grab_offsetX; + let new_top = showcase.position().top + showcase.height()/2 + offsetY - grab_offsetY; + + showcase.css('left', new_left +'px'); + showcase.css('top', new_top +'px'); + } + } + else{ + showcase.css('cursor', 'default'); + } +}); + +showcase.mousedown(function(event){ + move_photo = true; + let cursorY = event.pageY - $(window).scrollTop(); + grab_offsetX = event.pageX - (showcase.position().left + showcase.width()/2); + grab_offsetY = cursorY - (showcase.position().top + showcase.height()/2); + console.log("down"); +}); + +showcase.mouseup(function(){ + move_photo = false; + console.log("up"); +}); + +showcase.mouseleave(function(){ + move_photo = false; + console.log("up"); +}); + + /* * Display selected image in showcase * When clicked, display image in full size @@ -76,16 +128,6 @@ function closeBig() { photoOverlay.fadeOut(500); } -/* - * Toggle display of buttons/header - */ -function toggleFullscreen() { - if (showcaseButton.css("display") === "none") - disableFullscreen(); - else - enableFullscreen(); -} - function enableFullscreen() { showcaseButton.fadeOut(500); } @@ -104,10 +146,24 @@ function showTopBar() { sideNav.fadeIn(500); } +function is_fullscreen(){ + return showcaseButton.css("display") === "none"; +} + $(document).ready(function () { document.getElementById("photos_title").scrollIntoView(); + showcase.on('dragstart', function(event) { event.preventDefault(); }); // Stop image drag out of page + setInterval(timerIncrement, 100); }); +function timerIncrement() { + idle_time = idle_time+ 1; + if (idle_time > 10 && !is_fullscreen()) { // 1 second + enableFullscreen(); + } else if (idle_time <= 10 && is_fullscreen()){ + disableFullscreen(); + } +} /* * Control images with keyboard arrows @@ -190,6 +246,8 @@ function changeImage(thumb) { width: 'auto', height: '90%' }); + showcase.css('left', $(window).width()/2 +'px'); + showcase.css('top', $(window).height()/2 +'px'); showcaseLink.attr("href", source); showcaseDownload.attr("href", source); } diff --git a/downloads.php b/downloads.php index ae778d1..39c52c6 100644 --- a/downloads.php +++ b/downloads.php @@ -5,11 +5,14 @@ ob_start(); // Start reading html

Sur cette page tu peux télécharger les différents documents de ta semaine d'accueil