From db35804629209c23c6f6a706e4bdceef2d1b6995 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 28 May 2018 17:05:28 +0200 Subject: [PATCH] suite --- app/assets/stylesheets/plume_print.css.scss | 52 +++++++++++++++--- app/assets/stylesheets/public/plume.css.scss | 1 + app/controllers/public/plumes_controller.rb | 5 ++ app/views/public/plumes/_sommaire.html.haml | 6 ++- app/views/public/plumes/breves.html.haml | 15 ++++-- app/views/public/plumes/print.html.haml | 55 +++++++++++++++++++- 6 files changed, 120 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/plume_print.css.scss b/app/assets/stylesheets/plume_print.css.scss index bea44aa..c60aa0f 100644 --- a/app/assets/stylesheets/plume_print.css.scss +++ b/app/assets/stylesheets/plume_print.css.scss @@ -6,10 +6,34 @@ $beige:#F1F0EE; @import "qi_css/grid"; img{ opacity:1; + position:relative; + z-index:100; } + + +#mentions{ + background:$beige; + color:$marron; + position:absolute; + bottom:0; + left:0; + right:0; + padding:15px 30px; + margin-top:10px; + padding-bottom:25px; + + .legals{ + text-style:italic; + font-size:0.9em; + + } + font-size:0.9em; + p{margin-top:0; + margin-bottom:4px;} +} #couv{ height:685px; @@ -162,6 +186,7 @@ html{ display: block; clear: both; width:788px; + margin:auto; position:relative; min-height: 295mm; page-break-after: always; @@ -228,28 +253,32 @@ html{ .sommaire{ float:left; - width:30%; + width:295px; text-align:left; - + margin-left:40px; .sommaire_panel{ background:$marron; - padding:20px; + padding:10px; .content{ - padding:10px 20px; + padding:8px 16px; border:dashed 1px white; h2{ font-weight:bold; color:white; - font-size:40px; + font-size:28px; + margin-bottom:10px; + text-align:center; text-transform:uppercase; margin-top:0; padding-top:0; + padding-top:5px; } h3{ text-transform:uppercase; margin:0; padding:0; + font-size:18px; margin-top:10px; font-weight:bold; color:white; @@ -258,7 +287,7 @@ html{ a{ display:block; color:black; - font-size:18px; + font-size:15px; &:hover{ text-decoration:none; } @@ -404,4 +433,15 @@ h1,h2,h3,h4{ text-align:left; +} + +#edito_place{ + padding-top:20px; + margin-left:305px; + .left{ + text-transform:uppercase; + font-size:25px; + color:$marron; + font-weight:bold; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/public/plume.css.scss b/app/assets/stylesheets/public/plume.css.scss index b87744c..db3fa53 100644 --- a/app/assets/stylesheets/public/plume.css.scss +++ b/app/assets/stylesheets/public/plume.css.scss @@ -195,6 +195,7 @@ $vert:#7BAE53; font-size:30px; margin-top:15px; font-weight:bold; + line-height:1em; } h2{ font-size:20px; diff --git a/app/controllers/public/plumes_controller.rb b/app/controllers/public/plumes_controller.rb index 4e0afe3..c0b6001 100644 --- a/app/controllers/public/plumes_controller.rb +++ b/app/controllers/public/plumes_controller.rb @@ -53,8 +53,13 @@ class Public::PlumesController < ApplicationController layout: false, #page_size: 'A4', zoom: 1, + + #page_width: 300, + #page_height:320, + page_width: 210, page_height:297, + viewport_size: '800x600', template: "public/plumes/print.html.haml" , diff --git a/app/views/public/plumes/_sommaire.html.haml b/app/views/public/plumes/_sommaire.html.haml index 45dd72f..1195a4a 100644 --- a/app/views/public/plumes/_sommaire.html.haml +++ b/app/views/public/plumes/_sommaire.html.haml @@ -10,8 +10,10 @@ -plume_cat.plume_articles.each do |plume_article| =link_to plume_article.title, public_plume_article_path(plume_article) - =link_to agenda_public_plume_path(@plume) do - %h3 Agenda + =link_to breves_public_plume_path(@plume) do %h3 Brèves + + =link_to agenda_public_plume_path(@plume) do + %h3 Agenda \ No newline at end of file diff --git a/app/views/public/plumes/breves.html.haml b/app/views/public/plumes/breves.html.haml index 3f834ac..d2b9387 100644 --- a/app/views/public/plumes/breves.html.haml +++ b/app/views/public/plumes/breves.html.haml @@ -13,12 +13,17 @@ -@breve_cat = @plume.plume_cats.where(:title => "Brèves").first -if @breve_cat - -@breve_cat.plume_articles.each do |plume_article| - .plume_breve - %h2=plume_article.title + -@breve_cat.plume_articles.order(:position).each do |plume_article| + -if !plume_article.breakpage + .plume_breve + %h2=plume_article.title - .render_block - =render plume_article.block + .render_block + =render plume_article.block + + -if plume_article.author? + .author + =plume_article.author .clear diff --git a/app/views/public/plumes/print.html.haml b/app/views/public/plumes/print.html.haml index 7afa8cd..8b0b20a 100644 --- a/app/views/public/plumes/print.html.haml +++ b/app/views/public/plumes/print.html.haml @@ -56,10 +56,62 @@ %br 04 76 91 34 33 - contact@lepicvert.asso.fr - www.lepicvert.org + .page + -plume_article = @plume.plume_articles.where(:plume_cat_id => (@plume.plume_cats.where(:title => "Edito").first.id if @plume.plume_cats.where(:title => "Edito").first)).first + -if plume_article + -@plume_article = plume_article + + -if plume_article.article_type == "page" or (plume_article.article_type == "demi") and plume_article.plume_cat + .page_header{:style => "background:transparent;"} + .right + =image_tag "http://lepicvert.org/plume-header2.png" + %span + La Plume + ="N°#{@plume.number}" + + .clear + + + .sommaire{:style => ("margin-top:20px" if @plume.id == 3)} + =render :partial => "sommaire" + + #edito_place + + .page_inner{:style => ("padding-top:0" )} + .left= plume_article.plume_cat.title + + %h1{:style => ("font-size:15px;" if @plume.id == 3)}=plume_article.title + + .render_block{:style => ("font-size:12.6px;" if @plume.id == 3)} + =render plume_article.block + + -if plume_article.author? + .author + =plume_article.author + + + + .clear + + #mentions + %p.big + %strong Comité de rédaction et de relecture : + %p + =@plume.redaction_credits + + %p + %strong Crédit photo couverture : + =@plume.credits + + .legals + Imprimé sur papier 100% recyclé - Imprimerie Ruzzin + + + .page -i = 0 -@plume.plume_cats.order(:position).each do |plume_cat| - -if plume_cat.title != "Brèves" + -if plume_cat.title != "Brèves" and plume_cat.title != "Edito" -plume_cat.plume_articles.order("position").each do |plume_article| -@plume_article = plume_article -if plume_article.article_type == "page" or (plume_article.article_type == "demi" and i ==0) and plume_article.plume_cat @@ -130,6 +182,7 @@ -if plume_article.author? .author =plume_article.author + .clear =image_tag "http://lepicvert.org/adhesion.png", :style => "width:108%;margin-top:50px;margin-left:-4%;max-width:10000%;"