Skip to content

Commit

Permalink
add version nb in project file
Browse files Browse the repository at this point in the history
  • Loading branch information
mz committed Jun 7, 2017
1 parent aca3a95 commit 07e661e
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ function parseQuery(search) {
lng: lang,
fallbackLng: existing_lang[0],
backend: {
loadPath: 'static/locales/{{lng}}/translation.db45f698651b.json'
loadPath: 'static/locales/{{lng}}/translation.534307bc5156.json'
}
}, function (err, tr) {
if (err) {
Expand Down Expand Up @@ -7490,7 +7490,6 @@ function copy_layer(ref_layer, new_name, type_result, fields_to_copy) {
svg_map.lastChild.setAttribute("id", id_new_layer);
var node_new_layer = document.getElementById(id_new_layer);
svg_map.insertBefore(node_new_layer, svg_map.querySelector('.legend'));
node_new_layer.setAttribute("class", "result_layer layer");
result_data[new_name] = [];
current_layers[new_name] = {
n_features: current_layers[ref_layer].n_features,
Expand Down Expand Up @@ -15402,13 +15401,6 @@ function get_map_template() {
layer_style_i.color_map = [].concat(_toConsumableArray(current_layer_prop.color_map));
}
if (current_layer_prop.break_val) layer_style_i.break_val = current_layer_prop.break_val;

// } else if (current_layer_prop.renderer == "Stewart"
// || current_layer_prop.renderer == "Gridded"
// || current_layer_prop.renderer == "Choropleth"
// || current_layer_prop.renderer == "Categorical"
// || current_layer_prop.renderer == "Carto_doug"
// || current_layer_prop.renderer == "OlsonCarto") {
} else if (['Stewart', 'Gridded', 'Choropleth', 'Categorical', 'Carto_doug', 'OlsonCarto'].indexOf(current_layer_prop.renderer) > -1) {
(function () {
selection = map.select("#" + _layer_id).selectAll("path");
Expand Down Expand Up @@ -15505,7 +15497,7 @@ function get_map_template() {
}
}
// console.log(JSON.stringify({"map_config": map_config, "layers": layers_style}))
return JSON.stringify({ "map_config": map_config, "layers": layers_style });;
return JSON.stringify({ map_config: map_config, layers: layers_style, info: { version: _app.version } });;
});
}

Expand Down
2 changes: 1 addition & 1 deletion magrit_app/static/js/map_project.js
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ function get_map_template() {
}
}
// console.log(JSON.stringify({"map_config": map_config, "layers": layers_style}))
return JSON.stringify({"map_config": map_config, "layers": layers_style});;
return JSON.stringify({ map_config: map_config, layers: layers_style, info: { version: _app.version } });;
});
}

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.db45f698651b.min.css" rel="stylesheet" type="text/css">
<link href="static/css/style.534307bc5156.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.db45f698651b.js"></script>
<script src="static/js/app.534307bc5156.js"></script>
</body>
</html>

0 comments on commit 07e661e

Please sign in to comment.