DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

clean views

Browse source
This commit is contained in:
Tanguy PATTE 2015-08-20 16:04:36 +02:00
parent a265f2e48a
commit 260a664738
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/views/dossiers/_infos_dossier.html.haml
View file

@ -1,8 +1,9 @@
=javascript_include_tag "http://code.highcharts.com/highcharts.js", "chartkick" = javascript_include_tag "http://code.highcharts.com/highcharts.js", "chartkick"
.row{id: 'infos_dossier'} .row#infos_dossier
.col-md-6 .col-md-6
%h4.text-info= @dossier.nom_projet %h4.text-info
%div{style: 'margin-left:10px; padding-top:5px'} = @dossier.nom_projet
%div
.description .description
- begin - begin
- @dossier.description.split(/(?:\n\r?|\r\n?')/).each do |line| - @dossier.description.split(/(?:\n\r?|\r\n?')/).each do |line|
@ -12,27 +13,23 @@
='' =''
%br %br
.col-lg-6.col-md-6 .col-lg-6.col-md-6
%h4 %h4 Montant total
='Montant total '
%div{style: 'margin-left:10px'} %p
=number_to_currency(@dossier.montant_projet.to_f, :unit => " ", :separator => ",", :delimiter => " ") =number_to_currency(@dossier.montant_projet.to_f, :unit => " ", :separator => ",", :delimiter => " ")
!='€' !='€'
.col-lg-6.col-md-6 .col-lg-6.col-md-6
%h4 %h4 Début du projet souhaité
= 'Début du projet souhaité ' %p
= @dossier.date_fr
%div{style: 'margin-left:10px'}
=@dossier.date_fr
.col-lg-6.col-md-6 .col-lg-6.col-md-6
%br %br
%h4 %h4 Contact
='Contact'
%a{href: "mailto:#{@dossier.mail_contact}", style: 'margin-left:10px'} %a{ href: "mailto:#{@dossier.mail_contact}" }
=@dossier.mail_contact = @dossier.mail_contact
-if !request.url.include?('admin') -if !request.url.include?('admin')
.col-lg-6.col-md-6 .col-lg-6.col-md-6

13
app/views/dossiers/_infos_entreprise.html.haml
View file

@ -2,7 +2,7 @@
%h4 %h4
= @entreprise.raison_sociale_or_name = @entreprise.raison_sociale_or_name
#infos_entreprise .row#infos_entreprise
.col-lg-6.col-md-6 .col-lg-6.col-md-6
%dl.dl-horizontal %dl.dl-horizontal
@ -24,9 +24,12 @@
%dt Capital social : %dt Capital social :
%dd= @entreprise.pretty_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 %dl.dl-horizontal
%dt %dt Adresse :
Adresse :
%dd %dd
%address= @etablissement.adresse.gsub(/[\n]/, '<br>').html_safe %address
- @etablissement.adresse.split("\n").each do |line|
= line
%br