Compare commits

...
15 Commits
Author SHA1 Message Date
artnuc.ct9 6ca6e89cd5 gt symbol 2021-03-04 20:47:54 +04:00
artnuc.ct9 f5d09537b9 no more XXX 2021-03-04 20:30:31 +04:00
artnuc.ct9 a5c34cc6a0 XXX 2021-03-04 20:27:52 +04:00
artnuc.ct9 5c9fe38c4b Makefile 2021-03-04 20:20:33 +04:00
artnuc.ct9 feff65ab36 email cagettePéi 2021-03-04 19:57:04 +04:00
artnuc.ct9 c8a354e868 logo espace + police gras 2021-02-26 11:22:53 +04:00
artnuc.ct9 ccd46e79fc README plus complet 2021-02-26 11:19:27 +04:00
artnuc.ct9 6c6eec0b78 fix group.name undefined 2021-02-26 10:55:43 +04:00
artnuc.ct9 7662ce8771 Merge branch 'master' of artcode.re:cagetters/cagette 2021-02-26 09:42:22 +04:00
artnuc.ct9 8c8e9352d3 logo change 2021-02-26 09:41:37 +04:00
pvincent 6e28c2a5db Update 'README.md' 2021-02-25 20:46:03 +04:00
artnuc.ct9 33d97a2f93 fix Makefile conflict 2021-01-21 12:07:59 +04:00
artnuc.ct9 5f6c97d146 dont mess with config file 2021-01-21 11:57:08 +04:00
CAGETTE DEPLOYER e9a7ccad4a Merge branch 'master' of artcode.re:cagetters/cagette 2020-12-09 23:05:00 +04:00
artnuc.ct9 1b84212da5 create tmp 2020-11-26 22:35:21 +04:00
11 changed files with 55 additions and 1178 deletions
+8 -3
View File
@@ -6,8 +6,11 @@ ENV?="dev"
#To compile project with plugins, add PLUGINS=1 or type `export PLUGINS=1` #To compile project with plugins, add PLUGINS=1 or type `export PLUGINS=1`
install: install:
#copy config file from template #copy config file from template first time only
cp config.xml.dist config.xml @if [ ! -f config.xml ]; then \
cp config.xml.dist config.xml; \
fi
@if [ $(ENV) = "dev" ]; then \ @if [ $(ENV) = "dev" ]; then \
make install_dev; \ make install_dev; \
fi fi
@@ -47,7 +50,7 @@ compile:
echo "compile Cagette.net with plugins"; \ echo "compile Cagette.net with plugins"; \
haxe cagetteAllPlugins.hxml; \ haxe cagetteAllPlugins.hxml; \
else \ else \
echo "compile Cagette.net core"; \ echo "compile CagettePéi core"; \
haxe cagette.hxml; \ haxe cagette.hxml; \
fi fi
@@ -63,6 +66,8 @@ frontend:
else \ else \
haxe cagetteJs.hxml; \ haxe cagetteJs.hxml; \
fi fi
mkdir -p tmp
chown www-data:www-data tmp
#update POT file from source #update POT file from source
i18n: i18n:
+5 -1
View File
@@ -1,4 +1,8 @@
# Cagette péi # Cagette péi
Fourche du logiciel Cagette.net à partir de la version 0.9.2 Novembre 2018 Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018
Certaines portions du code source de Cagette.net n'étant plus disponibles en téléchargement,
j'ai repris sur la base d'un existant pour adapter au marché local réunionnais et leurs AMAPéi.
+14 -24
View File
@@ -1,29 +1,19 @@
<config <config
database="mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
host="<URL without http>"
name = "<HTML head title>"
default_email = "<default email>"
key="carotteMagique"
maintain="0"
cache="1"
cachetpl="0"
debug="0"
sqllog="0"
lang="fr" lang="fr"
langs="fr" langs="fr"
langnames="Français" langnames="Français"
host="www.amapeisudreunion.com"
name = "AMAPEI Sud Réunion"
default_email = "admin@amapeisudreunion.com"
webmaster_email = "postmaster@amapeisudreunion.com"
database="mysql://cagette:cagette@ct1/cagette"
sqllog="0"
debug="0"
cache="1"
maintain="0"
cachetpl="0"
key="carotteMagique"
smtp_host="localhost"
smtp_port="25"
smtp_user=""
smtp_pass=""
mt.net.form.Form.HTML5 = "1"
mt.net.form.Form.USE_TWITTER_BOOTSTRAP = "1"
google_geocoding_key="googlekey"
/> />
+2 -6
View File
@@ -14,7 +14,7 @@
<h1>::groupName::</h1> <h1>::groupName::</h1>
::else:: ::else::
<div style="margin-bottom:22px;" > <div style="margin-bottom:22px;" >
<a href="http://www.cagette.net" target="_blank"> <a href="https://git.artcode.re/cagetters/cagette" target="_blank">
<img src="/img/logo3.png" alt="::NAME::" /> <img src="/img/logo3.png" alt="::NAME::" />
</a> </a>
</div> </div>
@@ -130,7 +130,7 @@
<div class="row" id="footer"> <div class="row" id="footer">
<div class="col-md-9" > <div class="col-md-9" >
<a href="http://www.cagette.net" target="_blank"> <a href="https://git.artcode.re/cagetters/cagette" target="_blank">
<img src="/img/logo.png" alt="::_("Cagette.net")::"/> <img src="/img/logo.png" alt="::_("Cagette.net")::"/>
</a> </a>
</div> </div>
@@ -141,10 +141,6 @@
<li> <li>
<a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a> <a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a>
</li> </li>
<li>
<a href="https://www.cagette.pro" target="_blank">Formations pour producteurs</a>
</li>
<li> <li>
::if (user!=null && user.isAmapManager()):: <a href="https://cagette.uservoice.com" target="_blank">::_("Propose features")::</a> ::end:: ::if (user!=null && user.isAmapManager()):: <a href="https://cagette.uservoice.com" target="_blank">::_("Propose features")::</a> ::end::
</li> </li>
+4 -4
View File
@@ -17,11 +17,11 @@ table.table td{
<hr/> <hr/>
<div style="color:#666;font-size:12px;"> <div style="color:#666;font-size:12px;">
::_("This e-mail was sent from"):: <a href="http://::HOST::">::_("Cagette.net")::</a>. &gt; ::_("This e-mail was sent from"):: <a href="http://::raw HOST::">::_("Cagette.net")::</a>.
::if group!=null:: ::if group!=null::
<br/> <br/>
::_("You receive this message because you are part of"):: <b>::group.name::</b> ::_("You receive this message because you are part of"):: <b>::_("Cagette.net")::</b>
::end:: ::end::
::if list!=null:: ::if list!=null::
@@ -32,9 +32,9 @@ table.table td{
::if group!=null:: ::if group!=null::
<div style="width:50%;max-width:300px;margin: 12px auto;padding: 8px;text-decoration: none;background: #070;border-radius: 3px;text-align: center;"> <div style="width:50%;max-width:300px;margin: 12px auto;padding: 8px;text-decoration: none;background: #070;border-radius: 3px;text-align: center;">
<a href="http://::HOST::/group/::group.id::" style="color: white;font-weight: bold;text-decoration: none;font-size:1.2em;"> <a href="http://::HOST::/group/::group.id::" style="color: white;font-weight: bold;text-decoration: none;font-size:1.2em;">
&rarr; ::group.name:: &rarr; ::_("Cagette.net")::
</a> </a>
</div> </div>
::end:: ::end::
</div> </div>
+2 -2
View File
@@ -2,7 +2,7 @@
<div style="max-width:400px;margin:auto;border:solid 1px #AAA;border-radius:8px;padding:12px;text-align:center;font-family:Arial;"> <div style="max-width:400px;margin:auto;border:solid 1px #AAA;border-radius:8px;padding:12px;text-align:center;font-family:Arial;">
<img src="http://::HOST::/img/logo2.png" title="Cagette.net" /> <img src="http://::HOST::/img/logo2.png" title="CagettePéi" />
<p> <p>
::_("Hello"):: $$nullSafe(::name::), ::_("Hello"):: $$nullSafe(::name::),
@@ -42,4 +42,4 @@
</div> </div>
::end:: ::end::
+1 -1
View File
@@ -5,4 +5,4 @@
::end:: ::end::
Executable → Regular
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 26 KiB

+19 -1137
View File
File diff suppressed because it is too large Load Diff