Commit 205f115d authored by  JosephK's avatar JosephK

Merge branch 'master' into 'master'

Wisemapping 4.0.3

* mise à jour en fonction de la version 4.0.3 de Wisemapping
* fix encodage des caractères dans les mails
* fix export svg (lourds)
* seul le diff entre framindmap et wisemapping est conservé
* ajout de Mindmap tel qu'il est en prod (VF) au lieu du dépôt git officiel

See merge request !3
parents 9f9832cb 55684b2e
This diff is collapsed.
This diff is collapsed.
......@@ -21,6 +21,6 @@ Ce dépôt contient également le [logiciel Mindmaps](https://github.com/drichar
Ce logiciel est sous licence AGPLv3
La traduction s'est faite directement dans le code html du fichier framindmap.html (= index.html de la version drichard).
Ce logiciel était proposé par défaut comme service en ligne par l'association Framasoft de 2012 à novembre 2014 sur le site :
http://framindmap.org/
https://framindmap.org/
JETTY
=====
The Jetty project is a 100% Java HTTP Server, HTTP Client
and Servlet Container.
The Jetty @ eclipse project is based on the Jetty project at codehaus
http://jetty.codehaus.org
Ongoing development is now at the eclipse foundation
http://www.eclipse.org/jetty/
Jetty @ eclipse is open source and is dual licensed using the apache 2.0 and
eclipse public license 1.0. You may choose either license when distributing
jetty.
BUILDING JETTY
==============
Jetty uses maven 2 as its build system. Maven will fetch
the dependancies, build the server and assemble a runnable
version:
mvn install
RUNNING JETTY
=============
The run directory is either the top-level of a binary release
or jetty-distribution/target/assembly-prep directory when built from
source.
To run with the default options:
java -jar start.jar
To see the available options and the default arguments
provided by the start.ini file:
java -jar start.jar --help
To run with extra configuration file(s) appended, eg SSL
java -jar start.jar etc/jetty-ssl.xml
To run with properties
java -jar start.jar jetty.port=8081
To run with extra configuration file(s) prepended, eg logging & jmx
java -jar start.jar --pre=etc/jetty-logging.xml --pre=etc/jetty-jmx.xml
To run without the args from start.ini
java -jar start.jar --ini OPTIONS=Server,websocket etc/jetty.xml etc/jetty-deploy.xml etc/jetty-ssl.xml
to list the know OPTIONS:
java -jar start.jar --list-options
This diff is collapsed.
<html>
<body>
<div >
<div>
<table style="display: inline;width: 100%;">
<tbody>
<tr>
<td height="50px" width="2px"
style="padding: 0; padding-right: 5px; text-align:center;font-weight: normal;font-family: Arial, sans-serif">
<a href="${baseUrl}" style="text-decoration: none">
<h1><span style="color: #6A5687;">Fra</span><span style="color: #9BAE5F;">mindmap</span></h1>
</a>
</td>
<td valign="bottom" height="32px" style="padding: 0;font-size: 16px;">
${messageTitle}
</td>
</tr>
</tbody>
</table>
</div>
<div style="font-size: 13px; background-color: #FFF; padding: 10px 0; min-height: 100px">
<p>Bonjour ${firstName},</p>
<p>
${messageBody}
</p>
<p>Cordialement,<br/>
L&rsquo;&eacute;quipe Framasoft<br/>
</p>
<p>--<br />«&nbsp;La route est longue, mais la voie est libre...&nbsp;»<br/>
Framasoft ne vit que par vos dons (d&eacute;ductibles des imp&ocirc;ts).<br />
Merci d&rsquo;avance pour votre soutien <a href="https://soutenir.framasoft.org">https://soutenir.framasoft.org</a>.</p>
</div>
</div>
<p style="font-size: 13px;font-family: Arial, sans-serif">Important&nbsp;: Ne r&eacute;pondez pas &agrave; ce mail. Si vous avez besoin d&rsquo;aide ou pensez avoir re&ccedil;u ce mail par erreur, <a href="https://contact.framasoft.org/#framindmap">contactez-nous</a>.
</p>
</body>
</html>
\ No newline at end of file
<html>
<body>
<h3>Bienvenue sur Framindmap&nbsp;!</h3>
<p>
Pour activer votre compte et v&eacute;rifier votre adresse e-mail, cliquez sur le lien suivant.
</p>
<a href="${emailcheck}">${emailcheck}</a>
</p>
<p>
Si vous avez re&ccedil;u ce mail par erreur, vous n'avez rien &agrave; faire pour supprimer votre compte.
Votre compte ne sera tout simplement pas activ&eacute; et vous ne recevrez pas d&rsquo;autre email de notre part.
</p>
<p>
Si vous ne parvenez pas &agrave; cliquer sur le lien ci-dessus,
copiez et coller l&rsquo;URL dans la barre d&rsquo;adresse de votre navigateur web.
</p>
<p>
Si vous avez des questions relatives &agrave; l&rsquo;utilisation de votre compte, <a href="https://contact.framasoft.org/#framindmap">contactez-nous</a>.
</p>
<p>
Cordialement,<br/>
L&rsquo;&eacute;quipe Framasoft.
</p>
<p>--<br />«&nbsp;La route est longue, mais la voie est libre...&nbsp;»<br/>
Framasoft ne vit que par vos dons (d&eacute;ductibles des imp&ocirc;ts).<br />
Merci d&rsquo;avance pour votre soutien <a href="https://soutenir.framasoft.org">https://soutenir.framasoft.org</a>.</p>
</body>
</html>
<html>
<body>
<div>
<div>
<table style="display: inline;width: 100%;">
<tbody>
<tr>
<td height="50px" width="2px"
style="padding: 0; padding-right: 5px; text-align:center;font-weight: normal;font-family: Arial, sans-serif">
<a href="${baseUrl}" style="text-decoration: none">
<h1><span style="color: #6A5687;">Fra</span><span style="color: #9BAE5F;">mindmap</span></h1>
</a>
</td>
<td valign="bottom" height="32px" style="padding: 0;font-size: 16px;">Cette carte mentale <a
href='${mapEditUrl}'>
${mindmap.title}</a> a &eacute;t&eacute; partag&eacute;e avec vous.
</td>
</tr>
</tbody>
</table>
</div>
<div style="font-size: 13px; background-color: #FFF; padding: 10px 0; min-height: 100px">
<p><strong>Message de ${senderMail}&nbsp;: </strong></p>
#if($message )
<pre style="font-family: Arial, sans-serif; color: #000; ">${message}</pre>
#end
<p>Cliquez sur le lien suivant pour ouvrir la carte mentale&nbsp;: <a href="${mapEditUrl}">${mindmap.title}</a></p>
<p>Si vous n&rsquo;avez pas de compte sur Framindmap, vous pouvez cr&eacute;er un compte gratuitement et librement.</p>
<p>Cordialement,<br/>
L&rsquo;&eacute;quipe Framasoft<br/>
</p>
<p>--<br />«&nbsp;La route est longue, mais la voie est libre...&nbsp;»<br/>
Framasoft ne vit que par vos dons (d&eacute;ductibles des imp&ocirc;ts).<br />
Merci d&rsquo;avance pour votre soutien <a href="https://soutenir.framasoft.org">https://soutenir.framasoft.org</a>.</p>
</div>
</div>
<p style="font-size: 13px;font-family: Arial, sans-serif">Important&nbsp;: Ne r&eacute;pondez pas &agrave; ce mail. Si vous avez besoin d&rsquo;aide ou pensez avoir re&ccedil;u ce mail par erreur, <a href="https://contact.framasoft.org/#framindmap">contactez-nous</a>.
</p>
</body>
</html>
\ No newline at end of file
This diff is collapsed.
<map name="usage" version="tango">
<topic central="true" text="${messages.getMessage("TUTORIAL.HOW_TO_START",$noArgs,$locale)}" id="1" fontStyle=";;#eeeeee;;;" bgColor="#0a0a08">
<icon id="sign_help"/>
<topic position="171,-40" order="0" text="${messages.getMessage("TUTORIAL.TOPIC_PROPERTIES",$noArgs,$locale)}" id="11" fontStyle=";;#444444;;;" bgColor="#250be3"
brColor="#080559">
<icon id="sign_cancel"/>
<topic position="295,-92" order="1" text="${messages.getMessage("TUTORIAL.ADD_NOTES",$noArgs,$locale)}" id="31">
<note><![CDATA[${messages.getMessage("TUTORIAL.SAMPLE_NOTE",$noArgs,$locale)}]]></note>
</topic>
<topic position="321,-118" order="0" text="${messages.getMessage("TUTORIAL.ADD_LINKS_WEBPAGES",$noArgs,$locale)}" id="7" fontStyle=";;#444444;;;">
<link url="https://degooglisons-internet.org" type="url"/>
</topic>
<topic position="310,-14" order="3" text="${messages.getMessage("TUTORIAL.MULTIPLE_TEXT_STYLES",$noArgs,$locale)}"
id="32">
<topic position="402,-40" order="0" text="${messages.getMessage("TUTORIAL.FONT_COLOR",$noArgs,$locale)}" id="33" fontStyle=";;#ff0000;;;"/>
<topic position="402,-13" order="1" text="${messages.getMessage("TUTORIAL.FONT_STYLE",$noArgs,$locale)}" id="35" fontStyle=";;;bold;italic;"/>
<topic position="400,12" order="2" text="${messages.getMessage("TUTORIAL.FONT_TYPE",$noArgs,$locale)}" id="36" fontStyle="Times;6;;;;"/>
</topic>
<topic position="302,38" order="4" text="${messages.getMessage("TUTORIAL.DIFFERENT_SHAPES",$noArgs,$locale)}" shape="rectagle" id="8"
fontStyle=";;#444444;;;"/>
<topic position="298,-66" order="2" text="${messages.getMessage("TUTORIAL.FANCY_ICONS",$noArgs,$locale)}" id="43">
<icon id="face_wink"/>
</topic>
</topic>
<topic position="-188,-66" order="1" text="${messages.getMessage("TUTORIAL.EDITION_USING_KEYBOARD",$noArgs,$locale)}" id="22" fontStyle=";;#444444;;;"
bgColor="#add1f7">
<icon id="hard_keyboard"/>
<topic position="-348,-119" order="0" id="26" fontStyle=";;#444444;;;">
<text><![CDATA[${messages.getMessage("TUTORIAL.MOVE_WITH_ARROWS",$noArgs,$locale)}]]></text>
</topic>
<topic position="-351,-88" order="1"
text="${messages.getMessage("TUTORIAL.START_TYPING_TO_EDIT_TEXT",$noArgs,$locale)}" id="24"
fontStyle=";;#444444;;;"/>
<topic position="-357,-35" order="3" text="${messages.getMessage("TUTORIAL.ENTER_TO_ADD_SIBLING",$noArgs,$locale)}"
id="25" fontStyle=";;#444444;;;"/>
<topic position="-370,-62" order="2" text="${messages.getMessage("TUTORIAL.CTRL_TO_ADD_CHILD",$noArgs,$locale)}"
id="23"
fontStyle=";;#444444;;;"/>
<topic position="-355,-8" order="4" text="${messages.getMessage("TUTORIAL.MORE_KEY_TIPS",$noArgs,$locale)}" id="50"/>
</topic>
<topic position="134,92" order="2" text="${messages.getMessage("TUTORIAL.SHARING",$noArgs,$locale)}" id="6" fontStyle=";;#444444;;;" bgColor="#edabff">
<topic position="253,65" order="0" text="${messages.getMessage("TUTORIAL.INVITE_FRIEND",$noArgs,$locale)}" id="9" fontStyle=";;#444444;;;"/>
<topic position="226,92" order="1" text="${messages.getMessage("TUTORIAL.EMBED_IN_BLOGS",$noArgs,$locale)}" id="10" fontStyle=";;#444444;;;"/>
<topic position="257,119" order="2" text="${messages.getMessage("TUTORIAL.PUBLISH_YOUR_MAPS",$noArgs,$locale)}" id="15" fontStyle=";;#444444;;;"/>
</topic>
<topic position="-178,71" order="3" text="${messages.getMessage("TUTORIAL.EDITION_USING_MOUSE",$noArgs,$locale)}" id="2" fontStyle=";;#444444;;;"
bgColor="#d9b518">
<icon id="hard_mouse"/>
<topic position="-327,22" order="0" id="4" fontStyle=";;#444444;;;">
<text><![CDATA[${messages.getMessage("TUTORIAL.DOUBLE_CLICK_TO_EDIT_TEXT",$noArgs,$locale)}]]></text>
</topic>
<topic position="-341,57" order="1" id="3" fontStyle=";;#444444;;;">
<text><![CDATA[${messages.getMessage("TUTORIAL.DOUBLE_CLICK_TO_ADD",$noArgs,$locale)}]]></text>
</topic>
<topic position="-327,92" order="2" id="5" fontStyle=";;#444444;;;">
<text><![CDATA[${messages.getMessage("TUTORIAL.DRAG_AND_DROP_TO_POSITION",$noArgs,$locale)}]]></text>
</topic>
<topic position="-336,123" order="3" text="${messages.getMessage("TUTORIAL.USER_THE_TOOLBAR",$noArgs,$locale)}" id="27"/>
</topic>
</topic>
<relationship srcTopicId="22" destTopicId="2" lineType="3" endArrow="true" startArrow="false"/>
</map>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p>19 May, 2009</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). The Content is dual licensed and is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;) as well as the Apache Software License Version 2.0. A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. A copy of the ASL is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>. For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
</body>
</html>
\ No newline at end of file
Before running jetty-cygwin.sh on cygwin, define the JAVA_HOME and JETTY_HOME first.
$ export JAVA_HOME=/path/to/jvm
$ export JETTY_HOME=/path/to/jetty
Examples:
$ export JAVA_HOME=/usr/bin/jvm
So assuming you installed cygwin on C:\cygwin, the jvm needs to be in C:\cygwin\usr\bin\jvm
$ export JETTY_HOME=/usr/share/jetty6
So assuming you installed cygwin on C:\cygwin, jetty needs to be in C:\cygwin\usr\share\jetty6
\ No newline at end of file
This diff is collapsed.