From 58966731aa9079cc1da05cb58c7c55129401a1f1 Mon Sep 17 00:00:00 2001
From: Atala <alois.guillope@gmail.com>
Date: Thu, 12 May 2016 00:03:22 +0200
Subject: [PATCH 1/3] celan: remove useless if

---
 theme/front-page.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/theme/front-page.php b/theme/front-page.php
index ba8a99c..f10c383 100644
--- a/theme/front-page.php
+++ b/theme/front-page.php
@@ -14,13 +14,9 @@
 		<div id="widget-homepage-top" class="section home-widget-container">
 		<?php dynamic_sidebar('homepage-top') ?>
 		</div>
-	<?php endif;
-	if ('posts' == get_option('show_on_front')) :
+<?php endif;
 		include get_home_template();
-	else :
-	    include get_page_template();
-	endif;
-	dynamic_sidebar('homepage-bottom');
+		dynamic_sidebar('homepage-bottom');
 	if (!is_paged() && get_field('global_module_social', 'option') == 'oui') :
 		get_template_part('templates/module', 'home-social');
 	endif;

From 252132df8783e5bd3305297900e7f71482f0d5a0 Mon Sep 17 00:00:00 2001
From: Atala <alois.guillope@gmail.com>
Date: Thu, 12 May 2016 00:19:01 +0200
Subject: [PATCH 2/3] feat: add three columns layout

---
 theme/front-page.php | 13 ++++++++++++-
 theme/lib/setup.php  | 27 +++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/theme/front-page.php b/theme/front-page.php
index f10c383..60cf266 100644
--- a/theme/front-page.php
+++ b/theme/front-page.php
@@ -14,7 +14,18 @@
 		<div id="widget-homepage-top" class="section home-widget-container">
 		<?php dynamic_sidebar('homepage-top') ?>
 		</div>
-<?php endif;
+	<?php endif;
+	if (is_active_sidebar('homepage-top-one-third') || is_active_sidebar('homepage-top-two-third') || is_active_sidebar('homepage-top-three-third')) : ?>
+		<div id="widget-homepage-top" class="section home-widget-container">
+			<div class="container padded">
+				<div class="row">
+					<?php dynamic_sidebar('homepage-top-one-third') ?>
+					<?php dynamic_sidebar('homepage-top-two-third') ?>
+					<?php dynamic_sidebar('homepage-top-three-third') ?>
+				</div>
+			</div>
+		</div>
+	<?php endif;
 		include get_home_template();
 		dynamic_sidebar('homepage-bottom');
 	if (!is_paged() && get_field('global_module_social', 'option') == 'oui') :
diff --git a/theme/lib/setup.php b/theme/lib/setup.php
index 9705e08..8b9b5cf 100644
--- a/theme/lib/setup.php
+++ b/theme/lib/setup.php
@@ -74,6 +74,33 @@ function widgets_init() {
   //   'before_title'  => '<h2 class="flex-widget__title">',
   //   'after_title'   => '</h2>'
   // ]);
+
+  // Three columns layout
+  register_sidebar([
+    'name'          => 'Haut première colonne', // TODO translate
+    'id'            => 'homepage-top-one-third',
+    'before_widget' => '<div class=" %1$s %2$s col-md-4"><div id="widget-homepage-top-one-third">',
+    'after_widget'  => '</div></div>',
+    'before_title'  => '<h2>',
+    'after_title'   => '</h2>'
+  ]);
+  register_sidebar([
+    'name'          => 'Haut seconde colonne', // TODO translate
+    'id'            => 'homepage-top-two-third',
+    'before_widget' => '<div class=" %1$s %2$s col-md-4"><div id="homepage-top-two-third">',
+    'after_widget'  => '</div></div>',
+    'before_title'  => '<h2>',
+    'after_title'   => '</h2>'
+  ]);
+  register_sidebar([
+    'name'          => 'Haut troisième colonne', // TODO translate
+    'id'            => 'homepage-top-three-third',
+    'before_widget' => '<div class=" %1$s %2$s col-md-4"><div id="homepage-top-three-third">',
+    'after_widget'  => '</div></div>',
+    'before_title'  => '<h2>',
+    'after_title'   => '</h2>'
+  ]);
+  //
   register_sidebar([
     'name'          => 'Bas de page', // TODO translate
     'id'            => 'homepage-bottom',

From 5478333497078b33cf1fcf755a96f0ee580816f5 Mon Sep 17 00:00:00 2001
From: Atala <alois.guillope@gmail.com>
Date: Thu, 12 May 2016 00:34:01 +0200
Subject: [PATCH 3/3] feat: add two columns layout

---
 theme/front-page.php | 20 +++++++++++++++-----
 theme/lib/setup.php  | 35 +++++++++++++++++++++++++++--------
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/theme/front-page.php b/theme/front-page.php
index 60cf266..8f29dda 100644
--- a/theme/front-page.php
+++ b/theme/front-page.php
@@ -15,13 +15,23 @@
 		<?php dynamic_sidebar('homepage-top') ?>
 		</div>
 	<?php endif;
-	if (is_active_sidebar('homepage-top-one-third') || is_active_sidebar('homepage-top-two-third') || is_active_sidebar('homepage-top-three-third')) : ?>
-		<div id="widget-homepage-top" class="section home-widget-container">
+	if (is_active_sidebar('homepage-one-half') || is_active_sidebar('homepage-two-half')) : ?>
+		<div id="widget-homepage-half" class="section home-widget-container">
+			<div class="container padded">
+				<div class="row">
+					<?php dynamic_sidebar('homepage-one-half') ?>
+					<?php dynamic_sidebar('homepage-two-half') ?>
+				</div>
+			</div>
+		</div>
+	<?php endif;
+	if (is_active_sidebar('homepage-one-third') || is_active_sidebar('homepage-two-third') || is_active_sidebar('homepage-three-third')) : ?>
+		<div id="widget-homepage-third" class="section home-widget-container">
 			<div class="container padded">
 				<div class="row">
-					<?php dynamic_sidebar('homepage-top-one-third') ?>
-					<?php dynamic_sidebar('homepage-top-two-third') ?>
-					<?php dynamic_sidebar('homepage-top-three-third') ?>
+					<?php dynamic_sidebar('homepage-one-third') ?>
+					<?php dynamic_sidebar('homepage-two-third') ?>
+					<?php dynamic_sidebar('homepage-three-third') ?>
 				</div>
 			</div>
 		</div>
diff --git a/theme/lib/setup.php b/theme/lib/setup.php
index 8b9b5cf..a15e186 100644
--- a/theme/lib/setup.php
+++ b/theme/lib/setup.php
@@ -75,26 +75,45 @@ function widgets_init() {
   //   'after_title'   => '</h2>'
   // ]);
 
+  // Two columns layout
+  register_sidebar([
+    'name'          => '[Deux colonnes] Première colonne', // TODO translate
+    'id'            => 'homepage-one-half',
+    'before_widget' => '<div class=" %1$s %2$s col-md-6"><div id="homepage-one-half">',
+    'after_widget'  => '</div></div>',
+    'before_title'  => '<h2>',
+    'after_title'   => '</h2>'
+  ]);
+  register_sidebar([
+    'name'          => '[Deux colonnes] Seconde colonne', // TODO translate
+    'id'            => 'homepage-two-half',
+    'before_widget' => '<div class=" %1$s %2$s col-md-6"><div id="homepage-two-half">',
+    'after_widget'  => '</div></div>',
+    'before_title'  => '<h2>',
+    'after_title'   => '</h2>'
+  ]);
+  //
+
   // Three columns layout
   register_sidebar([
-    'name'          => 'Haut première colonne', // TODO translate
-    'id'            => 'homepage-top-one-third',
-    'before_widget' => '<div class=" %1$s %2$s col-md-4"><div id="widget-homepage-top-one-third">',
+    'name'          => '[Trois colonnes] Première colonne', // TODO translate
+    'id'            => 'homepage-one-third',
+    'before_widget' => '<div class=" %1$s %2$s col-md-4"><div id="homepage-one-third">',
     'after_widget'  => '</div></div>',
     'before_title'  => '<h2>',
     'after_title'   => '</h2>'
   ]);
   register_sidebar([
-    'name'          => 'Haut seconde colonne', // TODO translate
-    'id'            => 'homepage-top-two-third',
-    'before_widget' => '<div class=" %1$s %2$s col-md-4"><div id="homepage-top-two-third">',
+    'name'          => '[Trois colonnes] Seconde colonne', // TODO translate
+    'id'            => 'homepage-two-third',
+    'before_widget' => '<div class=" %1$s %2$s col-md-4"><div id="homepage-two-third">',
     'after_widget'  => '</div></div>',
     'before_title'  => '<h2>',
     'after_title'   => '</h2>'
   ]);
   register_sidebar([
-    'name'          => 'Haut troisième colonne', // TODO translate
-    'id'            => 'homepage-top-three-third',
+    'name'          => '[Trois colonnes] Troisième colonne', // TODO translate
+    'id'            => 'homepage-three-third',
     'before_widget' => '<div class=" %1$s %2$s col-md-4"><div id="homepage-top-three-third">',
     'after_widget'  => '</div></div>',
     'before_title'  => '<h2>',