diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml index 35c484d28..84a9954da 100644 --- a/app/views/dossiers/_infos_dossier.html.haml +++ b/app/views/dossiers/_infos_dossier.html.haml @@ -1,8 +1,9 @@ -=javascript_include_tag "http://code.highcharts.com/highcharts.js", "chartkick" -.row{id: 'infos_dossier'} += javascript_include_tag "http://code.highcharts.com/highcharts.js", "chartkick" +.row#infos_dossier .col-md-6 - %h4.text-info= @dossier.nom_projet - %div{style: 'margin-left:10px; padding-top:5px'} + %h4.text-info + = @dossier.nom_projet + %div .description - begin - @dossier.description.split(/(?:\n\r?|\r\n?')/).each do |line| @@ -12,27 +13,23 @@ ='' %br .col-lg-6.col-md-6 - %h4 - ='Montant total ' + %h4 Montant total - %div{style: 'margin-left:10px'} + %p =number_to_currency(@dossier.montant_projet.to_f, :unit => " ", :separator => ",", :delimiter => " ") !='€' .col-lg-6.col-md-6 - %h4 - = 'Début du projet souhaité ' - - %div{style: 'margin-left:10px'} - =@dossier.date_fr + %h4 Début du projet souhaité + %p + = @dossier.date_fr .col-lg-6.col-md-6 %br - %h4 - ='Contact' + %h4 Contact - %a{href: "mailto:#{@dossier.mail_contact}", style: 'margin-left:10px'} - =@dossier.mail_contact + %a{ href: "mailto:#{@dossier.mail_contact}" } + = @dossier.mail_contact -if !request.url.include?('admin') .col-lg-6.col-md-6 diff --git a/app/views/dossiers/_infos_entreprise.html.haml b/app/views/dossiers/_infos_entreprise.html.haml index 41142e31d..c60f9477d 100644 --- a/app/views/dossiers/_infos_entreprise.html.haml +++ b/app/views/dossiers/_infos_entreprise.html.haml @@ -2,7 +2,7 @@ %h4 = @entreprise.raison_sociale_or_name -#infos_entreprise +.row#infos_entreprise .col-lg-6.col-md-6 %dl.dl-horizontal @@ -24,9 +24,12 @@ %dt Capital social : %dd= @entreprise.pretty_capital_social - %div.col-lg-6.col-md-6{style:'margin-left:-2%'} + .col-lg-6.col-md-6 %dl.dl-horizontal - %dt - Adresse : + %dt Adresse : %dd - %address= @etablissement.adresse.gsub(/[\n]/, '
').html_safe + %address + - @etablissement.adresse.split("\n").each do |line| + = line + %br +