- 
- |
-
- 
- |
-
- 
- |
-
- 
- |
-
LibreEnCadeau is released under the GNU AGPL license.
diff --git a/src/org/april/libreencadeau/website/charter/contact.png b/src/org/april/libreencadeau/website/charter/contact.png
deleted file mode 100644
index 52694c1..0000000
Binary files a/src/org/april/libreencadeau/website/charter/contact.png and /dev/null differ
diff --git a/src/org/april/libreencadeau/website/charter/faq.png b/src/org/april/libreencadeau/website/charter/faq.png
deleted file mode 100644
index 0e88169..0000000
Binary files a/src/org/april/libreencadeau/website/charter/faq.png and /dev/null differ
diff --git a/src/org/april/libreencadeau/website/charter/legal.png b/src/org/april/libreencadeau/website/charter/legal.png
deleted file mode 100644
index 87dde21..0000000
Binary files a/src/org/april/libreencadeau/website/charter/legal.png and /dev/null differ
diff --git a/src/org/april/libreencadeau/website/charter/libreencadeau-small.css b/src/org/april/libreencadeau/website/charter/libreencadeau-small.css
deleted file mode 100644
index 30b07cd..0000000
--- a/src/org/april/libreencadeau/website/charter/libreencadeau-small.css
+++ /dev/null
@@ -1,190 +0,0 @@
-/**************** GENERIC PAGE CHARTER ****************/
-* {
- margin: 0px;
- padding: 0px;
- color: #2e2d30;
- font-family: Arial, Helvetica, sans-serif;
-}
-
-p
-{
- margin-bottom: 10px;
- margin-top: 10px;
-}
-
-hr
-{
- border:dashed #CCC 1px;
- border-bottom:0px;
- border-left:0px;
- width:100%;
- margin: 10px 2px;
- padding: 0px 5px;
-}
-
-
-ul, ol
-{
- margin-left:30px;
-}
-
-/***** CHARTER *****/
-#charter
-{
- width: 100%;
- font-size: 13px;
-}
-
-/***** CHARTER HEADER *****/
-#charter #header_container
-{
- margin: 0px;
- height: 100px;
- width: 670px;
- margin: 0 auto;
- position: relative;
- border: 1px solid blue;
-}
-
-#charter #header_container #logo_zone
-{
- position: absolute;
- top: 5px;
- width: 320px;
- height: 100px;
- color: white;
- background-repeat: no-repeat;
- display: inline;
- float: left;
-}
-
-#charter #header_container #logo_zone img
-{
- border: 0px none white;
-}
-
-#charter #header_container #title
-{
- position: relative;
- top: 7px;
- left: 55px;
- font-size: 50px;
-}
-
-#header_container{
- background-color:#90ee90;
-}
-/***** CHARTER BODY *****/
-#charter #body_container
-{
- position: relative;
- margin: 10px auto 10px auto;
- width: 670px;
- height: 100px;
- min-height: 520px;
-}
-
-/***** CHARTER MENU *****/
-#charter #body_container #menu_container
-{
- padding: 30px 10px 0 0;
-}
-
-.submenu
-{
- margin: 10px 10px 10px 10px;
- width: 160px;
- background-color: #ECECEC;
- border-radius: 5px;
- padding: 10px;
- margin-bottom: 50px;
-}
-
-.submenu a.active {
- color:white;
- text-decoration:none;
- background-color:#333;
-}
-
-.submenu a {
- color:#333;
- padding:3px;
- display:block;
- text-decoration:none;
-}
-
-.submenu a:hover {
- color:white;
- text-decoration:none;
- background-color:#333;
-}
-
-.submenu ul {
- margin-left:0px;
-}
-
-.submenu li {
- list-style-type:none;
-}
-
-.submenu_content {
- margin-left: 50px;
- width: 650px;
-}
-
-
-/***** CHARTER CONTENT *****/
-#charter #body_container #content_container
-{
- margin: 10px auto 20px auto;
- width: 750px;
- border: 0px none lightgreen;
-}
-#basic_menu
-{
- margin: 0 ;
- position: relative;
- height : 40px;
- width: 970px;
- margin: 0 auto;
- clear: both;
-}
-
-/***** CHARTER FOOTER *****/
-#charter #footer_container
-{
- margin: 0;
- position: relative;
- width:970px;
- margin:0 auto;
- clear: both;
- height: auto;
- border: 1px solid red;
-}
-
-/*********************/
-table.table_classic
-{
- border:0px;
- width:100%;
- margin: 5px;
- border-collapse: collapse;
-}
-
-table.table_classic > tr > th,
-table.table_classic > thead > tr > th
-{
- background-color:#ECECEC;
- border:1px solid #DCDCDC;
- margin: 5px;
- padding: 5px;
-}
-
-table.table_classic > tr > td,
-table.table_classic > tbody > tr > td,
-table.table_classic > tfoot > tr > td
-{
- border:1px solid #ECECEC;
- margin: 5px;
- padding: 5px;
-}
diff --git a/src/org/april/libreencadeau/website/charter/libreencadeau.css b/src/org/april/libreencadeau/website/charter/libreencadeau.css
index f5f403e..3ba7d1c 100644
--- a/src/org/april/libreencadeau/website/charter/libreencadeau.css
+++ b/src/org/april/libreencadeau/website/charter/libreencadeau.css
@@ -36,16 +36,31 @@ ul, ol
}
/***** CHARTER HEADER *****/
+@media screen and (max-width: 840px){
+
#charter #header_container
-{
- margin: 0px;
- height: 100px;
- width: 970px;
- margin: 0 auto;
- position: relative;
- border: 1px solid blue;
+ {
+ 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;
+ height: 100px;
+ width: 970px;
+ margin: 0 auto;
+ position: relative;
+ border: 1px solid blue;
+ }
+}
#charter #header_container #logo_zone
{
position: absolute;
@@ -75,15 +90,27 @@ ul, ol
background-color:#5684B9;
}
/***** CHARTER BODY *****/
+@media screen and (max-width: 840px){
#charter #body_container
-{
- position: relative;
- margin: 10px auto 10px auto;
- width: 970px;
- height: 100px;
- min-height: 520px;
+ {
+ 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;
+ margin: 10px auto 10px auto;
+ width: 970px;
+ height: 100px;
+ min-height: 520px;
+ }
+}
/***** CHARTER MENU *****/
#charter #body_container #menu_container
{
@@ -140,27 +167,81 @@ ul, ol
width: 750px;
border: 0px none lightgreen;
}
-
+@media screen and (min-width: 840px)
+{
+#footer_menu
+ {
+ margin: 0 ;
+ position: relative;
+ height : 40px;
+ width: 970px;
+ margin: 0 auto;
+ clear: both;
+ background-color:#FFFFFF;
+ }
+#footer_menu .button
+ { display:inline;
+ font-size: 20px;
+ float : left;
+ height: 20px;
+ background-color:#5684B9;
+ text-align: center;
+ margin: 5px;
+ width: 23.71%;
+ border-style: 3px solid #73AD21;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ }
/***** CHARTER FOOTER *****/
-#footer_menu
-{
- margin: 0 ;
- position: relative;
- height : 40px;
- width: 970px;
- margin: 0 auto;
- clear: both;
-}
#charter #footer_container
+ {
+ margin: 0;
+ position: relative;
+ width:970px;
+ margin:0 auto;
+ clear: both;
+ height: auto;
+ border: 1px solid red;
+ }
+}
+@media screen and (max-width: 840px)
{
- margin: 0;
- position: relative;
- width:970px;
- margin:0 auto;
- clear: both;
- height: auto;
- border: 1px solid red;
+#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;
+ }
+
+/***** CHARTER FOOTER *****/
+#charter #footer_container
+ {
+ margin: 0;
+ position: relative;
+ width:670px;
+ margin:0 auto;
+ clear: both;
+ height: auto;
+ border: 1px solid red;
+ }
}
/*********************/
diff --git a/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java b/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java
index 396bad8..2992fd3 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/charter.html");
+ Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter2.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 e527045..b27e40e 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/charter.html");
+ Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter2.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 c4bc601..77c422c 100644
--- a/src/org/april/libreencadeau/website/pages/Faq_xhtml.java
+++ b/src/org/april/libreencadeau/website/pages/Faq_xhtml.java
@@ -65,7 +65,7 @@ public class Faq_xhtml extends HttpServlet
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/pages/faq.html");
//
- Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
+ Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter2.html");
charter.include("content_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..4cfd2a4 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/charter.html");
+ Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter2.html");
charter.include("content_container", page);
String html = charter.dynamize().toString();