diff --git a/app.py b/app.py index ba5cb91..02ffc6c 100644 --- a/app.py +++ b/app.py @@ -412,9 +412,9 @@ def free_rooms(api = False, rq = None) : return response else : url_for("static", filename="style.css") - # Vérifie si le mode demo est demandé + # Vérifie si le mode demo est demandé : demo = str(rq.args.get("demo")) - if demo in ("1", "true", "True"): + if demo in ("1", "true", "True") : return render_template("demo.html", **context, **GLOBAL_CONTEXT) else: return render_template("free-rooms.html", **context, **GLOBAL_CONTEXT) diff --git a/static/demostyle.css b/static/demostyle.css index af12252..6558f36 100644 --- a/static/demostyle.css +++ b/static/demostyle.css @@ -1,24 +1,62 @@ :root { --bg: #ffffff; + --bg-dark: #303355; --fg: #303355; --special: #c09f80; } +main { + display: grid; + grid-template-rows: 2fr 1fr 5fr 1fr; +} + body { background: var(--bg); color: var(--fg); + font-family: "ubuntu", sans-serif; + font-size: 200%; + margin: 0px; +} + +h1, h2 { + text-align: center; +} + +h2 { + font-size: 90%; + font-weight: normal; +} + +.slider { + overflow: hidden; } .slide-track { - animation: scroll 40s linear infinite; display: flex; + flex-wrap: wrap; + gap: 50px; + animation: scroll 40s linear infinite; + width: 750%; /* Pas bô, mais on va faire avec en attendant... */ +} + +.room { + text-align: center; + background: var(--bg-dark); + border-style: solid; + border-width: 1px; + border-color: var(--bg-dark); + border-radius: 10px; + padding: 10px; + color: var(--bg); } @keyframes scroll { 0% { transform: translateX(0); } - 100% { transform: translateX(calc(-250px * 7))} + 100% { transform: translateX(calc(-250px * 7)); } } -.slider { - overflow:hidden; +footer { + margin-top: 10px; + font-size: 50%; + text-align: center; } diff --git a/templates/demo.html b/templates/demo.html index b0101a0..379230c 100644 --- a/templates/demo.html +++ b/templates/demo.html @@ -8,23 +8,20 @@
-

{{ depts_str }}

-

Salles disponibles:

- {% if date_str != "" : %} -

Le {{ date_str }}

- {% endif %} +

Salles disponibles

+

{{ depts_str }}

{% if favs: %} - - {% for i in range(2):%} - {% if favs_free_rooms|length>0: %} + + {% for i in range(2) : %} + {% if favs_free_rooms|length > 0 : %} {% for room in favs_free_rooms : %}
- {{ room.name }} {% if DEBUG :%}( {{ room.id }} ){% endif %} + {{ room.name }} {% if DEBUG :%}( {{ room.id }} ){% endif %} {% if not(room.noend) : %} -

Jusqu'à {{ frooms_disp[room.name]["end"] }} (dans {{ frooms_disp[room.name]["rtime"] }})

+

Jusqu'à {{ frooms_disp[room.name]["end"] }}

{% endif %}
{% endfor %} @@ -36,9 +33,9 @@ {% if free_rooms|length>0 %} {% for room in free_rooms: %}
- {{ room.name }} {% if DEBUG :%}( {{ room.id }} ){% endif %} + {{ room.name }} {% if DEBUG : %}( {{ room.id }} ){% endif %} {% if not room.noend : %} -

Jusqu'à {{ frooms_disp[room.name]["end"] }} (dans {{ frooms_disp[room.name]["rtime"] }})

+

Jusqu'à {{ frooms_disp[room.name]["end"] }}

{% endif %}
{% endfor %} @@ -48,7 +45,7 @@
diff --git a/templates/free-rooms.html b/templates/free-rooms.html index 54aa865..a3f1cfd 100644 --- a/templates/free-rooms.html +++ b/templates/free-rooms.html @@ -34,7 +34,7 @@ {% if favs: %}
- {% if favs_free_rooms|length>0: %} + {% if favs_free_rooms|length > 0 : %}

Favoris disponibles maintenant