Skip to content

Commit

Permalink
Merge pull request #165 from 2p2r/DB_HOST
Browse files Browse the repository at this point in the history 
priority configuration, work on backend usability
  • Loading branch information
@gerald2545
gerald2545 authored Apr 30, 2018
2 parents a690068 + 3585861 commit 70addc0
Show file tree
Hide file tree
Showing 3,956 changed files with 4,354 additions and 427,392 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified INSTALL.odt
View file
Binary file not shown.
Binary file modified VélObs-documentation_utilisateurs.odt
View file
Binary file not shown.
89 changes: 45 additions & 44 deletions admin.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php header('Content-Type: text/html; charset=UTF-8');
session_start();
include_once 'lib/php/key.php.template';
include_once 'lib/php/key.php';
include_once 'lib/php/commonfunction.php';
if (DEBUG){
Expand All @@ -25,14 +26,14 @@
<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;"/><?php echo INCLUDE_CODE_HTML_LOADING ?><br /><span id="loading-msg">Loading styles and images ...</span>
</div>
<link rel="stylesheet" type="text/css" href="resources/css/icon.css" />
<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.5.2" />
<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" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/gxtheme-gray.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/popup.css" />
<link rel="stylesheet" type="text/css" href="resources/css/admin.css" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css" />
<link rel="stylesheet" type="text/css" href="resources/css/admin.css?v1.5.2" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.5.2" />
<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />

<!--<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading Google Maps API...';</script>
Expand All @@ -48,9 +49,9 @@

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading language...';</script>
<script type="text/javascript" src="lib/js/framework/ext-3.4.0/src/locale/ext-lang-<?php echo $_SESSION['extension_language']; ?>.js"></script>
<script type="text/javascript" src="lib/js/translation_<?php echo $_SESSION['extension_language']; ?>.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.5.1"></script>
<script type="text/javascript" src="lib/js/key.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/translation_<?php echo $_SESSION['extension_language']; ?>.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.5.2"></script>
<script type="text/javascript" src="lib/js/key.js?v1.5.2"></script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading extensions...';</script>
<script type="text/javascript" src="lib/js/framework/ux/GeoNamesSearchCombo.js"></script>
Expand All @@ -64,62 +65,62 @@
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading geometry...';</script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading application...';</script>
<script type="text/javascript" src="lib/js/common.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poiCommon.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/userUpdate.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/common.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommon.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/userUpdate.js?v1.5.2"></script>
<?php
switch ($_SESSION['type']) {
case '1':
?>

<script type="text/javascript" src="lib/js/admin/modeemploi1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/icon1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/config1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/status1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/users1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/priorite1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/commune1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/pole1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/quartier1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/basket.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poi1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/subcategory1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/category1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/main1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/modeemploi1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/icon1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/config1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/status1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/users1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/priorite1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/commune1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/pole1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/quartier1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/basket.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poi1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/subcategory1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/category1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/main1.js?v1.5.2"></script>

<?php
break;
case '2':
?>
<script type="text/javascript" src="lib/js/admin/modeemploi2.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poi2.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/modeemploi2.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poi2.js?v1.5.2"></script>

<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/main2.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/main2.js?v1.5.2"></script>
<?php
break;
case '3':
?>
<script type="text/javascript" src="lib/js/admin/modeemploi3.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poi3.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/main3.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/modeemploi3.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poi3.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/main3.js?v1.5.2"></script>
<?php
break;
case '4':
?>
<script type="text/javascript" src="lib/js/admin/modeemploi4.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/commune1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/pole1.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/basket.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poi4.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/main4.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/admin/modeemploi4.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/commune1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/pole1.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/basket.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poi4.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/mapadmin.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommonBeforeRender.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/admin/main4.js?v1.5.2"></script>

<?php
break;
Expand All @@ -132,7 +133,7 @@
</div>
<div id="header">
<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="gotopublicmap" title="<?php echo getTranslation($_SESSION['id_language'],'OPENPUBLICMAP'); ?>" onclick="self.location.href='<?php echo URL ?>';"></div>
<div id="hellouser""><?php if ($_SESSION['nom'] != '') {echo "[".$_SESSION['nom']."]";} ?></div>
<div id="update" style="display:none;"></div>
</div>
Expand Down
41 changes: 26 additions & 15 deletions index.php
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?php
<?php header('Content-Type: text/html; charset=UTF-8');
session_start();
include_once 'lib/php/key.php';
include_once 'lib/php/commonfunction.php';
?>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<title><?php echo PAGE_TITLE ?> v1.5.1</title>
<title><?php echo PAGE_TITLE ?> v1.5.2</title>
<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
</head>
<body onunload="setCookie()">
Expand All @@ -13,14 +15,14 @@
<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;"/><?php echo INCLUDE_CODE_HTML_LOADING ?><br /><span id="loading-msg">Loading styles and images ...</span>
</div>
<link rel="stylesheet" type="text/css" href="resources/css/icon.css" />
<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.5.2" />
<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" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/gxtheme-gray.css" />
<link rel="stylesheet" type="text/css" href="lib/js/framework/GeoExt/resources/css/popup.css" />
<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/public.css?v1.5.2" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.5.2" />
<link rel="stylesheet" type="text/css" href="resources/css/fileuploadfield.css" />

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading ExtJS...';</script>
Expand All @@ -33,15 +35,14 @@

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading language...';</script>
<script type="text/javascript" src="lib/js/framework/ext-3.4.0/src/locale/ext-lang-fr.js"></script>
<script type="text/javascript" src="lib/js/translation_fr.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.5.1"></script>
<script type="text/javascript" src="lib/js/key.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/translation_fr.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.5.2"></script>
<script type="text/javascript" src="lib/js/key.js?v1.5.2"></script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading extensions...';</script>
<script type="text/javascript" src="lib/js/framework/ux/GeoNamesSearchCombo.js"></script>
<script type="text/javascript" src="lib/js/public/poidisplaystatus.js"></script>
<script type="text/javascript" src="lib/js/public/poidisplaydate.js"></script>
<script type="text/javascript" src="lib/js/public/baselayerlist.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/public/baselayerlist.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/framework/ux/FileUploadField.js"></script>
<script type="text/javascript" src="lib/js/framework/ux/IconCombo.js"></script>

Expand All @@ -50,14 +51,24 @@
<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Loading application...';</script>
<script type="text/javascript" src="lib/js/public/credits.js"></script>
<script type="text/javascript" src="lib/js/framework/AnimatedCluster.js"></script>
<script type="text/javascript" src="lib/js/common.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/public/proposition.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/public/map.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/public/main.js?v1.5.1"></script>
<script type="text/javascript" src="lib/js/common.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/public/proposition.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/public/map.js?v1.5.2"></script>
<script type="text/javascript" src="lib/js/public/main.js?v1.5.2"></script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initialization...';</script>
</div>
<?php

<div id="header">
<?php
if (isset($_SESSION['user'])){
?><div id="disconnect" title="<?php echo getTranslation($_SESSION['id_language'],'DISCONNECT'); ?>" onclick="self.location.href ='lib/php/admin/disconnect.php';"></div>
<?php } ?>
<div id="gotopublicmap" title="<?php echo getTranslation($_SESSION['id_language'],'OPENPUBLICMAP'); ?>" onclick="self.location.href='<?php echo URL."/admin.php" ?>';"></div>
<div id="hellouser""><?php if ($_SESSION['nom'] != '') {echo "[".$_SESSION['nom']."]";} ?></div>
<div id="update" style="display:none;"></div>
</div>
<?php
//add custom code from lib/php/key.php
echo INCLUDE_CODE_HTML_PUBLIC;
?>
Expand Down
9 changes: 4 additions & 5 deletions lib/js/admin/main1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ Ext.onReady(function(){
Ext.QuickTips.init();
Ext.BLANK_IMAGE_URL = 'lib/js/framework/ext-3.4.0/resources/images/default/s.gif';



PolesDataStore.load({params: {start: 0, limit: 250}});
CommunesDataStore.load({params: {start: 0, limit: 250}});

//the user wants to load an observation with a direct link e.g. URL/velobs/admin.php?id=2840
//so load the page of the grid listing the observations containing the wanted observation
if (getURLParameter('id') != null && isInt(getURLParameter('id'))) {
console.info('Dans main1.js onReady getURLParameter(id) != null ' + getURLParameter('id'));
idEdit = getURLParameter('id');
Expand Down Expand Up @@ -67,7 +66,7 @@ Ext.onReady(function(){
id: 'contentpanel',
region: 'center',
layoutOnTabChange: false,
activeTab: 2,
activeTab: 3,
margins: '5 5 5 5',
enableTabScroll: true,
items: [{
Expand Down Expand Up @@ -154,7 +153,7 @@ Ext.onReady(function(){
callback: function () {
console.log("statPanel afterrender main " + statStore.getCount());
var h1 = document.createElement("H1");
var nouveauContenu = document.createTextNode("Statut des observations créées");
var nouveauContenu = document.createTextNode("Statut des observations créées sur votre zone");
h1.appendChild(nouveauContenu);
Ext.get('statsVelobs').appendChild(h1);
for(var a=0;a<statStore.getCount();a++) {
Expand Down
4 changes: 2 additions & 2 deletions lib/js/admin/main2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Ext.onReady(function(){
id: 'contentpanel',
region: 'center',
layoutOnTabChange: false,
activeTab: 0,
activeTab: 1,
margins: '5 5 5 5',
enableTabScroll: true,
items: [{
Expand Down Expand Up @@ -120,7 +120,7 @@ Ext.onReady(function(){
callback: function () {
console.log("statPanel afterrender main " + statStore.getCount());
var h1 = document.createElement("H1");
var nouveauContenu = document.createTextNode("Statut des observations créées");
var nouveauContenu = document.createTextNode("Statut des observations créées sur votre zone");
h1.appendChild(nouveauContenu);
Ext.get('statsVelobs').appendChild(h1);
for(var a=0;a<statStore.getCount();a++) {
Expand Down
4 changes: 2 additions & 2 deletions lib/js/admin/main3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Ext.onReady(function(){
id: 'contentpanel',
region: 'center',
layoutOnTabChange: false,
activeTab: 0,
activeTab: 1,
margins: '5 5 5 5',
enableTabScroll: true,
items: [{
Expand Down Expand Up @@ -125,7 +125,7 @@ Ext.onReady(function(){
callback: function () {
console.log("statPanel afterrender main " + statStore.getCount());
var h1 = document.createElement("H1");
var nouveauContenu = document.createTextNode("Statut des observations créées");
var nouveauContenu = document.createTextNode("Statut des observations créées sur votre zone");
h1.appendChild(nouveauContenu);
Ext.get('statsVelobs').appendChild(h1);
for(var a=0;a<statStore.getCount();a++) {
Expand Down
4 changes: 2 additions & 2 deletions lib/js/admin/main4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Ext.onReady(function(){
id: 'contentpanel',
region: 'center',
layoutOnTabChange: false,
activeTab: 0,
activeTab: 1,
margins: '5 5 5 5',
enableTabScroll: true,
items: [{
Expand Down Expand Up @@ -125,7 +125,7 @@ Ext.onReady(function(){
callback: function () {
console.log("statPanel afterrender main " + statStore.getCount());
var h1 = document.createElement("H1");
var nouveauContenu = document.createTextNode("Statut des observations créées");
var nouveauContenu = document.createTextNode("Statut des observations créées sur votre zone");
h1.appendChild(nouveauContenu);
Ext.get('statsVelobs').appendChild(h1);
for(var a=0;a<statStore.getCount();a++) {
Expand Down
Loading

0 comments on commit 70addc0

Please sign in to comment.