Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Exemption : amélioration sur les couleurs #677

Merged
merged 4 commits into from
Dec 23, 2022
Merged

Exemption : amélioration sur les couleurs #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31c7902
Change color of Admin user button
raphodn Dec 23, 2022
9ee1459
User list: add background color on exempted users
raphodn Dec 23, 2022
b2666b9
User show: add background color if exempted
raphodn Dec 23, 2022
0f1abbd
Final fixes
raphodn Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Resources/views/admin/index.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

{% if is_granted("ROLE_USER_MANAGER") %}
<h6><i class="material-icons">people</i>&nbsp;Membres</h6>
<a href="{{ path("user_index") }}" class="waves-effect waves-light btn">
<i class="material-icons left">people</i>Gérer les adhérents
<a href="{{ path("user_index") }}" class="waves-effect waves-light btn white black-text">
<i class="material-icons left main-color-text">people</i>Gérer les adhérents
</a>
<a href="{{ path('ambassador_shifttimelog_list') }}" class="waves-effect waves-light btn">
<i class="material-icons left">phone</i>Relances créneaux
Expand Down
28 changes: 16 additions & 12 deletions app/Resources/views/admin/user/list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,15 @@
<th data-col="b.firstname">prénom</th>
<th data-col="b.lastname">nom</th>
<th data-col="b.email">email</th>
<th class="hide-on-small-and-down" data-col="r.date">Adhésion(s)</th>
<th data-col="r.date" class="hide-on-small-and-down">Adhésion(s)</th>
<th class="hide-on-med-and-down">Formation(s)</th>
<th class="hide-on-med-and-down">Commission(s)</th>
</tr>
</thead>
<tbody>
{% for member in members %}
{% if member.mainBeneficiary %}
<tr class="{% if member.withdrawn %}withdrawn{% elseif member.frozen %}frozen{% endif %}" data-url="{{ path('member_show', { 'member_number': member.memberNumber }) }}" >
<tr data-url="{{ path('member_show', { 'member_number': member.memberNumber }) }}" class="{% if member.withdrawn %}withdrawn{% elseif member.frozen %}frozen{% elseif member.isExemptedFromShifts() %}exempted{% endif %}">
<td class="hide-on-med-and-down">
{% if member.withdrawn %}
<i class="material-icons" title="Compte fermé">block</i>
Expand Down Expand Up @@ -293,8 +293,8 @@
</td>
</tr>
{% else %}
<tr class="{% if member.withdrawn %}withdrawn{% endif %} {% if member.frozen %}frozen{% endif %}" data-url="{{ path('member_show', { 'member_number': member.memberNumber }) }}" >
<td colspan="9">{{ member.mainBeneficiary.user }}</td>
<tr data-url="{{ path('member_show', { 'member_number': member.memberNumber }) }}" class="{% if member.withdrawn %}withdrawn{% endif %} {% if member.frozen %}frozen{% endif %}">
<td colspan="9">{{ member }}</td>
</tr>
{% endif %}
{% endfor %}
Expand Down Expand Up @@ -357,26 +357,30 @@

{% block stylesheets %}
<style>
td strong{
/*font-weight: 600;*/
th.active {
color: {{ main_color }};
}
th.active{
color: #51CAE9;
th[data-col] {
cursor: pointer;
}
tr.withdrawn{
tr.withdrawn {
background: rgba(255, 50, 0, 0.2);
}
tr.frozen{
tr.frozen {
background-color: rgba(0, 138, 255, 0.1);
background-image: url({% image '@AppBundle/Resources/public/img/snowflakes.svg' %}{{ asset_url }}{% endimage %});
background-position: top right;
background-repeat: no-repeat;
background-size: contain;
}
tr.frozen td{
tr.frozen td {
background-color: rgba(255, 255, 255, 0.5);
}
tbody tr{
tr.exempted {
/* teal */
background-color: rgb(0, 150, 136, 0.1);
}
tbody tr {
cursor: pointer;
}
</style>
Expand Down
28 changes: 13 additions & 15 deletions app/Resources/views/ambassador/phone/list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@

<table class="responsive-table">
<thead>
<tr>
<th data-col="o.member_number">#</th>
<th data-col="b.firstname">Prénom</th>
<th data-col="b.lastname">Nom</th>
<th data-col="r.date">Dernière adhésion</th>
<th data-col="time">Compteur</th>
<th>Note(s)</th>
<th>Actions</th>
</tr>
<tr>
<th data-col="o.member_number">#</th>
<th data-col="b.firstname">Prénom</th>
<th data-col="b.lastname">Nom</th>
<th data-col="r.date">Dernière adhésion</th>
<th data-col="time">Compteur</th>
<th>Note(s)</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{% for member in members %}
Expand Down Expand Up @@ -193,17 +193,15 @@
</li>
</ul>
{% endif %}

{% endblock %}

{% block stylesheets %}
<style>
td strong {
/*font-weight: 600;*/
}

th.active {
color: #51CAE9;
color: {{ main_color }};
}
th[data-col] {
cursor: pointer;
}
</style>
{% endblock %}
Expand Down
3 changes: 3 additions & 0 deletions app/Resources/views/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
.homebox {
border-color: {{ main_color }};
}
.main-color-text {
color: {{ main_color }};
}
</style>
</head>
<body>
Expand Down
4 changes: 4 additions & 0 deletions app/Resources/views/member/show.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,10 @@
body {
background-color: rgba(0, 138, 255, 0.1);
}
{% elseif member.isExemptedFromShifts() %}
body {
background-color: rgb(0, 150, 136, 0.1);
}
{% endif %}
</style>
{% endblock %}