From 230adca8d6363ff64a7ba178f51b9e0ccfe8511e Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Sun, 16 Oct 2022 01:34:58 +0200 Subject: [PATCH] Utilisation taille CSS pour TD key --- mycaldav/static/mycaldav/style.css | 7 ++++-- mycaldav/templates/manif/manif_view.html | 2 +- mycaldav/templates/op/op_view.html | 2 +- mycaldav/templates/rh/rh_view.html | 2 +- mycaldav/templates/road/road_view.html | 2 +- mycaldav/templates/task/task.html | 4 ++-- mycaldav/templates/team/team_view.html | 27 ++++++++++++++++++------ mycaldav/templates/vhc/vhc_view.html | 2 +- 8 files changed, 33 insertions(+), 15 deletions(-) diff --git a/mycaldav/static/mycaldav/style.css b/mycaldav/static/mycaldav/style.css index bc666fe..41d4b74 100644 --- a/mycaldav/static/mycaldav/style.css +++ b/mycaldav/static/mycaldav/style.css @@ -37,8 +37,11 @@ table{ } .team_svg_icon{ - width: 24px; - height: 24px; + width: 14px; + height: 14px; fill: white; } +.td_key{ + width: 150px +} diff --git a/mycaldav/templates/manif/manif_view.html b/mycaldav/templates/manif/manif_view.html index afa90e0..fbfeed9 100644 --- a/mycaldav/templates/manif/manif_view.html +++ b/mycaldav/templates/manif/manif_view.html @@ -7,7 +7,7 @@ {% for task in latest_task_list %} - + {{task.key}}
{{task.str_start_date}} - {{task.str_end_date}}
{{task.str_start_time}} - {{task.str_end_time}}
diff --git a/mycaldav/templates/op/op_view.html b/mycaldav/templates/op/op_view.html index 971a672..f7d9ceb 100644 --- a/mycaldav/templates/op/op_view.html +++ b/mycaldav/templates/op/op_view.html @@ -7,7 +7,7 @@ {% for task in latest_task_list %} - + {{task.key}}
{{task.str_start_date}} - {{task.str_end_date}}
{{task.str_start_time}} - {{task.str_end_time}} diff --git a/mycaldav/templates/rh/rh_view.html b/mycaldav/templates/rh/rh_view.html index a40ad76..a59cb85 100644 --- a/mycaldav/templates/rh/rh_view.html +++ b/mycaldav/templates/rh/rh_view.html @@ -7,7 +7,7 @@ {% for task in latest_task_list %} - + {{task.key}}
{{task.str_start_date}} - {{task.str_end_date}}
diff --git a/mycaldav/templates/road/road_view.html b/mycaldav/templates/road/road_view.html index 75b3639..0d2102b 100644 --- a/mycaldav/templates/road/road_view.html +++ b/mycaldav/templates/road/road_view.html @@ -7,7 +7,7 @@ {% for task in latest_task_list %} - + {{task.key}}
{{task.str_start_date}} - {{task.str_end_date}}
{{task.str_start_time}} - {{task.str_end_time}}
diff --git a/mycaldav/templates/task/task.html b/mycaldav/templates/task/task.html index 13c92df..81ef7c6 100644 --- a/mycaldav/templates/task/task.html +++ b/mycaldav/templates/task/task.html @@ -6,14 +6,14 @@ {% for task in latest_task_list %} -      +      {% endfor %} {% for task in night_task_list %} -      +      {% endfor %}
Jour
{{task.key}}{{ task.name }}
{{task.desc}}
{{task.key}}{{ task.name }}
{{task.desc}}
 
Nuit
{{task.key}}{{ task.name }}
{{task.desc}}
{{task.key}}{{ task.name }}
{{task.desc}}
diff --git a/mycaldav/templates/team/team_view.html b/mycaldav/templates/team/team_view.html index 6850353..2354d68 100644 --- a/mycaldav/templates/team/team_view.html +++ b/mycaldav/templates/team/team_view.html @@ -7,7 +7,7 @@ {% for task in latest_task_list %} - + {{task.key}} {% if task.team_transfert %} @@ -24,8 +24,8 @@ {% endif %} - {{ task.team_1 }}  - {{ task.team_2 }} + {{ task.team_1 }}  + {{ task.team_2 }} {% endfor %} @@ -35,10 +35,25 @@ {% for task in night_task_list %} {% if task.str_start_date == today %} - {{task.key}} + + {{task.key}} + {% if task.team_transfert %} + + + + + + + {% endif %} + {% if task.team_manif %} + + + + {% endif %} + - {{ task.team_1 }}  - {{ task.team_2 }} + {{ task.team_1 }}  + {{ task.team_2 }} {% endif %} diff --git a/mycaldav/templates/vhc/vhc_view.html b/mycaldav/templates/vhc/vhc_view.html index ffd970b..5038701 100644 --- a/mycaldav/templates/vhc/vhc_view.html +++ b/mycaldav/templates/vhc/vhc_view.html @@ -7,7 +7,7 @@ {% for task in latest_task_list %} - + {{task.key}}
{{task.str_start_date}} - {{task.str_end_date}}
{{task.str_start_time}} - {{task.str_end_time}}