Compare commits

...

8 commits

Author SHA1 Message Date
Clermonté
a4685d6002 update prefs 2018-03-14 21:56:27 +01:00
Clermonté
7edfcf6a5a renamed in cadal 2018-03-14 21:55:21 +01:00
Clermonté
4b87e554f1 added home page 2016-10-08 00:05:51 +02:00
Clermonté
691f5a018a improved css 2016-10-06 21:35:48 +02:00
Clermonté
44a27aa352 added menu + some other 2016-10-04 22:37:33 +02:00
Clermonté
db3ffc691c removed image, only one css 2016-10-02 23:20:53 +02:00
Clermonté
2cdca7ffb7 miscellaneous change + first test responsive 2016-09-29 23:02:33 +02:00
Clermonté
2ba011a608 first pages 2016-09-23 22:54:03 +02:00
28 changed files with 802 additions and 65 deletions

View file

@ -9,7 +9,6 @@
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_92"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-codec-1.8-sources.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-codec-1.8-sources.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-codec-1.8.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-codec-1.8.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.3-sources.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.3-sources.jar"/>
@ -33,5 +32,6 @@
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/slf4j-log4j12-1.7.5.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/slf4j-log4j12-1.7.5.jar"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xidyn-1.1.3-sources.zip"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/xidyn-1.1.3-sources.zip"/>
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/xidyn-1.1.3.jar"/> <classpathentry kind="lib" path="WebContent/WEB-INF/lib/xidyn-1.1.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-8-oracle"/>
<classpathentry kind="output" path="build/classes"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>

View file

@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.wst.ws.service.policy.projectEnabled=false

View file

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Kiss4web App environment configuration
=======================================
The configuration of App is done using JNDI in the context.xml file.
* Configure Kiss4web in Eclipse
1) copy the META-INF/model_of_content.xml file to META-INF/content.xml
2) edit environment settings in META-INF/content.xml
3) DO NEVER COMMIT META-INF/content.xml (right button > Team > Ignore)
To ensure that Eclipse take well the library changes:
- Server tab > Stop
- Server tab > Server > Right button > Clean
- Server tab > Server > Right button > Clean Tomcat Directory
* Configure App in Tomcat
1) copy the META-INF/model_of_content.xml file to $CATALINA_BASE/conf/[engine]/[localhost]/content.xml
2) edit environment settings in $CATALINA_BASE/conf/[engine]/[localhost]/content.xml
To ensure that Eclipse take well the library changes:
- Server tab > Stop
- Server tab > Server > Right button > Clean
- Server tab > Server > Right button > Clean Tomcat Directory
TARGET: DEVELOPMENT ENVIRONMENT
This file is located in the META-INF folder to define the configuration of an development environment.
-->
<Context>
<!-- Name the environment. -->
<Environment name="kiss4web.environment.name" value="DEV" type="java.lang.String" override="true"/>
<!-- Name the environment. -->
<Environment name="kiss4web.website.name" value="DEV" type="java.lang.String" override="true"/>
<!-- Define the website URL.
Some features need the domain name of the website (link in RSS, link in email...).
As the war could be behind a proxy server, this value must be defined in the environment configuration.
-->
<Environment name="kiss4web.website.url" value="http://localhost:8080/" type="java.lang.String" override="true"/>
<!-- Define where is the log4file. -->
<Environment name="kiss4web.log4j.path" value="WEB-INF/log4j.properties" type="java.lang.String" override="true"/>
</Context>

View file

@ -16,27 +16,27 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/> * along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/ */
package org.april.libreencadeau; package org.april.cadal;
/** /**
* *
* *
* @author Christian P. Momon * @author Christian P. Momon
*/ */
public class LibreEnCadeau public class Cadal
{ {
private static class SingletonHolder private static class SingletonHolder
{ {
private static final LibreEnCadeau instance = new LibreEnCadeau(); private static final Cadal instance = new Cadal();
} }
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LibreEnCadeau.class); private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Cadal.class);
/** /**
* @throws Exception * @throws Exception
* *
*/ */
private LibreEnCadeau() private Cadal()
{ {
} }
@ -44,7 +44,7 @@ public class LibreEnCadeau
* *
* @return * @return
*/ */
public static LibreEnCadeau instance() public static Cadal instance()
{ {
return SingletonHolder.instance; return SingletonHolder.instance;
} }

View file

@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/> * along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/ */
package org.april.libreencadeau.website; package org.april.cadal.website;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;

View file

@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/> * along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/ */
package org.april.libreencadeau.website; package org.april.cadal.website;
import java.io.IOException; import java.io.IOException;
@ -37,8 +37,8 @@ public class Index_xhtml extends HttpServlet
private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Index_xhtml.class); private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Index_xhtml.class);
/** /**
* *
*/ */
@Override @Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{ {
@ -64,7 +64,7 @@ public class Index_xhtml extends HttpServlet
// //
Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html"); 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(); String html = charter.dynamize().toString();
// Display page. // Display page.
@ -80,8 +80,8 @@ public class Index_xhtml extends HttpServlet
} }
/** /**
* *
*/ */
@Override @Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
{ {
@ -89,8 +89,8 @@ public class Index_xhtml extends HttpServlet
} }
/** /**
* *
*/ */
@Override @Override
public void init() throws ServletException public void init() throws ServletException
{ {

View file

@ -16,7 +16,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/> * along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/ */
package org.april.libreencadeau.website; package org.april.cadal.website;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View file

@ -36,15 +36,16 @@ ul, ol
} }
/***** CHARTER HEADER *****/ /***** CHARTER HEADER *****/
#charter #header_container #charter #header_container
{ {
margin: 0px; margin: 0px;
height: 100px; height: 100px;
width: 970px; width: 970px;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
border: 1px solid blue; border: 1px solid blue;
} }
#charter #header_container #logo_zone #charter #header_container #logo_zone
{ {
@ -68,19 +69,22 @@ ul, ol
position: relative; position: relative;
top: 7px; top: 7px;
left: 55px; left: 55px;
font-size: 40px; font-size: 50px;
} }
#header_container{
background-color:#5684B9;
}
/***** CHARTER BODY *****/ /***** CHARTER BODY *****/
#charter #body_container
{
position: relative;
margin: 10px auto 10px auto;
width: 970px;
height: 100px;
min-height: 520px;
}
#charter #body_container
{
position: relative;
margin: 10px auto 10px auto;
width: 970px;
height: 100px;
min-height: 520px;
}
/***** CHARTER MENU *****/ /***** CHARTER MENU *****/
#charter #body_container #menu_container #charter #body_container #menu_container
{ {
@ -132,26 +136,65 @@ ul, ol
/***** CHARTER CONTENT *****/ /***** CHARTER CONTENT *****/
#charter #body_container #content_container #charter #body_container #content_container
{ {
margin: 10px auto 20px auto; margin: 10px auto 20px auto;
width: 750px; width: 750px;
border: 0px none lightgreen; border: 0px none lightgreen;
} }
/***** CHARTER FOOTER *****/ /***** CHARTER FOOTER *****/
#charter #footer_container
{
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: 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;
}
#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:970px;
margin:0 auto;
clear: both;
height: auto;
border: 1px solid red;
}
/*********************/ /*********************/
table.table_classic table.table_classic/***** CHARTER BODY *****/
{ {
border:0px; border:0px;
width:100%; width:100%;
@ -176,3 +219,38 @@ table.table_classic > tfoot > tr > td
margin: 5px; margin: 5px;
padding: 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;
}
}

View file

@ -6,33 +6,28 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/x-icon" href="/favicon.ico" /> <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/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" /> <meta name="keywords" content="LibreEnCadeau" />
</head> </head>
<body id="charter"> <body id="charter">
<div id="header_container"> <div id="header_container">
<div id="logo_zone"> <div id="logo_zone">
<a href="/"><img src="/charter/libreencadeau-logo.png"/></a> <a href="/"><img src="/charter/logo-cadal-48x.png"/></a>
</div> </div>
<div id="title">LibreEnCadeau</div> <div id="title">CADAL</div>
</div> </div>
<div id="body_container" class="row"> <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="/foo">&#160;Foo</a></li>
</ul>
</div>
</div>
<div id="content_container" class="column">
Content…
</div>
</div> </div>
<div id="footer_container"> <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>LibreEnCadeau is released under the GNU AGPL license.</div>
<div>Source: https://framagit.org/devinsy/LibreEnCadeau</div> <div>Source: https://framagit.org/devinsy/LibreEnCadeau</div>
</div> </div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -0,0 +1,52 @@
<?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="body_container" class="column" style="width:680px;">
<div class="column" style="background-color:#5684B9;width:600px;height:120px;padding: 20px;text-align:center;font-size: 13px;margin:5px;">
<p><b>C'est votre anniversaire ?
Vous voulez que vos amis vous offrent des logiciels libres ?
Cadal vous aide à organiser tout ça.
</b></p>
</div>
<div class="column" style="background-color:#5684B9;width:560px;height:100px;padding: 40px;text-align:center;margin:5px;">
<p><b>
OK ! Je veux me faire offrir du libre
</b></p>
</div>
<div class="row">
<div class="column" style="display:block;background-color:#5684B9;width:315px;height:120px;padding-top: 40px;text-align:center;margin:5px;">
<p><b>
Je voudrais offrir du logiciel libre
</b> </p>
</div>
<div class="column" style="background-color:#5684B9;width:315px;height:120px;padding-top: 40px;text-align:center;margin:5px;">
<p><b>
Je voudrais référencer mon projet sur Cadal
</b></p>
</div>
</div>
</div>
<div class="column" style="width:250px;">
<div class="column" style="background-color:#ffff66;width:180px;height:200px;padding: 40px;text-align:center;margin:15px;">
<b>
Un projet libre : Moi j'aime le projet libre parce que c'est le plus beau projet qu'on puisse imaginer.
</b>
</div>
<div class="column" style="background-color:#ffff66;width:180px;height:130px;padding: 40px;text-align:center;margin:10px;">
<b>
<img src="/camenbert.jpg"/>
Super stats sur l'activité du site
</b>
</div>
</div>
</body>
</html>

View file

@ -0,0 +1,102 @@
/**
* Copyright (C) 2016 Christian Pierre MOMON
*
* This file is part of LibreEnCadeau.
*
* LibreEnCadeau is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* LibreEnCadeau is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
* details.
*
* You should have received a copy of the GNU Affero General Public License
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/
package org.april.cadal.website.pages;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.april.cadal.website.FatalView;
import fr.devinsy.xidyn.pages.Page;
import fr.devinsy.xidyn.pages.PageFactory;
/**
*
*/
public class Cadal_xhtml extends HttpServlet
{
private static final long serialVersionUID = -3597088223059326129L;
private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Cadal_xhtml.class);
/**
*
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{
logger.debug("doGet starting…");
try
{
//
logger.debug("doGet starting…");
// Get parameters.
// ===============
// Locale locale = kiwa.getUserLocale(request);
// Long accountId = kiwa.getAuthentifiedAccountId(request,
// response);
// Use parameters.
// ===============
// Send response.
// ==============
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/pages/cadal.html");
//
Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
charter.include("body_container", page);
String html = charter.dynamize().toString();
// Display page.
response.setContentType("application/xhtml+xml; charset=UTF-8");
response.getWriter().println(html);
}
catch (Exception exception)
{
FatalView.show(request, response, exception);
}
logger.debug("doGet done.");
}
/**
*
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
{
doGet(request, response);
}
/**
*
*/
@Override
public void init() throws ServletException
{
}
}
// ////////////////////////////////////////////////////////////////////////

View file

@ -0,0 +1,102 @@
/**
* Copyright (C) 2016 Christian Pierre MOMON
*
* This file is part of LibreEnCadeau.
*
* LibreEnCadeau is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* LibreEnCadeau is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
* details.
*
* You should have received a copy of the GNU Affero General Public License
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/
package org.april.cadal.website.pages;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.april.cadal.website.FatalView;
import fr.devinsy.xidyn.pages.Page;
import fr.devinsy.xidyn.pages.PageFactory;
/**
*
*/
public class Contact_xhtml extends HttpServlet
{
private static final long serialVersionUID = -3597088223059326129L;
private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Contact_xhtml.class);
/**
*
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{
logger.debug("doGet starting…");
try
{
//
logger.debug("doGet starting…");
// Get parameters.
// ===============
// Locale locale = kiwa.getUserLocale(request);
// Long accountId = kiwa.getAuthentifiedAccountId(request,
// response);
// Use parameters.
// ===============
// Send response.
// ==============
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/pages/contact.html");
//
Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
charter.include("body_container", page);
String html = charter.dynamize().toString();
// Display page.
response.setContentType("application/xhtml+xml; charset=UTF-8");
response.getWriter().println(html);
}
catch (Exception exception)
{
FatalView.show(request, response, exception);
}
logger.debug("doGet done.");
}
/**
*
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
{
doGet(request, response);
}
/**
*
*/
@Override
public void init() throws ServletException
{
}
}
// ////////////////////////////////////////////////////////////////////////

View file

@ -0,0 +1,104 @@
/**
* Copyright (C) 2016 Christian Pierre MOMON
*
* This file is part of LibreEnCadeau.
*
* LibreEnCadeau is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* LibreEnCadeau is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
* details.
*
* You should have received a copy of the GNU Affero General Public License
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/
package org.april.cadal.website.pages;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.april.cadal.website.FatalView;
import fr.devinsy.xidyn.pages.Page;
import fr.devinsy.xidyn.pages.PageFactory;
/**
*
*/
public class Faq_xhtml extends HttpServlet
{
private static final long serialVersionUID = -3597088223059326129L;
private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Faq_xhtml.class);
/**
*
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{
logger.debug("doGet starting…");
try
{
//
logger.debug("doGet starting…");
// Get parameters.
// ===============
// Locale locale = kiwa.getUserLocale(request);
// Long accountId = kiwa.getAuthentifiedAccountId(request,
// response);
// Use parameters.
// ===============
// 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/charter.html");
page.include("left_menu", menu);
charter.include("body_container", page);
String html = charter.dynamize().toString();
// Display page.
response.setContentType("application/xhtml+xml; charset=UTF-8");
response.getWriter().println(html);
}
catch (Exception exception)
{
FatalView.show(request, response, exception);
}
logger.debug("doGet done.");
}
/**
*
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
{
doGet(request, response);
}
/**
*
*/
@Override
public void init() throws ServletException
{
}
}
// ////////////////////////////////////////////////////////////////////////

View file

@ -0,0 +1,102 @@
/**
* Copyright (C) 2016 Christian Pierre MOMON
*
* This file is part of LibreEnCadeau.
*
* LibreEnCadeau is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* LibreEnCadeau is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
* details.
*
* You should have received a copy of the GNU Affero General Public License
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/
package org.april.cadal.website.pages;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.april.cadal.website.FatalView;
import fr.devinsy.xidyn.pages.Page;
import fr.devinsy.xidyn.pages.PageFactory;
/**
*
*/
public class Legal_xhtml extends HttpServlet
{
private static final long serialVersionUID = -3597088223059326129L;
private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Legal_xhtml.class);
/**
*
*/
@Override
public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{
logger.debug("doGet starting…");
try
{
//
logger.debug("doGet starting…");
// Get parameters.
// ===============
// Locale locale = kiwa.getUserLocale(request);
// Long accountId = kiwa.getAuthentifiedAccountId(request,
// response);
// Use parameters.
// ===============
// Send response.
// ==============
Page page = PageFactory.instance().create("/org/april/libreencadeau/website/pages/legal.html");
//
Page charter = PageFactory.instance().create("/org/april/libreencadeau/website/charter/charter.html");
charter.include("body_container", page);
String html = charter.dynamize().toString();
// Display page.
response.setContentType("application/xhtml+xml; charset=UTF-8");
response.getWriter().println(html);
}
catch (Exception exception)
{
FatalView.show(request, response, exception);
}
logger.debug("doGet done.");
}
/**
*
*/
@Override
public void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException
{
doGet(request, response);
}
/**
*
*/
@Override
public void init() throws ServletException
{
}
}
// ////////////////////////////////////////////////////////////////////////

View file

@ -0,0 +1,50 @@
<?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="kiss4web, devinsy" />
</head>
<body>
<div id="body_container" class="row">
<div class="column" style="background-color:#5684B9;width:560px;height:200px;padding-top: 20px;text-align:center;margin:5px;">
<p>C'est votre anniversaire ?
Vous voulez que vos amis vous offrent des logiciels libres ?
Cadal vous aide à organiser tout ça.</p>
</div>
<div class="column" style="background-color:#5684B9;width:560px;height:200px;padding-top: 40px;text-align:center;margin:5px;">
<p>OK ! Je veux me faire offrir du libre </p>
</div>
<div style="display:block;background-color:#5684B9;width:280px;height:200px;padding-top: 40px;text-align:center;margin:5px;">
<p>Je voudrais offrir du logiciel libre </p>
</div>
<div style="display:inline;float:left;"> test
<div style="background-color:#5684B9;width:280px;height:200px;padding-top: 40px;text-align:center;margin:5px;">
<p>Je voudrais référencer mon projet sur Cadal </p>
</div>
</div>
</div>
</body>
</html>

View file

@ -0,0 +1,18 @@
<?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>
<h1>Qu'est-ce que Cadal ?</h1>
<p>
Vous saurez tout sur CADAL !
</p>
</body>
</html>

View file

@ -10,9 +10,9 @@
<meta name="keywords" content="kiss4web, devinsy" /> <meta name="keywords" content="kiss4web, devinsy" />
</head> </head>
<body> <body>
<h1>LibreEnCadeau</h1> <h1>Pour nous contacter :</h1>
<p> <p>
Welcome! les_meilleurs@april.org
</p> </p>
</body> </body>
</html> </html>

View file

@ -0,0 +1,28 @@
<?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="line_container" class="row">
<div id="left_menu" class="column"></div>
<div id="content_container" class="column">
<h1>Tout ce que vous avez toujours voulu savoir sur Cadal</h1>
<p >
Sans jamais oser le demander.
</p>
</div>
</div>
</body>
</html>

View file

@ -0,0 +1,18 @@
<?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>
<h1>mentions légales</h1>
<p>
Celui qui ira en prison sera ........
</p>
</body>
</html>

View 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">&#160;Raw_hello</a></li>
</ul>
</div>
</div>
</body>
</html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -17,7 +17,7 @@
* along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/> * along with LibreEnCadeau. If not, see <http://www.gnu.org/licenses/>
*/ */
package org.april.libreencadeau; package org.april.cadal;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;