tagged as 1.13.0

.gitignore

@@ -28,8 +28,6 @@ www/lang/*.mo
 www/js/app.js
 www/js/libs.js
 
-www/file/*
-
 www/css/.sass-cache
 www/css/*.css
 !www/css/bootstrap.min.css

.semver_git_tag

@@ -1 +1 @@
-1.13.6
+1.13.0

lang/master/tpl/design.mtt

@@ -138,7 +138,7 @@
 					::_("HELP")::
 					<ul>
 						<li> 
-							<a href="https://wiki.cagette.net/doku.php" target="_blank">::_("Documentation")::</a>
+							<a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a> 
 						</li>
 						<li>
 							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Proposer une amélioration</a>
@@ -153,13 +153,7 @@
 		</div>
 		
 		<div class="row" id="subfooter">
-			<p>
-				version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a>
-			</p>
-			::if BANDEAU_REGION::
-			<img src='/img/bandeau_region_france_relance.png' alt='bandeau Région Réunion' width='250'></img>
-			::end::
-
+			<span>version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a></span>
 		</div>
 		
 		<div class="row">

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.13.6"}
+{"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.13.0"}

src/controller/Main.hx

@@ -29,10 +29,8 @@ class Main extends Controller {
 		if ( app.user!=null && group == null) {
 			throw Redirect("/user/choose");
 		}else if (app.user == null && (group==null || group.regOption!=db.Amap.RegOption.Open) ) {
-
-			if (db.Amap.manager.get(1, false) != null) throw Redirect("/group/1");
-			else throw Redirect("/user/login");
-
+			//throw Redirect("/user/login");
+			throw Redirect("/group/1");
 		}
 
 		view.amap = group;

src/form/ColorRadioGroup.hx

@@ -1,10 +1,12 @@
 package form;
-
 import sugoi.form.elements.RadioGroup;
 import Common;
 
-class ColorRadioGroup extends RadioGroup {
-	public function new(name:String, label:String, selected:String) {
+class ColorRadioGroup extends RadioGroup
+{
+
+	public function new(name:String, label:String,selected:String) 
+	{
 		var data = [];
 		var i = 0;
 		for (c in db.CategoryGroup.COLORS) {
@@ -15,18 +17,20 @@ class ColorRadioGroup extends RadioGroup {
 		super(name, label, data, selected, "1", false, true);
 	}
 	
-	override public function render():String {
+	override public function render():String
+	{
 		var s = "";
 		var n = parentForm.name + "_" +name;
 		
 		var c = 0;
-		if (data != null) {
-			for (row in data) {
-				var radio = "<input type=\"radio\" name=\"" + n + "\" id=\"" + n + c + "\" value=\"" + row.label + "\" "
-					+ (row.label == Std.string(value) ? "checked" : "") + " />\n";
-				var img = "<div style='margin-right:16px;width:32px;height:32px;background:"
-					+ App.current.view.intToHex(Std.parseInt(row.value))
-					+ ";'></div>";
+		if (data != null)
+		{
+			for (row in data)
+			{
+			
+				var radio = "<input type=\"radio\" name=\""+n+"\" id=\""+n+c+"\" value=\"" + row.label + "\" " + (row.label == Std.string(value) ? "checked":"") +" />\n";
+				
+				var img = "<div style='margin-right:16px;width:32px;height:32px;background:"+App.current.view.intToHex(Std.parseInt(row.value))+";'></div>";
 				
 				s += "<label for=\"" + n+c + "\" class='checkbox' style='display: inline-block;'>"+radio + " "+img+" </label>";
 				
@@ -36,4 +40,7 @@ class ColorRadioGroup extends RadioGroup {
 		
 		return s;
 	}
+	
+	
+	
 }

src/sugoi/BaseView.hx

@@ -20,14 +20,12 @@ class BaseView implements Dynamic {
 		this.HOST = App.config.HOST;
 		this.DATA_HOST = App.config.DATA_HOST;
 		this.DEBUG = App.config.DEBUG;
-		this.BANDEAU_REGION = App.config.BANDEAU_REGION;
 		this.NAME = App.config.NAME;
 		this.isAdmin = app.user != null && app.user.isAdmin();
 		
 		//Access basic functions in views
 		this.Std = Std;
 		this.Math = Math;
-		this.Config = App.config;
 		
 		
 		if ( App.config.SQL_LOG  ) {			

src/sugoi/Config.hx

@@ -11,7 +11,6 @@ class Config {
 	public var TPL:String;
 	public var TPL_TMP:String;
 	public var DEBUG:Bool;
-	public var BANDEAU_REGION:Bool;
 	public var HOST:String;
 	public var NAME:String;
 	public var KEY:String;
@@ -29,7 +28,6 @@ class Config {
 		TPL = PATH + "lang/" + LANG + "/tpl/";
 		TPL_TMP = PATH + "lang/" + LANG + "/tmp/";
 		DEBUG = get("debug", "0") == "1";
-		BANDEAU_REGION = get("bandeau_region", "0") == "1";
 		HOST = get("host");
 		KEY = get("key");
 		DATA_HOST = get("dataHost", "data." + HOST);