diff options
| author | Alban Peignier | 2017-12-29 16:02:06 +0100 |
|---|---|---|
| committer | Alban Peignier | 2017-12-29 16:02:06 +0100 |
| commit | 2b37fb8783f0ac070259b1922831372cbe7e6b18 (patch) | |
| tree | 7b9e6e23eec838fae9403125551aba1a94d1dda8 | |
| parent | 0eb611e60abf1a828f2e63a163282acad934fae4 (diff) | |
| download | chouette-core-2b37fb8783f0ac070259b1922831372cbe7e6b18.tar.bz2 | |
Fixes CSS of import_messages in imports#show. Refs #4473
| -rw-r--r-- | app/assets/stylesheets/modules/import_messages.sass | 40 | ||||
| -rw-r--r-- | app/views/imports/_import_messages.html.slim | 19 | ||||
| -rw-r--r-- | app/views/imports/show.html.slim | 8 |
3 files changed, 54 insertions, 13 deletions
diff --git a/app/assets/stylesheets/modules/import_messages.sass b/app/assets/stylesheets/modules/import_messages.sass index e5666cbcd..6a088dc06 100644 --- a/app/assets/stylesheets/modules/import_messages.sass +++ b/app/assets/stylesheets/modules/import_messages.sass @@ -2,4 +2,42 @@ .status_icon padding-right: 20px h1 - padding-bottom: 20px + padding-bottom: 20px + + +.import_message-list + padding-bottom: 20px + + .import_messages-head + display: block + font-size: 1.8rem + font-weight: 700 + border-bottom: 2px solid #4b4b4b + padding: 5px 15px 6px 15px + + dl + dd, dt + display: inline-block + letter-spacing: normal + word-spacing: normal + text-rendering: auto + vertical-align: top + padding: 5px 15px 6px 15px + + dt + position: relative + width: 7% + font-weight: 700 + + &:before + content: "" + display: block + position: absolute + z-index: 1 + top: 0 + left: 0 + width: 250% + border-bottom: 1px solid rgba(164, 164, 164, 0.5) + + dd + width: 93%
\ No newline at end of file diff --git a/app/views/imports/_import_messages.html.slim b/app/views/imports/_import_messages.html.slim index 4f2755b1d..a10dce065 100644 --- a/app/views/imports/_import_messages.html.slim +++ b/app/views/imports/_import_messages.html.slim @@ -1,10 +1,11 @@ - - if import_messages.any? - dl#import_messages - - import_messages.each do | import_message | - dt.import_message - = import_message.criticity - dd.import_message - = t( ['import_messages', - 'compliance_check_messages', - import_message.message_key].join('.'), import_message.message_attributes.symbolize_keys) + .import_message-list + .import_messages-head Messages + dl + - import_messages.each do | import_message | + dt.criticity + = import_message.criticity + dd + = t( ['import_messages', + 'compliance_check_messages', + import_message.message_key].join('.'), import_message.message_attributes.symbolize_keys) diff --git a/app/views/imports/show.html.slim b/app/views/imports/show.html.slim index b23c4fdbb..cf137867b 100644 --- a/app/views/imports/show.html.slim +++ b/app/views/imports/show.html.slim @@ -14,12 +14,14 @@ .page_content .container-fluid .row + .col-lg-6.col-md-6.col-sm-12.col-xs-12 + = definition_list t('metadatas'), { 'Récupération des données' => '-', "Nom de l'archive" => @import.try(:file_identifier)} + + .row .col-lg-12 .error_messages = render 'import_messages', import_messages: @import.messages - .row - .col-lg-6.col-md-6.col-sm-12.col-xs-12 - = definition_list t('metadatas'), { 'Récupération des données' => '-', "Nom de l'archive" => @import.try(:file_identifier)} + - if @import.children.any? .row .col-lg-12 |
