Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-03 07:26:12 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into 102_activites_annexes

Browse Source
This commit is contained in:
Julie Lenaerts 2021-08-03 15:56:56 +02:00
commit 81de17594d
699 changed files with 8605 additions and 20735 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -56,7 +56,7 @@
"knplabs/knp-time-bundle": "^1.12",
"symfony/intl": "4.*",
"symfony/swiftmailer-bundle": "^3.5",
"league/csv": "^9.6",
"league/csv": "^9.7.1",
"phpoffice/phpspreadsheet": "^1.16",
"symfony/browser-kit": "^5.2",
"symfony/css-selector": "^5.2",

3
package.json.txt Normal file
View File

@ -0,0 +1,3 @@
add npm/yarn dependency in package.json :
"select2-bootstrap-theme": "0.1.0-beta.10",

1
src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
View File

@ -22,6 +22,7 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt
'entityRef' => 'activity_gerard depardieu',
'sender' => 'center a_social',
'addressees' => [
'center a_social',
'center a_administrative',
'center a_direction',
'multi_center'

24
src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php Normal file
View File

@ -0,0 +1,24 @@
<?php
namespace Chill\ActivityBundle\Notification;
use Chill\MainBundle\Entity\Notification;
use Chill\ActivityBundle\Entity\Activity;
final class ActivityNotificationRenderer
{
public function supports(Notification $notification, array $options = []): bool
{
return $notification->getRelatedEntityClass() == Activity::class;
}
public function getTemplate()
{
return '@ChillActivity/Activity/showInNotification.html.twig';
}
public function getTemplateData(Notification $notification)
{
return ['notification' => $notification];
}
}

14
src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss → src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss
View File

@ -1,12 +1,14 @@
@import '~ChillMainSass/custom/config/colors';
@import '~ChillMainSass/custom/mixins/entity';
// Access to Bootstrap variables and mixins
@import '~ChillMainAssets/module/bootstrap/shared';
.chill-entity.chill-entity__activity-reason {
@include entity($chill-pink, white);
}
//@import '~ChillMainSass/custom/mixins/entity';
//.chill-entity.chill-entity__activity-reason {
// @include entity($chill-pink, white);
//}
.activity {
color: $chill-green;
//color: $chill-green;
}
// exceptions for flex-bloc in concerned-groups

1
src/Bundle/ChillActivityBundle/Resources/public/chill/index.js Normal file
View File

@ -0,0 +1 @@
require('./chillactivity.scss');

1
src/Bundle/ChillActivityBundle/Resources/public/index.js
View File

@ -1 +0,0 @@
require('./scss/chillactivity.scss');

2
src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
View File

@ -1,6 +1,6 @@
<template>
<li>
<span class="badge badge-primary" :title="person.text">
<span class="badge bg-primary" :title="person.text">
<span class="chill_denomination">
{{ textCutted }}
</span>

16
src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
View File

@ -1,11 +1,11 @@
<template>
<teleport to="#social-issues-acc">
<div class="container">
<div class="grid-4 clear">
<label>{{ $t('activity.social_issues') }}</label>
<div class="mb-3 row">
<div class="col-4">
<label class="col-form-label">{{ $t('activity.social_issues') }}</label>
</div>
<div class="grid-8">
<div class="col-8">
<check-social-issue
v-for="issue in socialIssuesList"
@ -41,11 +41,11 @@
</div>
</div>
<div class="container">
<div class="grid-4 clear">
<label>{{ $t('activity.social_actions') }}</label>
<div class="mb-3 row">
<div class="col-4">
<label class="col-form-label">{{ $t('activity.social_actions') }}</label>
</div>
<div class="grid-8">
<div class="col-8">
<div v-if="actionIsLoading === true">
<i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>

8
src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
View File

@ -1,18 +1,20 @@
<template>
<span class="inline-choice">
<div class="form-check">
<input
<input class="form-check-input"
type="checkbox"
v-model="selected"
name="action"
v-bind:id="action.id"
v-bind:value="action"
/>
<label class="inline" v-bind:for="action.id">
<label class="form-check-label" v-bind:for="action.id">
{{ action.text }}
</label>
</span><br>
</div>
</span>
</template>
<script>

8
src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
View File

@ -1,18 +1,20 @@
<template>
<span class="inline-choice">
<div class="form-check">
<input
<input class="form-check-input"
type="checkbox"
v-model="selected"
name="issue"
v-bind:id="issue.id"
v-bind:value="issue"
/>
<label class="inline" v-bind:for="issue.id">
<label class="form-check-label" v-bind:for="issue.id">
{{ issue.text }}
</label>
</span><br>
</div>
</span>
</template>
<script>

6
src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
View File

@ -59,8 +59,8 @@
{% for item in bloc.items %}
<li>
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
<span class="badge badge-primary">
{{ item|chill_entity_render_box({'only_denomination': true}) }}
<span class="badge bg-primary">
{{ item|chill_entity_render_box({'render': 'raw'}) }}
</span>
</a>
</li>
@ -83,7 +83,7 @@
{% for item in bloc.items %}
<li>
<a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
<span class="badge badge-primary">
<span class="badge bg-primary">
{{ item|chill_entity_render_box({'only_denomination': true}) }}
</span>
</a>

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = 'chill_activity_activity_list' %}
{% set person = activity.person %}

11
src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
View File

@ -1,8 +1,5 @@
<h1>{{ "Update activity"|trans ~ ' :' }}
<span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
{{ entity.type.name|localize_translatable_string }}
</span>
</h1>
<h1>{{ "Update activity"|trans }}</h1>
<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
{{ form_start(edit_form) }}
{{ form_errors(edit_form) }}
@ -94,12 +91,12 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-cancel">
<a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-cancel">
{{ 'Cancel'|trans }}
</a>
</li>
<li>
<button class="sc-button bt-update" type="submit">{{ 'Save'|trans }}</button>
<button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
</li>
</ul>
{{ form_end(edit_form) }}

8
src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
View File

@ -5,13 +5,17 @@
{% block title 'Update activity'|trans %}
{% block content %}
<div class="activity-edit">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %}
</div>
{% endblock %}
{% block js %}
{{ parent() }}
{{ encore_entry_link_tags('async_upload') }}
{{ encore_entry_link_tags('mod_async_upload') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function (e) {
chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@ -24,6 +28,6 @@
{% block css %}
{{ parent() }}
{{ encore_entry_link_tags('async_upload') }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{% endblock %}

10
src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
View File

@ -14,19 +14,23 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = 'chill_activity_activity_list' %}
{% block title 'Update activity'|trans %}
{% block personcontent %}
<div class="activity-edit">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %}
</div>
{% endblock %}
{% block js %}
{{ encore_entry_link_tags('async_upload') }}
{{ encore_entry_link_tags('mod_async_upload') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function (e) {
chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@ -38,6 +42,6 @@
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('async_upload') }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{% endblock %}

31
src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
View File

@ -13,22 +13,12 @@
{% if activities|length == 0 %}
<p class="chill-no-data-statement">
{{ "There isn't any activities."|trans }}
<a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create button-small"></a>
<a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create button-small"></a>
</p>
{% else %}
<div class="flex-table list-records context-{{ context }}">
<!--
<thead>
<tr>
<th class="chill-red">{{'Date' | trans }}</th>
<th class="chill-green">{{'Duration Time' | trans }}</th>
<th class="chill-orange">{{'Reasons' | trans}}</th>
<th>{{'Type' | trans}}</th>
<th>&nbsp;</th>
</tr>
</thead>
-->
{% for activity in activities %}
{% set t = activity.type %}
<div class="item-bloc">
@ -46,7 +36,6 @@
{{ activity.durationTime|date('H:i') }}
</p>
{% endif %}
{% if activity.travelTime and t.travelTimeVisible %}
<p>
<i class="fa fa-fw fa-car"></i>
@ -57,12 +46,10 @@
{% if context == 'person' and activity.accompanyingPeriod is not empty %}
<div class="accompanyingPeriodLink" style="margin-top: 1rem">
<a
href="{{ chill_path_add_return_path(
<a href="{{ chill_path_add_return_path(
"chill_person_accompanying_course_index",
{ 'accompanying_period_id': activity.accompanyingPeriod.id }
) }}"
>
) }}">
<i class="fa fa-random"></i>
{{ activity.accompanyingPeriod.id }}
</a>
@ -128,7 +115,7 @@
<span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span>
{%- else -%}
{% for r in activity.socialActions %}
<span class="badge badge-primary">{{ r.title|localize_translatable_string }}</span>
<span class="badge bg-primary">{{ r.title|localize_translatable_string }}</span>
{% endfor %}
{%- endif -%}
</li>
@ -138,20 +125,20 @@
</ul>
<ul class="record_actions">
<li>
<a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="sc-button bt-show "></a>
<a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
</li>
{# TOOD
{% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
#}
<li>
<a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="sc-button bt-update "></a>
<a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
</li>
{# TOOD
{% endif %}
{% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
#}
<li>
<a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-delete "></a>
<a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
</li>
{#
{% endif %}
@ -189,7 +176,7 @@
{# TODO set this condition in configuration #}
<ul class="record_actions">
<li>
<a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create">
<a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
{{ 'Add a new activity' | trans }}
</a>
</li>

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = 'chill_activity_activity_list' %}

11
src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
View File

@ -1,8 +1,5 @@
<h1>{{ "Activity creation"|trans ~ ' :' }}
<span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
{{ entity.type.name|localize_translatable_string }}
</span>
</h1>
<h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
{{ form_start(form) }}
{{ form_errors(form) }}
@ -86,7 +83,7 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a
class="sc-button bt-cancel"
class="btn btn-cancel"
{%- if context == 'person' -%}
href="{{ chill_return_path_or('chill_activity_activity_list', { 'person_id': person.id } )}}"
{%- else -%}
@ -97,7 +94,7 @@
</a>
</li>
<li>
<button class="sc-button bt-create" type="submit">
<button class="btn btn-create" type="submit">
{{ 'Create'|trans }}
</button>
</li>

8
src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
View File

@ -5,13 +5,17 @@
{% block title 'Activity creation' |trans %}
{% block content %}
<div class="activity-new">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
{% endblock %}
{% block js %}
{{ parent() }}
{{ encore_entry_script_tags('async_upload') }}
{{ encore_entry_script_tags('mod_async_upload') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function (e) {
chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
@ -24,6 +28,6 @@
{% block css %}
{{ parent() }}
<link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{% endblock %}

10
src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
View File

@ -1,16 +1,20 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = 'chill_activity_activity_new' %}
{% block title 'Activity creation' |trans %}
{% block personcontent %}
<div class="activity-new">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
</div>
{% endblock %}
{% block js %}
{{ encore_entry_link_tags('async_upload') }}
{{ encore_entry_link_tags('mod_async_upload') }}
<script type="text/javascript">
window.addEventListener('DOMContentLoaded', function (e) {
chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
@ -22,6 +26,6 @@
{% endblock %}
{% block css %}
{{ encore_entry_link_tags('async_upload') }}
{{ encore_entry_link_tags('mod_async_upload') }}
{{ encore_entry_link_tags('vue_activity') }}
{% endblock %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = 'chill_activity_activity_new' %}

13
src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
View File

@ -4,7 +4,7 @@
<h1>
{{ "Activity"|trans }}
{%- if t.emergencyVisible and entity.emergency -%}
<span class="badge badge-secondary">
<span class="badge bg-secondary">
{{- 'Emergency'|trans -}}
</span>
{%- endif -%}
@ -109,25 +109,28 @@
{% set accompanying_course_id = accompanyingCourse.id %}
{% endif %}
<ul class="record_actions">
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a class="sc-button bt-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
<a class="btn btn-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
<a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
<a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
{{ 'Edit'|trans }}
</a>
</li>
{# TODO
{% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
#}
<li>
<a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-delete">
<a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
{{ 'Delete'|trans }}
</a>
</li>
{#
{% endif %}
#}

4
src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
View File

@ -7,5 +7,9 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% block content -%}
<div class="activity-show">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
{% endblock content %}

4
src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig Normal file
View File

@ -0,0 +1,4 @@
{{ dump(notification) }}
<a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId }) }}">Go to Activity</a>

6
src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = 'chill_activity_activity_list' %}
@ -7,5 +7,9 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% block personcontent -%}
<div class="activity-show">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
</div>
{% endblock personcontent %}

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig
View File

@ -25,7 +25,7 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
<a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
</li>
</ul>
</td>
@ -36,7 +36,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_activity_presence_new') }}" class="sc-button bt-create">
<a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
{{ 'Create a new activity presence'|trans }}
</a>
</li>

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig
View File

@ -26,10 +26,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button orange' } } ) }}
{{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-chill-orange' } } ) }}
</li>
</ul>

6
src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig
View File

@ -33,10 +33,10 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
<a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
</li>
<li>
<a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
<a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
</li>
</ul>
</td>
@ -47,7 +47,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_activity_activityreason_new') }}" class="sc-button bt-new">
<a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
{{ 'Create a new activity reason'|trans }}
</a>
</li>

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig
View File

@ -26,10 +26,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
{{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
</li>
</ul>

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig
View File

@ -40,12 +40,12 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">
<a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
<a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
<a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit">
{{ 'Edit'|trans }}
</a>
</li>

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig
View File

@ -25,12 +25,12 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
{{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
{{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
</li>
</ul>

6
src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig
View File

@ -34,10 +34,10 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
<a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
</li>
<li>
<a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
<a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
</li>
</ul>
</td>
@ -48,7 +48,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="sc-button bt-new">
<a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
{{ 'Create a new activity category reason'|trans }}
</a>
</li>

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig
View File

@ -25,10 +25,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
{{ form_widget(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
</li>
</ul>
{{ form_end(form) }}

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig
View File

@ -39,12 +39,12 @@
</table>
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
<a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
<a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
<a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit">
{{ 'Edit'|trans }}
</a>
</li>

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig
View File

@ -41,7 +41,7 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
<a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
</li>
</ul>
</td>
@ -52,7 +52,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_activity_type_new') }}" class="sc-button bt-create">
<a href="{{ path('chill_crud_activity_type_new') }}" class="btn btn-create">
{{ 'Create a new activity type'|trans }}
</a>
</li>

4
src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig
View File

@ -25,7 +25,7 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_activity_type_category_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
<a href="{{ path('chill_crud_activity_type_category_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
</li>
</ul>
</td>
@ -36,7 +36,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_crud_activity_type_category_new') }}" class="sc-button bt-create">
<a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
{{ 'Create a new activity type category'|trans }}
</a>
</li>

4
src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
View File

@ -29,13 +29,13 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
<a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="btn btn-view">
{{ 'Show the activity'|trans }}
</a>
</li>
{% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
<li>
<a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
<a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="btn btn-edit">
{{ 'Edit the activity'|trans }}
</a>
</li>

5
src/Bundle/ChillActivityBundle/chill.webpack.config.js
View File

@ -1,6 +1,7 @@
// this file loads all assets from the Chill person bundle
module.exports = function(encore, entries) {
entries.push(__dirname + '/Resources/public/index.js');
module.exports = function(encore, entries)
{
entries.push(__dirname + '/Resources/public/chill/index.js');
encore.addAliases({
ChillActivityAssets: __dirname + '/Resources/public'

5
src/Bundle/ChillActivityBundle/config/services.yaml
View File

@ -33,3 +33,8 @@ services:
autoconfigure: true
resource: '../Menu/'
tags: ['chill.menu_builder']
Chill\ActivityBundle\Notification\:
autowire: true
autoconfigure: true
resource: '../Notification'

2
src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set person = element.person %}

6
src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set title = 'Edit Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@ -18,12 +18,12 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Edit' } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
</li>
</ul>

6
src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set title = 'New Charge for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@ -18,12 +18,12 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Create' } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
</li>
</ul>

6
src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set person = element.person %}
@ -39,13 +39,13 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
{% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
<li>
<a href="{{ path('chill_budget_charge_edit', { 'id': element.id } ) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
<a href="{{ path('chill_budget_charge_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
</li>
{% endif %}
</ul>

16
src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@ -68,17 +68,17 @@
<ul class="record_actions">
{% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::SHOW'), f) %}
<li>
<a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="sc-button bt-show"></a>
<a href="{{ path('chill_budget_' ~ family ~ '_view', { 'id': f.id } ) }}" class="btn btn-show"></a>
</li>
{% endif %}
{% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), f) %}
<li>
<a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="sc-button bt-edit"></a>
<a href="{{ path('chill_budget_' ~ family ~'_edit', { 'id': f.id } ) }}" class="btn btn-edit"></a>
</li>
{% endif %}
{% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::DELETE'), f) %}
<li>
<a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="sc-button bt-delete"></a>
<a href="{{ path('chill_budget_' ~ family ~ '_delete', { 'id': f.id } ) }}" class="btn btn-delete"></a>
</li>
{% endif %}
</ul>
@ -161,10 +161,10 @@
{% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
<ul class="record_actions">
<li>
<a class="sc-button bt-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
<a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
</li>
<li>
<a class="sc-button bt-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
<a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
</li>
</ul>
{% endif %}
@ -215,10 +215,10 @@
{% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::CREATE'), person) %}
<ul class="record_actions">
<li>
<a class="sc-button bt-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
<a class="btn btn-create" href="{{ path('chill_budget_resource_new', { 'id': person.id} ) }}">{{ 'Create new resource'|trans }}</a>
</li>
<li>
<a class="sc-button bt-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
<a class="btn btn-create" href="{{ path('chill_budget_charge_new', { 'id': person.id} ) }}">{{ 'Create new charge'|trans }}</a>
</li>
</ul>
{% endif %}

2
src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set person = element.person %}

6
src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set title = 'Edit Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@ -17,12 +17,12 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Edit' } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Edit' } ) }}
</li>
</ul>

6
src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set title = 'New Resource for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@ -17,12 +17,12 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' }, 'label': 'Create' } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
</li>
</ul>

6
src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set person = element.person %}
@ -39,13 +39,13 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path("chill_budget_elements_index", { 'id': person.id } ) }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
{% if is_granted(constant('Chill\\AMLI\\BudgetBundle\\Security\\Authorization\\BudgetElementVoter::UPDATE'), element) %}
<li>
<a href="{{ path('chill_budget_resource_edit', { 'id': element.id } ) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
<a href="{{ path('chill_budget_resource_edit', { 'id': element.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
</li>
{% endif %}
</ul>

4
src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig
View File

@ -36,12 +36,12 @@
{{ form_row(option) }}
{% endfor %}
{% endif %}
{{ form_row(edit_form.submit, {'attr': { 'class': 'sc-button btn-update' } } ) }}
{{ form_row(edit_form.submit, {'attr': { 'class': 'btn btn-update' } } ) }}
{{ form_end(edit_form) }}
<ul class="record_actions">
<li>
<a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="sc-button btn-reset">
<a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="btn btn-reset">
{{ 'Back to the group'|trans }}
</a>
</li>

6
src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig
View File

@ -37,17 +37,17 @@
{{ form_row(option) }}
{% endfor %}
{% endif %}
{{ form_row(form.submit, {'attr': { 'class': 'sc-button btn-create' } } ) }}
{{ form_row(form.submit, {'attr': { 'class': 'btn btn-create' } } ) }}
{{ form_end(form) }}
<ul class="record_actions">
<li>
{% if entity.customFieldsGroup is not null %}
<a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="sc-button btn-reset">
<a href="{{ path('customfieldsgroup_show', { 'id': entity.customFieldsGroup.id }) }}" class="btn btn-reset">
{{ 'Back to the group'|trans }}
</a>
{% else %}
<a href="{{ path('customfieldsgroup') }}" class="sc-button btn-reset">
<a href="{{ path('customfieldsgroup') }}" class="btn btn-reset">
{{ 'Back to the list'|trans }}
</a>
{% endif %}

6
src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig
View File

@ -27,17 +27,17 @@
{% if edit_form.options is defined %}
{{ form_row(edit_form.options) }}
{% endif %}
{{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
{{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
{{ form_end(edit_form) }}
<ul class="record_actions">
<li>
<a href="{{ path('customfieldsgroup') }}" class="sc-button bt-cancel">
<a href="{{ path('customfieldsgroup') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
<a href="{{ path('customfieldsgroup_show', { 'id' : entity.id }) }}" class="sc-button bt-cancel">
<a href="{{ path('customfieldsgroup_show', { 'id' : entity.id }) }}" class="btn btn-cancel">
{{ 'show'|trans|capitalize }}
</a>
</li>

8
src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig
View File

@ -40,17 +40,17 @@
<i class="fa fa-star"></i>
{%- else -%}
{{ form_start(make_default_forms[entity.id]) }}
{{ form_widget(make_default_forms[entity.id].submit, { 'attr' : { 'class' : 'sc-button bt-action' } } ) }}
{{ form_widget(make_default_forms[entity.id].submit, { 'attr' : { 'class' : 'btn btn-action' } } ) }}
{{ form_end(make_default_forms[entity.id]) }}
{%- endif -%}
</td>
<td>
<ul class="record_actions">
<li>
<a href="{{ path('customfieldsgroup_show', { 'id': entity.id }) }}" class="sc-button">{{ 'show'|trans|capitalize }}</a>
<a href="{{ path('customfieldsgroup_show', { 'id': entity.id }) }}" class="btn btn-show">{{ 'show'|trans|capitalize }}</a>
</li>
<li>
<a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="sc-button btn-edit">{{ 'edit'|trans|capitalize }}</a>
<a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'edit'|trans|capitalize }}</a>
</li>
</ul>
</td>
@ -60,7 +60,7 @@
</table>
<p>
<a href="{{ path('customfieldsgroup_new') }}" class="sc-button bt-create">
<a href="{{ path('customfieldsgroup_new') }}" class="btn btn-create">
{{ 'Create a new group'|trans }}
</a>
</p>

4
src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig
View File

@ -23,8 +23,8 @@
{{ form_row(form.name) }}
{{ form_row(form.entity) }}
<p>
{{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-create' } } ) }}
<a href="{{ path('customfieldsgroup') }}" class="sc-button bt-cancel">
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' } } ) }}
<a href="{{ path('customfieldsgroup') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</p>

14
src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig
View File

@ -52,12 +52,12 @@
<ul class="record_actions">
<li>
<a href="{{ path('customfieldsgroup') }}" class="sc-button bt-cancel">
<a href="{{ path('customfieldsgroup') }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
<a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
<a href="{{ path('customfieldsgroup_edit', { 'id': entity.id }) }}" class="btn btn-edit">
{{ 'Edit'|trans }}
</a>
</li>
@ -90,27 +90,27 @@
{%- endif -%}
</td>
<td style="text-align:center">
<a href="{{ path('customfield_edit', { 'id' : field.id }) }}" class="sc-button bt-edit">{{ 'edit'|trans|capitalize }}</a>
<a href="{{ path('customfield_edit', { 'id' : field.id }) }}" class="btn btn-edit">{{ 'edit'|trans|capitalize }}</a>
</td>
</tr>
{%- endfor -%}
</tbody>
</table>
{{ form_start(create_field_form) }}
<div class="grid-4">
<div class="col-4">
{{ form_widget(create_field_form.type) }}
</div>
{{ form_widget(create_field_form.submit, { 'attr': { 'class': 'sc-button bt-create' }, 'label': 'Add a new field' } ) }}
{{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Add a new field' } ) }}
{{ form_end(create_field_form) }}
{%- else -%}
<p>
{{ 'Any field is currently associated with this group'|trans }}
</p>
{{ form_start(create_field_form) }}
<div class="grid-4">
<div class="col-4">
{{ form_widget(create_field_form.type) }}
</div>
{{ form_widget(create_field_form.submit, { 'attr': { 'class': 'sc-button bt-create' }, 'label': 'Create a new field' } ) }}
{{ form_widget(create_field_form.submit, { 'attr': { 'class': 'btn btn-create' }, 'label': 'Create a new field' } ) }}
{{ form_end(create_field_form) }}
{%- endif -%}
{% endblock %}

8
src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsRendering/text.html.twig
View File

@ -1 +1,7 @@
{% if text is not empty %}{{ text|nl2br }}{% else %}<span class="custom_fields_text empty">{{ 'None'|trans }}</span>{% endif %}
{% if text is not empty %}
{% apply markdown_to_html %}
{{ text|raw }}
{% endapply %}
{% else %}
<span class="custom_fields_text empty">{{ 'None'|trans }}</span>
{% endif %}

2
src/Bundle/ChillCustomFieldsBundle/Resources/views/Form/fields.html.twig
View File

@ -65,7 +65,7 @@
}
function initializeCFChoiceOptionsChoices(div_id) {
var add_element_link = $('<a id="' + div_id + '_add_element_link"" href="#" class="sc-button bt-submit">{{ 'Add an element'|trans }}</a>');
var add_element_link = $('<a id="' + div_id + '_add_element_link"" href="#" class="btn btn-submit">{{ 'Add an element'|trans }}</a>');
var div = $('#' + div_id);
div.append(add_element_link);
div.data('index', div.find('td').length);

6
src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
View File

@ -280,10 +280,10 @@ var insertRemoveButton = (zone, zoneData) => {
labelCancel = 'Restaurer'
;
removeButton.classList.add('sc-button', 'bt-delete');
removeButton.classList.add('btn', 'btn-delete');
removeButton.textContent = labelRemove;
cancelButton.classList.add('sc-button');
cancelButton.classList.add('btn', 'btn-cancel');
cancelButton.textContent = labelCancel;
removeButton.addEventListener('click', (e) => {
@ -355,7 +355,7 @@ var insertDownloadButton = (zone, zoneData) => {
newButton.dataset.labelPreparing = labelPreparing;
newButton.dataset.labelReady = labelReady;
newButton.dataset.tempUrlGetGenerator = tempUrlGenerator + '?' + tempUrlGeneratorParams.toString();
newButton.classList.add('sc-button', 'bt-download', 'dz-bt-below-dropzone');
newButton.classList.add('btn', 'btn-download', 'dz-bt-below-dropzone');
newButton.textContent = labelQuietButton;
addBelowButton(newButton, zone, zoneData);

2
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_delete_form.html.twig
View File

@ -17,5 +17,5 @@
<form method="post" action="{{ path('document_category_delete', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}">
<input type="hidden" name="_method" value="DELETE">
<input type="hidden" name="_token" value="{{ csrf_token('delete' ~ document_category.bundleId ~ document_category.idInsideBundle) }}">
<button class="sc-button bt-delete">{{ 'Delete' | trans }}</button>
<button class="btn btn-delete">{{ 'Delete' | trans }}</button>
</form>

2
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_form.html.twig
View File

@ -16,5 +16,5 @@
#}
{{ form_start(form) }}
{{ form_widget(form) }}
<button class="sc-button bt-edit">{{ button_label|default('Save') }}</button>
<button class="btn btn-edit">{{ button_label|default('Save') }}</button>
{{ form_end(form) }}

4
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
View File

@ -29,12 +29,12 @@
{{ form_widget(form) }}
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('document_category_index') }}" class="sc-button bt-cancel">
<a href="{{ path('document_category_index') }}" class="btn btn-cancel">
{{ 'Back to the category list' | trans }}
</a>
</li>
<li>
<button class="sc-button bt-edit">{{ button_label|default('Edit')|trans }}</button>
<button class="btn btn-edit">{{ button_label|default('Edit')|trans }}</button>
</li>
</ul>
{{ form_end(form) }}

6
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
View File

@ -41,9 +41,9 @@
<td>
<a href="{{ path('document_category_show', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}"
class="sc-button bt-show" title="{{ 'show' | trans }}"></a>
class="btn btn-show" title="{{ 'show' | trans }}"></a>
<a href="{{ path('document_category_edit', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}"
class="sc-button bt-edit" title="{{ 'edit' | trans }}"></a>
class="btn btn-edit" title="{{ 'edit' | trans }}"></a>
</td>
</tr>
{% else %}
@ -56,7 +56,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('document_category_new') }}" class="sc-button bt-create">{{ 'Create new category' | trans }}</a>
<a href="{{ path('document_category_new') }}" class="btn btn-create">{{ 'Create new category' | trans }}</a>
</li>
</ul>
{% endblock %}

4
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
View File

@ -29,12 +29,12 @@
{{ form_widget(form) }}
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('document_category_index') }}" class="sc-button bt-cancel">
<a href="{{ path('document_category_index') }}" class="btn btn-cancel">
{{ 'Back to the category list' | trans }}
</a>
</li>
<li>
<button class="sc-button bt-new">{{ button_label|default('New')|trans }}</button>
<button class="btn btn-new">{{ button_label|default('New')|trans }}</button>
</li>
</ul>
{{ form_end(form) }}

4
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
View File

@ -45,11 +45,11 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('document_category_index') }}"
class="sc-button bt-cancel">{{ 'Back to the category list' | trans }}</a>
class="btn btn-cancel">{{ 'Back to the category list' | trans }}</a>
</li>
<li>
<a href="{{ path('document_category_edit', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}"
class="sc-button bt-edit">{{ 'Edit' | trans }}</a>
class="btn btn-edit">{{ 'Edit' | trans }}</a>
</li>
<li>
{{ include('ChillDocStoreBundle:DocumentCategory:_delete_form.html.twig') }}

2
src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig
View File

@ -2,7 +2,7 @@
{% if storedObject is null %}
<!-- No document to download -->
{% else %}
<a class="sc-button bt-download"
<a class="btn btn-download"
data-label-preparing="{{ ('Preparing'|trans ~ '...')|escape('html_attr') }}"
data-label-ready="{{ 'Ready to show'|trans|escape('html_attr') }}"
data-download-button

2
src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/_delete_form.html.twig
View File

@ -1,5 +1,5 @@
<form method="post" action="{{ path('person_document_delete', {'id': document.id, 'person': person.id}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
<input type="hidden" name="_method" value="DELETE">
<input type="hidden" name="_token" value="{{ csrf_token('delete' ~ document.id) }}">
<button class="sc-button bt-delete">{{ 'Delete' | trans }}</button>
<button class="btn btn-delete">{{ 'Delete' | trans }}</button>
</form>

10
src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
@ -36,12 +36,12 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('person_document_index', {'person': person.id}) }}" class="sc-button bt-cancel">
<a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
{{ 'Back to the list' | trans }}
</a>
</li>
<li class="edit">
<button class="sc-button bt-edit">{{ 'Edit'|trans }}</button>
<button class="btn btn-edit">{{ 'Edit'|trans }}</button>
</li>
{# {% if is_granted('CHILL_PERSON_DOCUMENT_DELETE', document) %}
<li class="delete">
@ -56,9 +56,9 @@
{% endblock %}
{% block js %}
<script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
{{ encore_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
<link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
{{ encore_entry_link_tags('mod_async_upload') }}
{% endblock %}

10
src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
@ -24,7 +24,7 @@
{% block title %}{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
{% block js %}
<script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
{{ encore_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block personcontent %}
@ -52,12 +52,12 @@
{{ m.download_button(document.object, document.title) }}
</li>
<li>
<a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="sc-button bt-show"></a>
<a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
</li>
{% endif %}
{% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
<li>
<a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="sc-button bt-update"></a>
<a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
</li>
{% endif %}
</ul>
@ -74,7 +74,7 @@
{% if is_granted('CHILL_PERSON_DOCUMENT_CREATE', person) %}
<ul class="record_actions">
<li class="create">
<a href="{{ path('person_document_new', {'person': person.id}) }}" class="sc-button bt-create">
<a href="{{ path('person_document_new', {'person': person.id}) }}" class="btn btn-create">
{{ 'Create new document' | trans }}
</a>
</li>

10
src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
@ -36,21 +36,21 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('person_document_index', {'person': person.id}) }}" class="sc-button bt-cancel">
<a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
{{ 'Back to the list' | trans }}
</a>
</li>
<li class="create">
<button class="sc-button bt-create">{{ 'Create'|trans }}</button>
<button class="btn btn-create">{{ 'Create'|trans }}</button>
</li>
</ul>
{{ form_end(form) }}
{% endblock %}
{% block js %}
<script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
{{ encore_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block css %}
<link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
{{ encore_entry_link_tags('mod_async_upload') }}
{% endblock %}

8
src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
@ -23,7 +23,7 @@
{% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
{% block js %}
<script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
{{ encore_entry_script_tags('mod_async_upload') }}
{% endblock %}
{% block personcontent %}
@ -54,7 +54,7 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('person_document_index', {'person': person.id}) }}" class="sc-button bt-cancel">
<a href="{{ path('person_document_index', {'person': person.id}) }}" class="btn btn-cancel">
{{ 'Back to the list' | trans }}
</a>
</li>
@ -65,7 +65,7 @@
{% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
<li>
<a href="{{ path('person_document_edit', {'id': document.id, 'person': person.id}) }}" class="sc-button bt-edit">
<a href="{{ path('person_document_edit', {'id': document.id, 'person': person.id}) }}" class="btn btn-edit">
{{ 'Edit' | trans }}
</a>
</li>

5
src/Bundle/ChillDocStoreBundle/chill.webpack.config.js
View File

@ -1,3 +1,4 @@
module.exports = function(encore) {
encore.addEntry('async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
module.exports = function(encore)
{
encore.addEntry('mod_async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
};

0
src/Bundle/ChillEventBundle/Resources/public/css/chillevent.css → src/Bundle/ChillEventBundle/Resources/public/chill/chillevent.scss
View File

1
src/Bundle/ChillEventBundle/Resources/public/chill/index.js Normal file
View File

@ -0,0 +1 @@
require('./chillevent.scss');

1
src/Bundle/ChillEventBundle/Resources/public/index.js
View File

@ -1 +0,0 @@
require('./css/chillevent.css');

4
src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
View File

@ -20,12 +20,12 @@
{% set returnPath = app.request.get('return_path') %}
{% set returnLabel = app.request.get('return_label') %}
<a href="{{ returnPath |default( path('chill_event_list_most_recent') ) }}" class="sc-button bt-cancel">
<a href="{{ returnPath |default( path('chill_event_list_most_recent') ) }}" class="btn btn-cancel">
{{ returnLabel |default('Back to the most recent events'|trans) }}
</a>
</li>
<li>
{{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'sc-button bt-update' } }) }}
{{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' } }) }}
</li>
</ul>

8
src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig
View File

@ -25,12 +25,12 @@
<ul class="record_actions">
<li>
{# {% if is_granted('CHILL_EVENT_SEE_DETAILS', event) %} #}
<a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="sc-button black">
<a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-dark">
{{ 'See'|trans }}
</a>
{# {% endif %} #}
{% if is_granted('CHILL_EVENT_UPDATE', event) %}
<a href="{{ path('chill_event__event_edit', { 'event_id' : event.id } ) }}" class="sc-button bt-update">
<a href="{{ path('chill_event__event_edit', { 'event_id' : event.id } ) }}" class="btn btn-update">
{{ 'Edit'|trans }}
</a>
{% endif %}
@ -46,13 +46,13 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_event__event_new_pickcenter') }}" class="sc-button bt-create" >
<a href="{{ path('chill_event__event_new_pickcenter') }}" class="btn btn-create" >
{{ 'New event'|trans }}
</a>
</li>
{% if preview == true and events|length < total %}
<li>
<a href="{{ path('chill_main_search', { "name": search_name, "q" : pattern }) }}" class="sc-button btn-next">
<a href="{{ path('chill_main_search', { "name": search_name, "q" : pattern }) }}" class="btn btn-next">
{{ 'See all results'|trans }}
</a>
</li>

62
src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = 'chill_event__list_by_person' %}
{% set currentPerson = person.firstName ~ ' ' ~ person.lastName %}
@ -24,7 +24,7 @@
{% block personcontent %}
<h2>{{ 'Events participation' |trans }}</h2>
<table class="events">
<table class="table table-striped table-bordered mt-3 events">
<thead>
<tr>
<th class="chill-green">{{ 'Date'|trans }}</th>
@ -44,53 +44,58 @@
<td>{{ participation.role.name|localize_translatable_string }}</td>
<td>{{ participation.status.name|localize_translatable_string }}</td>
<td>
<ul class="record_actions">
<li>
<ul class="list-inline">
{% set currentPath = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
{% set returnLabel = 'Back to %person% events'|trans({ '%person%' : currentPerson } ) %}
{% if is_granted('CHILL_EVENT_SEE_DETAILS', participation.event) %}
<li class="list-inline-item">
<a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel } ) }}"
class="sc-button bt-show" title="{{ 'See details of the event'|trans }}"></a>
class="btn btn-primary btn-sm" title="{{ 'See details of the event'|trans }}"><i class="fa fa-fw fa-eye"></i></a>
</li>
{% endif %}
{% if is_granted('CHILL_EVENT_UPDATE', participation.event)
and is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
<div class="bt-dropdown">
<a href="" class="sc-button bt-update"></a>
<div class="bt-dropdown-content">
<li class="list-inline-item">
<div class="btn dropdown-toggle">
<a href="" class="btn btn-warning btn-sm"><i class="fa fa-fw fa-pencil"></i></a>
<div class="dropdown-menu">
<a href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
class="sc-button bt-update">
class="btn btn-warning btn-sm">
{{ 'Edit the event'|trans }}
</a>
<a href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
class="sc-button bt-update">
class="btn btn-warning btn-sm">
{{ 'Edit the participation'|trans }}
</a>
</div>
</div>
</li>
{% else %}
<li class="list-inline-item">
{% if is_granted('CHILL_EVENT_UPDATE', participation.event) %}
<a href="{{ path('chill_event__event_edit', { 'event_id' : participation.event.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
class="sc-button bt-update">
class="btn btn-warning btn-sm">
{{ 'Edit the event'|trans }}
</a>
{% endif %}
{% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
<a href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id, 'return_path' : currentPath, 'return_label' : returnLabel }) }}"
class="sc-button bt-update">
class="btn btn-warning btn-sm">
{{ 'Edit the participation'|trans }}
</a>
{% endif %}
</li>
{% endif %}
</li>
</ul>
</td>
</tr>
@ -103,12 +108,31 @@
{{ chill_pagination(paginator) }}
{% endif %}
<div style="margin-bottom: 1.5em; margin-top: 2.5em;">
{{ form_start(form_add_event_participation_by_person) }}
{{ form_widget(form_add_event_participation_by_person.event_id, { 'attr' : { 'style' : 'width: 25em; display:inline-block; ' } } ) }}
{{ form_widget(form_add_event_participation_by_person.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
{{ form_rest(form_add_event_participation_by_person) }}
{{ form_end(form_add_event_participation_by_person) }}
<div class="input-group mb-3">
{{ form_start(form_add_event_participation_by_person) }}
{#
<input type="text" class="form-control" placeholder="Recipient's username" aria-label="Recipient's username" aria-describedby="button-addon2">
#}
{{ form_widget(form_add_event_participation_by_person.event_id, { 'attr' : { 'class' : 'form-control' } } ) }}
<div class="input-group-append input-group-btn">
{#
<button class="btn btn-outline-secondary" type="button" id="button-addon2">Button</button>
#}
{{ form_widget(form_add_event_participation_by_person.submit, { 'attr' : { 'class' : 'btn btn-success' } } ) }}
</div>
{{ form_rest(form_add_event_participation_by_person) }}
{{ form_end(form_add_event_participation_by_person) }}
</div>
{#
{{ form(form_add_event_participation_by_person) }}
#}
<div class="input-group mb-3">
<input class="form-control" placeholder="Recipient's username">
<div class="input-group-append">
<button class="btn btn-success">Button</button>
</div>
</div>
{% endblock %}

4
src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
View File

@ -16,12 +16,12 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
<a href="{{ path('chill_event_list_most_recent') }}" class="btn btn-cancel">
{{ 'Back to the most recent events'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-create' } }) }}
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } }) }}
</li>
</ul>

4
src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig
View File

@ -12,12 +12,12 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
<a href="{{ path('chill_event_list_most_recent') }}" class="btn btn-cancel">
{{ 'Back to the most recent events'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button green' } }) }}
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-chill-green' } }) }}
</li>
</ul>

22
src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
View File

@ -40,26 +40,26 @@
{% if returnPath and returnLabel %}
<li class="cancel">
<a href="{{ returnPath }}" class="sc-button bt-cancel">{{ returnLabel }}</a>
<a href="{{ returnPath }}" class="btn btn-cancel">{{ returnLabel }}</a>
</li>
<li>
<a href="{{ path('chill_event__event_edit', {
'event_id': event.id,
'return_path': app.request.getRequestUri,
'return_label': 'Back to details of the event'|trans
}) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}
}) }}" class="btn btn-edit">{{ 'Edit'|trans }}
</a>
</li>
{% else %}
<li>
<a href="{{ path('chill_event__event_edit', {'event_id': event.id }) }}" class="sc-button bt-edit">
<a href="{{ path('chill_event__event_edit', {'event_id': event.id }) }}" class="btn btn-edit">
{{ 'Edit'|trans }}
</a>
</li>
{% endif %}
<li>
<a href="{{ path('chill_event__event_delete', {'event_id' : event.id } ) }}"
class="sc-button bt-delete">{{ 'Delete event'|trans }}</a>
class="btn btn-delete">{{ 'Delete event'|trans }}</a>
</li>
</ul>
@ -94,11 +94,11 @@
{% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
<li>
<a href="{{ path('chill_event_participation_edit', { 'participation_id' : participation.id } ) }}"
class="sc-button bt-edit" title="{{ 'Edit'|trans }}"></a>
class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
</li>
<li>
<a href="{{ path('chill_event_participation_delete', {'participation_id' : participation.id } ) }}"
class="sc-button bt-delete" title="{{ 'Delete'|trans }}"></a>
class="btn btn-delete" title="{{ 'Delete'|trans }}"></a>
</li>
{% endif %}
</ul>
@ -113,12 +113,12 @@
<ul class="record_actions">
{% if count > 0 %}
<li><a href="{{ path('chill_event_participation_edit_multiple', { 'event_id' : event.id } ) }}" class="sc-button bt-edit">{{ 'Edit all the participations'|trans }}</a></li>
<li><a href="{{ path('chill_event_participation_edit_multiple', { 'event_id' : event.id } ) }}" class="btn btn-edit">{{ 'Edit all the participations'|trans }}</a></li>
{% endif %}
</ul>
<div style="margin-bottom: 10em;">
<div class="grid-8">
<div class="col-8">
{{ form_start(form_add_participation_by_person) }}
<div class="input-group">
{{ form_widget(form_add_participation_by_person.person_id, { 'attr' : {
@ -126,19 +126,19 @@
'style': 'min-width: 15em; max-width: 18em; display: inline-block;'
}} ) }}
<div class="input-group-append">
{{ form_widget(form_add_participation_by_person.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
{{ form_widget(form_add_participation_by_person.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
</div>
</div>
{{ form_rest(form_add_participation_by_person) }}
{{ form_end(form_add_participation_by_person) }}
</div>
<div class="grid-4">
<div class="col-4">
{{ form_start(form_export, {'attr': {'id': 'export_tableur'}}) }}
<div class="input-group">
{{ form_widget(form_export.format, { 'attr' : { 'class': 'custom-select' } }) }}
<div class="input-group-append">
{{ form_widget(form_export.submit, { 'attr' : { 'class': 'sc-button bt-save' } }) }}
{{ form_widget(form_export.submit, { 'attr' : { 'class': 'btn btn-save' } }) }}
</div>
<a class="bt-"></a>
</div>

4
src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
View File

@ -10,10 +10,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_eventtype_admin') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_eventtype_admin') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button bt-edit' }}) }}
{{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-edit' }}) }}
</li>
</ul>

6
src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
View File

@ -22,10 +22,10 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_eventtype_admin_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
<a href="{{ path('chill_eventtype_admin_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
</li>
<li>
<a href="{{ path('chill_eventtype_admin_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
<a href="{{ path('chill_eventtype_admin_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
</li>
</ul>
</td>
@ -36,7 +36,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_eventtype_admin_new') }}" class="sc-button bt-new">{{ 'Create a new type'|trans }}</a>
<a href="{{ path('chill_eventtype_admin_new') }}" class="btn btn-new">{{ 'Create a new type'|trans }}</a>
</li>
</ul>
{% endblock %}

4
src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
View File

@ -10,10 +10,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_eventtype_admin') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_eventtype_admin') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' }}) }}
{{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' }}) }}
</li>
</ul>

6
src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
View File

@ -23,14 +23,14 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_eventtype_admin') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_eventtype_admin') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
<a href="{{ path('chill_eventtype_admin_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
<a href="{{ path('chill_eventtype_admin_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
</li>
<li>
{{ form_start(delete_form) }}
{{ form_row(delete_form.submit, { 'attr': { 'class' : 'sc-button bt-delete' }}) }}
{{ form_row(delete_form.submit, { 'attr': { 'class' : 'btn btn-delete' }}) }}
{{ form_end(delete_form) }}
</li>
</ul>

4
src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
View File

@ -49,12 +49,12 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
{{ 'Back to the event'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-edit' } } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
</li>
</ul>

4
src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
View File

@ -32,12 +32,12 @@
{% set returnPath = app.request.get('return_path') %}
{% set returnLabel = app.request.get('return_label') %}
<a href="{{ returnPath |default( path('chill_event__event_show', { 'event_id' : participation.event.id } )) }}" class="sc-button bt-cancel">
<a href="{{ returnPath |default( path('chill_event__event_show', { 'event_id' : participation.event.id } )) }}" class="btn btn-cancel">
{{ returnLabel |default('Back to the event'|trans) }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-edit' } } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
</li>
</ul>

9
src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
View File

@ -4,8 +4,6 @@
{% block title 'Participation creation'|trans %}
{% form_theme form _self %}
{% block _collection_row %}
<tr>
<td>
@ -52,14 +50,13 @@
</table>
<ul class="record_actions">
<li>
<a href="{{ path('chill_event__event_show', { 'event_id' : participations[0].event.id } ) }}" class="sc-button btn-cancel">
<i class="fa fa-arrow-left"></i>
<li class="cancel">
<a href="{{ path('chill_event__event_show', { 'event_id' : participations[0].event.id } ) }}" class="btn btn-cancel">
{{ 'Back to the event'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
</li>
</ul>

5
src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
View File

@ -33,13 +33,12 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="sc-button btn-cancel">
<i class="fa fa-arrow-left"></i>
<a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="btn btn-cancel">
{{ 'Back to the event'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
</li>
</ul>

4
src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
View File

@ -10,10 +10,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event_admin_role') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_event_admin_role') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button bt-edit' }}) }}
{{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-edit' }}) }}
</li>
</ul>

6
src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
View File

@ -24,10 +24,10 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_event_admin_role_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
<a href="{{ path('chill_event_admin_role_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
</li>
<li>
<a href="{{ path('chill_event_admin_role_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
<a href="{{ path('chill_event_admin_role_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
</li>
</ul>
</td>
@ -38,7 +38,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_event_admin_role_new') }}" class="sc-button bt-new">{{ 'Create a new role'|trans }}</a>
<a href="{{ path('chill_event_admin_role_new') }}" class="btn btn-new">{{ 'Create a new role'|trans }}</a>
</li>
</ul>
{% endblock %}

4
src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
View File

@ -11,10 +11,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event_admin_role') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_event_admin_role') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' }}) }}
{{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' }}) }}
</li>
</ul>

6
src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
View File

@ -27,14 +27,14 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event_admin_role') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_event_admin_role') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
<a href="{{ path('chill_event_admin_role_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
<a href="{{ path('chill_event_admin_role_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
</li>
<li>
{{ form_start(delete_form) }}
{{ form_row(delete_form.submit, { 'attr': { 'class' : 'sc-button bt-delete' }}) }}
{{ form_row(delete_form.submit, { 'attr': { 'class' : 'btn btn-delete' }}) }}
{{ form_end(delete_form) }}
</li>
</ul>

4
src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
View File

@ -11,10 +11,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event_admin_status') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_event_admin_status') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button bt-edit' }}) }}
{{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-edit' }}) }}
</li>
</ul>

6
src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
View File

@ -24,10 +24,10 @@
<td>
<ul class="record_actions">
<li>
<a href="{{ path('chill_event_admin_status_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
<a href="{{ path('chill_event_admin_status_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
</li>
<li>
<a href="{{ path('chill_event_admin_status_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
<a href="{{ path('chill_event_admin_status_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
</li>
</ul>
</td>
@ -38,7 +38,7 @@
<ul class="record_actions sticky-form-buttons">
<li>
<a href="{{ path('chill_event_admin_status_new') }}" class="sc-button bt-new">{{ 'Create a new status'|trans }}</a>
<a href="{{ path('chill_event_admin_status_new') }}" class="btn btn-new">{{ 'Create a new status'|trans }}</a>
</li>
</ul>
{% endblock %}

4
src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
View File

@ -11,10 +11,10 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event_admin_status') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_event_admin_status') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
{{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' }}) }}
{{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' }}) }}
</li>
</ul>

6
src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
View File

@ -27,14 +27,14 @@
<ul class="record_actions">
<li class="cancel">
<a href="{{ path('chill_event_admin_status') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
<a href="{{ path('chill_event_admin_status') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
</li>
<li>
<a href="{{ path('chill_event_admin_status_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
<a href="{{ path('chill_event_admin_status_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
</li>
<li>
{{ form_start(delete_form) }}
{{ form_row(delete_form.submit, { 'attr': { 'class' : 'sc-button bt-delete' }}) }}
{{ form_row(delete_form.submit, { 'attr': { 'class' : 'btn btn-delete' }}) }}
{{ form_end(delete_form) }}
</li>
</ul>

2
src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
View File

@ -42,7 +42,7 @@
<ul class="record_actions">
<li>
<a href="{{ path('chill_event__event_show', { 'event_id': event.id} ) }}" class="sc-button bt-view">
<a href="{{ path('chill_event__event_show', { 'event_id': event.id} ) }}" class="btn btn-view">
{{ 'Show the event'|trans }}
</a>
</li>

6
src/Bundle/ChillEventBundle/chill.webpack.config.js
View File

@ -1,4 +1,4 @@
// this file loads all assets from the Chill Event Bundle
module.exports = function(encore, entries) {
entries.push(__dirname + '/Resources/public/index.js');
module.exports = function(encore, entries)
{
entries.push(__dirname + '/Resources/public/chill/index.js');
};

2
src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set person = familyMember.person %}

6
src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig
View File

@ -1,4 +1,4 @@
{% extends "@ChillPerson/layout.html.twig" %}
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% set activeRouteKey = '' %}
{% set title = 'Edit family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@ -26,12 +26,12 @@
<ul class="record_actions sticky-form-buttons">
<li class="cancel">
<a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="sc-button bt-cancel">
<a href="{{ path("chill_family_members_family_members_index", { 'id': person.id } ) }}" class="btn btn-cancel">
{{ 'Back to the list'|trans }}
</a>
</li>
<li>
{{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button bt-edit' }, 'label': 'Edit' } ) }}
{{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-edit' }, 'label': 'Edit' } ) }}
</li>
</ul>

Some files were not shown because too many files have changed in this diff Show More