diff --git a/src/agenda_culturel/static/js/calendar-buttons.js b/src/agenda_culturel/static/js/calendar-buttons.js index 61dcf2a..00181e7 100644 --- a/src/agenda_culturel/static/js/calendar-buttons.js +++ b/src/agenda_culturel/static/js/calendar-buttons.js @@ -2,26 +2,39 @@ function displayButtons() { + delta = 60 agenda = document.getElementById("calendar"); grid = agenda.querySelector(".grid"); - buttonLeft = agenda.querySelector(".slider-button.button-left"); - buttonRight = agenda.querySelector(".slider-button.button-right"); + buttonLeft = agenda.querySelector(".slider-button.slider-button-inside.button-left"); + buttonRight = agenda.querySelector(".slider-button.slider-button-inside.button-right"); + buttonLeftPage = agenda.querySelector(".slider-button.slider-button-page.button-left"); + buttonRightPage = agenda.querySelector(".slider-button.slider-button-page.button-right"); if (agenda.offsetWidth < grid.offsetWidth) { - if (agenda.scrollLeft == 0) + if (agenda.scrollLeft < delta) { buttonLeft.classList.add("hidden"); - else + buttonLeftPage.classList.remove("hidden"); + } + else { buttonLeft.classList.remove("hidden"); - if (agenda.scrollLeft + agenda.offsetWidth - grid.offsetWidth == 0) + buttonLeftPage.classList.add("hidden"); + } + if (agenda.scrollLeft + agenda.offsetWidth - grid.offsetWidth >= -2) { buttonRight.classList.add("hidden"); - else + buttonRightPage.classList.remove("hidden"); + } + else { buttonRight.classList.remove("hidden"); + buttonRightPage.classList.add("hidden"); + } } else { buttonLeft.classList.add("hidden"); buttonRight.classList.add("hidden"); + buttonLeftPage.classList.add("hidden"); + buttonRightPage.classList.add("hidden"); } } diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 6c77f39..a858164 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -312,10 +312,13 @@ footer [data-tooltip] { border-radius: 1em; line-height: 2em; text-align: center; - position: absolute; - top: 75vh; + position: fixed; + top: 65vh; z-index: 10; opacity: 0.9; + a { + color: var(--primary-inverse); + } } .slider-button.hidden { display: none; diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html index 06c9f9d..cdcd681 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-month.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html @@ -54,7 +54,13 @@
- + + {% if calendar.firstdate|shift_day:-1|not_before_first %} + {% if calendar.lastdate|not_after_last %} + + {% endif %} + {% endif %} +
{% for d in calendar.calendar_days_list %} {% if forloop.counter0|divisibleby:7 %} @@ -64,7 +70,12 @@ {% include "agenda_culturel/day-inc.html" with day=d resume=1 fixed_style=calendar.all_in_past filter=filter headers="h3" %} {% endfor %}
- + {% if calendar.lastdate|shift_day:+1|not_after_last %} + {% if calendar.lastdate|not_before_first %} + + {% endif %} + {% endif %} +
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html index c8ed2c2..48b2708 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-week.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html @@ -55,13 +55,25 @@
- + + {% if calendar.firstdate|shift_day:-1|not_before_first %} + {% if calendar.lastdate|not_after_last %} + + {% endif %} + {% endif %} +
{% for d in calendar.calendar_days_list %} {% include "agenda_culturel/day-inc.html" with day=d fixed_style=calendar.all_in_past filter=filter %} {% endfor %}
- + + {% if calendar.lastdate|shift_day:+1|not_after_last %} + {% if calendar.lastdate|not_before_first %} + + {% endif %} + {% endif %} +