aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/assets/stylesheets/components/_tables.sass10
-rw-r--r--app/views/compliance_control_sets/show.html.slim10
-rw-r--r--config/locales/compliance_control_sets.en.yml3
-rw-r--r--config/locales/compliance_control_sets.fr.yml3
4 files changed, 21 insertions, 5 deletions
diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass
index 8fe7be374..178ec2f36 100644
--- a/app/assets/stylesheets/components/_tables.sass
+++ b/app/assets/stylesheets/components/_tables.sass
@@ -247,6 +247,16 @@
width: 35px
height: 35px
margin: 5px
+ &.with_text
+ width: initial
+ > a, > button
+ border-radius: 4%
+ text-decoration: none
+ span
+ &.fa
+ padding-left: 10px
+ span
+ padding: 0 10px 0 0
> a, > button
display: block
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 7767bd0d9..f45b0227a 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -96,9 +96,13 @@
cls: 'table has-filter has-search'
.select_toolbox
ul
- li.st_action
+ li.st_action.with_text
= link_to select_type_compliance_control_set_compliance_controls_path(@compliance_control_set.id)
span.fa.fa-plus
- li.st_action
+ span
+ = t('compliance_control_sets.actions.add_compliance_control')
+ li.st_action.with_text
= link_to new_compliance_control_set_compliance_control_block_path(@compliance_control_set.id)
- span.fa.fa-plus-square
+ span.fa.fa-plus
+ span
+ = t('compliance_control_sets.actions.add_compliance_control_block')
diff --git a/config/locales/compliance_control_sets.en.yml b/config/locales/compliance_control_sets.en.yml
index f72342894..34f25e1e1 100644
--- a/config/locales/compliance_control_sets.en.yml
+++ b/config/locales/compliance_control_sets.en.yml
@@ -13,7 +13,8 @@ en:
edit: Edit
show: Show
destroy: Destroy
- add_compliance_control: Add a compliance control
+ add_compliance_control: Compliance Control
+ add_compliance_control_block: Compliance Control Block
destroy_confirm: Are you sur ?
filters:
name: 'Enter name ...'
diff --git a/config/locales/compliance_control_sets.fr.yml b/config/locales/compliance_control_sets.fr.yml
index c31eb9423..83be7da2b 100644
--- a/config/locales/compliance_control_sets.fr.yml
+++ b/config/locales/compliance_control_sets.fr.yml
@@ -15,7 +15,8 @@ fr:
edit: Editer
show: Consulter
destroy: Supprimer
- add_compliance_control: Ajouter un JDC
+ add_compliance_control: Contrôle
+ add_compliance_control_block: Groupe de contrôles
loaded: Charger le contrôle
destroy_confirm: Etes vous sûr de supprimer ce jeux de contrôle ?
filters: