diff --git a/app/assets/stylesheets/plume_print.css.scss b/app/assets/stylesheets/plume_print.css.scss index c02c6a0..52c2948 100644 --- a/app/assets/stylesheets/plume_print.css.scss +++ b/app/assets/stylesheets/plume_print.css.scss @@ -97,7 +97,7 @@ body{ -webkit-text-size-adjust: none; font-weight:normal; height:100%; - width:102%; + width:100%; padding:0; margin:0; font-family:Lato, serif; diff --git a/app/controllers/public/plumes_controller.rb b/app/controllers/public/plumes_controller.rb index b0152b1..4e0afe3 100644 --- a/app/controllers/public/plumes_controller.rb +++ b/app/controllers/public/plumes_controller.rb @@ -47,6 +47,7 @@ class Public::PlumesController < ApplicationController render :layout => false end format.pdf do + @pdf = true render pdf: 'file_name', disposition: 'inline', # default 'inline' layout: false, diff --git a/app/views/admin/plumes/_plume.html.haml b/app/views/admin/plumes/_plume.html.haml index 5e2f235..2f706c2 100644 --- a/app/views/admin/plumes/_plume.html.haml +++ b/app/views/admin/plumes/_plume.html.haml @@ -2,9 +2,11 @@ %td=plume.title %td - =link_to "Voir", public_plume_path(plume), :target => "plume_#{plume.id}" + =link_to "Version en ligne", public_plume_path(plume), :target => "plume_#{plume.id}" ="-" - =link_to "Voir la plume (pdf)", print_public_plume_path(plume, :format => "pdf"), :target => "plume_pdf_#{plume.id}" + =link_to "Version Pdf", print_public_plume_path(plume, :format => "pdf"), :target => "plume_pdf_#{plume.id}" + ="-" + =link_to "Aperçu taille PDF", print_public_plume_path(plume, :format => "html"), :target => "plume_pdfh_#{plume.id}" diff --git a/app/views/public/plumes/print.html.haml b/app/views/public/plumes/print.html.haml index 026c5ae..0aefc62 100644 --- a/app/views/public/plumes/print.html.haml +++ b/app/views/public/plumes/print.html.haml @@ -123,5 +123,12 @@ %p N’hésitez pas à nous contacter et vous inscrire au 04 76 91 34 33, par mail à contact@lepicvert.asso.fr, ou en consultant notre site www.lepicvert.org - + +-if !@pdf + :scss + + .page{ + margin:20px auto; + box-shadow:0 0 25px rgba(0,0,0,0.3); + } \ No newline at end of file