From 2d00b56945ac7193083b8077c123fcf0cddf5193 Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Wed, 26 Sep 2018 15:09:35 +0200 Subject: [PATCH] various fixes after dorothee tests --- teleforma/static/teleforma/css/teleforma.css | 111 ++++++++++++++++++ .../templates/teleforma/appointments.html | 8 +- teleforma/views/appointment.py | 2 + teleforma/views/core.py | 3 +- 4 files changed, 119 insertions(+), 5 deletions(-) diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index 96ce8006..facc4cef 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -1154,6 +1154,21 @@ a.image-link { color: #000; /*#6A0307;*/ } +.appointment a button{ + background: #444; + color: #fff; + border: 3px double #ccc; + padding: .1em .5em; + font-weight: bold; + cursor: pointer; + border-radius: 8px; + font-size: 100%; + padding: 5px 15px; +} +.appointment a button:hover{ + background: #000; +} + #action_blue { background-color: #357ae8; color: #FFF; @@ -1936,6 +1951,102 @@ form.add_actus #id_text_parent{ color: #BB0000; } + +.select-day{ + margin-bottom: 15px; +} + +.select-day .next_day, +.select-day .previous_day{ + cursor: pointer; + border: 1px solid #ccc; + background: #FFF; + padding: 2px 5px 2px 5px; + color: #444; + border-radius: 4px; + position: relative; + top: 2px; +} +.booking_day table{ + margin:0; + padding:0; + background:none; + border:none; + border-collapse:collapse; + border-spacing:0; +} + +.booking_day table tr th{ + padding: 5px 15px; +} + +.booking_day table tr td{ + padding: 0; + text-align: center; +} + +.booking_day table tr td button[type="submit"]{ + padding: 5px 15px; + margin: 5px; + cursor: pointer; + background: #92b220; + color: #FFF; + font-size: 12px; + font-weight: bold; + border: 0; +} + +.booking_day table tr td button[type="submit"]:hover{ + background: #8aa81e; +} + +.cancel_form button[type="submit"]{ + padding: 2px 15px; + margin: 5px; + cursor: pointer; + font-weight: bold; +} + +.booking_day table tr td strong{ + font-size: 12px; + color: #444; +} + +.ui-dialog .ui-dialog-titlebar-close{ + position: relative; +} +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { + padding: 1px !important; +} + +.ui-dialog .ui-dialog-titlebar-close.ui-state-hover{ + border: 0; + background: transparent; + font-weight: bold; + color: #000; +} + +.ui-dialog .ui-dialog-titlebar-close:before{ + content: "X"; + position: absolute; + top: 2px; + left: 3px; + color: #000; +} + +#content ul.messages{ + list-style: none; + padding: 0; + padding-left: 0px; + padding-left: 0; + font-size: 0.8em; + clear: both; +} + +#content ul.messages li{ + padding: 4px 10px; +} + /*! jQuery UI - v1.9.2 - 2018-09-18 * http://jqueryui.com * Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.button.css, jquery.ui.dialog.css, jquery.ui.theme.css diff --git a/teleforma/templates/teleforma/appointments.html b/teleforma/templates/teleforma/appointments.html index 811ece13..933ee882 100644 --- a/teleforma/templates/teleforma/appointments.html +++ b/teleforma/templates/teleforma/appointments.html @@ -210,10 +210,10 @@ - - - -
+ Heure d'arrivé + Heure de début @@ -234,10 +234,10 @@ {% for groupslot in day.slots.all %} {% for slot in groupslot.slots %}
{{ slot.arrival|date:'H:i' }} +