diff --git a/src/module_vmap/module/template/tools/advancedselect.html b/src/module_vmap/module/template/tools/advancedselect.html
index 9e0f58029789848d5353dcddb138c5bb9c7fa15d..84b2a6ca2cb5897a8acb5b7616dda995692a5c93 100755
--- a/src/module_vmap/module/template/tools/advancedselect.html
+++ b/src/module_vmap/module/template/tools/advancedselect.html
@@ -11,7 +11,7 @@
style="width: 80%"
ng-class="{'white color-gray': ctrl.currentAction === 'basicTools-selectByPoint' || ctrl.currentAction === 'basicTools-selectByLineString' || ctrl.currentAction === 'basicTools-selectByPolygon' || ctrl.currentAction === 'basicTools-selectByCircle'}"
ng-click="ctrl.selectGeomType !== '' ? ctrl.startSelection(ctrl.selectGeomType, ctrl.currentAction === 'basicTools-selectBy' + ctrl.selectGeomType) : angular.noop">
- Sélection graphique
+ {{ 'VMAP_ADVANCEDSELECT_GRAPHIC_SELECTION' | translate }}
</button>
<button type="button"
class="btn btn-sm btn-default dropdown-toggle"
@@ -28,23 +28,28 @@
<ul class="dropdown-menu">
<li><a href="javascript:void(0)"
ng-click="ctrl.selectGeomType = 'Point'; ctrl.startSelection('Point', false)">
- <span class="icon-point"></span> Point
+ <span class="icon-point"></span>
+ {{ 'VMAP_POINT' | translate }}
</a></li>
<li><a href="javascript:void(0)"
ng-click="ctrl.selectGeomType = 'MultiPoint'; ctrl.startSelection('MultiPoint', false)">
- <span class="icon-multipoint"></span> Multi point
+ <span class="icon-multipoint"></span>
+ {{ 'VMAP_MULTI_POINT' | translate }}
</a></li>
<li><a href="javascript:void(0)"
ng-click="ctrl.selectGeomType = 'LineString'; ctrl.startSelection('LineString', false)">
- <span class="icon-line"></span> Ligne
+ <span class="icon-line"></span>
+ {{ 'VMAP_LINE' | translate }}
</a></li>
<li><a href="javascript:void(0)"
ng-click="ctrl.selectGeomType = 'Polygon'; ctrl.startSelection('Polygon', false)">
- <span class="icon-polygon"></span> Polygone
+ <span class="icon-polygon"></span>
+ {{ 'VMAP_POLYGON' | translate }}
</a></li>
<li><a href="javascript:void(0)"
ng-click="ctrl.selectGeomType = 'Circle'; ctrl.startSelection('Circle', false)">
- <span class="icon-circle"></span> Cercle
+ <span class="icon-circle"></span>
+ {{ 'VMAP_CIRCLE' | translate }}
</a></li>
</ul>
</div>
@@ -57,13 +62,13 @@
class="btn btn-info btn-sm btn-block"
ng-click="ctrl.displaySelectionTable(ctrl.aSelections)">
<span class="icon-format_list_bulleted margin-sides-2"></span>
- Requêteur
+ {{ 'VMAP_ADVANCEDSELECT_REQUESTER' | translate }}
</button>
</div>
</div>
<div ng-show="!vmapScope.sizeOf(ctrl.oQueryableBOs) > 0">
<label class="margin-10 margin-sides-10">
- Aucun objet métier ou pas de droits en édition
+ {{ 'VMAP_ADVANCEDSELECT_NO_OBJECT' | translate }}
</label>
</div>
@@ -76,7 +81,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
- <h4 class="modal-title"><span class="icon-format_list_bulleted margin-sides-5"></span>Requêteur</h4>
+ <h4 class="modal-title"><span class="icon-format_list_bulleted margin-sides-5"></span> {{ 'VMAP_ADVANCEDSELECT_REQUESTER' | translate }}</h4>
</div>
<div class="modal-body modal-body-big">
@@ -173,23 +178,28 @@
</div>
<div class="col-xs-8" style="text-align: right">
<button class="btn btn-default" ng-click="ctrl.tableDeleteSelection('#select_table_' + bo_id)" ng-show="bo.user_rights.indexOf('DELETE') !== -1">
- <span class="icon-trash"></span> Supprimer les enregistrements
+ <span class="icon-trash"></span>
+ {{ 'VMAP_ADVANCEDSELECT_DELETE_RECORDINGS' | translate }}
</button>
<button class="btn btn-default" ng-click="ctrl.tableAddToCard('#select_table_' + bo_id, false)">
- <span class="icon-shopping_basket"></span> Ajouter au panier
+ <span class="icon-shopping_basket"></span>
+ {{ 'VMAP_ADVANCEDSELECT_ADD_BASKET' | translate }}
</button>
<button class="btn btn-default" ng-click="ctrl.tableAddToCard('#select_table_' + bo_id, true)">
- <span class="glyphicon glyphicon-repeat"></span> Remplacer panier
+ <span class="glyphicon glyphicon-repeat"></span>
+ {{ 'VMAP_ADVANCEDSELECT_REPLACE_BASKET' | translate }}
</button>
<div class="export btn-group dropup">
<button class="btn btn-default dropdown-toggle" aria-label="export type" title="Export data" data-toggle="dropdown" type="button">
- <i class="glyphicon glyphicon-export icon-share"></i> Exporter <span class="caret"></span>
+ <i class="glyphicon glyphicon-export icon-share"></i>
+ {{ 'VMAP_EXPORT' | translate }}
+ <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li role="menuitem" data-type="json" ng-click="ctrl.exportTable(bo_id, '#select_table_' + bo_id, 'json')"><a href="javascript:void(0)">JSON</a></li>
<li role="menuitem" data-type="csv" ng-click="ctrl.exportTable(bo_id, '#select_table_' + bo_id, 'csv')"><a href="javascript:void(0)">CSV</a></li>
<li role="menuitem" data-type="excel" ng-click="ctrl.exportTable(bo_id, '#select_table_' + bo_id, 'xlsx')"><a href="javascript:void(0)">MS-Excel</a></li>
- <li ng-if="ctrl.bGTFExport" role="menuitem" data-type="excel" ng-click="ctrl.exportTable(bo_id, '#select_table_' + bo_id, 'gtf')"><a href="javascript:void(0)">Autres formats</a></li>
+ <li ng-if="ctrl.bGTFExport" role="menuitem" data-type="excel" ng-click="ctrl.exportTable(bo_id, '#select_table_' + bo_id, 'gtf')"><a href="javascript:void(0)">{{ 'VMAP_ADVANCEDSELECT_OTHER_FORMATS' | translate }}</a></li>
</ul>
</div>
</div>
@@ -208,12 +218,12 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
- <h4 class="modal-title"><span class="glyphicon glyphicon-export icon-share margin-sides-5"></span>Demande d'export</h4>
+ <h4 class="modal-title"><span class="glyphicon glyphicon-export icon-share margin-sides-5"></span>{{ 'VMAP_ADVANCEDSELECT_EXPORT_REQUEST' | translate }}</h4>
</div>
<div class="modal-body">
<form id="vmap-gtf-export-form" ng-submit="ctrl.submitGtfExportFormModal(ctrl.oGTFExportAttibutes)">
<div class="form-group">
- <label for="vmap-gtf-export-form-format">Format de sortie</label>
+ <label for="vmap-gtf-export-form-format">{{ 'VMAP_ADVANCEDSELECT_EXPORT_FORMAT' | translate }}</label>
<select id="vmap-gtf-export-form-format"
class="form-control"
ng-model="ctrl.oGTFExportAttibutes.format"
@@ -221,7 +231,7 @@
ng-required="true"></select>
</div>
<div class="form-group">
- <label for="vmap-gtf-export-form-coordsys">Stystème de coordonnées (SRID)</label>
+ <label for="vmap-gtf-export-form-coordsys">{{ 'VMAP_ADVANCEDSELECT_EXPORT_SRID' | translate }}</label>
<select id="vmap-gtf-export-form-coordsys"
class="form-control"
ng-model="ctrl.oGTFExportAttibutes.coordsys"
@@ -229,14 +239,14 @@
ng-required="true"></select>
</div>
<div class="form-group">
- <label for="vmap-gtf-export-form-mails">Addresses mail (séparées par un point virgule)</label>
+ <label for="vmap-gtf-export-form-mails">{{ 'VMAP_ADVANCEDSELECT_EXPORT_MAIL' | translate }}</label>
<input type="text" class="form-control" id="vmap-gtf-export-form-mails" placeholder="ex: john.doe@veremes.com;armand@gmail.com" ng-model="ctrl.oGTFExportAttibutes.mails" required>
</div>
</form>
</div>
<div class="modal-footer">
- <button type="submit" class="btn btn-primary" form="vmap-gtf-export-form">Demander un export</button>
- <button type="button" class="btn btn-secondary" data-dismiss="modal">Annuler</button>
+ <button type="submit" class="btn btn-primary" form="vmap-gtf-export-form">{{ 'VMAP_ADVANCEDSELECT_EXPORT_SEND' | translate }}</button>
+ <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'VMAP_CANCEL' | translate }}</button>
</div>
</div>
</div>
diff --git a/src/module_vmap/module/template/tools/advancedselect_mobile.html b/src/module_vmap/module/template/tools/advancedselect_mobile.html
index 35341c47d45db7e68361202fd59e3f942160d01c..99bd7ac3f25952740f55496caaaa9cc0c8d93a70 100755
--- a/src/module_vmap/module/template/tools/advancedselect_mobile.html
+++ b/src/module_vmap/module/template/tools/advancedselect_mobile.html
@@ -5,7 +5,7 @@
<select class="form-control margin-5" ng-model="ctrl.sSelectedBo" ng-options="bo_id as bo.title for (bo_id, bo) in ctrl.oBusinessObjects"></select>
</div>
<!-- Menu -->
-<div id="vmap_menu_requeteur_menu_{{bo_id}}"
+<div id="vmap_menu_requeteur_menu_{{bo_id}}"
class="advanced-select-mobile-accordion"
ng-repeat="(bo_id, bo) in ctrl.oBusinessObjects"
ng-show="ctrl.sSelectedBo === bo_id">
@@ -13,23 +13,23 @@
<div class="panel list-group height-100">
<a href="#" class="list-group-item" data-toggle="collapse" data-target="#vmap_menu_requeteur_menu_filtre_{{bo_id}}" data-parent="#vmap_menu_requeteur_menu_{{bo_id}}">
<span class="icon-filter menu_logo"></span>
- Filtre
+ {{ 'VMAP_FILTER' | translate }}
</a>
<div id="vmap_menu_requeteur_menu_filtre_{{bo_id}}" class="sublinks collapse in">
<!--Search Form reader-->
<div id="select_search_form_reader_{{bo_id}}"
- app-form-reader
+ app-form-reader
app-properties="ctrl.properties"
app-token="ctrl.token"></div>
</div>
<a href="#" class="list-group-item" data-toggle="collapse" data-target="#vmap_menu_requeteur_menu_table_{{bo_id}}" data-parent="#vmap_menu_requeteur_menu_{{bo_id}}">
<span class="icon-table menu_logo"></span>
- Tableau résultant
+ {{ 'VMAP_ADVANCEDSELECT_TABLE' | translate }}
</a>
<div id="vmap_menu_requeteur_menu_table_{{bo_id}}" class="sublinks collapse margin-10 advanced-select-mobile-accordion-table">
- <table id="select_table_{{bo_id}}"
+ <table id="select_table_{{bo_id}}"
class="select_modal_table"
data-toggle="table"
data-search="false"
@@ -54,4 +54,4 @@
</table>
</div>
</div>
-</div>
\ No newline at end of file
+</div>