aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGuillaume2017-10-19 15:28:18 +0200
committerGuillaume2017-10-19 15:28:18 +0200
commit86122f091fc58cccaa882e1d76368730f16d30da (patch)
treec1e4cd50aaaecc8b9283891e0abe44479e21c604 /app
parent87c14225229ae775d3af8c4ec2eef810788598e0 (diff)
downloadchouette-core-86122f091fc58cccaa882e1d76368730f16d30da.tar.bz2
modify UI for bottom buttons actions on compliance_control_sets#show, add new locales Refs #4752
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/components/_tables.sass10
-rw-r--r--app/views/compliance_control_sets/show.html.slim10
2 files changed, 17 insertions, 3 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')