diff options
| author | cedricnjanga | 2017-12-08 18:09:30 +0100 | 
|---|---|---|
| committer | cedricnjanga | 2017-12-08 18:24:09 +0100 | 
| commit | 7b953e7a5965f753b3a8caebe0918058e0db2893 (patch) | |
| tree | d52aaba3b41fb5642ff27ccb3a6fbcf987c46494 | |
| parent | 579e404e3171dd35268b03cf392f4e4f705036e8 (diff) | |
| download | chouette-core-7b953e7a5965f753b3a8caebe0918058e0db2893.tar.bz2 | |
Refs #5162 refacto import resource view + add missing logos on other views
| -rw-r--r-- | app/assets/stylesheets/typography/_sboiv.sass | 4 | ||||
| -rw-r--r-- | app/views/compliance_check_sets/show.html.slim | 25 | ||||
| -rw-r--r-- | app/views/import_resources/index.html.slim | 2 | ||||
| -rw-r--r-- | config/locales/compliance_check_sets.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/compliance_check_sets.fr.yml | 3 | 
5 files changed, 24 insertions, 11 deletions
| diff --git a/app/assets/stylesheets/typography/_sboiv.sass b/app/assets/stylesheets/typography/_sboiv.sass index 6c82a5739..f694306c4 100644 --- a/app/assets/stylesheets/typography/_sboiv.sass +++ b/app/assets/stylesheets/typography/_sboiv.sass @@ -80,7 +80,7 @@  .sb-network:before    content: '\e90c' -.sb-compliance-check-set:before +.sb-compliance_check_set:before, .sb-import_resource:before    content: '\e90d'  .sb-OAT:before @@ -104,7 +104,7 @@  .sb-LDA:before    content: '\e914' -.sb-referential:before +.sb-referential:before, .sb-workbench:before    content: '\e915'  .sb-compliance_control_set:before diff --git a/app/views/compliance_check_sets/show.html.slim b/app/views/compliance_check_sets/show.html.slim index c9d0583a5..5d8e3fa15 100644 --- a/app/views/compliance_check_sets/show.html.slim +++ b/app/views/compliance_check_sets/show.html.slim @@ -1,11 +1,6 @@  - breadcrumb :compliance_check_sets, @workbench, @compliance_check_set  / PageHeader -= pageheader 'jeux-de-donnees', -             @compliance_check_set.name, -             '', -             t('last_update', time: l(@compliance_check_set.updated_at, format: :short)) do - -  / Below is secundary actions & optional contents (filters, ...) +- content_for :page_header_content do    .row      .col-lg-12.text-right.mb-sm        - @compliance_check_set.action_links.each do |link| @@ -13,7 +8,23 @@              method: link.method,              data: link.data,              class: 'btn btn-primary' do -          = link.content +              = link.content + +- page_header_content_for @compliance_check_set +/ = pageheader 'jeux-de-donnees', +/              @compliance_check_set.name, +/              '', +/              t('last_update', time: l(@compliance_check_set.updated_at, format: :short)) do + +  / Below is secundary actions & optional contents (filters, ...) +  / .row +  /   .col-lg-12.text-right.mb-sm +  /     - @compliance_check_set.action_links.each do |link| +  /       = link_to link.href, +  /           method: link.method, +  /           data: link.data, +  /           class: 'btn btn-primary' do +  /         = link.content  / PageContent  .page_content.import_messages diff --git a/app/views/import_resources/index.html.slim b/app/views/import_resources/index.html.slim index 1c4a5a765..728d9f4a8 100644 --- a/app/views/import_resources/index.html.slim +++ b/app/views/import_resources/index.html.slim @@ -1,4 +1,4 @@ - +- breadcrumb :import_resources, @import, @import_resources  .page_content.import_messages    .container-fluid      .row diff --git a/config/locales/compliance_check_sets.en.yml b/config/locales/compliance_check_sets.en.yml index 49323c91f..1081b1d66 100644 --- a/config/locales/compliance_check_sets.en.yml +++ b/config/locales/compliance_check_sets.en.yml @@ -19,6 +19,7 @@ en:      executed:        title: Executed control report %{name}      show: +      title: Compliance check set report        table_state: "%{lines_status} lines imported on %{lines_in_compliance_check_set} in the archive"        table_explanation: "These controls apply to all imported data and condition the construction of your organization's offer."        metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a" diff --git a/config/locales/compliance_check_sets.fr.yml b/config/locales/compliance_check_sets.fr.yml index 0382f2937..8f1c066e7 100644 --- a/config/locales/compliance_check_sets.fr.yml +++ b/config/locales/compliance_check_sets.fr.yml @@ -10,11 +10,12 @@ fr:            name_compliance_control_set: Indiquez le nom d'un jeu de contrôle            error_period_filter: La date de fin doit être supérieure ou égale à la date de début0      index: -      title: "Liste des jeux de contrôles" +      title: "Liste des jeux de contrôles"            search_no_results: Aucun rapport de contrôle ne correspond à votre recherche      executed:        title: Jeu de contrôles exécutés %{name}      show: +      title: Rapport de contrôle        table_state: "%{lines_status} lignes importées sur %{lines_in_compliance_check_set} présentes dans l'archive"        table_explanation: Ces contrôles s’appliquent pour toutes les données importées et conditionnent la construction de l’offre de votre organisation        metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a" | 
