-
+
{{ person }}
@@ -84,13 +84,13 @@
+ class="btn btn-action">
{{ 'Invert'|trans }}
- {{ 'Merge'|trans }}
+ {{ 'Merge'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
index f8f80bd56..2c424ca37 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
@@ -21,7 +21,7 @@
- {{ 'Next'|trans }}
+ {{ 'Next'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
index ffda32db6..df0a99450 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
@@ -56,10 +56,10 @@
-
+
-
+
{{ 'Merge'|trans }}
@@ -122,7 +122,7 @@
-
+
-
+
{{ 'Associate manually a duplicate person' | trans }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
index 9ae03e174..552517d8a 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig
@@ -31,10 +31,10 @@
{{ form_widget(edit_form) }}
{{ form_end(edit_form) }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
index 485771f51..04b32ee57 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/list.html.twig
@@ -48,12 +48,12 @@
{% if is_granted('CHILL_REPORT_SEE', report) %}
-
+
{% endif %}
{% if is_granted('CHILL_REPORT_UPDATE', report) %}
-
+
{% endif %}
@@ -71,7 +71,7 @@
-
+
{{ 'Create a new report'|trans }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
index 1fc18a735..8296045c2 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/new.html.twig
@@ -29,10 +29,10 @@
{{ form_row(form.cFData) }}
{{ form_end(form) }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
index 67983a7f8..6fbfbde17 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/select_report_type.html.twig
@@ -27,7 +27,7 @@
- {{ 'Back to the list'|trans }}
+ {{ 'Back to the list'|trans }}
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
index f1c6ffdae..752e22684 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Report/view.html.twig
@@ -46,11 +46,11 @@
diff --git a/src/Bundle/ChillReportBundle/Resources/views/Timeline/report.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Timeline/report.html.twig
index 7929fed9e..4840598a3 100644
--- a/src/Bundle/ChillReportBundle/Resources/views/Timeline/report.html.twig
+++ b/src/Bundle/ChillReportBundle/Resources/views/Timeline/report.html.twig
@@ -25,13 +25,13 @@
-
+
{{ 'View the report'|trans }}
{% if is_granted('CHILL_REPORT_UPDATE', report) %}
-
+
{{ 'Update the report'|trans }}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
index a90f34553..329e36708 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_list.html.twig
@@ -63,7 +63,7 @@
{% if workflow_transitions(task)|length > 0 %}
-
+
{% for transition in workflow_transitions(task) %}
{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
@@ -73,16 +73,16 @@
{% endif %}
-
+
{% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
-
+
{% endif %}
{% if is_granted('CHILL_TASK_TASK_DELETE', task) %}
-
+
{% endif %}
@@ -101,24 +101,24 @@
{% if person is not null %}
-
+
{{ 'Back to the list' | trans }}
{% endif %}
{% if user is not null %}
-
+
{{ 'Back to the list' | trans }}
{% endif %}
{% if person is not null %}
-
+
{{ 'Add a new task' | trans }}
{% endif %}
{% if user is not null %}
-
+
{{ 'Add a new task' | trans }}
{% endif %}
@@ -180,7 +180,7 @@
{% if person is not null %}
-
+
{{ 'Add a new task' | trans }}
{% endif %}
@@ -197,7 +197,7 @@
{% if person is not null %}
-
+
{{ 'Add a new task' | trans }}
{% endif %}
@@ -229,7 +229,7 @@
{% if person is not null and is_granted('CHILL_TASK_TASK_CREATE', person) %}
-
+
{{ 'Add a new task' | trans }}
{% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
index c43aaf0a8..1275ba7ec 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
@@ -36,7 +36,7 @@
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
index 7dc48f058..0a602703f 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
@@ -85,7 +85,7 @@
-
- {{'Change task status'|trans}}
+ {{'Change task status'|trans}}
{% for transition in workflow_transitions(task) %}
{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
@@ -107,14 +107,14 @@
{% endif %}
{% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
-
+
{{ 'Edit the task'|trans }}
{% endif %}
{% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
-
+
{{ 'Delete'|trans }}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
index fc27ee8c4..1199244cb 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
@@ -20,12 +20,12 @@
-
+
{{ 'Back to the list'|trans }}
- {{ form_widget(form.submit, { 'attr' : { 'class' : "sc-button bt-task-exchange green" }, 'label': task_workflow_metadata(task, 'transition.apply_transition_submit_label', transition)|default('apply')|trans } ) }}
+ {{ form_widget(form.submit, { 'attr' : { 'class' : "btn btn-task-exchange green" }, 'label': task_workflow_metadata(task, 'transition.apply_transition_submit_label', transition)|default('apply')|trans } ) }}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition.html.twig
index fe65a1f1f..7b717b990 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition.html.twig
@@ -34,12 +34,12 @@
-
+
{{ "View the task"|trans }}
-
+
{{ "Edit task"|trans }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
index 89b62f567..856dc8587 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
@@ -34,12 +34,12 @@
{% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', tp) %}
-
+
{% endif %}
{% if is_granted('CHILL_3PARTY_3PARTY_SHOW', tp) %}
-
+
{% endif %}
@@ -58,7 +58,7 @@
{% if is_granted('CHILL_3PARTY_3PARTY_CREATE') %}
-
+
{{ "New third party"|trans }}
{% endif %}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
index 12fe160a0..6fe6f2ea5 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/new.html.twig
@@ -20,12 +20,12 @@
-
+
{{ 'Back to the list'|trans }}
- {{ form_widget(form.submit, {'label': 'Create', 'attr': {'class': 'sc-button bt-new' }}) }}
+ {{ form_widget(form.submit, {'label': 'Create', 'attr': {'class': 'btn btn-new' }}) }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
index 2191d0c69..783b06e82 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/show.html.twig
@@ -49,14 +49,14 @@
-
+
{{ 'Cancel'|trans }}
{% if is_granted('CHILL_3PARTY_3PARTY_UPDATE', thirdParty) %}
-
+
{{ 'Update'|trans }}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
index 7e3244e32..9b68c36e5 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/update.html.twig
@@ -24,11 +24,11 @@
-
+
{{ 'Back to the list'|trans }}
- {{ form_row(form.submit, {'label': 'Update', 'attr': {'class': 'sc-button bt-update' }}) }}
+ {{ form_row(form.submit, {'label': 'Update', 'attr': {'class': 'btn btn-update' }}) }}