From 691f5a018ab4188062ed68791b95d406279d6d08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Clermont=C3=A9?= <dclermonte@april.org>
Date: Thu, 6 Oct 2016 21:35:48 +0200
Subject: [PATCH] improved css

---
 .../website/charter/charter.html              |   6 +-
 .../website/charter/libreencadeau.css         | 149 ++++++------------
 .../website/pages/Cadal_xhtml.java            |   2 +-
 .../website/pages/Contact_xhtml.java          |   2 +-
 .../website/pages/Faq_xhtml.java              |   4 +-
 .../website/pages/Legal_xhtml.java            |   2 +-
 .../libreencadeau/website/pages/faq.html      |  15 +-
 7 files changed, 66 insertions(+), 114 deletions(-)

diff --git a/src/org/april/libreencadeau/website/charter/charter.html b/src/org/april/libreencadeau/website/charter/charter.html
index 94faa4f..9e2d5d4 100644
--- a/src/org/april/libreencadeau/website/charter/charter.html
+++ b/src/org/april/libreencadeau/website/charter/charter.html
@@ -18,11 +18,7 @@
     </div>
     
     <div id="body_container" class="row">
-        <div id="left_menu" class="column"></div>
-    
-        <div id="content_container" class="column">
-            Content…
-        </div>
+       
     </div>
     
     <div id="footer_container">
diff --git a/src/org/april/libreencadeau/website/charter/libreencadeau.css b/src/org/april/libreencadeau/website/charter/libreencadeau.css
index 1f9b139..cdccfa4 100644
--- a/src/org/april/libreencadeau/website/charter/libreencadeau.css
+++ b/src/org/april/libreencadeau/website/charter/libreencadeau.css
@@ -36,23 +36,7 @@ ul, ol
 }
 
 /***** CHARTER HEADER *****/
-@media screen and (max-width: 840px)
-{
-	
-#charter #header_container
-    {
-        margin: 0px;
-        height: 100px;
-        width: 670px;
-        margin: 0 auto;
-        position: relative;
-        border: 1px solid blue;
-    }
-}
 
-@media screen and (min-width: 840px)
-{
-	
 #charter #header_container
     {
         margin: 0px;
@@ -62,7 +46,7 @@ ul, ol
         position: relative;
         border: 1px solid blue;
     }
-}
+
 #charter #header_container #logo_zone
 {
     position: absolute;
@@ -92,18 +76,7 @@ ul, ol
 	background-color:#5684B9;
 }
 /***** CHARTER BODY *****/
-@media screen and (max-width: 840px){
-#charter #body_container
-    {
-        position: relative;
-        margin: 10px auto 10px auto;
-        width: 670px;
-        height: 100px;
-        min-height: 520px;
-    }
-}
 
-@media screen and (min-width: 840px){
 #charter #body_container
     {
         position: relative;
@@ -112,7 +85,6 @@ ul, ol
         height: 100px;
         min-height: 520px;
     }
-}
 /***** CHARTER MENU *****/
 #charter #body_container #menu_container
 {
@@ -164,15 +136,14 @@ ul, ol
 
 /***** CHARTER CONTENT *****/
 #charter #body_container #content_container
-{
+  {
     margin: 10px auto 20px auto;
     width: 750px;
     border: 0px none lightgreen;
-}
+  }
 
 /***** CHARTER FOOTER *****/
-@media screen and (min-width: 840px)
-{
+
 #footer_menu
     {
 	   margin: 0 ;
@@ -198,19 +169,19 @@ ul, ol
    }
 
 #footer_menu .button a
-{
-	display:block;
-	width:100%;
-	height : 100% ;
-	text-decoration:none;
-}
+   {
+	 display:block;
+	 width:100%;
+	 height : 100% ;
+	 text-decoration:none;
+   }
 
 #footer_menu .button a:hover
-{
-	color:white;
-	background-color : #0000ff;
-	text-decoration:none;
-}
+  {
+	 color:white;
+	 background-color : #0000ff;
+	 text-decoration:none;
+  }
 
 #charter #footer_container
    {
@@ -222,61 +193,8 @@ ul, ol
       height: auto;
       border: 1px solid red;
    }
-}
-@media screen and (max-width: 840px)
-{
-#footer_menu
-    {
-	   margin: 0 ;
-	   position: relative;
-	   height : 40px;
-	   width: 670px;
-	   margin: 0 auto;
-	   clear: both;
-	   background-color:#FFFFFF;
-    }
-#footer_menu  .button
-   {   display:inline;
-       font-size: 16px;
-       float : left;
-       height: 20px;
-	   background-color:#5684B9;
-	   text-align: center;
-	   margin:  4px;
-	   width: 23.71%;
-	   border-style: 3px solid #73AD21;
-	   padding-top: 8px;
-	   padding-bottom: 8px;
-   }
-#footer_menu .button .a
-{
-	display:block;
-	width:100%;
-	height : 100% ;
-	text-decoration:none;
-}
-
-#footer_menu .button a:hover
-{
-	color:white;
-	background-color : #0000ff;
-	text-decoration:none;
-}
-
-#charter #footer_container
-   {
-      margin: 0;
-      position: relative;
-      width:670px;
-      margin:0 auto;
-      clear: both;
-      height: auto;
-      border: 1px solid red;
-   }
-}
-
 /*********************/
-table.table_classic
+table.table_classic/***** CHARTER BODY *****/
 {
     border:0px;
     width:100%;
@@ -301,3 +219,38 @@ table.table_classic > tfoot > tr > td
     margin: 5px;
     padding: 5px;
 }
+/************************/
+/**** SMALL SCREEN  *****/
+@media screen and (max-width: 840px)
+
+{
+/***** CHARTER HEADER *****/
+#charter #header_container
+    {
+        width: 670px;
+    }
+/***** CHARTER BODY *****/
+#charter #body_container
+    {
+        width: 670px;
+    }
+/***** CHARTER FOOTER *****/
+    
+#footer_menu
+    {
+	   width: 670px;
+    }
+#footer_menu  .button
+   { 
+       font-size: 16px;
+       height: 20px;
+	   margin:  4px;
+	   width: 23.71%;
+   }
+
+#charter #footer_container
+   {
+      width:670px;
+    }
+}
+
diff --git a/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java b/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java
index 396bad8..0075304 100644
--- a/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java
@@ -66,7 +66,7 @@ public class Cadal_xhtml extends HttpServlet
 
             //
             Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
-            charter.include("content_container", page);
+            charter.include("body_container", page);
             String html = charter.dynamize().toString();
 
             // Display page.
diff --git a/src/org/april/libreencadeau/website/pages/Contact_xhtml.java b/src/org/april/libreencadeau/website/pages/Contact_xhtml.java
index e527045..022c00c 100644
--- a/src/org/april/libreencadeau/website/pages/Contact_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Contact_xhtml.java
@@ -66,7 +66,7 @@ public class Contact_xhtml extends HttpServlet
 
             //
             Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
-            charter.include("content_container", page);
+            charter.include("body_container", page);
             String html = charter.dynamize().toString();
 
             // Display page.
diff --git a/src/org/april/libreencadeau/website/pages/Faq_xhtml.java b/src/org/april/libreencadeau/website/pages/Faq_xhtml.java
index c1e096f..fc7f072 100644
--- a/src/org/april/libreencadeau/website/pages/Faq_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Faq_xhtml.java
@@ -66,8 +66,8 @@ public class Faq_xhtml extends HttpServlet
             Page menu = PageFactory.instance().create("/org/april/libreencadeau/website/pages/menu.html");
             //
             Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
-            charter.include("left_menu", menu);
-            charter.include("content_container", page);
+            page.include("left_menu", menu);
+            charter.include("body_container", page);
 
             String html = charter.dynamize().toString();
 
diff --git a/src/org/april/libreencadeau/website/pages/Legal_xhtml.java b/src/org/april/libreencadeau/website/pages/Legal_xhtml.java
index 5f6a26a..e11a17e 100644
--- a/src/org/april/libreencadeau/website/pages/Legal_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Legal_xhtml.java
@@ -66,7 +66,7 @@ public class Legal_xhtml extends HttpServlet
 
             //
             Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
-            charter.include("content_container", page);
+            charter.include("body_container", page);
             String html = charter.dynamize().toString();
 
             // Display page.
diff --git a/src/org/april/libreencadeau/website/pages/faq.html b/src/org/april/libreencadeau/website/pages/faq.html
index d577691..59359f5 100644
--- a/src/org/april/libreencadeau/website/pages/faq.html
+++ b/src/org/april/libreencadeau/website/pages/faq.html
@@ -12,14 +12,17 @@
 </head>
 <body>
  
-    
+    <div id="line_container" class="row">
+        <div id="left_menu" class="column"></div>
+
         <div id="content_container" class="column">
-            Content…
+             <h1>Tout ce que vous avez toujours voulu savoir sur Cadal</h1>
+             <p>
+                 Sans jamais oser le demander.
+             </p>
         </div>
+    </div>
+   
    
-    <h1>Tout ce que vous avez toujours voulu savoir sur Cadal</h1>
-    <p>
-        Sans jamais oser le demander.
-    </p>
 </body>
 </html>
\ No newline at end of file