Compare commits

..
7 Commits
Author SHA1 Message Date
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
7 changed files with 37 additions and 44 deletions
+5 -2
View File
@@ -6,8 +6,11 @@ ENV?="dev"
#To compile project with plugins, add PLUGINS=1 or type `export PLUGINS=1`
install:
#copy config file from template
#cp config.xml.dist config.xml
#copy config file from template first time only
@if [ ! -f config.xml ]; then \
cp config.xml.dist config.xml; \
fi
@if [ $(ENV) = "dev" ]; then \
make install_dev; \
fi
+5 -1
View File
@@ -1,4 +1,8 @@
# 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
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"
langs="fr"
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>
::else::
<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::" />
</a>
</div>
@@ -130,7 +130,7 @@
<div class="row" id="footer">
<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")::"/>
</a>
</div>
@@ -141,10 +141,6 @@
<li>
<a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a>
</li>
<li>
<a href="https://www.cagette.pro" target="_blank">Formations pour producteurs</a>
</li>
<li>
::if (user!=null && user.isAmapManager()):: <a href="https://cagette.uservoice.com" target="_blank">::_("Propose features")::</a> ::end::
</li>
+4 -4
View File
@@ -17,11 +17,11 @@ table.table td{
<hr/>
<div style="color:#666;font-size:12px;">
::_("This e-mail was sent from"):: <a href="http://::HOST::">::_("Cagette.net")::</a>.
::_("This e-mail was sent from"):: <a href="http://::HOST::">::_("Cagette.net")::</a>.
::if group!=null::
<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::
::if list!=null::
@@ -32,9 +32,9 @@ table.table td{
::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;">
<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>
</div>
::end::
</div>
</div>
Executable → Regular
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 25 KiB

+7 -7
View File
@@ -595,7 +595,7 @@ msgstr "Cet email n'est lié à aucun compte connu"
#: src/controller/Member.hx:11229 src/db/User.hx:14677
#: lang/master/tpl/design.mtt:4888 lang/master/tpl/mail/design.mtt:279
msgid "Cagette.net"
msgstr "Cagette.net"
msgstr "CagettePéi"
#: src/controller/User.hx:3419
msgid "Password change"
@@ -741,19 +741,19 @@ msgstr ""
#: src/controller/Member.hx:11303
msgid "Change your e-mail in your account Cagette.net"
msgstr "Changement d'email sur votre compte Cagette.net"
msgstr "Changement d'email sur votre compte CagettePéi"
#: src/controller/Member.hx:11447 src/controller/Member.hx:11975
msgid ""
" just modified your e-mail in your account Cagette.net.<br/>Your e-mail is "
"now:"
msgstr ""
" vient de modifier votre email dans votre compte Cagette.net.<br/>Votre "
" vient de modifier votre email dans votre compte CagetteiPéi.<br/>Votre "
"email est maintenant:"
#: src/controller/Member.hx:11833
msgid "Change the e-mail of your account Cagette.net"
msgstr "Changement d'email sur votre compte Cagette.net"
msgstr "Changement d'email sur votre compte CagettePéi"
#: src/controller/Member.hx:12173
msgid "This member has beed updated"
@@ -2199,7 +2199,7 @@ msgstr "Invitation"
#: src/db/User.hx:14547
msgid "Invitation Cagette.net"
msgstr "Invitation Cagette.net"
msgstr "Invitation CagettePéi"
#: src/db/User.hx:15848 lang/master/tpl/member/import.mtt:717
#: lang/master/tpl/member/import.mtt:1429
@@ -2600,7 +2600,7 @@ msgstr "Solde"
#: lang/master/tpl/home.mtt:233
msgid "Welcome to Cagette.net !"
msgstr "Bienvenue sur Cagette.net !"
msgstr "Bienvenue sur CagettePéi !"
#: lang/master/tpl/home.mtt:287
msgid ""
@@ -4555,7 +4555,7 @@ msgstr "http://www.cagette.net"
#: lang/master/tpl/group/view.mtt:5060
msgid "Cagette.net, the free software of food direct-selling"
msgstr "Cagette.net, le logiciel libre du circuit court"
msgstr "CagettePéi, logiciel libre du circuit court pour la Réunion"
#: lang/master/tpl/design.mtt:903
msgid "Change group"