nicolas/pmr_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

articles

Browse Source
This commit is contained in:
Nicolas Bally 2016-02-19 00:29:10 +01:00
parent 184385129d
commit c7a1785adc
5 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/assets/stylesheets/public.scss
View File

@ -191,6 +191,10 @@ h1,h2,h3{
.q_counter_holder{ .q_counter_holder{
text-align:center; text-align:center;
p{
margin-top:10px;
}
} }
.socials_links{ .socials_links{
@ -198,7 +202,7 @@ h1,h2,h3{
margin-right:10px; margin-right:10px;
position:absolute; position:absolute;
right:10px; right:10px;
bottom:120px; top:20px;
a, .top_link{ a, .top_link{
display:inline-block; display:inline-block;
padding:10px 0px; padding:10px 0px;
@ -301,4 +305,31 @@ padding:10px 20px;
float:left; float:left;
} }
}
.article_large{
.date{
width:25%;
float:left;
border-right:1px solid #8d8d8d;
text-align:right;
margin-top:20px;
box-sizing:border-box;
padding-right:20px;
min-height:240px;
}
.description{
margin-left:25%;
padding-left:20px;
p{
max-width:70%;
}
}
}
#articles{
margin-bottom:100px;
margin-top:40px;
} }

2
app/views/layouts/public.html.haml
View File

@ -141,7 +141,7 @@
.row .row
.columns.span_4{:style => "padding:10px;"} .columns.span_4{:style => "padding:10px;"}
=link_to image_tag("/logo-w.png", :class => "logo"),"/" =link_to image_tag("/logo-w.png", :class => "logo"),"/", :style => "margin-left:20Px;"
%br %br
%br %br
%br %br

35
app/views/public/articles/_article.html.haml
View File

@ -2,27 +2,22 @@
-img_url = article.image_file.file.large.url if article.image_file -img_url = article.image_file.file.large.url if article.image_file
.article_large
.article-1x{:style => "background-image:url('#{img_url}');"}
 
=link_to article_path(:slug => lang_article.slug, :lang => @lang.slug), :style => "background-image:url('#{img_url}');", :class => "article-1x" do .date
=l(article.published_at, :format => :human_date)
.overlay
=#image_tag( article.image_file.file.large.medium.url ) if article.image_file
.description .description
-if !article.title_cached -if !article.title_cached
%h2= lang_article.title %h3= lang_article.title
%p.date
="le "+l(article.published_at, :format => :human_date)
="-"
%span.coms=i(:"comment-o")+" "+article.comments.count.to_s
=simple_format lang_article.description =simple_format lang_article.description
%p.read_more
Lire la suite =#%p.read_more
=#Lire la suite
-if article.image_file and article.image_file.photograph .clear
-@page_images_credits << article.image_file.photograph

21
app/views/public/articles/index.html.haml
View File

@ -1,26 +1,11 @@
.center
.menu_item_title
-if @lang.slug == "fr"
%h1 Articles du blog
-elsif @lang.slug == "en"
%h1 Blog
=render :partial => "article", :object => @articles[0], :as => :article #articles=render @articles
.more_articles #articles_pagination= paginate @articles
-i = 0
-@articles[1..20].each do |article|
-i = i +1
=render :partial => "article_x2", :object => article, :as => :article, :locals => {:i => i}
.clear
%br
%br
%br
#articles_pagination= paginate @articles

12
config/routes.rb
View File

@ -41,17 +41,19 @@ Rails.application.routes.draw do
get "evenements/:id.html" => "public/events#show", :as => "public_event" get "evenements/:id.html" => "public/events#show", :as => "public_event"
get "evenements.html" => "public/events#index", :as => "public_events" get "evenements.html" => "public/events#index", :as => "public_events"
get 'blog/:id.html' => "public/articles#show", :as => "public_article"
get 'actualite/:id.html' => "public/articles#show", :as => "public_article"
get "blog/archives/:year/:month.html"=> "public/articles#archives", :as => :archive_public_article get "actualite/archives/:year/:month.html"=> "public/articles#archives", :as => :archive_public_article
get "blog/tags/:id.html"=> "public/articles#tags", :as => :public_tag get "actualite/tags/:id.html"=> "public/articles#tags", :as => :public_tag
get "categorie/:slug.:f"=> "public/articles#category", :as => :category_public_article, :f => "html" get "categorie/:slug.:f"=> "public/articles#category", :as => :category_public_article, :f => "html"
get ':lang/blog/:slug.:f' => 'public/articles#show', :as => :article, :f => "html" get ':lang/actualite/:slug.:f' => 'public/articles#show', :as => :article, :f => "html"
get ':lang/blog.:f' => 'public/articles#index', :as => :articles, :f => "html" get ':lang/actualite.:f' => 'public/articles#index', :as => :articles, :f => "html"
get ':lang/petitions/:slug.:f' => 'public/petitions#show', :as => :petition, :f => "html" get ':lang/petitions/:slug.:f' => 'public/petitions#show', :as => :petition, :f => "html"