design

app/assets/stylesheets/public.scss

@@ -38,7 +38,9 @@ body{
   margin:0;
   font-size:15px;
   color:#333333;
-  background:rgba(241,240,238,1);
+  background-color:rgba(241,240,238,0.2);
+  //background: url('/fond2.jpeg') center center fixed;
+  background-size: cover;
   
 }
 
@@ -307,19 +309,41 @@ margin:auto;
 
 #main{
   width:100%;
-  max-width:1200px;
+  max-width:1300px;
-  margin:auto;
+  margin:50px auto;
+  
   
   #corps{
     width:68%;
     float:left;
-    background:white;
+    background:rgba(255,255,255,0.95);
-    
+    padding:10px 20px;
     
   }
   #sidebar{
     width:30%;
     float:right;
+    background:white;
+    padding:10px 20px;
+    text-align:left;
+    
+    a.active{
+      font-weight:bold;
+      
+    }
+    ul{
+      padding-left:20px;
+      
+    }
+    li{
+      padding-bottom:10px;
+      ul{
+        padding-left:30px;
+        li{
+          padding-bottom:0;
+        }
+      }
+    }
     
     
   }
@@ -371,22 +395,42 @@ h1,h2,h3,h4{
   text-align:left;
 font-weight: 400;
 font-family:$header_font, Arial, sans-serif;
+color:#69952f;
+text-transform:uppercase;
+font-weight:bold;
+
 a{
-  color:black;
+  color:#69952f;
   
 }
 
 }
+
+
+h1{
+
+  
+  font-size:22px;
+  line-height:24px;
+  font-family:$header_font, Arial, sans-serif;
+}
+
+h2{
+  
+  color: #333333;
+  font-weight: bold;
+  font-size: 16px;
+  font-family: "source-sans-pro", Arial, sans-serif;
+  text-transform:none;
+}
+
 .date{
   margin-top:10px;
   margin-bottom:-20px;
   font-size:18px;
   font-family:$header_font, Arial, sans-serif;
 }
-h1{
+
-  font-size:30px;
-  
-}
 .share{
   
   font-size:16px;
@@ -399,8 +443,7 @@ h1{
 .bottom{
 
 
-  background:white;
+
-  background:rgba(250,250,250,0.8);
   font-size:0.8em;
   padding:0.7em 1em;
   margin-top:120px;
@@ -460,13 +503,7 @@ a{
   }
   
 }
-h3{
+
-  
-  font-size:1.5em;
-  margin-bottom:5px;
-  padding-bottom:0px;
-  
-}
 article{
   margin-bottom:6em;
   
@@ -525,19 +562,7 @@ article{
       margin-left:10px;
       color:black;
     }
-    h1{
+   
-      margin:0;
-      padding:0;
-      margin-left:10px;
-      margin-bottom:10px;
-      margin-top:20px;
-      color:#69952f;
-      text-transform:uppercase;
-      font-weight:bold;
-      font-size:22px;
-      line-height:24px;
-      font-family:$header_font, arial, sans-serif;
-    }
     
   }
   
@@ -561,28 +586,19 @@ article{
     height:80px;
     margin-bottom:5px;
   }
+  
   h2{
-    
+    margin-top:10px;
-    color:#333333;
+    margin-left:10px;
-    font-weight:bold;
+    margin-right:10px;
-    font-size:16px;
-    padding-left:10px;
-    font-family:$header_font, Arial, sans-serif;
   }
+
   
 }
 
 
 
-h1{
 
-  color:#69952f;
-  text-transform:uppercase;
-  font-weight:bold;
-  font-size:22px;
-  line-height:24px;
-  font-family:$header_font, Arial, sans-serif;
-}
 
 .article_date{
   text-align:left;
@@ -651,6 +667,17 @@ h1{
     margin-bottom:5px;
     
   }
+  margin-bottom:3em;
   
   
+}
+
+.breadcrumb{
+  
+  background:transparent;
+  padding:0;
+  color:rgba(115,115,115,1);
+  a,a.active{
+    color:rgba(115,115,115,1);
+  }
 }

app/controllers/public/events_controller.rb

@@ -18,7 +18,7 @@ class Public::EventsController < ApplicationController
       
     else
       @start_list_date = Time.now.beginning_of_month
-      @end_list_date = @start_list_date + 2.month
+      @end_list_date = Event.order("stop_at DESC").first.start_at.end_of_month.next_month
       
 
       

app/views/layouts/public.html.haml

@@ -55,8 +55,8 @@
         =#{:style => "display:none"}
         <ul class="bxslider" data-ratio="2.2">
         <li><img src="/accueil/1.jpg" title="" /></li>
-        <li><img src="http://photographie-hors-piste.com/slide/2.jpg" title="" /></li>
+        <li><img src="/accueil/2.jpg" title="" /></li>
-        <li><img src="http://photographie-hors-piste.com/slide/3.jpg" title="" /></li>
+        <li><img src="/accueil/3.jpg" title="" /></li>
     
         </ul>
     
@@ -68,7 +68,7 @@
           .main_section_title
             =link_to "Actualités +", "/actualites.html"
           
-          -article = Article.before(Date.today).recents.first
+          -article = Article.where(:echo => false).before(Date.today).recents.first
             
           -if article
             %a{:href => public_article_path(:id => article.slug)}
@@ -80,7 +80,7 @@
                   =simple_format article.description
                 .clear
           
-          -articles = Article.before(Date.today).recents.offset(1).limit(6)
+          -articles = Article.where(:echo => false).before(Date.today).recents.offset(1).limit(6)
             
           -if articles
             .articles

app/views/public/events/index.html.haml

@@ -1,28 +1,28 @@
 %p
-	
+  
-	-first_month = @start_list_date.beginning_of_month
+  -first_month = @start_list_date.beginning_of_month
-	-last_month = @end_list_date.beginning_of_month
+  -last_month = @end_list_date.beginning_of_month
-	-the_month = first_month
+  -the_month = first_month
 
-	
+  
-	-while the_month <= last_month
+  -while the_month <= last_month
-		%h2{:class => "month_title"}=l(the_month.to_date, :format => :month_and_year)
+    %h2{:class => "month_title"}=l(the_month.to_date, :format => :month_and_year)
-		.month_content
+    .month_content
-			=render :partial => "public/events/event", :collection =>Event.where('(start_at < ? AND start_at > ?) OR  (stop_at < ? AND stop_at > ?)',the_month.end_of_month, the_month.beginning_of_month,the_month.end_of_month, the_month.beginning_of_month).order(:start_at)
+      =render :partial => "public/events/event", :collection =>Event.where('(start_at < ? AND start_at > ?) OR  (stop_at < ? AND stop_at > ?)',the_month.end_of_month, the_month.beginning_of_month,the_month.end_of_month, the_month.beginning_of_month).order(:start_at)
       
 
-		-the_month = the_month.next_month
+    -the_month = the_month.next_month
-	
+  
-	
+  
-	
+  
-	
+  
-		
+-content_for :sidebar do
-		
+    
-%h2{:class => "month_title"} Agenda par mois
+  %h2{:class => "month_title"} Agenda par mois
-%ul
+  %ul
-	-first_month = Event.order(:start_at).first.start_at.beginning_of_month
+    -first_month = Event.order(:start_at).first.start_at.beginning_of_month
-	-last_month = Event.order(:start_at).last.start_at.beginning_of_month
+    -last_month = Event.order(:start_at).last.start_at.beginning_of_month
-	-the_month = last_month
+    -the_month = last_month
-	-while the_month >= first_month
+    -while the_month >= first_month
-		%li=link_to l(the_month.to_date, :format => :month_and_year), public_events_path(:year => the_month.year, :month => the_month.month)
+      %li=link_to l(the_month.to_date, :format => :month_and_year), public_events_path(:year => the_month.year, :month => the_month.month)
-		-the_month = the_month.last_month
+      -the_month = the_month.last_month