Merge pull request #87 from af83/4663-compliance_controls_layouts

update layout show/select_types for compliance control Refs #4663

6 files changed, 60 insertions, 13 deletions

diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim
index 088532447..8c56d145f 100644
--- a/app/views/compliance_controls/_form.html.slim
+++ b/app/views/compliance_controls/_form.html.slim
@@ -2,7 +2,7 @@
   .row
     .col-lg-12
       = f.input :name
-      = f.input :type, as: :select, collection: ComplianceControl.subclasses
+      = f.input :type, as: :select, collection: ComplianceControl.subclasses, disabled: true
       = f.input :code
       = f.input :criticity
       = f.association :compliance_control_block, collection: @compliance_control_set.compliance_control_blocks, label_method: :label_method
diff --git a/app/views/compliance_controls/new.html.slim b/app/views/compliance_controls/new.html.slim
index 0651461cb..20ed371ab 100644
--- a/app/views/compliance_controls/new.html.slim
+++ b/app/views/compliance_controls/new.html.slim
@@ -1,5 +1,8 @@
-= pageheader 'compliance-control',
-        t('compliance_control.index.new')
+/ PageHeader
+- header_params = ['jeux-de-donnees',
+        t('compliance_control_sets.index.new_control'),
+        '']
+= pageheader(*header_params) do
 
 
 .page_content
diff --git a/app/views/compliance_controls/select_type.html.slim b/app/views/compliance_controls/select_type.html.slim
index 66a38279d..90811f4d1 100644
--- a/app/views/compliance_controls/select_type.html.slim
+++ b/app/views/compliance_controls/select_type.html.slim
@@ -1,8 +1,18 @@
-= form_tag(new_compliance_control_set_compliance_control_path, method: :get) do
-  - @sti_subclasses.each do |klass|
-    = radio_button_tag(:sti_class, klass)
-    = label_tag(:sti_class, klass)
-  end
-  = submit_tag("suivant")
-end
+/ PageHeader
+- header_params = ['jeux-de-donnees',
+        t('compliance_control_sets.index.select_types'),
+        '']
+= pageheader(*header_params) do
 
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = form_tag(new_compliance_control_set_compliance_control_path, method: :get) do
+          - @sti_subclasses.each do |klass|
+            .radio
+              = radio_button_tag(:sti_class, klass)
+              = label_tag(:sti_class, klass)
+          .text-right
+            = submit_tag t('compliance_control_sets.actions.loaded'), class: "btn btn-outline-primary"
\ No newline at end of file
diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim
index a665f1ab1..7affcf2a3 100644
--- a/app/views/compliance_controls/show.html.slim
+++ b/app/views/compliance_controls/show.html.slim
@@ -1,3 +1,32 @@
-= @compliance_control.inspect
-br
-= @compliance_control.compliance_control_block.inspect
+/ PageHeader
+= pageheader 'jeux-de-donnees',
+        @compliance_control.name,
+        ''
+/ PageContent
+.page_content
+  .container-fluid
+    .row
+      .col-lg-6.col-md-6.col-sm-12.col-xs-12
+        /- @compliance_control.control_attributes.each_with_index do |(key,value), index|
+        = definition_list t('metadatas'),
+              { \
+                ComplianceControl.human_attribute_name(:name) => @compliance_control.name,
+                ComplianceControl.human_attribute_name(:code) => @compliance_control.code,
+                ComplianceControl.human_attribute_name(:criticity) => @compliance_control.criticity,
+                ComplianceControl.human_attribute_name(:comment) => @compliance_control.comment,
+              }.merge( \
+                {}.tap do |hash| \
+                  @compliance_control.control_attributes.each do |k, v| \
+                    hash[ComplianceControl.human_attribute_name(k)] = v \
+                  end \
+                end \
+              )
+        - if @compliance_control.compliance_control_block
+          = definition_list t('metadatas'),
+                  {}.merge( \
+                    {}.tap do |hash| \
+              @compliance_control.compliance_control_block.condition_attributes.each do |k, v| \
+                hash[ComplianceControl.human_attribute_name(k)] = v \
+              end \
+            end \
+          )
diff --git a/config/locales/compliance_control_sets.en.yml b/config/locales/compliance_control_sets.en.yml
index ae0d2bc53..83b14642c 100644
--- a/config/locales/compliance_control_sets.en.yml
+++ b/config/locales/compliance_control_sets.en.yml
@@ -3,6 +3,8 @@ en:
     index:
       title: Compliance control set
       new: New compliance control set
+      new_control: Creating a Control
+      select_types: Control Type Selection
       edit: Edit compliance control set
     actions:
       new: Add
diff --git a/config/locales/compliance_control_sets.fr.yml b/config/locales/compliance_control_sets.fr.yml
index 833ad723a..e1b56c820 100644
--- a/config/locales/compliance_control_sets.fr.yml
+++ b/config/locales/compliance_control_sets.fr.yml
@@ -3,6 +3,8 @@ fr:
     index:
       title: Jeux de contrôle
       new: Création d'un jeux de contrôle
+      new_control: Création d'un contrôle
+      select_types: Séléction du type de contrôle
       edit: Édition d'un jeux de contrôle
     actions:
       new: Ajouter
@@ -10,6 +12,7 @@ fr:
       show: Consulter
       destroy: Supprimer
       add_compliance_control: Ajouter un JDC
+      loaded: Charger le contrôle
       destroy_confirm: Etes vous sûr de supprimer ce jeux de contrôle ?
     filters:
       name: 'Indiquez un nom de jeux de contrôle...'