devinsy/libreencadeau
devinsy/libreencadeau
1
0
Fork 0
Code Issues 4 Pull requests Releases Activity

Compare commits

base: devinsy:dcl-firstTest
Branches Tags
devinsy:master
devinsy:dcl-firstTest
..
compare: devinsy:master
Branches Tags
devinsy:dcl-firstTest
devinsy:master

8 commits
dcl-firstT ... master

Author SHA1 Message Date
Luk
f949de726d Delete 002-evenements 2016-11-20 23:25:09 +01:00
Luk
a0bd1bba40 Add new file 2016-11-20 23:24:58 +01:00
Luk
aa14f193c8 Update 002-events 2016-11-20 23:22:54 +01:00
Luk
f272372db1 Add new file 2016-11-20 23:22:17 +01:00
Luk
445d52c85c Add new file 2016-11-20 22:51:45 +01:00
Luk
ca596078e5 Add new file 2016-11-20 22:42:37 +01:00
Luk
8561dca29b Update index.html 2016-11-20 22:38:18 +01:00
Luk
a195ddf25d Update index.html 2016-11-20 22:34:58 +01:00
32 changed files with 199 additions and 818 deletions
Show stats Expand all files Collapse all files

2
.classpath
View file

@ -9,6 +9,7 @@
</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"/>
@ -32,6 +33,5 @@
<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>

2
.settings/org.eclipse.wst.ws.service.policy.prefs
View file

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

57
WebContent/WEB-INF/context.xml
View file

@ -1,57 +0,0 @@
<?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>

BIN
src/org/april/cadal/website/camenbert.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
src/org/april/cadal/website/charter/logo-cadal-48x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

BIN
src/org/april/cadal/website/favicon.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

52
src/org/april/cadal/website/index.html
View file

@ -1,52 +0,0 @@
<?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>

102
src/org/april/cadal/website/pages/Cadal_xhtml.java
View file

@ -1,102 +0,0 @@
/**
* 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
{
}
}
// ////////////////////////////////////////////////////////////////////////

102
src/org/april/cadal/website/pages/Contact_xhtml.java
View file

@ -1,102 +0,0 @@
/**
* 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
{
}
}
// ////////////////////////////////////////////////////////////////////////

104
src/org/april/cadal/website/pages/Faq_xhtml.java
View file

@ -1,104 +0,0 @@
/**
* 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
{
}
}
// ////////////////////////////////////////////////////////////////////////

102
src/org/april/cadal/website/pages/Legal_xhtml.java
View file

@ -1,102 +0,0 @@
/**
* 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
{
}
}
// ////////////////////////////////////////////////////////////////////////

50
src/org/april/cadal/website/pages/accueil.html
View file

@ -1,50 +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="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>

18
src/org/april/cadal/website/pages/cadal.html
View file

@ -1,18 +0,0 @@
<?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>

18
src/org/april/cadal/website/pages/contact.html
View file

@ -1,18 +0,0 @@
<?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>Pour nous contacter :</h1>
<p>
les_meilleurs@april.org
</p>
</body>
</html>

28
src/org/april/cadal/website/pages/faq.html
View file

@ -1,28 +0,0 @@
<?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>

18
src/org/april/cadal/website/pages/legal.html
View file

@ -1,18 +0,0 @@
<?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>

29
src/org/april/cadal/website/pages/menu.html
View file

@ -1,29 +0,0 @@
<?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>

12
src/org/april/cadal/Cadal.java → src/org/april/libreencadeau/LibreEnCadeau.java
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.cadal; package org.april.libreencadeau;
/** /**
* *
* *
* @author Christian P. Momon * @author Christian P. Momon
*/ */
public class Cadal public class LibreEnCadeau
{ {
private static class SingletonHolder private static class SingletonHolder
{ {
private static final Cadal instance = new Cadal(); private static final LibreEnCadeau instance = new LibreEnCadeau();
} }
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Cadal.class); private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LibreEnCadeau.class);
/** /**
* @throws Exception * @throws Exception
* *
*/ */
private Cadal() private LibreEnCadeau()
{ {
} }
@ -44,7 +44,7 @@ public class Cadal
* *
* @return * @return
*/ */
public static Cadal instance() public static LibreEnCadeau instance()
{ {
return SingletonHolder.instance; return SingletonHolder.instance;
} }

21
src/org/april/libreencadeau/website/001-identification Normal file
View file

@ -0,0 +1,21 @@
=Formulaire d'identification/Création de compte=
Le formulaire est une page publique accessible depuis la page d'index du site.
Elle comporte deux fonctions :
* L'identification
* La création de compte
==Identification==
*Mail d'identification
*Mot de passe
*Lien mot de passe perdu
==Création de compte==
mail
login
mot de passe
détrompeur de mot de passe
==Identifier un utilisateur==
L'utilisateur identifié est orienté vers la page "événements".

30
src/org/april/libreencadeau/website/002-events Normal file
View file

@ -0,0 +1,30 @@
=Page événement= La page événement est une page privée accessible après
identification. Son contenu est fonction des élements créés par l'utlisateur.
Elle se décompose en :
* un menu
* une liste d'événement
* un bouton de création d'un nouvel événement
==Menu== Le menu permet à l'utilisateur d'accéder
* ses événements (page actuelle, par défaut lors de l'identification)
* ses données personnelles
* sa déconnexion
==Liste d'événements==
La liste des événements permet de consulter et éditer les événements existants.
Elle liste les événements à venir et les événements passés. Elle comporte les
champs :
* nom de l'événement : le nom choisi par l'utilisateur lorsqu'il a créé
l'événement.
* Date de création de l'événement : l'horodatage de la création de l'événement
* Actions relatives à l'événement :
** Voir : accéder à l'événement de la même façon que les destinataires
** Copier URL : copier l'URL de la page de l'événement
** Modifier : modifier l'événement => renvoie vers le formulaire de l'événement
**Supprimer : Supprimer l'événement => supprime l'événement après une demande de
confirmation.
==Bouton création d'événement==
Un bouton permet de créer un nouvel événement.
Il renvoie vers la page de création d'un nouvel événement.

44
src/org/april/libreencadeau/website/003-event_form Normal file
View file

@ -0,0 +1,44 @@
=Formulaire de description d'un événement=
Cette page privée permet de paramétrer les éléments d'un nouvel évéenement ou
de modifier un événement existant.
Elle est composée d'éléements obligatoires et d'éléments facultatifs :
* Nom de l'événement (obligatoire)
* Date de l'événement ou URL de sondage de date (obligatoire)
* Heure de début de l'événement (obligatoire)
* Heure de fin de l'événement (facultatif)
* Lieu
** Adresse postale (facultatif)
** Lien vers OSM pour géolocalisation de l'adresse (facultatif)
** Géolocalisation (facultatif)
* Texte d'accompagnement de l'événement (facultatif)
* Choix d'un paragraphe standard (éditable ensuite dans le champs de texte
d'accompagnement (facultatif)
* Texte d'accompagnement de l'invitation au don à un projet libre
* Choix d'un paragraphe standard d'invitation au don (éditable ensuite dans le
champs de texte d'accompagnement) (facultatif)
* URL d'un sondage de présente (facultatif)
* Lien vers un service de création de sondage (faculatif)
* Choix d'une illustration (facultatif)
** Sélection de l'illustration dans la bibliothèque des illustrations
disponibles (facultatif)
** URL d'illustration externe à la bibliothèque
* Liste des projets à soutenir :
** Nom du projet
** Voir => lien vers le site internet du projet (hors cadal)
** Modifier : Modifier les éléments de description du projet si il a été créé
par l'utilisateur uniquement.=>=> formulaire de
de description de projet d'un utilisateur enregistré
** Suppression du projet de la liste
** Rédaction d'une déclaration d'amour au projet soutenu. => formulaire de
de description de projet d'un utilisateur enregistré
* Bouton d'ajout d'un projet à partir de la liste des projets libre du site =>
Sélection de projet existant (déjà modérés)
* Bouton de création d'un nouveau projet libre (utilisable par l'utilisateur
uniquement tant qu'il n'a pas été validé par la modération) => formulaire de
de description de projet d'un utilisateur enregistré
* Prévisualiser : avoir un aperçu de la page telle qu'elle sera envoyée aux
invités.
* Valider : enregistrer le formulaire et retour vers la page "événements"
* Annuler : retour vers la page "événements" sans enregistrer

2
src/org/april/cadal/website/FatalView.java → src/org/april/libreencadeau/website/FatalView.java
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.cadal.website; package org.april.libreencadeau.website;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;

4
src/org/april/cadal/website/Index_xhtml.java → src/org/april/libreencadeau/website/Index_xhtml.java
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.cadal.website; package org.april.libreencadeau.website;
import java.io.IOException; import java.io.IOException;
@ -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("body_container", page); charter.include("content_container", page);
String html = charter.dynamize().toString(); String html = charter.dynamize().toString();
// Display page. // Display page.

2
src/org/april/cadal/website/Raw_hello_xhtml.java → src/org/april/libreencadeau/website/Raw_hello_xhtml.java
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.cadal.website; package org.april.libreencadeau.website;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;

23
src/org/april/cadal/website/charter/charter.html → src/org/april/libreencadeau/website/charter/charter.html
View file

@ -6,28 +6,33 @@
<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/logo-cadal-48x.png"/></a> <a href="/"><img src="/charter/libreencadeau-logo.png"/></a>
</div> </div>
<div id="title">CADAL</div> <div id="title">LibreEnCadeau</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>

BIN
src/org/april/libreencadeau/website/charter/kiss4web-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

0
src/org/april/cadal/website/charter/kiss4web.css → src/org/april/libreencadeau/website/charter/kiss4web.css
View file

BIN
src/org/april/libreencadeau/website/charter/libreencadeau-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

102
src/org/april/cadal/website/charter/cadal.css → src/org/april/libreencadeau/website/charter/libreencadeau.css
View file

@ -36,16 +36,15 @@ 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
{ {
@ -69,22 +68,19 @@ ul, ol
position: relative; position: relative;
top: 7px; top: 7px;
left: 55px; left: 55px;
font-size: 50px; font-size: 40px;
} }
#header_container{
background-color:#5684B9;
}
/***** CHARTER BODY *****/ /***** CHARTER BODY *****/
#charter #body_container #charter #body_container
{ {
position: relative; position: relative;
margin: 10px auto 10px auto; margin: 10px auto 10px auto;
width: 970px; width: 970px;
height: 100px; height: 100px;
min-height: 520px; min-height: 520px;
} }
/***** CHARTER MENU *****/ /***** CHARTER MENU *****/
#charter #body_container #menu_container #charter #body_container #menu_container
{ {
@ -136,55 +132,15 @@ 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 *****/
#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 #charter #footer_container
{ {
margin: 0; margin: 0;
position: relative; position: relative;
width:970px; width:970px;
@ -192,9 +148,10 @@ ul, ol
clear: both; clear: both;
height: auto; height: auto;
border: 1px solid red; border: 1px solid red;
} }
/*********************/ /*********************/
table.table_classic/***** CHARTER BODY *****/ table.table_classic
{ {
border:0px; border:0px;
width:100%; width:100%;
@ -219,38 +176,3 @@ 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;
}
}

BIN
src/org/april/libreencadeau/website/favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

41
src/org/april/libreencadeau/website/index.html Normal file
View file

@ -0,0 +1,41 @@
<?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>LibreEnCadeau</h1>
<p>
Welcome!
</p>
</body>
</html>
=Description de la page=
La page d'accueil es tune page publique qui se compose :
* D'un texte de présentation statique
* D'éléments de navigation vers d'autres pages du site
* D'élements dynamique d'information/illustration
==Texte de présentation statique==
Un texte qui explique en quelques mot quel est l'objet du site.
==Eléments cliquables renvoyant vers d'autres pages du site==
* Un texte invitant un visiteur dont c'est l'anniversaire à se faire offrir
des logiciels libre. => renvoie vers l'identification/création de compte.
* Un texte pour un visiteur qui voudrait offrir du logiciel libre. => renvoie
vers la liste des projets libres validés.
* Un texte pour un vistieur qui voudrait faire référencer son projet sur
le site. => renvoie vers une formulaire de proposition de projet pour
un utilisateur non enregistré
==Élément dynamique d'information/illustration==
* La déclaration d'amour à un projet libre pris au hasard dans la liste.
* Des statistiques sur l'activité du site.

2
test/org/april/cadal/FooSandbox.java → test/org/april/libreencadeau/FooSandbox.java
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.cadal; package org.april.libreencadeau;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;