diff --git a/api/client.php b/api/client.php
index 06b5cb0..4019644 100644
--- a/api/client.php
+++ b/api/client.php
@@ -112,16 +112,18 @@
curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
- /* (4) On definit les donnees POST */
- $postdata = '';
+ /* (4) On definit les donnees POST si on est pas en get */
+ if( $build['method'] != 'GET' ){
+ $postdata = '';
- // On formatte les donnees au format 'key=value&key=value'
- foreach($build['postdata'] as $key=>$value)
- $postdata .= $key.'='.$value.'&';
- rtrim($postdata); // on supprime le '&' a la fin s'il y a
+ // On formatte les donnees au format 'key=value&key=value'
+ foreach($build['postdata'] as $key=>$value)
+ $postdata .= $key.'='.$value.'&';
+ rtrim($postdata); // on supprime le '&' a la fin s'il y a
- // On envoie les donnees
- curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
+ // On envoie les donnees
+ curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
+ }
/* [4] Execution de la requete et recup de la response
diff --git a/api/manifest.json b/api/manifest.json
index edd11c7..247157d 100644
--- a/api/manifest.json
+++ b/api/manifest.json
@@ -26,7 +26,7 @@
"path": "charts/network_data"
},
"description": "Renvoie un jeu de donnees pour un graphique de type network"
- }
+ }
}
diff --git a/automate.php b/automate.php
index 0853128..211e6d7 100755
--- a/automate.php
+++ b/automate.php
@@ -74,8 +74,8 @@
// $api = new client();
- // $response = $api->send('generate-network-chart-data', array(
- // '@token'=> '48e701d4e72e4e35bc37c9a800b49d5400734d7b'
+ // $response = $api->send('testmethod', array(
+ // '@token'=> '52945efbed43b50c12413f2f0e9519bfd9e98ce8'
// ));
// var_dump($response);
diff --git a/config/dispatcher-extensions.json b/config/dispatcher-extensions.json
index b1f3c76..052f0a9 100755
--- a/config/dispatcher-extensions.json
+++ b/config/dispatcher-extensions.json
@@ -1,11 +1,11 @@
{
- "svg": "image/svg+xml",
-
- "jpg": "image/jpeg",
- "png": "image/png",
-
- "css": "text/css",
- "js": "text/js",
-
- "json": "application/json"
+ "svg": "image/svg+xml",
+
+ "jpg": "image/jpeg",
+ "png": "image/png",
+
+ "css": "text/css",
+ "js": "text/javascript",
+
+ "json": "application/json"
}
\ No newline at end of file
diff --git a/css/container.css b/css/container.css
index 2411aa1..b1ed8cf 100755
--- a/css/container.css
+++ b/css/container.css
@@ -1,2 +1,2 @@
-#WRAPPER>#CONTAINER>section{display:none;position:relative;flex-grow:1;padding:1em;border-radius:3px;background-color:#fff;color:#000;font-size:1em;border:1px solid #ddd}#WRAPPER>#CONTAINER>section.active{display:block}#WRAPPER>#CONTAINER>section h6{color:#848484;font-size:1.2em;text-transform:uppercase;font-weight:300;letter-spacing:.2em;margin:0;padding:0}#WRAPPER>#CONTAINER>section h6:before{content:'- '}#WRAPPER>#CONTAINER>section h6:after{content:' -'}#WRAPPER>#CONTAINER>section h6.center{text-align:center}#WRAPPER>#CONTAINER>section input[type="radio"],#WRAPPER>#CONTAINER>section input[type="checkbox"]{display:none}#WRAPPER>#CONTAINER>section input[type="radio"]+label[for],#WRAPPER>#CONTAINER>section input[type="checkbox"]+label[for]{padding-left:.8em;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#WRAPPER>#CONTAINER>section input[type="radio"]+label[for]:before,#WRAPPER>#CONTAINER>section input[type="checkbox"]+label[for]:before{content:'';display:inline-block;position:relative;top:.1em;left:-.8em;width:calc( 1em - 2*.15em );height:calc( 1em - 2*.15em );border-radius:50% / 50%;border:0.15em solid #399ced;background:#fff center center no-repeat;background-image:none;background-size:70% auto;transition:background .2s ease-in-out;cursor:pointer}#WRAPPER>#CONTAINER>section input[type="radio"]:checked+label[for]:before,#WRAPPER>#CONTAINER>section input[type="checkbox"]:checked+label[for]:before{background-color:#399ced;background-image:url("/f/svg/checked/st/container")}#WRAPPER>#CONTAINER>section input[type="checkbox"]+label[for]:before{border-radius:3px}#WRAPPER>#CONTAINER>section input[type="submit"],#WRAPPER>#CONTAINER>section input[type="button"]{margin:.5em 0;padding:.3em .5em;border-radius:3px;border:1px solid #515151;color:#515151;background-color:#fff;transition:background .1s ease-in-out, color .1s ease-in-out}#WRAPPER>#CONTAINER>section input[type="submit"]:hover,#WRAPPER>#CONTAINER>section input[type="button"]:hover{background-color:#515151;color:#fff}#WRAPPER>#CONTAINER>section input[type="submit"].primary,#WRAPPER>#CONTAINER>section input[type="button"].primary{border-color:#399ced;color:#399ced;background-color:#fff}#WRAPPER>#CONTAINER>section input[type="submit"].primary:hover,#WRAPPER>#CONTAINER>section input[type="button"].primary:hover{background-color:#399ced;color:#fff}#WRAPPER>#CONTAINER>section img{margin:1em;height:3em}#WRAPPER>#CONTAINER>section .flag{margin:0 .8em;padding:.2em .8em;border-radius:5px;border:1px solid #b5b5b5;color:#555;font-family:'Inconsolata'}
+#WRAPPER>#CONTAINER>section{display:none;position:relative;flex-grow:1;padding:1em;border-radius:3px;background-color:#fff;color:#000;font-size:1em;border:1px solid #ddd}#WRAPPER>#CONTAINER>section.active{display:block}#WRAPPER>#CONTAINER>section.charts{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:space-around}#WRAPPER>#CONTAINER>section h6{color:#848484;font-size:1.2em;text-transform:uppercase;font-weight:300;letter-spacing:.2em;margin:0;padding:0}#WRAPPER>#CONTAINER>section h6:before{content:'- '}#WRAPPER>#CONTAINER>section h6:after{content:' -'}#WRAPPER>#CONTAINER>section h6.center{text-align:center}#WRAPPER>#CONTAINER>section input[type="radio"],#WRAPPER>#CONTAINER>section input[type="checkbox"]{display:none}#WRAPPER>#CONTAINER>section input[type="radio"]+label[for],#WRAPPER>#CONTAINER>section input[type="checkbox"]+label[for]{padding-left:.8em;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#WRAPPER>#CONTAINER>section input[type="radio"]+label[for]:before,#WRAPPER>#CONTAINER>section input[type="checkbox"]+label[for]:before{content:'';display:inline-block;position:relative;top:.1em;left:-.8em;width:calc( 1em - 2*.15em );height:calc( 1em - 2*.15em );border-radius:50% / 50%;border:0.15em solid #399ced;background:#fff center center no-repeat;background-image:none;background-size:70% auto;transition:background .2s ease-in-out;cursor:pointer}#WRAPPER>#CONTAINER>section input[type="radio"]:checked+label[for]:before,#WRAPPER>#CONTAINER>section input[type="checkbox"]:checked+label[for]:before{background-color:#399ced;background-image:url("/f/svg/checked/st/container")}#WRAPPER>#CONTAINER>section input[type="checkbox"]+label[for]:before{border-radius:3px}#WRAPPER>#CONTAINER>section input[type="submit"],#WRAPPER>#CONTAINER>section input[type="button"]{margin:.5em 0;padding:.3em .5em;border-radius:3px;border:1px solid #515151;color:#515151;background-color:#fff;transition:background .1s ease-in-out, color .1s ease-in-out}#WRAPPER>#CONTAINER>section input[type="submit"]:hover,#WRAPPER>#CONTAINER>section input[type="button"]:hover{background-color:#515151;color:#fff}#WRAPPER>#CONTAINER>section input[type="submit"].primary,#WRAPPER>#CONTAINER>section input[type="button"].primary{border-color:#399ced;color:#399ced;background-color:#fff}#WRAPPER>#CONTAINER>section input[type="submit"].primary:hover,#WRAPPER>#CONTAINER>section input[type="button"].primary:hover{background-color:#399ced;color:#fff}#WRAPPER>#CONTAINER>section img{margin:1em;height:3em}#WRAPPER>#CONTAINER>section .flag{margin:0 .8em;padding:.2em .8em;border-radius:5px;border:1px solid #b5b5b5;color:#555;font-family:'Inconsolata'}
/*# sourceMappingURL=container.css.map */
diff --git a/css/container.css.map b/css/container.css.map
index 2f301a1..5c77dec 100755
--- a/css/container.css.map
+++ b/css/container.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AAMC,2BAAW,CACV,OAAO,CAAE,IAAI,CAKb,QAAQ,CAAE,QAAQ,CAClB,SAAS,CAAE,CAAC,CAEZ,OAAO,CAAE,GAAG,CAEZ,aAAa,CAAE,GAAG,CAElB,gBAAgB,CAAE,IAAI,CAEtB,KAAK,CAAE,IAAI,CACX,SAAS,CAAE,GAAG,CAEd,MAAM,CAAE,cAAc,CAdtB,kCAAQ,CAAE,OAAO,CAAE,KAAK,CAoBxB,8BAAI,CACH,KAAK,CAAE,OAAsB,CAC7B,SAAS,CAAE,KAAK,CAChB,cAAc,CAAE,SAAS,CACzB,WAAW,CAAE,GAAG,CAChB,cAAc,CAAE,IAAI,CAEpB,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CAEV,qCAAQ,CAAC,OAAO,CAAC,IAAI,CACrB,oCAAO,CAAC,OAAO,CAAC,IAAI,CAGpB,qCAAQ,CACP,UAAU,CAAE,MAAM,CAUpB,kGACwB,CACvB,OAAO,CAAE,IAAI,CAId,wHACqC,CACpC,YAAY,CAAE,IAAI,CAGlB,qBAAqB,CAAE,IAAI,CAC3B,mBAAmB,CAAI,IAAI,CAC3B,kBAAkB,CAAK,IAAI,CAC3B,gBAAgB,CAAO,IAAI,CAC3B,eAAe,CAAQ,IAAI,CAC3B,WAAW,CAAY,IAAI,CAI3B,sIAAQ,CACP,OAAO,CAAE,EAAE,CACX,OAAO,CAAE,YAAY,CACrB,QAAQ,CAAE,QAAQ,CACjB,GAAG,CAAE,IAAI,CACT,IAAI,CAAE,KAAK,CACX,KAAK,CAAE,qBAAqB,CAC5B,MAAM,CAAE,qBAAqB,CAE9B,aAAa,CAAE,SAAS,CACxB,MAAM,CAAE,oBAA6B,CAErC,UAAU,CAAE,4BAA4B,CACxC,gBAAgB,CAAE,IAAI,CACtB,eAAe,CAAE,QAAQ,CAEzB,UAAU,CAAE,0BAA0B,CAEtC,MAAM,CAAE,OAAO,CAKjB,sJACoD,CACnD,gBAAgB,CC9FA,OAAO,CD+FvB,gBAAgB,CAAE,kCAAkC,CAKrD,oEAA4C,CAC3C,aAAa,CAAE,GAAG,CASnB,iGACsB,CACrB,MAAM,CAAE,MAAM,CACd,OAAO,CAAE,SAAS,CAElB,aAAa,CAAE,GAAG,CAClB,MAAM,CAAE,iBAAmB,CAE3B,KAAK,CCvHW,OAAO,CDyHvB,gBAAgB,CAAE,IAAI,CAEtB,UAAU,CAAE,iDAAiD,CAG7D,6GAAO,CACN,gBAAgB,CC/HD,OAAO,CDgItB,KAAK,CAAE,IAAI,CAKZ,iHAAS,CACR,YAAY,CCrIG,OAAO,CDsItB,KAAK,CCtIU,OAAO,CDuItB,gBAAgB,CAAE,IAAI,CAItB,6HAAO,CACN,gBAAgB,CC5IF,OAAO,CD6IrB,KAAK,CAAE,IAAI,CASd,+BAAK,CACJ,MAAM,CAAE,GAAG,CACX,MAAM,CAAE,GAAG,CAKZ,iCAAO,CACN,MAAM,CAAE,MAAM,CACd,OAAO,CAAE,SAAS,CAElB,aAAa,CAAE,GAAG,CAClB,MAAM,CAAE,iBAAiB,CAEzB,KAAK,CAAE,IAAI,CACX,WAAW,CAAE,aAAa",
+"mappings": "AAMC,2BAAW,CACV,OAAO,CAAE,IAAI,CAcb,QAAQ,CAAE,QAAQ,CAClB,SAAS,CAAE,CAAC,CAEZ,OAAO,CAAE,GAAG,CAEZ,aAAa,CAAE,GAAG,CAElB,gBAAgB,CAAE,IAAI,CAEtB,KAAK,CAAE,IAAI,CACX,SAAS,CAAE,GAAG,CAEd,MAAM,CAAE,cAAc,CAvBtB,kCAAQ,CAAE,OAAO,CAAE,KAAK,CAGxB,kCAAQ,CACP,OAAO,CAAE,IAAI,CAEb,cAAc,CAAE,GAAG,CACnB,SAAS,CAAE,IAAI,CACf,eAAe,CAAE,YAAY,CAqB9B,8BAAI,CACH,KAAK,CAAE,OAAsB,CAC7B,SAAS,CAAE,KAAK,CAChB,cAAc,CAAE,SAAS,CACzB,WAAW,CAAE,GAAG,CAChB,cAAc,CAAE,IAAI,CAEpB,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CAEV,qCAAQ,CAAC,OAAO,CAAC,IAAI,CACrB,oCAAO,CAAC,OAAO,CAAC,IAAI,CAGpB,qCAAQ,CACP,UAAU,CAAE,MAAM,CAUpB,kGACwB,CACvB,OAAO,CAAE,IAAI,CAId,wHACqC,CACpC,YAAY,CAAE,IAAI,CAGlB,qBAAqB,CAAE,IAAI,CAC3B,mBAAmB,CAAI,IAAI,CAC3B,kBAAkB,CAAK,IAAI,CAC3B,gBAAgB,CAAO,IAAI,CAC3B,eAAe,CAAQ,IAAI,CAC3B,WAAW,CAAY,IAAI,CAI3B,sIAAQ,CACP,OAAO,CAAE,EAAE,CACX,OAAO,CAAE,YAAY,CACrB,QAAQ,CAAE,QAAQ,CACjB,GAAG,CAAE,IAAI,CACT,IAAI,CAAE,KAAK,CACX,KAAK,CAAE,qBAAqB,CAC5B,MAAM,CAAE,qBAAqB,CAE9B,aAAa,CAAE,SAAS,CACxB,MAAM,CAAE,oBAA6B,CAErC,UAAU,CAAE,4BAA4B,CACxC,gBAAgB,CAAE,IAAI,CACtB,eAAe,CAAE,QAAQ,CAEzB,UAAU,CAAE,0BAA0B,CAEtC,MAAM,CAAE,OAAO,CAKjB,sJACoD,CACnD,gBAAgB,CCvGA,OAAO,CDwGvB,gBAAgB,CAAE,kCAAkC,CAKrD,oEAA4C,CAC3C,aAAa,CAAE,GAAG,CASnB,iGACsB,CACrB,MAAM,CAAE,MAAM,CACd,OAAO,CAAE,SAAS,CAElB,aAAa,CAAE,GAAG,CAClB,MAAM,CAAE,iBAAmB,CAE3B,KAAK,CChIW,OAAO,CDkIvB,gBAAgB,CAAE,IAAI,CAEtB,UAAU,CAAE,iDAAiD,CAG7D,6GAAO,CACN,gBAAgB,CCxID,OAAO,CDyItB,KAAK,CAAE,IAAI,CAKZ,iHAAS,CACR,YAAY,CC9IG,OAAO,CD+ItB,KAAK,CC/IU,OAAO,CDgJtB,gBAAgB,CAAE,IAAI,CAItB,6HAAO,CACN,gBAAgB,CCrJF,OAAO,CDsJrB,KAAK,CAAE,IAAI,CASd,+BAAK,CACJ,MAAM,CAAE,GAAG,CACX,MAAM,CAAE,GAAG,CAKZ,iCAAO,CACN,MAAM,CAAE,MAAM,CACd,OAAO,CAAE,SAAS,CAElB,aAAa,CAAE,GAAG,CAClB,MAAM,CAAE,iBAAiB,CAEzB,KAAK,CAAE,IAAI,CACX,WAAW,CAAE,aAAa",
"sources": ["container.scss","constants.scss"],
"names": [],
"file": "container.css"
diff --git a/css/container.scss b/css/container.scss
index b16c8dc..a588459 100755
--- a/css/container.scss
+++ b/css/container.scss
@@ -9,6 +9,15 @@
// Gestion de l'activation des sous-parties
&.active{ display: block; }
+
+ // Gestion d'une section contenant des graphiques
+ &.charts{
+ display: flex;
+
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: space-around;
+ }
position: relative;
flex-grow: 1;
diff --git a/js/lib/highcharts/api/css/font-awesome.min.css b/js/lib/highcharts/api/css/font-awesome.min.css
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/css/images/ui-bg_flat_75_ffffff_40x100.png b/js/lib/highcharts/api/css/images/ui-bg_flat_75_ffffff_40x100.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/css/images/ui-bg_glass_75_dadada_1x400.png b/js/lib/highcharts/api/css/images/ui-bg_glass_75_dadada_1x400.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/css/jquery-ui.min.css b/js/lib/highcharts/api/css/jquery-ui.min.css
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/css/ref.css b/js/lib/highcharts/api/css/ref.css
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/css/source-sans-pro.css b/js/lib/highcharts/api/css/source-sans-pro.css
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/fonts/fontawesome-webfont.woff b/js/lib/highcharts/api/fonts/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/highcharts.html b/js/lib/highcharts/api/highcharts.html
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/Highcharts.svg b/js/lib/highcharts/api/images/Highcharts.svg
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-114x114.png b/js/lib/highcharts/api/images/apple-touch-icon-114x114.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-120x120.png b/js/lib/highcharts/api/images/apple-touch-icon-120x120.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-144x144.png b/js/lib/highcharts/api/images/apple-touch-icon-144x144.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-152x152.png b/js/lib/highcharts/api/images/apple-touch-icon-152x152.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-180x180.png b/js/lib/highcharts/api/images/apple-touch-icon-180x180.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-57x57.png b/js/lib/highcharts/api/images/apple-touch-icon-57x57.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-60x60.png b/js/lib/highcharts/api/images/apple-touch-icon-60x60.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-72x72.png b/js/lib/highcharts/api/images/apple-touch-icon-72x72.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/apple-touch-icon-76x76.png b/js/lib/highcharts/api/images/apple-touch-icon-76x76.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/favicon-160x160.png b/js/lib/highcharts/api/images/favicon-160x160.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/favicon-16x16.png b/js/lib/highcharts/api/images/favicon-16x16.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/favicon-192x192.png b/js/lib/highcharts/api/images/favicon-192x192.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/favicon-32x32.png b/js/lib/highcharts/api/images/favicon-32x32.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/favicon-96x96.png b/js/lib/highcharts/api/images/favicon-96x96.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/splash.svg b/js/lib/highcharts/api/images/splash.svg
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/images/sprite.png b/js/lib/highcharts/api/images/sprite.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/js/highcharts.json b/js/lib/highcharts/api/js/highcharts.json
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/js/jquery-1.11.3.min.js b/js/lib/highcharts/api/js/jquery-1.11.3.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/js/jquery-ui.min.js b/js/lib/highcharts/api/js/jquery-ui.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/api/js/ref.js b/js/lib/highcharts/api/js/ref.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/3d-column-interactive/index.htm b/js/lib/highcharts/examples/3d-column-interactive/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/3d-column-null-values/index.htm b/js/lib/highcharts/examples/3d-column-null-values/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/3d-column-stacking-grouping/index.htm b/js/lib/highcharts/examples/3d-column-stacking-grouping/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/3d-pie-donut/index.htm b/js/lib/highcharts/examples/3d-pie-donut/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/3d-pie/index.htm b/js/lib/highcharts/examples/3d-pie/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/3d-scatter-draggable/index.htm b/js/lib/highcharts/examples/3d-scatter-draggable/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/area-basic/index.htm b/js/lib/highcharts/examples/area-basic/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/area-inverted/index.htm b/js/lib/highcharts/examples/area-inverted/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/area-missing/index.htm b/js/lib/highcharts/examples/area-missing/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/area-negative/index.htm b/js/lib/highcharts/examples/area-negative/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/area-stacked-percent/index.htm b/js/lib/highcharts/examples/area-stacked-percent/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/area-stacked/index.htm b/js/lib/highcharts/examples/area-stacked/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/arearange-line/index.htm b/js/lib/highcharts/examples/arearange-line/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/arearange/index.htm b/js/lib/highcharts/examples/arearange/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/areaspline/index.htm b/js/lib/highcharts/examples/areaspline/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/bar-basic/index.htm b/js/lib/highcharts/examples/bar-basic/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/bar-negative-stack/index.htm b/js/lib/highcharts/examples/bar-negative-stack/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/bar-stacked/index.htm b/js/lib/highcharts/examples/bar-stacked/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/box-plot/index.htm b/js/lib/highcharts/examples/box-plot/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/bubble-3d/index.htm b/js/lib/highcharts/examples/bubble-3d/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/bubble/index.htm b/js/lib/highcharts/examples/bubble/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-basic/index.htm b/js/lib/highcharts/examples/column-basic/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-drilldown/index.htm b/js/lib/highcharts/examples/column-drilldown/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-negative/index.htm b/js/lib/highcharts/examples/column-negative/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-parsed/index.htm b/js/lib/highcharts/examples/column-parsed/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-placement/index.htm b/js/lib/highcharts/examples/column-placement/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-rotated-labels/index.htm b/js/lib/highcharts/examples/column-rotated-labels/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-stacked-and-grouped/index.htm b/js/lib/highcharts/examples/column-stacked-and-grouped/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-stacked-percent/index.htm b/js/lib/highcharts/examples/column-stacked-percent/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/column-stacked/index.htm b/js/lib/highcharts/examples/column-stacked/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/columnrange/index.htm b/js/lib/highcharts/examples/columnrange/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/combo-dual-axes/index.htm b/js/lib/highcharts/examples/combo-dual-axes/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/combo-meteogram/index.htm b/js/lib/highcharts/examples/combo-meteogram/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/combo-multi-axes/index.htm b/js/lib/highcharts/examples/combo-multi-axes/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/combo-regression/index.htm b/js/lib/highcharts/examples/combo-regression/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/combo-timeline/index.htm b/js/lib/highcharts/examples/combo-timeline/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/combo/index.htm b/js/lib/highcharts/examples/combo/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/dynamic-click-to-add/index.htm b/js/lib/highcharts/examples/dynamic-click-to-add/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/dynamic-master-detail/index.htm b/js/lib/highcharts/examples/dynamic-master-detail/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/dynamic-update/index.htm b/js/lib/highcharts/examples/dynamic-update/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/error-bar/index.htm b/js/lib/highcharts/examples/error-bar/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/funnel/index.htm b/js/lib/highcharts/examples/funnel/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/gauge-activity/index.htm b/js/lib/highcharts/examples/gauge-activity/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/gauge-clock/index.htm b/js/lib/highcharts/examples/gauge-clock/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/gauge-dual/index.htm b/js/lib/highcharts/examples/gauge-dual/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/gauge-solid/index.htm b/js/lib/highcharts/examples/gauge-solid/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/gauge-speedometer/index.htm b/js/lib/highcharts/examples/gauge-speedometer/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/gauge-vu-meter/index.htm b/js/lib/highcharts/examples/gauge-vu-meter/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/heatmap-canvas/index.htm b/js/lib/highcharts/examples/heatmap-canvas/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/heatmap/index.htm b/js/lib/highcharts/examples/heatmap/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/line-ajax/index.htm b/js/lib/highcharts/examples/line-ajax/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/line-basic/index.htm b/js/lib/highcharts/examples/line-basic/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/line-labels/index.htm b/js/lib/highcharts/examples/line-labels/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/line-log-axis/index.htm b/js/lib/highcharts/examples/line-log-axis/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/line-time-series/index.htm b/js/lib/highcharts/examples/line-time-series/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/pie-basic/index.htm b/js/lib/highcharts/examples/pie-basic/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/pie-donut/index.htm b/js/lib/highcharts/examples/pie-donut/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/pie-drilldown/index.htm b/js/lib/highcharts/examples/pie-drilldown/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/pie-gradient/index.htm b/js/lib/highcharts/examples/pie-gradient/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/pie-legend/index.htm b/js/lib/highcharts/examples/pie-legend/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/pie-monochrome/index.htm b/js/lib/highcharts/examples/pie-monochrome/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/pie-semi-circle/index.htm b/js/lib/highcharts/examples/pie-semi-circle/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/polar-spider/index.htm b/js/lib/highcharts/examples/polar-spider/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/polar-wind-rose/index.htm b/js/lib/highcharts/examples/polar-wind-rose/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/polar/index.htm b/js/lib/highcharts/examples/polar/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/polygon/index.htm b/js/lib/highcharts/examples/polygon/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/pyramid/index.htm b/js/lib/highcharts/examples/pyramid/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/renderer/index.htm b/js/lib/highcharts/examples/renderer/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/scatter/index.htm b/js/lib/highcharts/examples/scatter/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/sparkline/index.htm b/js/lib/highcharts/examples/sparkline/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/spline-inverted/index.htm b/js/lib/highcharts/examples/spline-inverted/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/spline-irregular-time/index.htm b/js/lib/highcharts/examples/spline-irregular-time/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/spline-plot-bands/index.htm b/js/lib/highcharts/examples/spline-plot-bands/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/spline-symbols/index.htm b/js/lib/highcharts/examples/spline-symbols/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/synchronized-charts/index.htm b/js/lib/highcharts/examples/synchronized-charts/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/treemap-coloraxis/index.htm b/js/lib/highcharts/examples/treemap-coloraxis/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/treemap-large-dataset/index.htm b/js/lib/highcharts/examples/treemap-large-dataset/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/treemap-with-levels/index.htm b/js/lib/highcharts/examples/treemap-with-levels/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/examples/waterfall/index.htm b/js/lib/highcharts/examples/waterfall/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/gfx/vml-radial-gradient.png b/js/lib/highcharts/gfx/vml-radial-gradient.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/highslide/close.png b/js/lib/highcharts/graphics/highslide/close.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/highslide/closeX.png b/js/lib/highcharts/graphics/highslide/closeX.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/highslide/outlines/rounded-white.png b/js/lib/highcharts/graphics/highslide/outlines/rounded-white.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/highslide/resize.gif b/js/lib/highcharts/graphics/highslide/resize.gif
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/highslide/zoomout.cur b/js/lib/highcharts/graphics/highslide/zoomout.cur
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/meteogram-symbols-30px.png b/js/lib/highcharts/graphics/meteogram-symbols-30px.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/search.png b/js/lib/highcharts/graphics/search.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/skies.jpg b/js/lib/highcharts/graphics/skies.jpg
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/snow.png b/js/lib/highcharts/graphics/snow.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/graphics/sun.png b/js/lib/highcharts/graphics/sun.png
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/index.htm b/js/lib/highcharts/index.htm
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/adapters/standalone-framework.js b/js/lib/highcharts/js/adapters/standalone-framework.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/adapters/standalone-framework.src.js b/js/lib/highcharts/js/adapters/standalone-framework.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/highcharts-3d.js b/js/lib/highcharts/js/highcharts-3d.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/highcharts-3d.src.js b/js/lib/highcharts/js/highcharts-3d.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/highcharts-more.js b/js/lib/highcharts/js/highcharts-more.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/highcharts-more.src.js b/js/lib/highcharts/js/highcharts-more.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/highcharts.js b/js/lib/highcharts/js/highcharts.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/highcharts.src.js b/js/lib/highcharts/js/highcharts.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/boost.js b/js/lib/highcharts/js/modules/boost.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/boost.src.js b/js/lib/highcharts/js/modules/boost.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/broken-axis.js b/js/lib/highcharts/js/modules/broken-axis.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/broken-axis.src.js b/js/lib/highcharts/js/modules/broken-axis.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/canvas-tools.js b/js/lib/highcharts/js/modules/canvas-tools.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/canvas-tools.src.js b/js/lib/highcharts/js/modules/canvas-tools.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/data.js b/js/lib/highcharts/js/modules/data.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/data.src.js b/js/lib/highcharts/js/modules/data.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/drilldown.js b/js/lib/highcharts/js/modules/drilldown.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/drilldown.src.js b/js/lib/highcharts/js/modules/drilldown.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/exporting.js b/js/lib/highcharts/js/modules/exporting.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/exporting.src.js b/js/lib/highcharts/js/modules/exporting.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/funnel.js b/js/lib/highcharts/js/modules/funnel.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/funnel.src.js b/js/lib/highcharts/js/modules/funnel.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/heatmap.js b/js/lib/highcharts/js/modules/heatmap.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/heatmap.src.js b/js/lib/highcharts/js/modules/heatmap.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/no-data-to-display.js b/js/lib/highcharts/js/modules/no-data-to-display.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/no-data-to-display.src.js b/js/lib/highcharts/js/modules/no-data-to-display.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/offline-exporting.js b/js/lib/highcharts/js/modules/offline-exporting.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/offline-exporting.src.js b/js/lib/highcharts/js/modules/offline-exporting.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/solid-gauge.js b/js/lib/highcharts/js/modules/solid-gauge.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/solid-gauge.src.js b/js/lib/highcharts/js/modules/solid-gauge.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/treemap.js b/js/lib/highcharts/js/modules/treemap.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/modules/treemap.src.js b/js/lib/highcharts/js/modules/treemap.src.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/themes/dark-blue.js b/js/lib/highcharts/js/themes/dark-blue.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/themes/dark-green.js b/js/lib/highcharts/js/themes/dark-green.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/themes/dark-unica.js b/js/lib/highcharts/js/themes/dark-unica.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/themes/gray.js b/js/lib/highcharts/js/themes/gray.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/themes/grid-light.js b/js/lib/highcharts/js/themes/grid-light.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/themes/grid.js b/js/lib/highcharts/js/themes/grid.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/themes/sand-signika.js b/js/lib/highcharts/js/themes/sand-signika.js
old mode 100644
new mode 100755
diff --git a/js/lib/highcharts/js/themes/skies.js b/js/lib/highcharts/js/themes/skies.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/README.md b/js/lib/sigma/README.md
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.parsers.json.min.js b/js/lib/sigma/plugins/sigma-parsers-json-min.js
old mode 100644
new mode 100755
similarity index 100%
rename from js/lib/sigma/plugins/sigma.parsers.json.min.js
rename to js/lib/sigma/plugins/sigma-parsers-json-min.js
diff --git a/js/lib/sigma/plugins/sigma.exporters.svg.min.js b/js/lib/sigma/plugins/sigma.exporters.svg.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.layout.forceAtlas2.min.js b/js/lib/sigma/plugins/sigma.layout.forceAtlas2.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.neo4j.cypher.min.js b/js/lib/sigma/plugins/sigma.neo4j.cypher.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.parsers.cypher.min.js b/js/lib/sigma/plugins/sigma.parsers.cypher.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.parsers.gexf.min.js b/js/lib/sigma/plugins/sigma.parsers.gexf.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.pathfinding.astar.min.js b/js/lib/sigma/plugins/sigma.pathfinding.astar.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.plugins.animate.min.js b/js/lib/sigma/plugins/sigma.plugins.animate.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.plugins.dragNodes.min.js b/js/lib/sigma/plugins/sigma.plugins.dragNodes.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.plugins.filter.min.js b/js/lib/sigma/plugins/sigma.plugins.filter.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.plugins.neighborhoods.min.js b/js/lib/sigma/plugins/sigma.plugins.neighborhoods.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.plugins.relativeSize.min.js b/js/lib/sigma/plugins/sigma.plugins.relativeSize.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.renderers.customEdgeShapes.min.js b/js/lib/sigma/plugins/sigma.renderers.customEdgeShapes.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.renderers.customShapes.min.js b/js/lib/sigma/plugins/sigma.renderers.customShapes.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.renderers.edgeLabels.min.js b/js/lib/sigma/plugins/sigma.renderers.edgeLabels.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.renderers.parallelEdges.min.js b/js/lib/sigma/plugins/sigma.renderers.parallelEdges.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.renderers.snapshot.min.js b/js/lib/sigma/plugins/sigma.renderers.snapshot.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/plugins/sigma.statistics.HITS.min.js b/js/lib/sigma/plugins/sigma.statistics.HITS.min.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/sigma.min.js b/js/lib/sigma/sigma-min.js
old mode 100644
new mode 100755
similarity index 100%
rename from js/lib/sigma/sigma.min.js
rename to js/lib/sigma/sigma-min.js
diff --git a/js/lib/sigma/sigma.js b/js/lib/sigma/sigma.js
old mode 100644
new mode 100755
diff --git a/js/lib/sigma/sigma.require.js b/js/lib/sigma/sigma.require.js
old mode 100644
new mode 100755
diff --git a/manager/ResourceDispatcher.php b/manager/ResourceDispatcher.php
index e88e52d..d245296 100755
--- a/manager/ResourceDispatcher.php
+++ b/manager/ResourceDispatcher.php
@@ -123,7 +123,7 @@
$correct = $correct && array_key_exists($serialFlags[0], self::$supported_extensions);
// Verification du filename
- $correct = $correct && preg_match('/^[\w_-]+$/i', $serialFlags[1]);
+ $correct = $correct && preg_match('/^[\w_\.-]+$/i', $serialFlags[1]);
// Verification du parent
$correct = $correct && array_key_exists($serialFlags[2], self::$supported_parents);
@@ -135,14 +135,12 @@
$correct = $correct && preg_match('/^[\w_-]+$/i', $serialFlags[3]);
// Verification de la couleur (optionnel)
- $opt_color = count($serialFlags) >= 5 && preg_match('/^[\da-f]{6}+$/i', $serialFlags[4]);
-
+ $opt_color = count($serialFlags) >= 5 && preg_match('/^[\da-f]{6,8}+$/i', $serialFlags[4]);
if( !$correct )
return false;
-
/* [2] Creation (non serialisee) des flags
======================================================*/
// Si tout se deroule bien, on cree les flags
diff --git a/receiver.php b/receiver.php
index 6432074..8a63dd9 100644
--- a/receiver.php
+++ b/receiver.php
@@ -1,9 +1,4 @@
\ No newline at end of file
diff --git a/view.php b/view.php
index ff7b15e..3b6a360 100755
--- a/view.php
+++ b/view.php
@@ -25,11 +25,14 @@
-
-
-
-
+
+
+
+
+
+
+
diff --git a/view/charts.php b/view/charts.php
index dcf6e26..5094566 100755
--- a/view/charts.php
+++ b/view/charts.php
@@ -39,7 +39,20 @@ $render = $answer->get('render');
?>
-
- CERCLE DES RELATIONS
-
+
+
+
+
+ SOCIOGRAMME SPATIAL
+
+
+
+
+
+
+
+ SOCIOGRAMME EGOCENTRE
+
+
+
\ No newline at end of file
diff --git a/view/js/charts.js b/view/js/charts.js
index e69de29..886bfed 100644
--- a/view/js/charts.js
+++ b/view/js/charts.js
@@ -0,0 +1,71 @@
+/* [1] Gestion du sociogramme
+=========================================================*/
+/* (0) On recupere les elements importants */
+var SOCIOGRAM = {
+ container: document.getElementById('sociogram'),
+ sigma: null
+};
+// Initialisation de SIGMA
+SOCIOGRAM.sigma = new sigma(SOCIOGRAM.container);
+
+/* (1) On recupere les informations via l'API */
+
+
+/* (2) Parametrage de SIGMA */
+SOCIOGRAM.sigma.settings({
+ defaultNodeColor: '#ec5148'
+ });
+
+/* (3) On recupere la liste des noeuds */
+var nodes = [
+ {
+ "id": "n0",
+ "label": "A node",
+ "x": 0,
+ "y": 0,
+ "size": 3
+ }, {
+ "id": "n1",
+ "label": "Another node",
+ "x": 3,
+ "y": 1,
+ "size": 2
+ }, {
+ "id": "n2",
+ "label": "And a last one",
+ "x": 1,
+ "y": 3,
+ "size": 1
+ }];
+
+
+/* (4) On recupere la liste des liens */
+var edges = [{
+ "id": "e0",
+ "source": "n0",
+ "target": "n1"
+ }, {
+ "id": "e1",
+ "source": "n1",
+ "target": "n2"
+ }, {
+ "id": "e2",
+ "source": "n2",
+ "target": "n0"
+ }];
+
+
+/* (5) On ajoute nos noeuds */
+for( var i = 0 ; i < nodes.length ; i++)
+ SOCIOGRAM.sigma.graph.addNode(nodes[i]);
+
+/* (6) On ajoute nos liens */
+for( var i = 0 ; i < edges.length ; i++)
+ SOCIOGRAM.sigma.graph.addEdge(edges[i]);
+
+/* (7) Gestion des interactions */
+
+
+/* (8) On affiche le graphique */
+SOCIOGRAM.sigma.camera.ratio = 2;
+SOCIOGRAM.sigma.refresh();
\ No newline at end of file