-
+
Content…
@@ -33,6 +26,12 @@
diff --git a/src/org/april/libreencadeau/website/charter/charter2.html b/src/org/april/libreencadeau/website/charter/charter2.html
deleted file mode 100644
index 1956edf..0000000
--- a/src/org/april/libreencadeau/website/charter/charter2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
LibreEnCadeau
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/org/april/libreencadeau/website/charter/kiss4web-logo.png b/src/org/april/libreencadeau/website/charter/kiss4web-logo.png
deleted file mode 100644
index 1b138cb..0000000
Binary files a/src/org/april/libreencadeau/website/charter/kiss4web-logo.png and /dev/null differ
diff --git a/src/org/april/libreencadeau/website/charter/libreencadeau.css b/src/org/april/libreencadeau/website/charter/libreencadeau.css
index 3ba7d1c..1f9b139 100644
--- a/src/org/april/libreencadeau/website/charter/libreencadeau.css
+++ b/src/org/april/libreencadeau/website/charter/libreencadeau.css
@@ -36,7 +36,8 @@ ul, ol
}
/***** CHARTER HEADER *****/
-@media screen and (max-width: 840px){
+@media screen and (max-width: 840px)
+{
#charter #header_container
{
@@ -49,7 +50,8 @@ ul, ol
}
}
-@media screen and (min-width: 840px){
+@media screen and (min-width: 840px)
+{
#charter #header_container
{
@@ -167,6 +169,8 @@ ul, ol
width: 750px;
border: 0px none lightgreen;
}
+
+/***** CHARTER FOOTER *****/
@media screen and (min-width: 840px)
{
#footer_menu
@@ -193,7 +197,21 @@ ul, ol
padding-bottom: 8px;
}
-/***** CHARTER FOOTER *****/
+#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;
@@ -230,8 +248,21 @@ ul, ol
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 *****/
#charter #footer_container
{
margin: 0;
diff --git a/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java b/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java
index 2992fd3..396bad8 100644
--- a/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java
@@ -65,7 +65,7 @@ public class Cadal_xhtml extends HttpServlet
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/pages/cadal.html");
//
- Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter2.html");
+ Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
charter.include("content_container", page);
String html = charter.dynamize().toString();
diff --git a/src/org/april/libreencadeau/website/pages/Contact_xhtml.java b/src/org/april/libreencadeau/website/pages/Contact_xhtml.java
index b27e40e..e527045 100644
--- a/src/org/april/libreencadeau/website/pages/Contact_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Contact_xhtml.java
@@ -65,7 +65,7 @@ public class Contact_xhtml extends HttpServlet
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/pages/contact.html");
//
- Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter2.html");
+ Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
charter.include("content_container", page);
String html = charter.dynamize().toString();
diff --git a/src/org/april/libreencadeau/website/pages/Faq_xhtml.java b/src/org/april/libreencadeau/website/pages/Faq_xhtml.java
index 77c422c..c1e096f 100644
--- a/src/org/april/libreencadeau/website/pages/Faq_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Faq_xhtml.java
@@ -63,10 +63,12 @@ public class Faq_xhtml extends HttpServlet
// Send response.
// ==============
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/pages/faq.html");
-
+ Page menu = PageFactory.instance().create("/org/april/libreencadeau/website/pages/menu.html");
//
- Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter2.html");
+ Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
+ charter.include("left_menu", menu);
charter.include("content_container", page);
+
String html = charter.dynamize().toString();
// Display page.
diff --git a/src/org/april/libreencadeau/website/pages/Legal_xhtml.java b/src/org/april/libreencadeau/website/pages/Legal_xhtml.java
index 4cfd2a4..5f6a26a 100644
--- a/src/org/april/libreencadeau/website/pages/Legal_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Legal_xhtml.java
@@ -65,7 +65,7 @@ public class Legal_xhtml extends HttpServlet
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/pages/legal.html");
//
- Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter2.html");
+ Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
charter.include("content_container", page);
String html = charter.dynamize().toString();
diff --git a/src/org/april/libreencadeau/website/pages/contact.html b/src/org/april/libreencadeau/website/pages/contact.html
index 7ca279f..4cbec5f 100644
--- a/src/org/april/libreencadeau/website/pages/contact.html
+++ b/src/org/april/libreencadeau/website/pages/contact.html
@@ -12,7 +12,7 @@
Pour nous contacter :
- les_meilleurs(at)april.org
+ les_meilleurs@april.org
\ No newline at end of file
diff --git a/src/org/april/libreencadeau/website/pages/faq.html b/src/org/april/libreencadeau/website/pages/faq.html
index baf5ecc..d577691 100644
--- a/src/org/april/libreencadeau/website/pages/faq.html
+++ b/src/org/april/libreencadeau/website/pages/faq.html
@@ -8,8 +8,15 @@
+
+
+
+
+ Content…
+
+
Tout ce que vous avez toujours voulu savoir sur Cadal
Sans jamais oser le demander.
diff --git a/src/org/april/libreencadeau/website/pages/menu.html b/src/org/april/libreencadeau/website/pages/menu.html
new file mode 100644
index 0000000..05b9e11
--- /dev/null
+++ b/src/org/april/libreencadeau/website/pages/menu.html
@@ -0,0 +1,29 @@
+
+
+
+
+
Kiss4web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
