tagged as 1.16.0

.semver_git_tag

@@ -1 +1 @@
-1.14.3
+1.16.0

config.xml.dist

@@ -4,11 +4,21 @@
 	default_email = "<EMAIL>"
 	webmaster_email = "<EMAIL>"
 	key = "<SECRET_PHRASE>"
-	
+
 	debug="0"
 	sqllog="0"
 	maintain="0"
-	
+
 	cache="1"
 	cachetpl="0"
+
+	legal.name="TODO"
+	legal.email="TODO"
+	legal.siren="TODO"
+	legal.siret="TODO"
+	legal.naf="TODO"
+	legal.juridique="TODO"
+	legal.responsable="TODO"
+	legal.hebergeur="<a href='mailto:TODO'>TODO</a>"
+
 />

js/App.hx

@@ -192,7 +192,7 @@ class App {
 	public function cookieConsentBox(redirectUrl:String, ?message:String, ?phoneRequired = false) {
 		js.Browser.console.log("cookieConsentBox should load modal...");
 		var m = App.j("#myModal");
-		m.find(".modal-title").html("Consentement RGPD");
+		m.find(".modal-title").html("Consentement aux cookies");
 		m.find(".modal-dialog").removeClass("modal-lg");
 		untyped m.modal();
 		ReactDOM.render(jsx('<$CookieConsentBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),

js/react/user/CookieConsentBox.hx

@@ -40,15 +40,17 @@ class CookieConsentBox extends react.ReactComponentOfPropsAndState<CookieConsent
 			<$Error error="${state.error}" />
 			<$Message message="${props.message}" />
 			<form action="" method="post" className="form-horizontal">
-				<h4>Personnaliser les préférences en matière de consentement</h4>
+				<h4>Personnalisation du paramétrage</h4>
+				<p>L\'outil CagettePéi n\'utilise que des cookies nécessaires pour vous aider à naviguer efficacement et à exécuter certaines fonctionnalités. Pas de cookie publicitaire, en provenance de site tiers ou de mesure d\'audience.
+				</p>
 				<p>
-				Nous n\'utilisons que des cookies nécessaires pour vous aider à naviguer efficacement et à exécuter certaines fonctionnalités. Les cookies nécessaires sont cruciaux pour les fonctions de base du site Web et celui-ci ne fonctionnera pas comme prévu sans eux. Ces cookies ne stockent aucune donnée personnellement identifiable.
+				Seuls les cookies nécessaires sont cruciaux pour les fonctions de base du site Web et celui-ci ne fonctionnera pas comme prévu sans eux. Ces cookies ne stockent aucune donnée personnellement identifiable.
 				</p>
 
 				<p className="text-center">
-					<a onClick={deny} className="btn btn-secondary btn-lg" >Refuser</a>
+					<a onClick={deny} className="btn btn-secondary btn-lg" ><span className="glyphicon glyphicon-remove"></span> Tout Refuser</a>
 					&nbsp;
-					<a onClick={submit} className="btn btn-primary btn-lg" ><span className="glyphicon glyphicon-user"></span> Accepter</a>
+					<a onClick={submit} className="btn btn-primary btn-lg" ><span className="glyphicon glyphicon-ok"></span> Tout Accepter</a>
 				</p>
 			</form>
 		</div>');

lang/master/tpl/mentions_legales/default.mtt

@@ -7,6 +7,11 @@
 
 
 			<h4>Mentions Légales</h4>
+
+<p>
+Ce site web est édité par <b>::name::</b>
+</p>
+
 			<table class="table table-bordered table-condensed">
 				<tbody><tr>
 					<th>Champ</th>
@@ -15,37 +20,37 @@
 
 				<tr>
 					<td>Adresse de courrier électronique</td>
-					<td>contact@mangue-et-solidaire.re</td>
+					<td>::email::</td>
 				</tr>
 
 				<tr>
 					<td>Numéro Siren</td>
-					<td>879178739</td>
+					<td>::siren::</td>
 				</tr>
 
 				<tr>
 					<td>Numéro Siret</td>
-					<td>87917873900022</td>
+					<td>::siret::</td>
 				</tr>
 
 				<tr>
 					<td>Code NAF / APE</td>
-					<td>4711B</td>
+					<td>::naf::</td>
 				</tr>
 
 				<tr>
 					<td>Forme juridique et capital</td>
-					<td>Association Loi 1901</td>
+					<td>::juridique::</td>
 				</tr>
 
 				<tr>
 					<td>Responsable éditorial</td>
-					<td>Yann Jacob</td>
+					<td>::responsable::</td>
 				</tr>
 
 				<tr>
 					<td>Hébergeur</td>
-					<td><a href="www.artcode.re">Artcode</a></td>
+					<td>::raw hebergeur::</td>
 				</tr>
 			</tbody>
 		</table>

package.json

@@ -1 +1 @@
-{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.14.3"}
+{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.16.0"}

src/controller/MentionsLegales.hx

@@ -6,5 +6,14 @@ class MentionsLegales extends Controller {
 	}
 
 	@tpl("mentions_legales/default.mtt")
-	function doDefault() {}
+	function doDefault() {
+		view.name = App.config.get("legal.name");
+		view.email = App.config.get("legal.email");
+		view.siren = App.config.get("legal.siren");
+		view.siret = App.config.get("legal.siret");
+		view.naf = App.config.get("legal.naf");
+		view.juridique = App.config.get("legal.juridique");
+		view.responsable = App.config.get("legal.responsable");
+		view.hebergeur = App.config.get("legal.hebergeur");
+	}
 }