diff --git a/app/assets/stylesheets/public.scss b/app/assets/stylesheets/public.scss
index 19a74b7..7f2ac4a 100644
--- a/app/assets/stylesheets/public.scss
+++ b/app/assets/stylesheets/public.scss
@@ -62,17 +62,7 @@ a{
   
 }
 
-aside{
-  
-  font-size:0.8em;
-}
 
-.desc{
-  a{color:#1e1e1e;}
-  font-size:1.2em;
-  margin-bottom:1em;
-  
-}
 
 
 .read{
@@ -80,3 +70,14 @@ aside{
   text-align:left;
 }
 
+.right{
+  float:right;
+  
+}
+.coms{
+  
+  a{
+    color:inherit;
+    
+  }
+}
diff --git a/app/assets/stylesheets/public/layout.css.scss b/app/assets/stylesheets/public/layout.css.scss
index 678b75b..2fa7086 100644
--- a/app/assets/stylesheets/public/layout.css.scss
+++ b/app/assets/stylesheets/public/layout.css.scss
@@ -44,10 +44,7 @@ navigation#first_nav{
 
 }
 
-#main, #sidebar{
-	margin-top:50px !important;
 
-}
 #main{
 	
 
@@ -63,10 +60,9 @@ navigation#first_nav{
 	 
 }
 #corps{
-  background:white;
-  padding:40px;
+  
   float:left;
-  width:70%;
+  width:60%;
   box-sizing: border-box;
 }
 
@@ -76,15 +72,13 @@ navigation#first_nav{
 }
 #sidebar{	
 	padding:20px;
-  margin-left:70%;
+  width:40%;
+  float:right;
   box-sizing: border-box;
  
 	
 
-	
-	img{
-		margin:0.5em 0;	
-	}
+
 	
 
 
@@ -186,23 +180,96 @@ footer{
 .article_small{
 
   margin-bottom:20px;
-  position:relative;
-  h1{
-    text-align:center;
+
+
+  h3{
+    margin:0;
     
   }
   background:white;
   
   padding:10px;
-  padding-left:120px;
+
   .img{
     width:100px;
-    position:absolute;
-
-    top:10px;
-    left:10px;
+    float:left  ;
+    display:block;
+    margin:0;
+    margin-right:10px;
     background-size:cover;
 
     
   }
 }
+
+.article_img{
+
+  margin-bottom:20px;
+
+  *{
+    color:white;
+    
+  }
+  h3{
+    margin-top:10px;
+    margin-bottom:10px;
+    
+  }
+  background:center center no-repeat;
+  background-size:100%;
+  background-size:cover;
+  text-align:center;
+  padding:10px;
+  p.article_infos{
+    margin-top:0;
+  }
+}
+
+article, .corps_content{
+  padding:40px;
+  background:white;
+  margin-bottom:40px;
+  
+}
+.activites{
+  background:center center no-repeat;
+  background-size:100%;
+  background-size:cover;
+  text-align:center;
+  padding:50px 0;
+  color:white;
+  display:block;
+  font-family:Lato;
+  text-transform:uppercase;
+  
+  span{
+    display:inline-block;
+    padding:5px 10px;
+    border:1px solid white;
+    
+  }
+  margin-bottom:20px;
+  
+  &:hover{
+    span{
+      
+      background:rgba(255,255,255,0.5);
+      color:#333;
+    }
+    
+  }
+}
+.photographe{
+  
+  background-image:url('/photographe.jpg');
+}
+
+.sites{
+  
+  background-image:url('/sites.jpg');
+}
+
+.design{
+  
+  background-image:url('/design.jpg');
+}
diff --git a/app/controllers/admin/articles_controller.rb b/app/controllers/admin/articles_controller.rb
index 1c57b9f..c3a7115 100644
--- a/app/controllers/admin/articles_controller.rb
+++ b/app/controllers/admin/articles_controller.rb
@@ -113,7 +113,7 @@ class Admin::ArticlesController < ApplicationController
 	
   private
     def article_params
-      params.require(:article).permit(:category_id, :enabled, :published_at, :title, :slug, :tags_cache, :description, :image_file_id, :title_cached)
+      params.require(:article).permit(:category_id, :enabled, :published_at, :title, :slug, :tags_cache, :description, :image_file_id, :title_cached, :thumb_style)
       
   
       
diff --git a/app/views/admin/articles/_form.html.haml b/app/views/admin/articles/_form.html.haml
index 1b1c9ce..abc084e 100644
--- a/app/views/admin/articles/_form.html.haml
+++ b/app/views/admin/articles/_form.html.haml
@@ -6,9 +6,9 @@
       = form.input :published_at, :label => "Date de publication : ",:as => :qi_date_picker
       = form.input :image_file_id, :label => "Image :" , :as => :qi_image_select
       = form.input :title, :label => "Titre :" 
-      =# form.input :title_cached,:as => :boolean , :label => "Titre masqué ?" 
+      = form.input :title_cached,:as => :boolean , :label => "Titre masqué ?" 
       =# form.input :slug, :label => "Slug :"   
-      
+      =form.input :thumb_style, :as => :select, :collection => {  "Image en fond" => "article_img"}
       = form.input :description, :label => "Description courte :", :as => :text
       
       = form.input :tags_cache, :label => "Tags :"
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 561a162..9e685d0 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -42,16 +42,26 @@
     
     
     #main
-      #corps{:class => ("article_corps" if @article)}=yield
-    
       %section#sidebar
         =render :partial => "public/articles/sidebar_recents"
       
       
         %h3 Mes activités
-        %ul
-          %li= link_to "Création de site web", "http://www.quartz-agence.com", :title => "Site de l'agence Nicolas Bally, création de sites web", :target => "_blank"
-          %li= link_to "Photographie", "http://www.nicolasbally.com", :title => "Site photo de Nicolas Bally, Photographe", :target => "_blank"
+
+          
+        %a.design.activites{:target => "_blank", :href => "http://www.quartz-agence.com", :title => "Site photo de Nicolas Bally, Photographe"}
+          %span Design & communication
+          
+        %a.sites.activites{:target => "_blank", :href => "http://www.quartz-agence.com", :title => "Site photo de Nicolas Bally, Photographe"}
+          %span Sites & applications web
+        
+        %a.photographe.activites{:target => "_blank", :href => "http://art.nicolasbally.com", :title => "Site photo de Nicolas Bally, Photographe"}
+          %span Photographie
+          
+      
+    
+      #corps{:class => ("article_corps" if @article)}=yield
+    
       
       
     
diff --git a/app/views/public/articles/_article.html.haml b/app/views/public/articles/_article.html.haml
index ba50339..278c469 100644
--- a/app/views/public/articles/_article.html.haml
+++ b/app/views/public/articles/_article.html.haml
@@ -1,20 +1,23 @@
-.article_small
-  -if article.image_file
-    =image_tag(article.image_file.file.square.url, :class => "img")
+-if !article.thumb_style?
+  .article_small
+    -if article.image_file
+      =image_tag(article.image_file.file.square.url, :class => "img")
     
   
   
-  %h3=link_to article.title, article_path(:slug => article.slug), :title => " "+article.title.to_s
+    %h3=link_to article.title, article_path(:slug => article.slug), :title => " "+article.title.to_s
   
   
 
   
 
-  %p.article_infos
+    %p.article_infos
 
   
 
-    %time.updated{:datetime => Time.now, :pubdate => true}
-
-      ="le "+l(article.published_at, :format => :human_date)
+      %time.updated{:datetime => Time.now, :pubdate => true}
 
+        ="le "+l(article.published_at, :format => :human_date)
+    .clear
+-else
+  =render :partial => "public/articles/#{article.thumb_style}", :locals => {:article => article}
diff --git a/app/views/public/articles/_article_img.html.haml b/app/views/public/articles/_article_img.html.haml
new file mode 100644
index 0000000..d0bd24d
--- /dev/null
+++ b/app/views/public/articles/_article_img.html.haml
@@ -0,0 +1,18 @@
+.article_img{:style => "background-image:url('#{(article.image_file.file.large.medium.small.url if article.image_file)}')"}
+     
+  
+  
+  %h3=link_to article.title, article_path(:slug => article.slug), :title => " "+article.title.to_s
+  
+  
+
+  
+
+  %p.article_infos
+
+  
+
+    %time.updated{:datetime => Time.now, :pubdate => true}
+
+      ="le "+l(article.published_at, :format => :human_date)
+  .clear
diff --git a/app/views/public/articles/_article_intro.html.haml b/app/views/public/articles/_article_intro.html.haml
index e5cc77d..7f27a48 100644
--- a/app/views/public/articles/_article_intro.html.haml
+++ b/app/views/public/articles/_article_intro.html.haml
@@ -1,24 +1,20 @@
-%article
 
-  %header
-    
-    
-    %p.article_infos
 
+%header
+  
+
+  .right.coms
+    =link_to i(:"comment-o")+" "+article.comments.count.to_s, article_path(:slug => article.slug, :anchor => "comments")
+  %time.updated{:datetime => Time.now, :pubdate => true}
+
+    ="le "+l(article.published_at, :format => :human_date)
+
+
+    
     
   
-      %time.updated{:datetime => Time.now, :pubdate => true}
-
-        ="le "+l(article.published_at, :format => :human_date)
-  
-      ="-"
-      =link_to i(:"comment-o")+" "+article.comments.count.to_s, article_path(:slug => article.slug, :anchor => "comments")
       
-    
-        
-    %h1=link_to article.title, article_path(:slug => article.slug), :title => "blog conseil en image : "+article.title.to_s
+  %h1=link_to article.title, article_path(:slug => article.slug), :title => "blog conseil en image : "+article.title.to_s
 
 
-  =render article.block
-  
-%hr
\ No newline at end of file
+=render article.block
diff --git a/app/views/public/articles/_sidebar_recents.html.haml b/app/views/public/articles/_sidebar_recents.html.haml
index 4ea15de..a10c07c 100644
--- a/app/views/public/articles/_sidebar_recents.html.haml
+++ b/app/views/public/articles/_sidebar_recents.html.haml
@@ -1,4 +1,6 @@
 
 .recents.widget
 	%h3 Articles récents
-	=render Article.recents.limit(10)
\ No newline at end of file
+	=render Article.recents.limit(10)
+  
+  
\ No newline at end of file
diff --git a/app/views/public/articles/show.html.haml b/app/views/public/articles/show.html.haml
index 10fae37..2e5972b 100644
--- a/app/views/public/articles/show.html.haml
+++ b/app/views/public/articles/show.html.haml
@@ -1,23 +1,24 @@
 
-=render :partial => "public/articles/article_intro", :locals => {:article => @article}
-.share_in_social
-	=link_to image_tag("front/twitter_dark.png", :mouseover => "front/twitter_active.png" ), "http://twitter.com/intent/tweet?source=sharethiscom&text=Blog de Nicolas Bally : "+@article.title+"&url="+article_url(:slug => @article.slug), :target => "_blank",:title => "partager sur twitter l'article du blog de Nicolas Bally : "+@article.title.to_s
-	=link_to image_tag("front/facebook_dark.png", :mouseover => "front/facebook_active.png"), "https://www.facebook.com/sharer.php?u="+article_url(:slug => @article.slug)+"&t=Blog de Nicolas Bally : "+@article.title+"", :target => "_blank",:title => "partager sur facebook l'article du blog de Nicolas Bally : "+@article.title.to_s
-	=link_to image_tag("front/viadeo_dark.png", :mouseover => "front/viadeo_active.png"), "http://www.viadeo.com/shareit/share/?url="+article_url(:slug => @article.slug)+"&title=Blog de Nicolas Bally : "+@article.title+"", :target => "_blank",:title => "partager sur viadeo l'article du blog de Nicolas Bally : "+@article.title.to_s
-	=link_to image_tag("front/in_dark.png", :mouseover => "front/in_active.png"), "http://www.linkedin.com/shareArticle?mini=true&summary="+@article.description+"&url="+article_url(:slug => @article.slug)+"&title=Blog de Nicolas Bally : "+@article.title+"", :target => "_blank",:title => "partager sur linked in l'article du blog de Nicolas Bally : "+@article.title.to_s
-	
-		
+%article
+  =render :partial => "public/articles/article_intro", :locals => {:article => @article}
+  .share_in_social
+    =link_to image_tag("front/twitter_dark.png", :mouseover => "front/twitter_active.png" ), "http://twitter.com/intent/tweet?source=sharethiscom&text=Blog de Nicolas Bally : "+@article.title+"&url="+article_url(:slug => @article.slug), :target => "_blank",:title => "partager sur twitter l'article du blog de Nicolas Bally : "+@article.title.to_s
+    =link_to image_tag("front/facebook_dark.png", :mouseover => "front/facebook_active.png"), "https://www.facebook.com/sharer.php?u="+article_url(:slug => @article.slug)+"&t=Blog de Nicolas Bally : "+@article.title+"", :target => "_blank",:title => "partager sur facebook l'article du blog de Nicolas Bally : "+@article.title.to_s
+    =link_to image_tag("front/viadeo_dark.png", :mouseover => "front/viadeo_active.png"), "http://www.viadeo.com/shareit/share/?url="+article_url(:slug => @article.slug)+"&title=Blog de Nicolas Bally : "+@article.title+"", :target => "_blank",:title => "partager sur viadeo l'article du blog de Nicolas Bally : "+@article.title.to_s
+    =link_to image_tag("front/in_dark.png", :mouseover => "front/in_active.png"), "http://www.linkedin.com/shareArticle?mini=true&summary="+@article.description+"&url="+article_url(:slug => @article.slug)+"&title=Blog de Nicolas Bally : "+@article.title+"", :target => "_blank",:title => "partager sur linked in l'article du blog de Nicolas Bally : "+@article.title.to_s
+  
+    
 
-#comments
-	%h2 Commentaires
-	=render :partial => "public/comments/comment", :collection => @article.comments.recents
-		
-#comment_form.background_opacity.padding_20
-	=render :partial => "public/comments/form"
-	
-	
-	
-	
+  #comments
+    %h2 Commentaires
+    =render :partial => "public/comments/comment", :collection => @article.comments.recents
+    
+  #comment_form.background_opacity.padding_20
+    =render :partial => "public/comments/form"
+  
+  
+  
+  
 
 
-		
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/app/views/public/home/home.html.haml b/app/views/public/home/home.html.haml
index bc5b4fa..7a0b7d9 100644
--- a/app/views/public/home/home.html.haml
+++ b/app/views/public/home/home.html.haml
@@ -1,8 +1,10 @@
 
 -if @index_title
-	%h1=@index_title
-=render :partial => "public/articles/article_intro", :collection => @articles, :as => "article"
+  %h1=@index_title
+  
+-@articles.each do |article|
+  %article=render :partial => "public/articles/article_intro", :locals => {:article => article}
 .clear
 #articles_pagination= paginate @articles
 
-		
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/app/views/public/menu_items/show.html.haml b/app/views/public/menu_items/show.html.haml
index 5c50dea..c17078e 100644
--- a/app/views/public/menu_items/show.html.haml
+++ b/app/views/public/menu_items/show.html.haml
@@ -1 +1,2 @@
-=render :partial => "public/blocks/block", :locals => {:block => @menu_item.menu_content.blocks[0]}
+.corps_content
+  =render :partial => "public/blocks/block", :locals => {:block => @menu_item.menu_content.blocks[0]}
diff --git a/db/migrate/20150411165401_add_thumb_style_to_articles.rb b/db/migrate/20150411165401_add_thumb_style_to_articles.rb
new file mode 100644
index 0000000..9213c08
--- /dev/null
+++ b/db/migrate/20150411165401_add_thumb_style_to_articles.rb
@@ -0,0 +1,6 @@
+class AddThumbStyleToArticles < ActiveRecord::Migration
+  def change
+    add_column :articles, :thumb_style, :string
+    add_column :articles, :title_cached, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cd52160..8a8f8f7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,15 +11,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 1050) do
+ActiveRecord::Schema.define(version: 20150411165401) do
 
   create_table "admins", force: :cascade do |t|
-    t.string   "name",                   limit: 255
-    t.string   "firstname",              limit: 255
-    t.string   "avatar",                 limit: 255
-    t.string   "username",               limit: 255, default: "", null: false
     t.string   "email",                  limit: 255, default: "", null: false
-    t.string   "password_digest",        limit: 255, default: "", null: false
+    t.string   "encrypted_password",     limit: 128, default: "", null: false
+    t.string   "confirmation_token",     limit: 255
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
     t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
@@ -28,16 +27,29 @@ ActiveRecord::Schema.define(version: 1050) do
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip",     limit: 255
     t.string   "last_sign_in_ip",        limit: 255
+    t.string   "username",               limit: 255
+    t.string   "surname",                limit: 255
+    t.string   "firstname",              limit: 255
+    t.integer  "roles_mask",             limit: 4
+    t.datetime "created_at",                                      null: false
+    t.datetime "updated_at",                                      null: false
     t.string   "remember_token",         limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "password_digest",        limit: 255
+    t.string   "name",                   limit: 255
   end
 
   create_table "albums", force: :cascade do |t|
     t.string   "name",        limit: 255
     t.boolean  "super_admin", limit: 1
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
+  end
+
+  create_table "allowed_block_contents", force: :cascade do |t|
+    t.integer  "block_id",        limit: 4
+    t.integer  "content_type_id", limit: 4
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "articles", force: :cascade do |t|
@@ -46,26 +58,27 @@ ActiveRecord::Schema.define(version: 1050) do
     t.string   "slug",            limit: 255
     t.string   "tag",             limit: 255
     t.text     "description",     limit: 65535
-    t.text     "keywords",        limit: 65535
     t.boolean  "enabled",         limit: 1
     t.integer  "image_file_id",   limit: 4
-    t.boolean  "title_cached",    limit: 1
     t.string   "tags_cache",      limit: 255
     t.string   "tags_cache_slug", limit: 255
     t.integer  "category_id",     limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
+    t.string   "author",          limit: 255
+    t.string   "thumb_style",     limit: 255
+    t.boolean  "title_cached",    limit: 1
   end
 
   create_table "block_contents", force: :cascade do |t|
     t.integer  "style",       limit: 4
     t.integer  "nbr_columns", limit: 4
+    t.datetime "created_at",            null: false
+    t.datetime "updated_at",            null: false
     t.integer  "row1",        limit: 4
     t.integer  "row2",        limit: 4
     t.integer  "row3",        limit: 4
     t.integer  "row4",        limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
   end
 
   create_table "blocks", force: :cascade do |t|
@@ -73,16 +86,16 @@ ActiveRecord::Schema.define(version: 1050) do
     t.string   "blockable_type", limit: 255
     t.integer  "blockable_id",   limit: 4
     t.text     "content",        limit: 65535
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                   null: false
+    t.datetime "updated_at",                   null: false
   end
 
   create_table "break_contents", force: :cascade do |t|
     t.boolean  "line",       limit: 1
     t.integer  "height",     limit: 4
     t.string   "style",      limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "categories", force: :cascade do |t|
@@ -91,12 +104,8 @@ ActiveRecord::Schema.define(version: 1050) do
     t.boolean  "enabled",       limit: 1
     t.text     "description",   limit: 65535
     t.integer  "image_file_id", limit: 4
-    t.integer  "position",      limit: 4
-    t.integer  "parent_id",     limit: 4
-    t.string   "permalink",     limit: 255
-    t.boolean  "front_page",    limit: 1
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
   end
 
   create_table "cel_tables", force: :cascade do |t|
@@ -104,8 +113,27 @@ ActiveRecord::Schema.define(version: 1050) do
     t.integer  "style",            limit: 4
     t.integer  "table_row_id",     limit: 4
     t.integer  "table_content_id", limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
+  end
+
+  create_table "cible_aliases", force: :cascade do |t|
+    t.integer  "menu_item_id", limit: 4
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+  end
+
+  create_table "cible_types", force: :cascade do |t|
+    t.string   "slug",       limit: 255
+    t.string   "name",       limit: 255
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+  end
+
+  create_table "cible_urls", force: :cascade do |t|
+    t.string   "url",        limit: 255
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "comments", force: :cascade do |t|
@@ -117,19 +145,28 @@ ActiveRecord::Schema.define(version: 1050) do
     t.integer  "commentable_id",   limit: 4
     t.string   "commentable_type", limit: 255
     t.integer  "user_id",          limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                  null: false
+    t.datetime "updated_at",                                  null: false
+  end
+
+  add_index "comments", ["commentable_id"], name: "index_comments_on_commentable_id", using: :btree
+  add_index "comments", ["commentable_type"], name: "index_comments_on_commentable_type", using: :btree
+
+  create_table "content_types", force: :cascade do |t|
+    t.string   "slug",       limit: 255
+    t.string   "name",       limit: 255
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "data_files", force: :cascade do |t|
     t.string   "file",           limit: 255
     t.string   "name",           limit: 255
     t.string   "slug",           limit: 255
-    t.string   "token",          limit: 255
     t.string   "description",    limit: 255
     t.integer  "file_folder_id", limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
 
   create_table "download_contents", force: :cascade do |t|
@@ -137,29 +174,49 @@ ActiveRecord::Schema.define(version: 1050) do
     t.string   "style",        limit: 255
     t.text     "description",  limit: 65535
     t.integer  "data_file_id", limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
 
   create_table "dynamic_contents", force: :cascade do |t|
     t.string   "name",       limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+  end
+
+  create_table "event_contents", force: :cascade do |t|
+    t.string   "title",         limit: 255
+    t.text     "description",   limit: 65535
+    t.datetime "start_at"
+    t.boolean  "tremplin",      limit: 1
+    t.string   "artist",        limit: 255
+    t.integer  "event_type",    limit: 4
+    t.string   "place",         limit: 255
+    t.text     "address",       limit: 65535
+    t.decimal  "latitude",                    precision: 15, scale: 10
+    t.decimal  "longitude",                   precision: 15, scale: 10
+    t.integer  "image_file_id", limit: 4
+    t.integer  "cible_id",      limit: 4
+    t.string   "cible_type",    limit: 255
+    t.boolean  "with_cible",    limit: 1
+    t.boolean  "popup",         limit: 1
+    t.datetime "created_at",                                            null: false
+    t.datetime "updated_at",                                            null: false
   end
 
   create_table "external_links", force: :cascade do |t|
     t.string   "title",       limit: 255
     t.text     "description", limit: 65535
     t.string   "url",         limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "file_folders", force: :cascade do |t|
     t.string   "name",        limit: 255
     t.boolean  "super_admin", limit: 1
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
   create_table "gallery_contents", force: :cascade do |t|
@@ -167,27 +224,26 @@ ActiveRecord::Schema.define(version: 1050) do
     t.text     "description", limit: 65535
     t.integer  "style",       limit: 4
     t.integer  "nbr_img",     limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "gallery_images", force: :cascade do |t|
     t.string   "title",              limit: 255
     t.text     "description",        limit: 65535
-    t.string   "tags",               limit: 255
     t.integer  "position",           limit: 4
     t.integer  "image_file_id",      limit: 4
     t.integer  "gallery_content_id", limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                       null: false
+    t.datetime "updated_at",                       null: false
   end
 
   create_table "html_contents", force: :cascade do |t|
     t.text     "content",      limit: 65535
     t.string   "style",        limit: 255
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
     t.string   "content_type", limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
   end
 
   create_table "image_contents", force: :cascade do |t|
@@ -202,8 +258,11 @@ ActiveRecord::Schema.define(version: 1050) do
     t.string   "cible_type",    limit: 255
     t.boolean  "with_cible",    limit: 1
     t.boolean  "popup",         limit: 1
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
+    t.string   "source_name",   limit: 255
+    t.string   "source_link",   limit: 255
+    t.text     "legend",        limit: 65535
   end
 
   create_table "image_files", force: :cascade do |t|
@@ -213,11 +272,11 @@ ActiveRecord::Schema.define(version: 1050) do
     t.text     "description", limit: 65535
     t.string   "tags",        limit: 255
     t.integer  "album_id",    limit: 4
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
     t.string   "photograph",  limit: 255
     t.string   "cible_type",  limit: 255
     t.integer  "cible_id",    limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
   end
 
   create_table "link_contents", force: :cascade do |t|
@@ -229,8 +288,8 @@ ActiveRecord::Schema.define(version: 1050) do
     t.string   "style",      limit: 255
     t.integer  "cible_id",   limit: 4
     t.string   "cible_type", limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "map_contents", force: :cascade do |t|
@@ -239,24 +298,28 @@ ActiveRecord::Schema.define(version: 1050) do
     t.integer  "view",       limit: 4
     t.boolean  "info_bule",  limit: 1
     t.integer  "zoom",       limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "menu_aliases", force: :cascade do |t|
     t.integer  "menu_item_id", limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
+  end
+
+  create_table "menu_item_content_types", force: :cascade do |t|
+    t.string   "name",        limit: 255
+    t.string   "slug",        limit: 255
+    t.boolean  "super_admin", limit: 1
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
   create_table "menu_items", force: :cascade do |t|
     t.string   "name",              limit: 255
     t.string   "slug",              limit: 255
     t.string   "permalink",         limit: 255
-    t.string   "section_name",      limit: 255
-    t.integer  "section_id",        limit: 4
-    t.string   "repertoire_name",   limit: 255
-    t.integer  "repertoire_id",     limit: 4
     t.integer  "parent_id",         limit: 4
     t.integer  "position",          limit: 4
     t.boolean  "super_admin",       limit: 1
@@ -266,34 +329,30 @@ ActiveRecord::Schema.define(version: 1050) do
     t.integer  "menu_id",           limit: 4
     t.integer  "menu_content_id",   limit: 4
     t.string   "menu_content_type", limit: 255
-    t.integer  "archive_id",        limit: 4
-    t.boolean  "archived",          limit: 1
-    t.datetime "archived_at"
-    t.boolean  "password",          limit: 1
-    t.boolean  "comment",           limit: 1
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
+    t.integer  "archived",          limit: 4
   end
 
   create_table "menu_urls", force: :cascade do |t|
     t.string   "url",        limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "menus", force: :cascade do |t|
     t.string   "name",       limit: 255
     t.string   "max_levels", limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "pages", force: :cascade do |t|
     t.text     "title",       limit: 65535
     t.text     "description", limit: 65535
     t.text     "keywords",    limit: 65535
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "portlets", force: :cascade do |t|
@@ -301,24 +360,24 @@ ActiveRecord::Schema.define(version: 1050) do
     t.integer  "content_id",   limit: 4
     t.string   "content_type", limit: 255
     t.integer  "position",     limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
   end
 
   create_table "table_contents", force: :cascade do |t|
     t.integer  "style",      limit: 4
     t.integer  "nbr_rows",   limit: 4
     t.integer  "nbr_cols",   limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
   end
 
   create_table "table_rows", force: :cascade do |t|
     t.integer  "position",         limit: 4
     t.integer  "style",            limit: 4
     t.integer  "table_content_id", limit: 4
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
 
   create_table "tag_taggables", force: :cascade do |t|
@@ -343,16 +402,16 @@ ActiveRecord::Schema.define(version: 1050) do
   create_table "text_contents", force: :cascade do |t|
     t.string   "style",      limit: 255
     t.text     "content",    limit: 65535
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
   end
 
   create_table "title_contents", force: :cascade do |t|
     t.text     "content",    limit: 65535
     t.integer  "level",      limit: 4
     t.string   "style",      limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
   end
 
 end
diff --git a/public/design.jpg b/public/design.jpg
new file mode 100644
index 0000000..50b8640
Binary files /dev/null and b/public/design.jpg differ
diff --git a/public/photographe.jpg b/public/photographe.jpg
new file mode 100644
index 0000000..0a1b64a
Binary files /dev/null and b/public/photographe.jpg differ
diff --git a/public/sites.jpg b/public/sites.jpg
new file mode 100644
index 0000000..722f3f3
Binary files /dev/null and b/public/sites.jpg differ