Skip to content

Commit

Permalink
Merge pull request #201 from 2p2r/v1.6.2
Browse files Browse the repository at this point in the history 
V1.6.2
  • Loading branch information
@gerald2545
gerald2545 authored Feb 12, 2019
2 parents 3013ccc + 9ca677e commit dd65d86
Show file tree
Hide file tree
Showing 38 changed files with 4,365 additions and 2,826 deletions.
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.
87 changes: 44 additions & 43 deletions admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,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?v1.6" />
<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.6.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?v1.6" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6" />
<link rel="stylesheet" type="text/css" href="resources/css/admin.css?v1.6.2" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6.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 @@ -51,9 +51,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.6"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.6"></script>
<script type="text/javascript" src="lib/js/key.js?v1.6"></script>
<script type="text/javascript" src="lib/js/translation_<?php echo $_SESSION['extension_language']; ?>.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.6.2"></script>
<script type="text/javascript" src="lib/js/key.js?v1.6.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 @@ -67,62 +67,63 @@
<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.6"></script>
<script type="text/javascript" src="lib/js/admin/poiCommon.js?v1.6"></script>
<script type="text/javascript" src="lib/js/admin/userUpdate.js?v1.6"></script>
<script type="text/javascript" src="lib/js/common.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/poiCommon.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/admin/userUpdate.js?v1.6.2"></script>
<?php
switch ($_SESSION['type']) {
case '1':
?>

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

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

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

<?php
break;
Expand Down
24 changes: 12 additions & 12 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<title><?php echo PAGE_TITLE ?> v1.6</title>
<title><?php echo PAGE_TITLE ?> v1.6.2</title>
<link rel="shortcut icon" type="image/png" href="resources/favicon/favicon.ico" />
</head>
<body onunload="setCookie()">
Expand All @@ -15,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?v1.6" />
<link rel="stylesheet" type="text/css" href="resources/css/icon.css?v1.6.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?v1.6" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6" />
<link rel="stylesheet" type="text/css" href="resources/css/public.css?v1.6.2" />
<link rel="stylesheet" type="text/css" href="resources/css/iconmarker.css?v1.6.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 @@ -35,14 +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.6"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.6"></script>
<script type="text/javascript" src="lib/js/key.js?v1.6"></script>
<script type="text/javascript" src="lib/js/translation_fr.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/key.js.template?v1.6.2"></script>
<script type="text/javascript" src="lib/js/key.js?v1.6.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/baselayerlist.js?v1.6"></script>
<script type="text/javascript" src="lib/js/public/baselayerlist.js?v1.6.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 @@ -51,10 +51,10 @@
<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.6"></script>
<script type="text/javascript" src="lib/js/public/proposition.js?v1.6"></script>
<script type="text/javascript" src="lib/js/public/map.js?v1.6"></script>
<script type="text/javascript" src="lib/js/public/main.js?v1.6"></script>
<script type="text/javascript" src="lib/js/common.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/public/proposition.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/public/map.js?v1.6.2"></script>
<script type="text/javascript" src="lib/js/public/main.js?v1.6.2"></script>

<script type="text/javascript">document.getElementById('loading-msg').innerHTML = 'Initialization...';</script>
</div>
Expand Down
2 changes: 1 addition & 1 deletion lib/js/admin/category1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ var CategorysDataStore = new Ext.data.Store({
{ name: 'lib_category', type: 'string', mapping: 'lib_category'},
{ name: 'icon_category', type: 'string', mapping: 'icon_category'},
{ name: 'treerank_category', type: 'int', mapping: 'treerank_category'},
{ name: 'display_category', type: 'bool'}
{ name: 'display_category', type: 'bool'}
]),
sortInfo: {field: 'lib_category', direction: 'ASC'}
});
Expand Down
11 changes: 11 additions & 0 deletions lib/js/admin/main1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ Ext.onReady(function(){
iconCls: 'fugue_users',
tabCls: 'right-tab',
items: UsersListingEditorGrid
}, {
id: 'users_link_pole',
layout: 'fit',
title: T_users_link_pole,
iconCls: 'fugue_users',
tabCls: 'right-tab',
items: UsersLinkListingEditorGrid
}
],
listeners: {
Expand All @@ -134,6 +141,10 @@ Ext.onReady(function(){
}else if (tab.id == "subcategory"){
SubCategorysDataStore.load({params: {start: 0, limit: 250}});
IconsDataStore.load({params: {start: 0, limit: 250}});
}else if (tab.id == "users_link_pole"){
LinksDataStore.load({params: {start: 0, limit: 250}});
}else if (tab.id == "config"){
IconsDataStore.load({params: {start: 0, limit: 250}});
}
}
}
Expand Down
11 changes: 8 additions & 3 deletions lib/js/admin/mapadmin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function getMarker() {
console.info('Dans mapadmin1.js getMarker '+tabcheckchild);
if (tabcheckchild != '') {
document.getElementById("loader").style.display = "block";
var uri = 'lib/php/admin/getMarker.php?listType='+tabcheckchild+'&dateLastModif='+dateLastModif+'&priority='+comboPrioritePOIMapItemMenu.getValue()+'&status='+StatusPOIFieldMapItemMenu.getValue()+'&displayObservationsToBeAnalyzedByComCom='+displayObservationsToBeAnalyzedByComCom+'&displayObservationsToBeAnalyzedByPole='+displayObservationsToBeAnalyzedByPole+'&commentToModerate='+displayObservationsWithCommentToModerate;
var uri = 'lib/php/admin/getMarker.php?listType='+tabcheckchild+'&dateLastModif='+dateLastModif+'&priority='+comboPrioritePOIMapItemMenu.getValue()+'&status='+StatusPOIFieldMapItemMenu.getValue()+'&displayObservationsToBeAnalyzedByComCom='+displayObservationsToBeAnalyzedByComCom+'&displayObservationsToBeAnalyzedByPole='+displayObservationsToBeAnalyzedByPole+'&commentToModerate='+displayObservationsWithCommentToModerate+'&nbSupportMinimum='+nbSupportMinimum;
OpenLayers.loadURL(uri, '', this, displayMarker);
}
}
Expand Down Expand Up @@ -278,7 +278,7 @@ function createPopup(feature) {
collapse: false,
collapsible: false,
resizable: true,
width: 600,
width: 800,
height: 450,
anchored: true,
autoScroll: true,
Expand Down Expand Up @@ -545,7 +545,12 @@ var mapAdminPanel = new GeoExt.MapPanel({
tbar: new Ext.Toolbar({
height: '20',
cls: 'x-panel-header',
items: arrayItemsMenuAdminMap
items: arrayItemsMenuTopAdminMap
}),
bbar: new Ext.Toolbar({
height: '20',
cls: 'x-panel-header',
items: arrayItemsMenuBottomAdminMap
})
});

Expand Down
4 changes: 3 additions & 1 deletion lib/js/admin/poi1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,9 @@ function endDrag(feat) {


var arrayItemsCenterPanel = [POIListingEditorGrid,PrioriteListingEditorGrid,StatusListingEditorGrid,BasketListingEditorGrid];
var arrayItemsMenuAdminMap = ['Filtres : ',dateFieldModifiedSince, CancelDateFilterItem, '&', StatusPOIFieldMapItemMenu, CancelStatusFilterItem, '&',comboPrioritePOIMapItemMenu, CancelPrioriteFilterItem,'&',checkboxDisplayObservationsWithCommentToModerate, ', ou ',searchObservationField,searchObservationButton,'->', comboALL];
var arrayItemsMenuTopAdminMap = ['Filtres : ',dateFieldModifiedSince,CancelDateFilterItem,'&', StatusPOIFieldMapItemMenu,CancelStatusFilterItem,'&',comboPrioritePOIMapItemMenu,CancelPrioriteFilterItem,'&',checkboxDisplayObservationsWithCommentToModerate,'&',numberFieldNbSupport,CancelVoteFilterItem];
var arrayItemsMenuBottomAdminMap = [searchObservationField,'->', comboALL];

var arrayItemsPhotoManagement = [hiddenIdPOI,
{
html: "<center><img id='photo' height='350' src='resources/images/logo_blank.png'/></center><br/>"
Expand Down
5 changes: 4 additions & 1 deletion lib/js/admin/poi2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,10 @@ function saveThePOI(oGrid_event) {


var arrayItemsCenterPanel = [POIListingEditorGrid];
var arrayItemsMenuAdminMap = ['Filtres : ',dateFieldModifiedSince, CancelDateFilterItem, '&',StatusPOIFieldMapItemMenu, CancelStatusFilterItem, '&',comboPrioritePOIMapItemMenu, CancelPrioriteFilterItem, '&',checkboxDisplayObservationsToBeAnalyzedByComCom,', ou ', searchObservationField,searchObservationButton, '->', comboALL];

var arrayItemsMenuTopAdminMap = ['Filtres : ',dateFieldModifiedSince,CancelDateFilterItem,'&',StatusPOIFieldMapItemMenu,CancelStatusFilterItem,'&',comboPrioritePOIMapItemMenu,CancelPrioriteFilterItem,'&',checkboxDisplayObservationsToBeAnalyzedByComCom,'&',numberFieldNbSupport,CancelVoteFilterItem];
var arrayItemsMenuBottomAdminMap = [searchObservationField, '->', comboALL];

var arrayItemsPhotoManagement = [hiddenIdPOI,
{
html: "<center><img id='photo' height='350' src='resources/images/logo_blank.png'/></center><br/>"
Expand Down
5 changes: 4 additions & 1 deletion lib/js/admin/poi3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,10 @@ function saveThePOI(oGrid_event) {
}

var arrayItemsCenterPanel = [POIListingEditorGrid];
var arrayItemsMenuAdminMap = ['Filtres : ',dateFieldModifiedSince, CancelDateFilterItem, '&',StatusPOIFieldMapItemMenu, CancelStatusFilterItem, '&',comboPrioritePOIMapItemMenu, CancelPrioriteFilterItem, '&',checkboxDisplayObservationsToBeAnalyzedByPole, '->',', ou',searchObservationField,searchObservationButton, comboALL]

var arrayItemsMenuTopAdminMap = ['Filtres : ',dateFieldModifiedSince,CancelDateFilterItem,'&',StatusPOIFieldMapItemMenu,CancelStatusFilterItem,'&',comboPrioritePOIMapItemMenu,CancelPrioriteFilterItem,'&',checkboxDisplayObservationsToBeAnalyzedByPole,'&',numberFieldNbSupport,CancelVoteFilterItem]
var arrayItemsMenuBottomAdminMap = [searchObservationField, '->',comboALL]

var arrayItemsPhotoManagement = [hiddenIdPOI,
{
html: "<center><img id='photo' height='350' src='resources/images/logo_blank.png'/></center><br/>"
Expand Down
Loading

0 comments on commit dd65d86

Please sign in to comment.