fix test for accompanying period

The data fixtures still create accompanying period for each person.

package.json.txt

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

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -282,7 +282,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
         return $this->socialIssues;
     }
 
-    public function addSocialIssue(?SocialIssue $socialIssue): self
+    public function addSocialIssue(SocialIssue $socialIssue): self
     {
         if (!$this->socialIssues->contains($socialIssue)) {
             $this->socialIssues[] = $socialIssue;
@@ -303,7 +303,7 @@ class Activity implements HasCenterInterface, HasScopeInterface
         return $this->socialActions;
     }
 
-    public function addSocialAction(?SocialAction $socialAction): self
+    public function addSocialAction(SocialAction $socialAction): self
     {
         if (!$this->socialActions->contains($socialAction)) {
             $this->socialActions[] = $socialAction;

src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss

@@ -1,9 +1,9 @@
-@import '~ChillMainSass/custom/config/colors';
+@import '~ChillMainAssets/modules/bootstrap/bootstrap';
-@import '~ChillMainSass/custom/mixins/entity';
+//@import '~ChillMainSass/custom/mixins/entity';
 
-.chill-entity.chill-entity__activity-reason {
+//.chill-entity.chill-entity__activity-reason {
-    @include entity($chill-pink, white);
+//    @include entity($chill-pink, white);
-}
+//}
 
 .activity {
     color: $chill-green;

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -65,7 +65,7 @@ export default {
          addPersons: {
             key: 'activity',
             options: {
-               type: ['person', 'thirdparty'], // TODO add 'user'
+               type: ['person', 'thirdparty', 'user'], // TODO add 'user'
                priority: null,
                uniq: false,
             }

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

@@ -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>

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

@@ -1,11 +1,11 @@
 <template>
    <teleport to="#social-issues-acc">
       
-      <div class="container">
+      <div class="mb-3 row">
-         <div class="grid-4 clear">
+         <div class="col-4">
-            <label>{{ $t('activity.social_issues') }}</label>
+            <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="mb-3 row">
-         <div class="grid-4 clear">
+         <div class="col-4">
-            <label>{{ $t('activity.social_actions') }}</label>
+            <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>

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

@@ -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>

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

@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -59,7 +59,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>
@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/Activity/confirm_deletePerson.html.twig

@@ -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 %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -1,8 +1,5 @@
-<h1>{{ "Update activity"|trans ~ ' :' }}
+<h1>{{ "Update activity"|trans }}</h1>
-    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
+<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
-        {{ entity.type.name|localize_translatable_string }}
-    </span>
-</h1>
 
 {{ 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) }}

src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig

@@ -5,8 +5,16 @@
 {% block title  'Update activity'|trans %}
 
 {% block content %}
+<div class="activity-edit">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+            
+        </div>
+    </div>
+</div>
 {% endblock %}
 
 {% block js %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig

@@ -14,15 +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 class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+            
+        </div>
+    </div>
+</div>
 {% endblock %}
 
 {% block js %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig

@@ -13,7 +13,7 @@
 {% 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 %}
 
@@ -128,7 +128,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 +138,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 +189,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>

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -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' %}
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig

@@ -1,8 +1,5 @@
-<h1>{{ "Activity creation"|trans ~ ' :' }}
+<h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
-    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
+<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
-        {{ entity.type.name|localize_translatable_string }}
-    </span>
-</h1>
 
 {{ 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>

src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig

@@ -5,8 +5,16 @@
 {% block title 'Activity creation' |trans %}
 
 {% block content %}
+<div class="activity-new">
+    <div class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
+            
+        </div>
+    </div>
+</div>            
 {% endblock %}
 
 {% block js %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig

@@ -1,12 +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 class="row justify-content-center">
+        <div class="col-md-10 col-xxl">
+            
             <div id="activity"></div> {# <=== vue component #}
             {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
+            
+        </div>
+    </div>
+</div>
 {% endblock %}
 
 {% block js %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -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 %}
     #}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig

@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/edit.html.twig

@@ -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>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig

@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig

@@ -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>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig

@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/edit.html.twig

@@ -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>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig

@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig

@@ -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) }}

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig

@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig

@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig

@@ -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>

src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig

@@ -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>

src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig

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

src/Bundle/ChillBudgetBundle/Resources/views/Charge/edit.html.twig

@@ -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>
        

src/Bundle/ChillBudgetBundle/Resources/views/Charge/new.html.twig

@@ -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>
        

src/Bundle/ChillBudgetBundle/Resources/views/Charge/view.html.twig

@@ -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>

src/Bundle/ChillBudgetBundle/Resources/views/Element/index.html.twig

@@ -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 %}

src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig

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

src/Bundle/ChillBudgetBundle/Resources/views/Resource/edit.html.twig

@@ -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>
        

src/Bundle/ChillBudgetBundle/Resources/views/Resource/new.html.twig

@@ -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>
        

src/Bundle/ChillBudgetBundle/Resources/views/Resource/view.html.twig

@@ -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>

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/edit.html.twig

@@ -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>

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomField/new.html.twig

@@ -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 %}

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/edit.html.twig

@@ -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>

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/index.html.twig

@@ -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>

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/new.html.twig

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

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsGroup/show.html.twig

@@ -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 %}

src/Bundle/ChillCustomFieldsBundle/Resources/views/CustomFieldsRendering/text.html.twig

@@ -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 %}

src/Bundle/ChillCustomFieldsBundle/Resources/views/Form/fields.html.twig

@@ -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);

src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js

@@ -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);

src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_delete_form.html.twig

@@ -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>

src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/_form.html.twig

@@ -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) }}

src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig

@@ -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) }}

src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig

@@ -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 %}

src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig

@@ -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) }}

src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig

@@ -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') }}

src/Bundle/ChillDocStoreBundle/Resources/views/Macro/macro.html.twig

@@ -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 

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/_delete_form.html.twig

@@ -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>

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig

@@ -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">

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig

@@ -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 = '' %}
 
@@ -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>

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig

@@ -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,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="create">
-            <button  class="sc-button bt-create">{{ 'Create'|trans }}</button>
+            <button  class="btn btn-create">{{ 'Create'|trans }}</button>
         </li>
     </ul>
     {{ form_end(form) }}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig

@@ -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 = '' %}
 
@@ -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>

src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig

@@ -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>
             

src/Bundle/ChillEventBundle/Resources/views/Event/list.html.twig

@@ -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>

src/Bundle/ChillEventBundle/Resources/views/Event/listByPerson.html.twig

@@ -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">
+                    <ul class="list-inline">
-                        <li>
 
                         {% 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">
+                        <li class="list-inline-item">
-                                    <a href="" class="sc-button bt-update"></a>
+                            <div class="btn dropdown-toggle">
-                                    <div class="bt-dropdown-content">
+                                <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,33 @@
     {{ chill_pagination(paginator) }}
 {% endif %}
 
-<div style="margin-bottom: 1.5em; margin-top: 2.5em;">
+{% form_theme form_add_event_participation_by_person 'bootstrap_4_layout.html.twig' %}
-    {{ 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; ' } } ) }}
+<div class="input-group mb-3">
-    {{ form_widget(form_add_event_participation_by_person.submit, { 'attr' : { 'class' : 'sc-button bt-create' } } ) }}
+{{ form_start(form_add_event_participation_by_person) }}
-    {{ form_rest(form_add_event_participation_by_person) }}
+    {#
-    {{ form_end(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 %}

src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig

@@ -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>
             

src/Bundle/ChillEventBundle/Resources/views/Event/newPickCenter.html.twig

@@ -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>
             

src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig

@@ -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>

src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig

@@ -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>
 

src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig

@@ -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 %}

src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig

@@ -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>
 

src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig

@@ -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>

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

@@ -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>
     

src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig

@@ -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>
     

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

@@ -52,14 +52,13 @@
     </table>
         
     <ul class="record_actions">
-        <li>
+        <li class="cancel">
-            <a href="{{ path('chill_event__event_show', { 'event_id' : participations[0].event.id } ) }}" class="sc-button btn-cancel">
+            <a href="{{ path('chill_event__event_show', { 'event_id' : participations[0].event.id } ) }}" class="btn btn-cancel">
-                <i class="fa fa-arrow-left"></i>
                 {{ '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>
     

src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig

@@ -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">
+            <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="btn btn-cancel">
-                <i class="fa fa-arrow-left"></i>
                 {{ '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>
     

src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig

@@ -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>
 

src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig

@@ -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 %}

src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig

@@ -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>
 

src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig

@@ -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>

src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig

@@ -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>
 

src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig

@@ -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 %}

src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig

@@ -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>
 

src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig

@@ -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>

src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig

@@ -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>

src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/confirm_delete.html.twig

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

src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/edit.html.twig

@@ -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>
        

src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/index.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Family members for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
@@ -65,17 +65,17 @@
                 <ul class="record_actions">
                     {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::SHOW'), f) %}
                         <li>
-                            <a href="{{ path('chill_family_members_family_members_view', { 'id': f.id } ) }}" class="sc-button bt-show"></a>
+                            <a href="{{ path('chill_family_members_family_members_view', { 'id': f.id } ) }}" class="btn btn-show"></a>
                         </li>
                     {% endif %}
                     {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::UPDATE'), f) %}
                         <li>
-                            <a href="{{ path('chill_family_members_family_members_edit', { 'id': f.id } ) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ path('chill_family_members_family_members_edit', { 'id': f.id } ) }}" class="btn btn-edit"></a>
                         </li>
                     {% endif %}
                     {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::DELETE'), f) %}
                         <li>
-                            <a href="{{ path('chill_family_members_family_members_delete', { 'id': f.id } ) }}" class="sc-button bt-delete"></a>
+                            <a href="{{ path('chill_family_members_family_members_delete', { 'id': f.id } ) }}" class="btn btn-delete"></a>
                         </li>
                     {% endif %}
                 </ul>
@@ -116,7 +116,7 @@
 {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::CREATE'), person) %}
     <ul class="record_actions">
         <li>
-            <a class="sc-button bt-create" href="{{ path('chill_family_members_family_members_new', { 'id': person.id} ) }}">{{ 'Create new family membership'|trans }}</a>
+            <a class="btn btn-create" href="{{ path('chill_family_members_family_members_new', { 'id': person.id} ) }}">{{ 'Create new family membership'|trans }}</a>
         </li>
     </ul>
 {% endif %}

src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/new.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'New 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-create' }, 'label': 'Create' } ) }}
+        {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-create' }, 'label': 'Create' } ) }}
     </li>
 </ul>
        

src/Bundle/ChillFamilyMembersBundle/Resources/views/FamilyMember/view.html.twig

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/layout.html.twig" %}
+{% extends "@ChillPerson/Person/layout.html.twig" %}
 
 {% set activeRouteKey = '' %}
 {% set person = familyMember.person %}
@@ -73,13 +73,13 @@
 
 <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>
     {% if is_granted(constant('Chill\\AMLI\\FamilyMembersBundle\\Security\\Voter\\FamilyMemberVoter::UPDATE'), familyMember) %}
         <li>
-            <a href="{{ path('chill_family_members_family_members_edit', { 'id': familyMember.id } ) }}" class="sc-button bt-edit">{{ 'Edit'|trans }}</a>
+            <a href="{{ path('chill_family_members_family_members_edit', { 'id': familyMember.id } ) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
         </li>
     {% endif %}
 </ul>

src/Bundle/ChillMainBundle/Resources/public/js/collection/collection.scss

@@ -1,27 +1,25 @@
 div.chill-collection {
-    ul.chill-collection__list {
+   padding: 1em;
+
+   ul.list-entry {
       list-style: none;
       padding: 0;
       margin-bottom: 1.5rem;
 
-        li.chill-collection__list__entry:nth-child(2n) {
+      li.entry {
-            background-color: var(--chill-light-gray);
+         padding: 1em;
-            padding: 0.5rem 0;
+         border: 1px solid var(--bs-chill-light-gray);
+         
+         &:nth-child(even) {
+            background-color: var(--bs-chill-light-gray);
+         }
       }
 
-        // all entries, except the last one
+      button.remove-entry {
-        li.chill-collection__list__entry:nth-last-child(1n+2) {
-            margin-bottom: 1rem;
-        }
-        
-        button.chill-collection__list__remove-entry {
          margin-left: 0.5rem;
       }
    }
 
-    button.chill-collection__button--add {
+   button.add-entry {
-        
-        
    }
 }
-

src/Bundle/ChillMainBundle/Resources/public/js/collection/collections.js

@@ -54,7 +54,7 @@ var handleAdd = function(button) {
         ;
     content = prototype.replace(new RegExp('__name__', 'g'), counter);
     entry.innerHTML = content;
-    entry.classList.add('chill-collection__list__entry');
+    entry.classList.add('entry');
     initializeRemove(collection, entry);
     collection.appendChild(entry);
     
@@ -75,7 +75,7 @@ var initializeRemove = function(collection, entry) {
         return;
     }
     
-    button.classList.add('sc-button', 'bt-delete', 'chill-collection__list__remove-entry');
+    button.classList.add('btn', 'btn-delete', 'remove-entry');
     button.textContent = content;
     
     button.addEventListener('click', function(e) {
@@ -110,6 +110,3 @@ window.addEventListener('load', function() {
         }
     }
 });
-
-
-

src/Bundle/ChillMainBundle/Resources/public/main.js

@@ -23,6 +23,7 @@ require('./js/collection/collections.js');
 
 // from node-modules
 require('select2/dist/css/select2.css');
+require('select2-bootstrap-theme/dist/select2-bootstrap.css');
 
 require('./modules/breadcrumb/index.js');
 require('./modules/download-report/index.js');

src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/_custom.scss

@@ -2,3 +2,283 @@
  *  These custom styles will override bootstrap enabled stylesheets
  */
 
+/// chill buttons
+@import 'custom/_buttons';
+
+// chill record_actions
+@import 'custom/_record_actions';
+
+/// titles 
+h1, h2, .h1, .h2 {
+   font-weight: $headings-font-weight + 200;
+}
+
+/// typography
+.open_sansbold {
+   font-weight: bold;
+}
+
+/// forms
+
+@mixin title_in_form {
+   font-size: 1.438em;
+   font-weight: 700;
+   width: 100%;
+   border-bottom: 3px solid $gray-200;
+   margin-bottom: 1em;
+   display: block;
+}
+
+.col-form-label {
+   padding-top: .5em;
+   padding-bottom: .5em;
+   font-weight: 700;
+   margin-bottom: .375em;
+}
+
+form {
+   /* avoid useless html in first level of the custom fields row loop in forms
+   * (better should to improve the loop)
+   */
+   & > div.container-fluid {
+      & > div.row > .parent {
+         padding: 0;
+         & div.cf-fields span.cf-title {
+            margin: 1em -15px 0;
+            width: calc(100% + 30px);
+            @include title_in_form;
+         }
+      }
+   }
+   fieldset {
+      margin-top: 1em;
+      & > legend {
+         @include title_in_form;
+      }
+   }
+   label {
+      display: inline;
+      &.required:after {
+         content: " *";
+         color: $red;
+      }
+   }
+}
+
+/// table 
+
+table.table-bordered {
+   thead, thead * {
+      border: 0 !important;
+      text-align: center;
+   }
+}
+
+/// chill elements of design 
+
+.sticky-form-buttons {
+   margin-top: 4em;
+   background-color: $beige;
+   position: sticky;
+   bottom: 0.3em;
+   text-align: center;
+   display: flex;
+   padding: 0.8em 1.6em;
+   border-radius: 0;
+}
+
+.chill-user-quote {
+   border-left: 10px solid $yellow;
+   margin: 1.5em 10px;
+   padding: 0.5em 15px;
+   quotes: "\201C" "\201D" "\2018" "\2019";
+   background-color: $gray-200;
+   blockquote {
+      border-left: 0.4em solid $gray-400;
+      padding-left: 0.9em;
+      margin-left: 0.9em;
+      font-style: italic;
+   }
+}
+
+div.chill_address {
+   div.chill_address_address {
+      margin: 0.7em 0;
+      font-size: 98%;
+      font-variant: small-caps;
+      p {
+         display: inline-block;
+         margin: 0 0 0 1.5em;
+         text-indent: -1.5em;
+      }
+   }
+}
+
+/// base layout positions
+
+body {
+   display: flex;
+   flex-direction: column;
+   min-height: 100vh;
+   footer {
+      margin-top: auto;
+   }
+}
+
+header {
+   nav.navbar {
+      padding: 0;
+      a.navbar-brand img {
+         height: 50px;
+         margin: 8px 0;
+      }
+      div.navbar-collapse {
+         float: right;
+      }
+      ul.navbar-nav {
+         display: flex;
+         align-items: stretch;
+         li.nav-item {
+            display: flex;
+            &.btn {
+               padding-top: 0;
+               padding-bottom: 0;
+            }
+            & > a {
+               align-self: center;
+            }
+            form.form-inline {
+               align-self: center;
+               display: flex;
+               input.form-control {
+                  align-self: center;
+                  height: 32px;
+               }
+            }
+         }
+      }
+      div.dropdown-menu {
+         margin: 0;
+         padding: 0;
+         border-radius: 0;
+         a.dropdown-item {
+            width: 120%;
+            border: 0;
+            border-bottom: 1px solid $gray-200;
+            font-size: smaller;
+            i { 
+               float: right; }
+            &:hover { 
+               color: $gray-500 !important; }
+         }
+      }
+      
+      // fullwidth menu when navbar is collapsed
+      @media (max-width: 767px) {
+         & {
+            position: relative; 
+         }
+         button.navbar-toggler {
+            float: right;
+         }
+         div.navbar-collapse {
+            float: none;
+            position: absolute;
+            top: 4em;
+            left: 0; 
+            right: 0;
+            z-index: 2;
+            padding: 1em;
+            border-top: 1px solid shade-color($primary, 25%);
+            ul.navbar-nav {
+               display: grid;
+               grid-template-areas: 
+                  "sear sear sear"
+                  "sect user lang";
+               li.nav-item {
+                  flex-direction: column;
+                  border: 0;
+                  a.nav-link {}
+                  &.navigation-search {
+                     grid-area: sear;
+                     margin-bottom: 1em;
+                     form {
+                        width: 100%;
+                        input.form-control {}
+                        button.btn {}
+                     }
+                  }
+                  &.nav-section  { grid-area: sect; } 
+                  &.nav-user     { grid-area: user; }
+                  &.nav-language { grid-area: lang; }
+               }
+               li.dropdown {
+                  &, & > * {
+                     background-color: transparent !important;
+                  }
+                  a.dropdown-toggle {}
+                  div.dropdown-menu {
+                     display: block;
+                     border: 0;
+                     a.dropdown-item {
+                        width: 100%;
+                        border: 0;
+                        border-top: 1px dotted $gray-200;
+                        background-color: transparent !important;
+                     }
+                  }
+               }   
+            }
+         }
+      }
+            
+   }
+}
+
+div.banner {
+   div.header-name, 
+   div.header-details {
+      div.row > div:first-child {
+         @media (min-width: 576px) { 
+            //margin-left: 1.5em;
+         }
+      }
+   }
+   a {
+      text-decoration: none;
+   }
+}
+
+div.vertical-menu {
+   border-radius: 0;
+   margin-top: 0.5rem;
+   a.list-group-item { 
+      background-color: $chill-yellow;
+      border: 0;
+      margin-bottom: 0.25rem;
+      &:hover {
+         background-color: tint-color($chill-yellow, 20%)
+      }
+   }
+}
+
+footer.footer {
+   background: $dark;
+   padding-top: 10px;
+   padding-bottom: 10px;
+   width: 100%;
+   p {
+      font-family: Open Sans;
+      font-weight: 300;
+      clear: both;
+      color: $white;
+      font-size: 0.9em;
+      line-height: 1.5em;
+      margin: auto;
+      max-width: 35em;
+      text-align: center;
+      a, a:hover {
+         text-decoration: underline;
+      }
+   }
+}

src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/bootstrap.scss

@@ -1,47 +1,61 @@
-/*
+/*!
+ * Bootstrap v5.0.1 (https://getbootstrap.com/)
+ * Copyright 2011-2021 The Bootstrap Authors
+ * Copyright 2011-2021 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ *
  * Enable / disable bootstrap assets
  */
 
+// scss-docs-start import-stack
+// Configuration
 @import "bootstrap/scss/functions";
 
-/* replace variables */
+/* replace by CHILL variables */
-// @import "bootstrap/scss/variables";
+//@import "bootstrap/scss/variables";
 @import "custom/_variables";
 
 @import "bootstrap/scss/mixins";
-// @import "bootstrap/scss/root";
+@import "bootstrap/scss/utilities";
-// @import "bootstrap/scss/reboot";
+
-// @import "bootstrap/scss/type";
+// Layout & components
-// @import "bootstrap/scss/images";
+@import "bootstrap/scss/root";
-// @import "bootstrap/scss/code";
+@import "bootstrap/scss/reboot";
-// @import "bootstrap/scss/grid";
+@import "bootstrap/scss/type";
-// @import "bootstrap/scss/tables";
+@import "bootstrap/scss/images";
-// @import "bootstrap/scss/forms";
+@import "bootstrap/scss/containers";
+@import "bootstrap/scss/grid";
+@import "bootstrap/scss/tables";
+@import "bootstrap/scss/forms";
 @import "bootstrap/scss/buttons";
 @import "bootstrap/scss/transitions";
-// @import "bootstrap/scss/dropdown";
+@import "bootstrap/scss/dropdown";
-// @import "bootstrap/scss/button-group";
+@import "bootstrap/scss/button-group";
-// @import "bootstrap/scss/input-group";
-// @import "bootstrap/scss/custom-forms";
 @import "bootstrap/scss/nav";
-// @import "bootstrap/scss/navbar";
+@import "bootstrap/scss/navbar";
-// @import "bootstrap/scss/card";
+@import "bootstrap/scss/card";
-// @import "bootstrap/scss/breadcrumb";
+@import "bootstrap/scss/accordion";
-// @import "bootstrap/scss/pagination";
+@import "bootstrap/scss/breadcrumb";
+@import "bootstrap/scss/pagination";
 @import "bootstrap/scss/badge";
-// @import "bootstrap/scss/jumbotron";
 @import "bootstrap/scss/alert";
-// @import "bootstrap/scss/progress";
+@import "bootstrap/scss/progress";
-// @import "bootstrap/scss/media";
+@import "bootstrap/scss/list-group";
-// @import "bootstrap/scss/list-group";
+@import "bootstrap/scss/close";
-// @import "bootstrap/scss/close";
+@import "bootstrap/scss/toasts";
-// @import "bootstrap/scss/toasts";
 @import "bootstrap/scss/modal";
-// @import "bootstrap/scss/tooltip";
+@import "bootstrap/scss/tooltip";
-// @import "bootstrap/scss/popover";
+@import "bootstrap/scss/popover";
-// @import "bootstrap/scss/carousel";
+@import "bootstrap/scss/carousel";
-// @import "bootstrap/scss/spinners";
+@import "bootstrap/scss/spinners";
-@import "bootstrap/scss/utilities";
+@import "bootstrap/scss/offcanvas";
-// @import "bootstrap/scss/print";
 
+// Helpers
+@import "bootstrap/scss/helpers";
+
+// Utilities
+@import "bootstrap/scss/utilities/api";
+// scss-docs-end import-stack
+
+// CHILL custom
 @import "custom";

src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss

@@ -0,0 +1,103 @@
+/// buttons
+
+// adding special chill actions buttons
+$chill-theme-buttons: (
+   "submit":        $chill-green,
+   "save":          $chill-green,
+   "create":        $chill-green,
+   "new":           $chill-green,
+   "duplicate":     $chill-green,
+   "not-duplicate": $chill-green,
+   "reset":         $chill-red,
+   "delete":        $chill-red,
+   "danger":        $chill-red,
+   "remove":        $chill-red,
+   "action":        $chill-orange,
+   "edit":          $chill-orange,
+   "update":        $chill-orange,
+   "show":          $chill-blue,
+   "view":          $chill-blue,
+   "misc":          $chill-light-gray,
+   "cancel":        $chill-light-gray,
+);
+
+@each $button, $color in $chill-theme-buttons {
+  .btn-#{$button} {
+    @include button-variant($color, $color);
+  }
+}
+
+@each $button, $color in $chill-theme-buttons {
+  .btn-outline-#{$button} {
+    @include button-outline-variant($color);
+  }
+}
+
+.btn {
+   &.btn-submit,
+   &.btn-save,
+   &.btn-create,
+   &.btn-new,
+   &.btn-duplicate,
+   &.btn-not-duplicate,
+   &.btn-reset,
+   &.btn-delete,
+   &.btn-danger,
+   &.btn-remove,
+   &.btn-action,
+   &.btn-edit,
+   &.btn-update {
+       &, &:hover {
+          color: $light;
+       }
+   }
+}
+
+.btn {
+   &.btn-new::before,
+   &.btn-create::before,
+   &.btn-edit::before,
+   &.btn-update::before,
+   &.btn-show::before,
+   &.btn-view::before,
+   &.btn-save::before,
+   &.btn-duplicate::before,
+      &.btn-not-duplicate::before,
+      &.btn-submit::before,
+      &.btn-reset::before,
+      &.btn-action::before,
+   &.btn-delete::before,
+   &.btn-remove::before,
+   &.btn-cancel::before {
+      font: normal normal normal 14px/1 ForkAwesome;
+      margin-right: 0.5em;
+   }
+   &[class*='btn-']:empty {
+      &::before {
+         margin-right: 0;         
+      }
+   }
+}
+
+.btn {
+   &.btn-new::before,
+   &.btn-create::before    { content: "\f067"; } // fa-plus 
+   &.btn-edit::before, 
+   &.btn-update::before    { content: "\f040"; } // fa-pencil
+   &.btn-show::before, 
+   &.btn-view::before      { content: "\f06e"; } // fa-eye
+   &.btn-save::before      { content: "\f0c7"; } // fa-floppy-o
+   &.btn-duplicate::before { content: "\f24d"; } // fa-clone  // f0c5 fa-files-o
+   &.btn-delete::before    { content: "\f1f8"; } // fa-trash
+   &.btn-remove::before    { content: "\f00d"; } // fa-times
+   &.btn-cancel::before    { content: "\f060"; } // fa-arrow-left
+}
+
+
+/// fix text color on themes buttons
+.btn-success,
+.btn-warning {
+   &, &:hover {
+      color: $light;
+   }
+}

src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_record_actions.scss

@@ -0,0 +1,55 @@
+ul.record_actions,
+ul.record_actions_column {
+   display: flex;
+   justify-content: flex-end;
+
+   &.record_actions--left {
+      justify-content: flex-start;
+   }
+   padding: 0.5em 0;
+   flex-wrap: wrap-reverse;
+
+   li {
+      display: inline-block;
+      list-style-type: none;
+      margin-right: 1em;
+      order: 99;
+
+      &:last-child {
+         margin-right: 0;
+      }
+   }
+
+   li.cancel {
+      order: 1;
+      margin-right: auto;
+   }
+}
+
+ul.record_actions {
+   flex-direction: row;
+}
+
+ul.record_actions_column {
+   flex-direction: column;
+}
+
+ul.record_actions.sticky-form-buttons {
+   padding-left: 1em;
+   padding-right: 1em;
+}
+
+// inside table exceptions
+table {
+   td ul.record_actions,
+   ul.record_actions_small {
+      li {
+         margin-right: 0.2em;
+      }
+   }
+
+   ul.record_actions {
+      margin: 0;
+      padding: 0.5em;
+   }
+}