Merge branch 'master' into dist/eole/2.8.1/master
This commit is contained in:
commit
ddb6a4d53a
|
@ -139,7 +139,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if not isvalideuser and not isvalidemaster %}
|
{% if not isvalideuser and not isvalidemaster %}
|
||||||
<div style="width:380px; text-align:left">
|
<div style="width:300px; text-align:left">
|
||||||
<div class="custom-control custom-switch" style="zoom:130%">
|
<div class="custom-control custom-switch" style="zoom:130%">
|
||||||
<input type="checkbox" class="custom-control-input" id="istelework" {%if istelework%}checked{%endif%}>
|
<input type="checkbox" class="custom-control-input" id="istelework" {%if istelework%}checked{%endif%}>
|
||||||
<label class="custom-control-label" for="istelework">Télétravail</label>
|
<label class="custom-control-label" for="istelework">Télétravail</label>
|
||||||
|
@ -156,20 +156,20 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<a href="{{path("app_tallyday_uservalidate",{dateof:"now"|date("Y-m-d")})}}" class="btn btn-danger mt-3" style="width:380px" data-method="confirm" data-confirm="Êtes-vous sûr de vouloir valider votre journée ?">Valider ma journée</a>
|
<a href="{{path("app_tallyday_uservalidate",{dateof:"now"|date("Y-m-d")})}}" class="btn btn-danger mt-3" style="width:300px" data-method="confirm" data-confirm="Êtes-vous sûr de vouloir valider votre journée ?">Valider ma journée</a>
|
||||||
<br>
|
<br>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<a href="{{path("app_tallyday_userlist")}}" class="btn btn-secondary mt-3" style="width:380px">Gérer mes Pointages</a>
|
<a href="{{path("app_tallyday_userlist")}}" class="btn btn-secondary mt-3" style="width:300px">Gérer mes Pointages</a>
|
||||||
|
|
||||||
{% if isvalideuser and not isvalidemaster %}
|
{% if isvalideuser and not isvalidemaster %}
|
||||||
<br><a href="{{path("app_tallyday_userdevalidate",{dateof:"now"|date("Y-m-d")})}}" class="btn btn-warning mt-3" style="width:380px">Dévalider ma journée</a>
|
<br><a href="{{path("app_tallyday_userdevalidate",{dateof:"now"|date("Y-m-d")})}}" class="btn btn-warning mt-3" style="width:300px">Dévalider ma journée</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if is_granted('ROLE_MASTER') %}
|
{% if is_granted('ROLE_MASTER') %}
|
||||||
<hr class="mt-5" style="width: 300px; background-color:var(--colorbgbodylight);">
|
<hr class="mt-5" style="width: 300px; background-color:var(--colorbgbodylight);">
|
||||||
<h3>GESTION</h3>
|
<h3>GESTION</h3>
|
||||||
<a href="{{path("app_tallyday_masterlist")}}" class="btn btn-success mt-3 mb-3" style="width:380px">Gestion des Pointages</a>
|
<a href="{{path("app_tallyday_masterlist")}}" class="btn btn-success mt-3 mb-3" style="width:300px">Gestion des Pointages</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue