Fix geosolutions-it#2531 notes

MV88 · Mar 8, 2018 · ba0fd54 · ba0fd54
1 parent 82e6ec2
commit ba0fd54
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 26 deletions.
diff --git a/web/client/components/mapcontrols/annotations/AnnotationsEditor.jsx b/web/client/components/mapcontrols/annotations/AnnotationsEditor.jsx
@@ -519,6 +519,7 @@ class AnnotationsEditor extends React.Component {
                     (<Portal><ConfirmDialog
                         show
                         modal
+                        title={<Message msgId="annotations.insertText" />}
                         confirmButtonDisabled={this.state.textValue === ""}
                         confirmButtonBSStyle="default"
                         onClose={this.props.onCancelText}

diff --git a/web/client/components/mapcontrols/annotations/DropdownFeatureType.jsx b/web/client/components/mapcontrols/annotations/DropdownFeatureType.jsx
@@ -22,7 +22,7 @@ const getGeomCollStyle = (type, multiType, style, defaultStyle = DEFAULT_ANNOTAT
 
 const DropdownButtonT = tooltip(DropdownButton);
 const DropdownFeatureType = ({onClick = () => {}, onStopDrawing = () => {}, onAddText = () => {}, onSetStyle = () => {}, bsStyle = "primary", ...props} = {}) => (
-    <DropdownButtonT id={props.idDropDown || uuidv1()} tooltip={props.tooltip} className="square-button-md" bsStyle={bsStyle} title={<Glyphicon glyph={props.glyph}/>} disabled={!!props.disabled} noCaret onClick={() => {onStopDrawing(); }}>
+    <DropdownButtonT id={props.idDropDown || uuidv1()} tooltipId={props.tooltipId} className="square-button-md" bsStyle={bsStyle} title={<Glyphicon glyph={props.glyph}/>} disabled={!!props.disabled} noCaret onClick={() => {onStopDrawing(); }}>
         <MenuItem eventKey="1" onClick={() => { onClick("MultiPoint"); onSetStyle(getGeomCollStyle("Point", "MultiPoint", props.style || {})); }}><Glyphicon glyph="point"/>{props.titles.marker}</MenuItem>
         <MenuItem eventKey="2" onClick={() => { onClick("MultiLineString"); onSetStyle(getGeomCollStyle("LineString", "MultiLineString", props.style || {})); }}><Glyphicon glyph="line"/>{props.titles.line}</MenuItem>
         <MenuItem eventKey="3" onClick={() => { onClick("MultiPolygon"); onSetStyle(getGeomCollStyle("Polygon", "MultiPolygon", props.style || {})); }}><Glyphicon glyph="polygon"/>{props.titles.polygon}</MenuItem>

diff --git a/web/client/themes/default/icons.less b/web/client/themes/default/icons.less
@@ -786,17 +786,14 @@
 .glyphicon-redo:before {
   content: "\003f";
 }
+
 /* geometry */
 .glyphicon-point:before {
   content: "\007e";
 }
 .glyphicon-polyline:before {
   content: "\007f";
 }
-.glyphicon-polygon:before {
-  content: "\0080";
-}
-
 .glyphicon-point-plus:before {
   content: "\0081";
 }
@@ -898,7 +895,6 @@
   content: "\0027";
 }
 
-
 .glyphicon-bulb-on:before {
   content: "\0028";
 }
@@ -923,6 +919,14 @@
   content: "\003d";
 }
 
+.glyphicon-line:before {
+  content: "\00B3";
+}
+
+.glyphicon-polygon:before {
+  content: "\00B4";
+}
+
 /* TODO: icons table positions (ie/firefox compatibility) */
 
 .glyphicon-polyline-remove:before {
@@ -931,7 +935,6 @@
 .glyphicon-polygon-remove:before {
   content: "\0086";
 }
-
 .glyphicon-point-dash:before {
   content: "\0087";
 }
@@ -941,14 +944,12 @@
 .glyphicon-polygon-dash:before {
   content: "\0089";
 }
-
 .glyphicon-point-trash:before {
   content: "\008a";
 }
 .glyphicon-polyline-trash:before {
   content: "\008b";
 }
-
 .glyphicon-point-minus:before {
   content: "\008d";
 }
@@ -958,10 +959,6 @@
 .glyphicon-polygon-minus:before {
   content: "\008f";
 }
-
-.glyphicon-line:before {
-  content: "\0090";
-}
 .glyphicon-line-plus:before {
   content: "\0091";
 }
@@ -976,4 +973,4 @@
 }
 .glyphicon-line-minus:before {
   content: "\0095";
-}
+}
diff --git a/web/client/themes/default/icons/icons.eot b/web/client/themes/default/icons/icons.eot
diff --git a/web/client/themes/default/icons/icons.svg b/web/client/themes/default/icons/icons.svg
diff --git a/web/client/themes/default/icons/icons.ttf b/web/client/themes/default/icons/icons.ttf
diff --git a/web/client/themes/default/icons/icons.woff b/web/client/themes/default/icons/icons.woff
diff --git a/web/client/translations/data.de-DE b/web/client/translations/data.de-DE
@@ -730,7 +730,7 @@
             "save": "Speichern",
             "cancel": "Abbrechen",
             "back": "Zurück",
-            "addMarker": "Einen neuen Punkt auf der Karte hinzufügen",
+            "addMarker": "Fügen Sie eine Geometrie hinzu",
             "styleGeometry": "Wählen Sie einen anderen Stil für Punkte",
             "deleteGeometry": "Bestehende Punkte entfernen",
             "removeannotation": "Möchten Sie die Annotation entfernen?",
@@ -742,6 +742,7 @@
             "add": "Neue",
             "filter": "Filtern die annotationen...",
             "undo": "Sind Sie sicher, dass Sie die Annotationsbearbeitungssitzung aufgeben möchten?",
+            "insertText": "Bitte fügen Sie die Textanmerkung ein",
             "downloadtooltip": "Laden Sie Anmerkungen herunter",
             "downloadcurrenttooltip": "Aktuelle Annotation herunterladen",
             "downloadError": "Fehler beim Exportieren",

diff --git a/web/client/translations/data.en-US b/web/client/translations/data.en-US
@@ -731,7 +731,7 @@
             "save": "Save",
             "cancel": "Cancel",
             "back": "Back",
-            "addMarker": "Add a new feature on the map",
+            "addMarker": "Add a new geometry",
             "styleGeometry": "Choose a different style for points, lines, polygons",
             "deleteGeometry": "Remove existing geometry",
             "removeannotation": "Do you want to remove the annotation?",
@@ -744,6 +744,7 @@
             "undo": "Are you sure you want to abandon the annotation editing session?",
             "title": "Annotations",
             "zoomTo": "Zoom",
+            "insertText": "Please insert the text annotation",
             "downloadtooltip": "Download annotations",
             "downloadcurrenttooltip": "Download current annotation",
             "downloadError": "Export error",

diff --git a/web/client/translations/data.es-ES b/web/client/translations/data.es-ES
@@ -730,7 +730,7 @@
             "save": "Guardar",
             "cancel": "Cancelar",
             "back": "Espalda",
-            "addMarker": "Añadir un nuevo punto en el mapa",
+            "addMarker": "Agrega una geometría",
             "styleGeometry": "Elige un estilo diferente para los puntos",
             "deleteGeometry": "Eliminar puntos existentes",
             "removeannotation": "¿Desea eliminar la anotación?",
@@ -743,6 +743,7 @@
             "filter": "Filtrar las anotaciones...",
             "undo": "¿Estás seguro de que quieres abandonar la sesión de edición de anotaciones?",
             "zoomTo": "Zoom",
+            "insertText": "Por favor inserte la anotación de texto",
             "downloadtooltip": "Descargar anotaciones",
             "downloadcurrenttooltip": "Descargar la anotación actual",
             "downloadError": "Error de exportación",

diff --git a/web/client/translations/data.fr-FR b/web/client/translations/data.fr-FR
@@ -702,7 +702,7 @@
             "save": "Enregistrer",
             "cancel": "Annuler",
             "back": "Arrière",
-            "addMarker": "Ajouter un nouveau point sur la carte",
+            "addMarker": "Ajouter une géométrie",
             "styleGeometry": "Choisissez un style différent pour les points",
             "deleteGeometry": "Supprimer les points existants",
             "removeannotation": "Voulez-vous supprimer l'annotation?",
@@ -715,6 +715,7 @@
             "filter": "Filtrer les annotations...",
             "undo": "Êtes-vous sûr de vouloir abandonner la session d'édition d'annotation?",
             "zoomTo": "Zoom",
+            "insertText": "Veuillez insérer l'annotation de texte",
             "downloadtooltip": "Télécharger les annotations",
             "downloadcurrenttooltip": "Télécharger l'annotation en cours",
             "downloadError": "Erreur d'exportation",

diff --git a/web/client/translations/data.it-IT b/web/client/translations/data.it-IT
@@ -730,7 +730,7 @@
             "save": "Salva",
             "cancel": "Annulla",
             "back": "Indietro",
-            "addMarker": "Aggiungi un punto sulla mappa",
+            "addMarker": "Aggiungi una geometria",
             "styleGeometry": "Scegli lo stile per il punto",
             "deleteGeometry": "Rimuovi i punti esistenti",
             "removeannotation": "Vuoi rimuovere l'annotazione?",
@@ -743,6 +743,7 @@
             "undo": "Sei sicuro di voler abbandonare la modifica in corso?",
             "title": "Annotazioni",
             "zoomTo": "Zoom",
+            "insertText": "Inserisci il testo dell'annotatzione",
             "downloadtooltip": "Esporta annotazioni",
             "downloadcurrenttooltip": "Esporta annotazione corrente",
             "downloadError": "Errore di esportazione",