Skip to content

Commit

Permalink
Stuff with styles + error message
Browse files Browse the repository at this point in the history
  • Loading branch information
mthh committed Mar 19, 2018
1 parent 02cf832 commit 9bdff00
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 10 deletions.
1 change: 0 additions & 1 deletion magrit_app/static/css/style.2c49a7a15878.min.css

This file was deleted.

1 change: 1 addition & 0 deletions magrit_app/static/css/style.83410dbffb27.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions magrit_app/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ p.params_section2 > select {
min-width: 40px;
font-size: 11.5px;
right: 20px;
max-width: 300px;
}

#section3 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,7 @@ function parseQuery(search) {
lng: lang,
fallbackLng: _app.existing_lang[0],
backend: {
loadPath: 'static/locales/{{lng}}/translation.2c49a7a15878.json'
loadPath: 'static/locales/{{lng}}/translation.83410dbffb27.json'
}
}, function (err, tr) {
if (err) {
Expand Down Expand Up @@ -8191,7 +8191,7 @@ var fields_griddedMap = {
color_palette: document.getElementById('Gridded_color_pal').value
};
if (params.mesh_type === 'user_polygons' && !params.polygon_layer) {
display_error_during_computation('A background layer is needed for this functionnality');
display_error_during_computation(i18next.t('app_page.common.error_background_needed'));
return;
}
render_GriddedFromPts(params, output_name);
Expand Down
2 changes: 1 addition & 1 deletion magrit_app/static/js/function.js
Original file line number Diff line number Diff line change
Expand Up @@ -3820,7 +3820,7 @@ const fields_griddedMap = {
color_palette: document.getElementById('Gridded_color_pal').value,
};
if (params.mesh_type === 'user_polygons' && !params.polygon_layer) {
display_error_during_computation('A background layer is needed for this functionnality');
display_error_during_computation(i18next.t('app_page.common.error_background_needed'));
return;
}
render_GriddedFromPts(params, output_name);
Expand Down
2 changes: 1 addition & 1 deletion magrit_app/static/json/list_symbols.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["amenity=police.png","h.png","food_fastfood.png","bank.png","landuse_hills.png","landuse_quary.png","poi_military_bunker.png","poi_tower_water.png","landuse_coniferous_and_deciduous.png","deer.png","tourist_battlefield.png","amenity=restaurant.png","poi_place_village.png","house.png","tourist_memorial.png","disability_lowvision.png","fish.png","tourist_steam_train.png","city_large.png","poi_mine.png","tourist_cinema.png","city_small.png","boat.png","shipwreck.png","city_building.png","tourist_archaeological.png","amenity=hospital.png","walker.png","flag.png","amenity=fast_food.png","food_bar.png","food_cafe.png","landuse_grass.png","poi_point_of_interest.png","gas.png","tourist_theatre.png","phone.png","amenity=theatre.png","tourisum_fountain.png","poi_tower_communications.png","landuse_swamp.png","question.png","parking.png","tourist_monument.png","amenity=bar.png","tourist_casino.png","skull.png","landuse_deciduous.png","landuse_scrub.png","poi_cave.png","plane.png","food_pub.png","tourist_fountain.png","tourist_windmill.png","waypoint.png","food_drinkingtap.png","camera.png","amenity=pub.png","couple.png","skier.png","poi_place_city.png","tourist_castle.png","poi_place_town.png","poi_embassy2.png","tourist_view_point.png","poi_peak.png","tourist_picnic.png","tourist_waterwheel.png","cross.png","swimmer.png","tourist_beach.png","education_university.png","golf.png","education_school.png","tourist_ruin.png","tourist_zoo.png","tourist_wreck.png","landuse_coniferous.png","tourist_art_gallery2.png","education_nursery.png","poi_tower_power.png","car.png","teepee.png","tourist_museum.png","parachute.png","fountain.png","poi_boundary_administrative.png","poi_embassy.png","city_medium.png","amenity=fire_station.png","anchor.png","disability_accessibility.png"]
["tourist_beach.png","landuse_hills.png","poi_boundary_administrative.png","tourist_castle.png","tourist_casino.png","landuse_deciduous.png","amenity=bar.png","tourist_theatre.png","tourist_cinema.png","poi_tower_communications.png","poi_place_city.png","food_drinkingtap.png","walker.png","car.png","poi_mine.png","poi_peak.png","food_fastfood.png","swimmer.png","amenity=fire_station.png","city_medium.png","education_school.png","poi_place_town.png","tourist_museum.png","phone.png","landuse_coniferous.png","tourist_fountain.png","tourisum_fountain.png","tourist_waterwheel.png","education_nursery.png","cross.png","shipwreck.png","skull.png","poi_military_bunker.png","plane.png","tourist_wreck.png","amenity=hospital.png","poi_cave.png","fountain.png","tourist_picnic.png","poi_place_village.png","tourist_ruin.png","deer.png","tourist_art_gallery2.png","anchor.png","fish.png","couple.png","food_cafe.png","amenity=theatre.png","city_building.png","amenity=restaurant.png","gas.png","landuse_swamp.png","camera.png","poi_embassy.png","city_small.png","city_large.png","poi_point_of_interest.png","disability_accessibility.png","landuse_grass.png","landuse_quary.png","education_university.png","flag.png","poi_tower_power.png","amenity=police.png","parachute.png","house.png","disability_lowvision.png","parking.png","golf.png","food_bar.png","question.png","tourist_steam_train.png","amenity=fast_food.png","tourist_memorial.png","tourist_monument.png","teepee.png","tourist_archaeological.png","boat.png","amenity=pub.png","landuse_coniferous_and_deciduous.png","h.png","poi_tower_water.png","skier.png","tourist_zoo.png","poi_embassy2.png","waypoint.png","food_pub.png","tourist_view_point.png","landuse_scrub.png","tourist_battlefield.png","tourist_windmill.png","bank.png"]
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"error_invalid_empty": "The layer to load seems to be empty.",
"error_waffle_too_many": "The number of symbols to be drawn is too large. Please select a higher ratio.",
"error_multiple_fields": "Please select at least 2 fields.",
"error_background_needed": "A background map (polygon layer) is required for this functionality.",
"warning_multiple_layers": "Layers from TopoJSON have to be provided one by one. Only the first one will be added.",
"warning_not_adapted_classification": "The choosen classification method doesn't seems to fit the serie distribution.",
"warning_empty_geom": "Look out, the layer contains one feature without geometry!",
Expand Down Expand Up @@ -838,7 +839,7 @@
"message": "Message",
"contact": "Contact",
"index": "Index page",
"intro_text": "An observation ? A suggestion ? A bug to report? Please use this form to contact us and give your feedback!<br><span class=\"link_email\">matthieu.viry [at] cnrs [dot] fr</span>"
"intro_text": "An observation ? A suggestion ? A bug to report? Please use this form to contact us and give your feedback!<br><span class=\"link_email\">riate [at] cnrs [dot] fr</span>"
},
"page404": {
"message1": "Error 404 - Page not found",
Expand Down
1 change: 1 addition & 0 deletions magrit_app/static/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"error_invalid_empty": "The layer to load seems to be empty.",
"error_waffle_too_many": "The number of symbols to be drawn is too large. Please select a higher ratio.",
"error_multiple_fields": "Please select at least 2 fields.",
"error_background_needed": "A background map (polygon layer) is required for this functionality.",
"warning_multiple_layers": "Layers from TopoJSON have to be provided one by one. Only the first one will be added.",
"warning_not_adapted_classification": "The choosen classification method doesn't seems to fit the serie distribution.",
"warning_empty_geom": "Look out, the layer contains one feature without geometry!",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"error_invalid_empty": "La capa seleccionada no contiene datos.",
"error_waffle_too_many": "El número de símbolos para dibujar es demasiado alto. Por favor, seleccione una mayor proporción.",
"error_multiple_fields": "Por favor elija al menos dos campos.",
"error_background_needed": "Se requiere un mapa de fondo (capa de polígonos) para esta funcionalidad.",
"warning_multiple_layers": "Las capas de tipo TopoJSON deben ser añadidas una por una. Sólo se agregará la primera.",
"warning_not_adapted_classification": "¡La discretización escogida no parece estar adaptada al modo de distribución!",
"warning_empty_geom": "Tenga en cuenta que la capa contiene una entidad sin geometría!",
Expand Down Expand Up @@ -832,7 +833,7 @@
"message": "Mensaje",
"contact": "Contacto",
"index": "Inicio",
"intro_text": "¿Algún comentario? ¿Sugerencia? ¿Error (bug)? ¡Gracias de antemano por señalarlo en este formulario y compartirnos su experiencia!<br><span class=\"link_email\">matthieu.viry [at] cnrs [punto] fr</span>"
"intro_text": "¿Algún comentario? ¿Sugerencia? ¿Error (bug)? ¡Gracias de antemano por señalarlo en este formulario y compartirnos su experiencia!<br><span class=\"link_email\">riate [at] cnrs [punto] fr</span>"
},
"page404": {
"message1": "Error 404 - Página inválida",
Expand Down
1 change: 1 addition & 0 deletions magrit_app/static/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"error_invalid_empty": "La capa seleccionada no contiene datos.",
"error_waffle_too_many": "El número de símbolos para dibujar es demasiado alto. Por favor, seleccione una mayor proporción.",
"error_multiple_fields": "Por favor elija al menos dos campos.",
"error_background_needed": "Se requiere un mapa de fondo (capa de polígonos) para esta funcionalidad.",
"warning_multiple_layers": "Las capas de tipo TopoJSON deben ser añadidas una por una. Sólo se agregará la primera.",
"warning_not_adapted_classification": "¡La discretización escogida no parece estar adaptada al modo de distribución!",
"warning_empty_geom": "Tenga en cuenta que la capa contiene una entidad sin geometría!",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"error_invalid_empty": "La couche à charger ne contient pas de données.",
"error_waffle_too_many": "Le nombre de symboles à dessiner est trop important. Veuillez sélectionner un ratio plus élevé.",
"error_multiple_fields": "Veuillez sélectionner au minimum 2 champs.",
"error_background_needed": "Un fond de carte (couche de polygones) est requis pour cette fonctionnalité.",
"warning_multiple_layers": "Les couches provenant de TopoJSON doivent être ajoutées une par une. Seule la 1ère va être ajoutée",
"warning_not_adapted_classification": "La discrétisation choisie ne semble pas adaptée à la forme de la distribution!",
"warning_empty_geom": "Attention, la couche contient une entité sans géométrie !",
Expand Down Expand Up @@ -838,7 +839,7 @@
"message": "Message",
"contact": "Contact",
"index": "Acceuil",
"intro_text": "Une remarque ? Une suggestion ? Un bug à signaler ? Merci d'utiliser ce formulaire pour nous contacter et nous faire part de vos retours d'expérience!<br><span class=\"link_email\">matthieu.viry [at] cnrs [point] fr</span>"
"intro_text": "Une remarque ? Une suggestion ? Un bug à signaler ? Merci d'utiliser ce formulaire pour nous contacter et nous faire part de vos retours d'expérience!<br><span class=\"link_email\">riate [at] cnrs [point] fr</span>"
},
"page404": {
"message1": "Erreur 404 - Page introuvable",
Expand Down
1 change: 1 addition & 0 deletions magrit_app/static/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"error_invalid_empty": "La couche à charger ne contient pas de données.",
"error_waffle_too_many": "Le nombre de symboles à dessiner est trop important. Veuillez sélectionner un ratio plus élevé.",
"error_multiple_fields": "Veuillez sélectionner au minimum 2 champs.",
"error_background_needed": "Un fond de carte (couche de polygones) est requis pour cette fonctionnalité.",
"warning_multiple_layers": "Les couches provenant de TopoJSON doivent être ajoutées une par une. Seule la 1ère va être ajoutée",
"warning_not_adapted_classification": "La discrétisation choisie ne semble pas adaptée à la forme de la distribution!",
"warning_empty_geom": "Attention, la couche contient une entité sans géométrie !",
Expand Down
4 changes: 2 additions & 2 deletions magrit_app/templates/modules.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title> {{ app_name }} </title>
<link rel="icon" type="image/png" href="static/img/favicon.png" />
<link href="static/css/scoped-bootstrap.min.css" rel="stylesheet" type="text/css">
<link href="static/css/style.2c49a7a15878.min.css" rel="stylesheet" type="text/css">
<link href="static/css/style.83410dbffb27.min.css" rel="stylesheet" type="text/css">
<link href="static/css/_vanilla-dataTables.min.css" rel="stylesheet" type="text/css">
<link href="static/css/alertify.min.css" rel="stylesheet" type="text/css">
<link href="static/css/semantic.min.css" rel="stylesheet" type="text/css">
Expand Down Expand Up @@ -51,6 +51,6 @@
</div>
</noscript>
<script src="static/js/lib/bootstrap-native3.mod.min.js"></script>
<script src="static/js/app.2c49a7a15878.js"></script>
<script src="static/js/app.83410dbffb27.js"></script>
</body>
</html>

0 comments on commit 9bdff00

Please sign in to comment.