2p2r · gerald2545 · Jan 4, 2018 · Jan 4, 2018 · Jan 4, 2018 · Jan 4, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
 *.csv
 lib/js/key.js
 lib/php/key.php
+.vscode/
+resources/pictures/
+!resources/pictures/README
+v2/node_modules
+v2/npm-debug.log
diff --git a/.~lock.INSTALL.odt# b/.~lock.INSTALL.odt#
@@ -0,0 +1 @@
+,aloxq,adrien-OptiPlex-3020,25.01.2018 09:34,file:///home/aloxq/.config/libreoffice/4;
diff --git a/admin.html b/admin.html
@@ -2,14 +2,15 @@
 <!DOCTYPE >
 <html>
 	<head>
-		<title>VelObs [Admin]</title>
-		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
+		<title>Cyclo-fiches - Vélo-Cité [Admin]</title>
+		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.jpg" />
 	</head>
 	<body>
 		<div id="loading">
 			<div class="loading-indicator">
-				<img alt="Velobs" src="resources/images/velobs.jpg" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/>VelObs - <a href="https://www.2p2r.org/" target="_blank">2P2R</a><br /><span id="loading-msg">Loading styles and images ...</span>
+				<img alt="VelObs" src="resources/images/logo-main.png" height="64" style="margin-right:8px;float:left;vertical-align:top;"/>Cyclo-fiches - <a href="https://www.velo-cite.org/" target="_blank">Vélo-Cité</a><br /><span id="loading-msg">Loading styles and images ...</span>
 			</div>
+
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/geoext-all.css" />

diff --git a/admin.php b/admin.php
@@ -11,19 +11,33 @@
 		}
 		switch ($_SESSION['type']) {
 			case '1':
+			/* Rôle : Administrateur */
 ?>
 <!DOCTYPE >
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-		<title>VelObs [Admin]</title>
-		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
+		<title>Cyclo-fiches - Vélo-Cité [Admin]</title>
+		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.jpg" />
 	</head>
 	<body onunload="setCookie()">
-		<div id="loading"> 
-			<div class="loading-indicator">
-				<img alt="VelObs" src="resources/images/velobs.jpg" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/>VelObs - <a href="https://www.2p2r.org/" target="_blank">2P2R</a><br /><span id="loading-msg">Loading styles and images ...</span>
+		<div id="loading"
+			 class="loading"> 
+			 <div class="loading-indicator">
+				<img src="resources/images/logo-main.png"
+					 class="loading__logo"
+					 title="Logo Vélo-Cité"
+					 alt="Logo Vélo-Cité"
+					 height="64"
+					 style="margin-right:8px;float:left;vertical-align:top;"/>
+
+				<span class="loading__message">
+					<p>Cyclo-fiches - <a href="https://www.velo-cite.org/" target="_blank">Vélo-Cité</a></p>
+
+					<p id="loading-msg">Loading styles and images ...</p>
+				</span>
 			</div>
+
 			<link rel="stylesheet" type="text/css" href="resources/css/icon.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
@@ -34,6 +48,10 @@
 			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css" />
 			<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />
 
+			<!-- Début particularités Vélo-Cité -->
+			<link rel="stylesheet" type="text/css" href="resources/css/velocite/loading.css"/>
+			<!-- Fin particularités Vélo-Cité -->
+
 			<!--<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading Google Maps API...';</script> 
 			<script src="http://maps.google.com/maps/api/js?v=3&sensor=false"></script>-->
 
@@ -80,30 +98,50 @@
 
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initialization...';</script> 
 		</div>
-		<div id="header">
+
+		<img src="resources/images/cyclofiche.png"
+			 title="CycloFiche"
+			 alt="CycloFiche"
+			 style="height: 85px; position: absolute; left: 85px; top: 10px;"/>
+
+		<div>
 			<div id="disconnect" title="<?php echo getTranslation($_SESSION['id_language'],'DISCONNECT'); ?>" onclick="self.location.href ='lib/php/admin/disconnect.php';"></div>
 			<div id="gotopublicmap" title=<?php echo getTranslation($_SESSION['id_language'],'OPENPUBLICMAP'); ?> onclick="window.open('./');"></div>
-			<div id="hellouser""><?php if ($_SESSION['nom'] != '') {echo "[".$_SESSION['nom']."]";} ?></div>
+			<div id="hellouser"><?php if ($_SESSION['nom'] != '') {echo "[".$_SESSION['nom']."]";} ?></div>
 			<div id="update" style="display:none;"></div>
 		</div>
 	</body>
 </html>
 <?php			
 				break;
 			case '2':
+			/* Rôle : Communauté de communes */
 ?>
 <!DOCTYPE >
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-		<title>VelObs [Admin]</title>
-		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
+		<title>Cyclo-fiches - Vélo-Cité [Admin]</title>
+		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.jpg" />
 	</head>
 	<body>
-		<div id="loading"> 
+		<div id="loading"
+			 class="loading"> 
 			<div class="loading-indicator">
-				<img alt="2P2R" src="resources/images/2p2r.png" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/>VelObs - <a href="https://www.2p2r.org/" target="_blank">2P2R</a><br /><span id="loading-msg">Loading styles and images ...</span>
+				<img src="resources/images/logo-main.png"
+					 class="loading__logo"
+					 title="Logo Vélo-Cité"
+					 alt="Logo Vélo-Cité"
+					 height="64"
+					 style="margin-right:8px;float:left;vertical-align:top;"/>
+
+				<span class="loading__message">
+					<p>Cyclo-fiches - <a href="https://www.velo-cite.org/" target="_blank">Vélo-Cité</a></p>
+
+					<p id="loading-msg">Loading styles and images ...</p>
+				</span>
 			</div>
+
 			<link rel="stylesheet" type="text/css" href="resources/css/icon.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
@@ -114,6 +152,10 @@
 			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css" />
 			<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />
 
+			<!-- Début particularités Vélo-Cité -->
+			<link rel="stylesheet" type="text/css" href="resources/css/velocite/loading.css"/>
+			<!-- Fin particularités Vélo-Cité -->
+
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading Google Maps API...';</script> 
 			<!--<script src="http://maps.google.com/maps/api/js?v=3&sensor=false"></script>-->
 
@@ -149,17 +191,18 @@
 
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initialization...';</script> 
 		</div>
-		<?php
-            if ($_SESSION['header_logo'] == 1) {
-                echo '<div id="headergt">';
-            } else if ($_SESSION['header_logo'] == 2) {
-                echo '<div id="header" style="background:url(./resources/images/logowithsico.png) no-repeat;">';
-            } else if ($_SESSION['header_logo'] == 3) {
-                echo '<div id="header" style="background:url(./resources/images/logowithmur.png) no-repeat;">';
-            } else {
-                echo '<div id="header" style="background:url(./resources/images/logo.png) no-repeat;">';
-            }
-        ?>
+
+		<img src="resources/images/cyclofiche.png"
+			 title="CycloFiche"
+			 alt="CycloFiche"
+			 style="height: 85px; position: absolute; left: 85px; top: 10px;"/>
+
+		<img src="resources/images/bmheader.png"
+			 title="Logo Bordeaux Métropole"
+			 alt="Logo Bordeaux Métropole"
+			 style="height: 85px; position: absolute; left: 195px; top: 10px;"/>
+
+		<div>
 			<div id="disconnect" title="<?php echo getTranslation($_SESSION['id_language'],'DISCONNECT'); ?>" onclick="self.location.href ='lib/php/admin/disconnect.php';"></div>
 			<div id="gotopublicmap" title=<?php echo getTranslation($_SESSION['id_language'],'OPENPUBLICMAP'); ?> onclick="window.open('./');"></div>
 			<div id="hellouser"><?php if ($_SESSION['nom'] != '') {echo "[".$_SESSION['nom']."]";} ?></div>
@@ -170,19 +213,33 @@
 <?php
 				break;
 			case '3':
+			/* Rôle : Pôle technique */
 ?>
 <!DOCTYPE >
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-		<title>VelObs [Admin]</title>
-		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
+		<title>Cyclo-fiches - Vélo-Cité [Admin]</title>
+		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.jpg" />
 	</head>
 	<body onunload="setCookie()">
-		<div id="loading"> 
+		<div id="loading"
+			 class="loading"> 
 			<div class="loading-indicator">
-				<img alt="2P2R" src="resources/images/2p2r.png" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/>VelObs - <a href="https://www.2p2r.org/" target="_blank">2P2R</a><br /><span id="loading-msg">Loading styles and images ...</span>
+				<img src="resources/images/logo-main.png"
+					 class="loading__logo"
+					 title="Logo Vélo-Cité"
+					 alt="Logo Vélo-Cité"
+					 height="64"
+					 style="margin-right:8px;float:left;vertical-align:top;"/>
+
+				<span class="loading__message">
+					<p>Cyclo-fiches - <a href="https://www.velo-cite.org/" target="_blank">Vélo-Cité</a></p>
+
+					<p id="loading-msg">Loading styles and images ...</p>
+				</span>
 			</div>
+
 			<link rel="stylesheet" type="text/css" href="resources/css/icon.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
@@ -193,6 +250,10 @@
 			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css" />
 			<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />
 
+			<!-- Début particularités Vélo-Cité -->
+			<link rel="stylesheet" type="text/css" href="resources/css/velocite/loading.css"/>
+			<!-- Fin particularités Vélo-Cité -->
+
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading Google Maps API...';</script> 
 			<!--<script src="http://maps.google.com/maps/api/js?v=3&sensor=false"></script>-->
 
@@ -230,17 +291,8 @@
 
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initialization...';</script> 
 		</div>
-        <?php
-            if ($_SESSION['header_logo'] == 1) {
-                echo '<div id="header" style="background:url(./resources/images/logowithgt.png) no-repeat;">';
-            } else if ($_SESSION['header_logo'] == 2) {
-                echo '<div id="header" style="background:url(./resources/images/logowithsico.png) no-repeat;">';
-            } else if ($_SESSION['header_logo'] == 3) {
-                echo '<div id="header" style="background:url(./resources/images/logowithmur.png) no-repeat;">';
-            } else {
-                echo '<div id="header" style="background:url(./resources/images/logo.png) no-repeat;">';
-            }
-        ?>
+
+        <div>
 			<div id="disconnect" title="<?php echo getTranslation($_SESSION['id_language'],'DISCONNECT'); ?>" onclick="self.location.href ='lib/php/admin/disconnect.php';"></div>
 			<div id="gotopublicmap" title=<?php echo getTranslation($_SESSION['id_language'],'OPENPUBLICMAP'); ?> onclick="window.open('./');"></div>
 			<div id="hellouser"><?php if ($_SESSION['nom'] != '') {echo "[".$_SESSION['nom']."]";} ?></div>
@@ -250,20 +302,34 @@
 </html>			
 <?php
 				break;
-		    case '4':
+			case '4':
+			/* Rôle : Responsable pôle modérateur */
 ?>
 <!DOCTYPE >
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-		<title>VelObs [Admin]</title>
-		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
+		<title>Cyclo-fiches - Vélo-Cité [Admin]</title>
+		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.jpg" />
 	</head>
 	<body onunload="setCookie()">
-		<div id="loading">
+		<div id="loading"
+			 class="loading"> 
 			<div class="loading-indicator">
-                <img alt="2P2R" src="resources/images/2p2r.png" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/>VelObs - <a href="https://www.2p2r.org/" target="_blank">2P2R</a><br /><span id="loading-msg">Loading styles and images ...</span>
-            </div>
+				<img src="resources/images/logo-main.png"
+					 class="loading__logo"
+					 title="Logo Vélo-Cité"
+					 alt="Logo Vélo-Cité"
+					 height="64"
+					 style="margin-right:8px;float:left;vertical-align:top;"/>
+
+				<span class="loading__message">
+					<p>Cyclo-fiches - <a href="https://www.velo-cite.org/" target="_blank">Vélo-Cité</a></p>
+
+					<p id="loading-msg">Loading styles and images ...</p>
+				</span>
+			</div>
+
 			<link rel="stylesheet" type="text/css" href="resources/css/icon.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
@@ -275,6 +341,10 @@
 			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css" />
 			<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />
 
+			<!-- Début particularités Vélo-Cité -->
+			<link rel="stylesheet" type="text/css" href="resources/css/velocite/loading.css"/>
+			<!-- Fin particularités Vélo-Cité -->
+
 			<!--<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading Google Maps API...';</script>
 			<script src="http://maps.google.com/maps/api/js?v=3&sensor=false"></script>-->
 
@@ -314,17 +384,8 @@
 
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initialization...';</script>
 		</div>
-		<?php
-            if ($_SESSION['header_logo'] == 1) {
-                echo '<div id="headergt">';
-            } else if ($_SESSION['header_logo'] == 2) {
-                echo '<div id="header" style="background:url(./resources/images/logowithsico.png) no-repeat;">';
-            } else if ($_SESSION['header_logo'] == 3) {
-                echo '<div id="header" style="background:url(./resources/images/logowithmur.png) no-repeat;">';
-            } else {
-                echo '<div id="header" style="background:url(./resources/images/logo.png) no-repeat;">';
-            }
-        ?>
+
+		<div>
 			<div id="disconnect" title="<?php echo getTranslation($_SESSION['id_language'],'DISCONNECT'); ?>" onclick="self.location.href ='lib/php/admin/disconnect.php';"></div>
 			<div id="gotopublicmap" title=<?php echo getTranslation($_SESSION['id_language'],'OPENPUBLICMAP'); ?> onclick="window.open('./');"></div>
 			<div id="hellouser"><?php if ($_SESSION['nom'] != '') {echo "[".$_SESSION['nom']."]";} ?></div>

diff --git a/index.html b/index.html
@@ -1,14 +1,28 @@
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-		<title>VelObs</title>
-		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
+		<title>Signalez un problème à vélo à Bordeaux et dans la métropole | Vélo-Cité</title>
+		<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.jpg" />
 	</head>
+
 	<body onunload="setCookie()">
-		<div id="loading"> 
+		<div id="loading"
+			 class="loading"> 
 			<div class="loading-indicator">
-                <img alt="VelObs" src="resources/images/velobs.jpg" width="99" height="64" style="margin-right:8px;float:left;vertical-align:top;"/>VelObs - <a href="https://www.2p2r.org/" target="_blank">2P2R</a><br /><span id="loading-msg">Loading styles and images ...</span>
+				<img src="resources/images/logo-main.png"
+					 class="loading__logo"
+					 title="Logo Vélo-Cité"
+					 alt="Logo Vélo-Cité"
+					 height="64"
+					 style="margin-right:8px;float:left;vertical-align:top;"/>
+
+				<span class="loading__message">
+					<p>Cyclo-fiches - <a href="https://www.velo-cite.org/" target="_blank">Vélo-Cité</a></p>
+
+					<p id="loading-msg">Loading styles and images ...</p>
+				</span>
 			</div>
+
 			<link rel="stylesheet" type="text/css" href="resources/css/icon.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/ext-all.css" />
 			<link rel="stylesheet" type="text/css" href="lib/js/framework/ext-3.4.0/resources/css/xtheme-gray.css" />
@@ -18,6 +32,13 @@
 			<link rel="stylesheet" type="text/css" href="resources/css/public.css" />
 			<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css" />
 			<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />
+
+			<!-- Début particularités Vélo-Cité -->
+			<link rel="stylesheet" type="text/css" href="resources/css/velocite/common.css"/>
+			<link rel="stylesheet" type="text/css" href="resources/css/velocite/loading.css"/>
+			<link rel="stylesheet" type="text/css" href="resources/css/velocite/header.css"/>
+			<link rel="stylesheet" type="text/css" href="resources/css/velocite/map.css"/>
+			<!-- Fin particularités Vélo-Cité -->
 
 			<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading ExtJS...';</script>
 			<script type="text/javascript" src="lib/js/framework/ext-3.4.0/adapter/ext/ext-base.js"></script>

diff --git a/lib/js/admin/basket.js b/lib/js/admin/basket.js
@@ -14,8 +14,10 @@ var BasketsDataStore = new Ext.data.Store({
 			{ name: 'id_poi', type: 'int', mapping: 'id_poi'},
 			{ name: 'lib_poi', type: 'string', mapping: 'lib_poi'},
 			{ name: 'adherent_poi', type: 'string', mapping: 'adherent_poi'},
+			{ name: 'adherentfirstname_poi', type: 'string', mapping: 'adherentfirstname_poi'},
 			{ name: 'num_poi', type: 'string', mapping: 'num_poi'},
 			{ name: 'rue_poi', type: 'string', mapping: 'rue_poi'},
+			{ name: 'communename_poi', type: 'string', mapping: 'communename_poi'},
 			{ name: 'tel_poi', type: 'string', mapping: 'tel_poi'},
 			{ name: 'mail_poi', type: 'string', mapping: 'mail_poi'},
 			{ name: 'desc_poi', type: 'string', mapping: 'desc_poi'},
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		,aloxq,adrien-OptiPlex-3020,25.01.2018 09:34,file:///home/aloxq/.config/libreoffice/4;