added menu + some other
This commit is contained in:
Clermonté
parent
db3ffc691c
commit
44a27aa352
12 changed files with 89 additions and 59 deletions
|
|
@ -63,7 +63,7 @@ public class Index_xhtml extends HttpServlet
|
|||
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/index.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();
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
|
||||
<link rel="stylesheet" type="text/css" href="/charter/kiss4web.css" />
|
||||
<link rel="stylesheet" type="text/css" href="/charter/libreencadeau.css" />
|
||||
<link rel="stylesheet" type="text/css" href="/charter/libreencadeau.css" />
|
||||
<meta name="keywords" content="LibreEnCadeau" />
|
||||
</head>
|
||||
<body id="charter">
|
||||
|
|
@ -14,18 +14,11 @@
|
|||
<div id="logo_zone">
|
||||
<a href="/"><img src="/charter/logo-cadal-48x.png"/></a>
|
||||
</div>
|
||||
<div id="title">LibreEnCadeau</div>
|
||||
<div id="title">CADAL</div>
|
||||
</div>
|
||||
|
||||
<div id="body_container" class="row">
|
||||
<div id="menu_container" class="column">
|
||||
<div id="menu" class="submenu column">
|
||||
<ul>
|
||||
<li><a id="menu_welcome" href="/">Home</a></li>
|
||||
<li><a href="/Raw_hello.xhtml"> Raw_hello</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="left_menu" class="column"></div>
|
||||
|
||||
<div id="content_container" class="column">
|
||||
Content…
|
||||
|
|
@ -33,6 +26,12 @@
|
|||
</div>
|
||||
|
||||
<div id="footer_container">
|
||||
<div id="footer_menu" >
|
||||
<div class="button"><a href="/pages/cadal.xhtml"> Qu'est-ce que Cadal ?</a></div>
|
||||
<div class="button"> <a href="/pages/legal.xhtml">Légal</a></div>
|
||||
<div class="button"> <a href="/pages/faq.xhtml">FAQ</a></div>
|
||||
<div class="button"> <a href="/pages/contact.xhtml">Contact</a></div>
|
||||
</div>
|
||||
<div>LibreEnCadeau is released under the GNU AGPL license.</div>
|
||||
<div>Source: https://framagit.org/devinsy/LibreEnCadeau</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" >
|
||||
<head>
|
||||
<title>LibreEnCadeau</title>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
|
||||
<link rel="stylesheet" type="text/css" href="/charter/kiss4web.css" />
|
||||
<link rel="stylesheet" type="text/css" href="/charter/libreencadeau.css" />
|
||||
<meta name="keywords" content="LibreEnCadeau" />
|
||||
</head>
|
||||
<body id="charter">
|
||||
<div id="header_container">
|
||||
<div id="logo_zone">
|
||||
<a href="/"><img src="/charter/logo-cadal-48x.png"/></a>
|
||||
</div>
|
||||
<div id="title">CADAL</div>
|
||||
</div>
|
||||
|
||||
<div id="body_container" class="row">
|
||||
|
||||
|
||||
<div id="content_container" class="column">
|
||||
Content…
|
||||
</div>
|
||||
</div>
|
||||
<div id="footer_menu" >
|
||||
<div class="button"><a href="/pages/cadal.xhtml"> Qu'est-ce que Cadal ?</a></div>
|
||||
<div class="button"> <a href="/pages/legal.xhtml">Légal</a></div>
|
||||
<div class="button"> <a href="/pages/faq.xhtml">FAQ</a></div>
|
||||
<div class="button"> <a href="/pages/contact.xhtml">Contact</a></div>
|
||||
</div>
|
||||
<div id="footer_container">
|
||||
<div>LibreEnCadeau is released under the GNU AGPL license.</div>
|
||||
<div>Source: https://framagit.org/devinsy/LibreEnCadeau</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB |
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<body>
|
||||
<h1>Pour nous contacter :</h1>
|
||||
<p>
|
||||
les_meilleurs(at)april.org
|
||||
les_meilleurs@april.org
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -8,8 +8,15 @@
|
|||
<link rel="stylesheet" type="text/css" href="/charter/kiss4web.css" />
|
||||
<link rel="stylesheet" type="text/css" href="/charter/libreencadeau.css" />
|
||||
<meta name="keywords" content="kiss4web, devinsy" />
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
||||
<div id="content_container" class="column">
|
||||
Content…
|
||||
</div>
|
||||
|
||||
<h1>Tout ce que vous avez toujours voulu savoir sur Cadal</h1>
|
||||
<p>
|
||||
Sans jamais oser le demander.
|
||||
|
|
|
|||
29
src/org/april/libreencadeau/website/pages/menu.html
Normal file
29
src/org/april/libreencadeau/website/pages/menu.html
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" >
|
||||
<head>
|
||||
<title>Kiss4web</title>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
|
||||
<link rel="stylesheet" type="text/css" href="/charter/kiss4web.css" />
|
||||
<link rel="stylesheet" type="text/css" href="/charter/libreencadeau.css" />
|
||||
<meta name="keywords" content="kiss4web, devinsy" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="menu_container" class="column">
|
||||
<div id="menu" class="submenu column">
|
||||
<ul>
|
||||
<li><a id="menu_welcome" href="/">Home</a></li>
|
||||
<li><a href="/Raw_hello.xhtml"> Raw_hello</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in a new issue