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

Fix bug : QP not appears on mini carte in infos_dossier page

Browse source
This commit is contained in:
Xavier J 2015-12-08 11:32:29 +01:00
parent 11596ade65
commit 9f9e8ca176
4 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/assets/stylesheets/carte.scss
View file

@ -7,16 +7,25 @@ table {
font-size: 13px; font-size: 13px;
} }
#map{ #carte_page {
@extend .col-md-12; #map {
@extend .col-lg-12; @extend .col-md-12;
@extend .col-lg-12;
height:600px; height: 600px;
}
#map.qp {
@extend .col-md-9;
@extend .col-lg-9;
}
} }
#map.qp { #infos_dossier {
@extend .col-md-9; #map.mini {
@extend .col-lg-9; height: 300px;
width: 100%;
}
} }
#qp_list { #qp_list {
@ -24,19 +33,14 @@ table {
@extend .col-lg-3; @extend .col-lg-3;
h3 { h3 {
margin-top:0px; margin-top: 0px;
} }
ul li { ul li {
margin-bottom:10px; margin-bottom: 10px;
} }
} }
#map.mini{
height:300px;
width:100%;
}
#map section.overlay { #map section.overlay {
position: absolute; position: absolute;
top: 0; top: 0;
@ -107,16 +111,15 @@ table {
pointer-events: none; pointer-events: none;
} }
.info { .info {
padding: 6px 8px; padding: 6px 8px;
font: 14px/16px Arial, Helvetica, sans-serif; font: 14px/16px Arial, Helvetica, sans-serif;
background: white; background: white;
background: rgba(255,255,255,0.8); background: rgba(255, 255, 255, 0.8);
box-shadow: 0 0 15px rgba(0,0,0,0.2); box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
border-radius: 5px; border-radius: 5px;
} }
.info h4 { .info h4 {
margin: 0 0 5px; margin: 0 0 5px;
color: #777; color: #777;

4
app/decorators/dossier_decorator.rb
View file

@ -16,6 +16,10 @@ class DossierDecorator < Draper::Decorator
DossierDecorator.case_state_fr state DossierDecorator.case_state_fr state
end end
def class_qp_active
'qp' if procedure.module_api_carto.quartiers_prioritaires
end
def state_color_class def state_color_class
return 'text-danger' if waiting_for_gestionnaire? return 'text-danger' if waiting_for_gestionnaire?
return 'text-info' if waiting_for_user? return 'text-info' if waiting_for_user?

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

@ -14,7 +14,9 @@
='' =''
- if @dossier.procedure.module_api_carto.use_api_carto - if @dossier.procedure.module_api_carto.use_api_carto
.col-lg-6.col-md-6 .col-lg-6.col-md-6
#map.mini
#map.mini{class: @dossier.class_qp_active}
%input{id: 'json_latlngs', type:'hidden', value: "#{@dossier.json_latlngs}"} %input{id: 'json_latlngs', type:'hidden', value: "#{@dossier.json_latlngs}"}
%input{id: 'quartier_prioritaires', type:'hidden', value: "#{@dossier.quartier_prioritaires.to_json}"} %input{id: 'quartier_prioritaires', type:'hidden', value: "#{@dossier.quartier_prioritaires.to_json}"}
%script{type: 'text/javascript'} %script{type: 'text/javascript'}

2
app/views/users/carte/show.html.haml
View file

@ -11,7 +11,7 @@
%br %br
%br %br
.row #carte_page.row
- if @dossier.procedure.module_api_carto.quartiers_prioritaires - if @dossier.procedure.module_api_carto.quartiers_prioritaires
#map.qp #map.qp
#qp_list #qp_list