change add notification button color

This commit is contained in:
Mathieu Jaumotte 2022-01-28 12:46:58 +01:00
parent 917dd49d07
commit 72e306b583
3 changed files with 6 additions and 56 deletions

View File

@ -188,7 +188,6 @@
{% endif %} {% endif %}
</div> </div>
{% set person_id = null %} {% set person_id = null %}
{% if person %} {% if person %}
{% set person_id = person.id %} {% set person_id = person.id %}
@ -206,7 +205,7 @@
</a> </a>
</li> </li>
<li> <li>
<a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}"> <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
<i class="fa fa-paper-plane fa-fw"></i> <i class="fa fa-paper-plane fa-fw"></i>
{{ 'notification.Notify'|trans }} {{ 'notification.Notify'|trans }}
</a> </a>
@ -214,7 +213,7 @@
{% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %} {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
<li> <li>
<a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" <a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
class="btn btn-update" title="{{ 'Edit'|trans }}"></a> class="btn btn-update">{{ 'Edit'|trans }}</a>
</li> </li>
{% endif %} {% endif %}
{% if is_granted('CHILL_ACTIVITY_DELETE', entity) %} {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}

View File

@ -1,63 +1,13 @@
<h2>{{ 'notification.Notification'|trans }}</h2> <h1 class="mt-5">{{ 'notification.Notifications'|trans }}</h1>
<div class="flex-table accordion accordion-flush" id="notification-fold"> <div class="flex-table accordion accordion-flush" id="notification-fold">
{% for notification in notifications %} {% for notification in notifications %}
{% include 'ChillMainBundle:Notification:_list_item.html.twig' with { {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
'action_button': false,
'full_content': true, 'full_content': true,
'fold_item': true, 'fold_item': true,
'action_button': true,
'with_folded_comments': false
} %}{# } %}{#
DISABLED
'with_folded_comments': true
#} #}
{% endfor %} {% endfor %}
</div> </div>
{#
<div class="list-group my-2 notification notification-box">
<div class="list-group-item">
<h4>{{ 'notification.Sent'|trans }}</h4>
</div>
{% for notification in notifications %}
<div class="list-group-item notification-status {% if notification.isReadBy(app.user) %}read{% else %}unread{% endif %}">
{% if not notification.isSystem %}
{% if notification.sender == app.user %}
<h6 class="notification-title">
<abbr title="{{ 'Le ' ~ notification.date|format_date('long') ~ '\n' ~ notification.title }}">
{{ notification.date|format_datetime('short','short') }}
</abbr>
<span class="notification_toggle_read_status"
data-notification-id="{{ notification.id }}"
data-notification-current-is-read="{{ notification.isReadBy(app.user) }}"
data-container="notification-status"
data-show-button-url="{{ chill_path_add_return_path('chill_main_notification_show', {'id': notification.id}, false) }}"
data-button-class="btn-outline-primary"
data-button-text="false"
></span>
</h6>
{% if notification.addressees|length > 0 %}
<abbr title="{{ 'notification.sent_to'|trans }}">{{ 'notification.to'|trans }}:</abbr>
{% endif %}
{% for a in notification.addressees %}
<span class="badge-user">
{{ a|chill_entity_render_string }}
</span>
{% endfor %}
{% else %}
<div>{{ 'notification.you were notified by %sender%'|trans({'%sender%': notification.sender|chill_entity_render_string }) }}</div>
{% endif %}
{% else %}
<div>{{ 'notification.you were notified by system'|trans }}</div>
{% endif %}
</div>
{% endfor %}
</div>
#}

View File

@ -396,6 +396,7 @@ Subscribe all steps: Recevoir une notification à chaque étape
notification: notification:
Notification: Notification Notification: Notification
Notifications: Notifications
My own notifications: Mes notifications My own notifications: Mes notifications
Notify: Envoyer une notification Notify: Envoyer une notification
Send: Envoyer Send: Envoyer