diff --git a/src/module_vmap/module/lang/lang-en.json b/src/module_vmap/module/lang/lang-en.json index 097f79a397373f94de4deaa9d747413d5333740b..a374d1b90562cd59e3bce6a3722ffa61f911be09 100644 --- a/src/module_vmap/module/lang/lang-en.json +++ b/src/module_vmap/module/lang/lang-en.json @@ -550,6 +550,10 @@ "VMAP_SERVICE_NAME": "Service name", "VMAP_SERVICE_URL": "Service URL", "VMAP_TITLE": "Title", + "VMAP_VERSION": "Version", + "VMAP_GET_CONTENT": "Get content", + "VMAP_MATRIX": "Matrix", + "VMAP_FORMAT": "Format", "": "", "VMAP_LAYERTREE_DATASETS": "Datasets", "VMAP_LAYERTREE_MAP_1": "Map 1", @@ -681,8 +685,9 @@ "VMAP_MAPMODAL_OSM_TITLE": "Add OSM layer", "": "", "VMAP_MAPMODAL_WMS_TITLE": "Add WMS layer", - "VMAP_MAPMODAL_WMS_GET_CONTENT": "Get content", "VMAP_MAPMODAL_WMS_ID": "Login (not required)", "VMAP_MAPMODAL_WMS_PASS": "Password (not required)", + "": "", + "VMAP_MAPMODAL_WMTS_TITLE": "Ajouter une couche WMTS", "": "" } diff --git a/src/module_vmap/module/lang/lang-fr.json b/src/module_vmap/module/lang/lang-fr.json index 80e4904b23dd56bc568e86c2a922b3f6d591b901..ef0d034f265c18e7c4ef28bb2fbc5e1ea7193863 100644 --- a/src/module_vmap/module/lang/lang-fr.json +++ b/src/module_vmap/module/lang/lang-fr.json @@ -551,6 +551,10 @@ "VMAP_SERVICE_NAME": "Nom du service", "VMAP_SERVICE_URL": "URL du service", "VMAP_TITLE": "Titre", + "VMAP_VERSION": "Version", + "VMAP_GET_CONTENT": "Voir le contenu", + "VMAP_MATRIX": "Matrice", + "VMAP_FORMAT": "Format", "": "", "VMAP_LAYERTREE_DATASETS": "Jeux de données", "VMAP_LAYERTREE_MAP_1": "Carte 1", @@ -681,8 +685,9 @@ "VMAP_MAPMODAL_OSM_TITLE": "Ajouter une couche OSM", "": "", "VMAP_MAPMODAL_WMS_TITLE": "Ajouter une couche WMS", - "VMAP_MAPMODAL_WMS_GET_CONTENT": "Voir le contenu", "VMAP_MAPMODAL_WMS_ID": "Identifiant (optionnel)", "VMAP_MAPMODAL_WMS_PASS": "Mot de passe (optionnel)", + "": "", + "VMAP_MAPMODAL_WMTS_TITLE": "Ajouter une couche WMTS", "": "" } diff --git a/src/module_vmap/module/template/layers/mapmodal/wmssuggestions.html b/src/module_vmap/module/template/layers/mapmodal/wmssuggestions.html index 3a16266091b5ad2648e870096cbc10b8c9c4ccb6..096259c8eb128c09336c22bf9602593814494a80 100755 --- a/src/module_vmap/module/template/layers/mapmodal/wmssuggestions.html +++ b/src/module_vmap/module/template/layers/mapmodal/wmssuggestions.html @@ -17,7 +17,7 @@ <div class="input-group"> <input type="text" class="form-control" placeholder="{{ 'VMAP_SERVICE_URL' | translate }}" aria-describedby="sizing-addon1" ng-model="oSelectedService.url" ng-change="ctrl.reloadServicesList()"> <span class="input-group-btn"> - <button type="submit" class="btn btn-success">{{ 'VMAP_MAPMODAL_WMS_GET_CONTENT' | translate }}</button> + <button type="submit" class="btn btn-success">{{ 'VMAP_GET_CONTENT' | translate }}</button> </span> </div> </div> diff --git a/src/module_vmap/module/template/layers/mapmodal/wmtssuggestions.html b/src/module_vmap/module/template/layers/mapmodal/wmtssuggestions.html index 5a2f5eadc0ba26f1be0558d74624fc642ae0e6d0..897dc52e39cffb301e05bc516060d29097102c80 100755 --- a/src/module_vmap/module/template/layers/mapmodal/wmtssuggestions.html +++ b/src/module_vmap/module/template/layers/mapmodal/wmtssuggestions.html @@ -1,45 +1,45 @@ <!-- Liste des cartes utilisables --> -<h3>Ajouter une couche WMTS: </h3> +<h3>{{ 'VMAP_MAPMODAL_WMTS_TITLE' | translate }}: </h3> <hr> <form ng-submit="ctrl.getCapabilities()"> <div class="row"> <div class="col-xs-3"> - <b>Service: </b> - <select id="select-wmts-service" class="form-control" - ng-model="iServiceIndex" + <b>{{ 'VMAP_SERVICE' | translate }}: </b> + <select id="select-wmts-service" class="form-control" + ng-model="iServiceIndex" ng-change="ctrl.selectService(iServiceIndex)"> <option value=""></option> <option ng-repeat="node in ctrl.catalog.services.wmts" value="{{$index}}">{{node.name}}</option> </select> </div> <div class="col-xs-3"> - <b>Type: </b> - <select id="select-wmts-service" class="form-control" + <b>{{ 'VMAP_TYPE' | translate }}: </b> + <select id="select-wmts-service" class="form-control" ng-model="ctrl.sRequestType"> <option value="KVP">KVP</option> <option value="REST">REST</option> </select> </div> <div class="col-xs-3"> - <b>Version: </b> - <input type="text" id="getCapabilities-wmts-version-field" class="form-control" placeholder="Version" aria-describedby="sizing-addon1" ng-model="ctrl.sRequestVersion"> + <b>{{ 'VMAP_VERSION' | translate }}: </b> + <input type="text" id="getCapabilities-wmts-version-field" class="form-control" placeholder="{{ 'VMAP_VERSION' | translate }}" aria-describedby="sizing-addon1" ng-model="ctrl.sRequestVersion"> </div> </div> <br> <div class="row"> <div class="col-xs-12"> - <b>URL: </b> + <b>{{ 'VMAP_URL' | translate }}: </b> <div class="input-group"> <input type="text" class="form-control" placeholder="Service url" aria-describedby="sizing-addon1" ng-model="ctrl.sRequestUrl"> <span class="input-group-btn"> - <button type="submit" class="btn btn-success">Voir le contenu</button> + <button type="submit" class="btn btn-success">{{ 'VMAP_GET_CONTENT' | translate }}</button> </span> </div> </div> - </div> + </div> </form> <br> @@ -47,18 +47,18 @@ <div id="load-img-wmts" style="display: none; text-align: center"><img src="images/ajax-load-big.gif"></div> <div id="wmts-suggestions-list" style="display: none"> - <input class="form-control input-sm right margin-sides-10 margin-5" - type="text" - placeholder="Rechercher" + <input class="form-control input-sm right margin-sides-10 margin-5" + type="text" + placeholder="Rechercher" style="width: 200px;" ng-model="filter"> <table class="table table-striped"> <thead> <tr> - <th>Titre</th> - <th>Nom</th> - <th>Matrice</th> + <th>{{ 'VMAP_TITLE' | translate }}</th> + <th>{{ 'VMAP_NAME' | translate }}</th> + <th>{{ 'VMAP_MATRIX' | translate }}</th> <th></th> </tr> </thead> @@ -71,9 +71,9 @@ </td> <!-- Si la projeciton est bonne --> <td class="WMTSSuggestionsButton"> - <button type="button" + <button type="button" class="btn btn-info" - ng-click="ctrl.addLayer(oLayer)">Ajouter</button> + ng-click="ctrl.addLayer(oLayer)">{{ 'VMAP_ADD' | translate }}</button> </td> </tr> </tbody> @@ -92,9 +92,9 @@ <div class="row"> <div class="col-xs-4"> - <label>Style</label> - <select class="form-control" - ng-model="oSelectedStyle" + <label>{{ 'VMAP_STYLE' | translate }}</label> + <select class="form-control" + ng-model="oSelectedStyle" ng-change="ctrl.sLayerToAdd_style_name = oSelectedStyle.Identifier" ng-options="oStyle.Title for oStyle in ctrl.oLayerToAdd.Style"></select> <br> @@ -103,16 +103,16 @@ </div> </div> <div class="col-xs-4"> - <label>Format</label> - <select id="select-wmts-service" class="form-control" + <label>{{ 'VMAP_FORMAT' | translate }}</label> + <select id="select-wmts-service" class="form-control" ng-model="ctrl.sLayerToAdd_format_name"> <option value="?"></option> <option ng-repeat="sFormat in ctrl.oLayerToAdd.Format" value="{{sFormat}}">{{sFormat}}</option> </select> </div> <div class="col-xs-4"> - <label>Matrice</label> - <select id="select-wmts-service" class="form-control" + <label>{{ 'VMAP_MATRIX' | translate }}</label> + <select id="select-wmts-service" class="form-control" ng-model="ctrl.sLayerToAdd_matrix_name"> <option value="?"></option> <option ng-repeat="oMatrix in ctrl.oLayerToAdd.TileMatrixSetLink" value="{{oMatrix.TileMatrixSet}}">{{oMatrix.TileMatrixSet}}</option> @@ -126,8 +126,8 @@ </div> <div class="modal-footer"> - <button type="button" class="btn btn-primary" ng-click="ctrl.addLayerToAdd()">Valider</button> + <button type="button" class="btn btn-primary" ng-click="ctrl.addLayerToAdd()">{{ 'VMAP_VALIDATE' | translate }}</button> </div> </div> </div> -</div> \ No newline at end of file +</div>