summaryrefslogtreecommitdiff
path: root/gnowsys-ndf/gnowsys_ndf
diff options
context:
space:
mode:
authorKedar Aitawdekar <kedar2a@gmail.com>2015-07-06 18:56:49 +0530
committerKedar Aitawdekar <kedar2a@gmail.com>2015-07-06 18:56:49 +0530
commitebd6ef6ff10522b487b53424527b1637ec16bcee (patch)
treeb74581558d0f7e055e2a691162e9b600c388e6ae /gnowsys-ndf/gnowsys_ndf
parent899a10519a8153d5c03f9d88a570b83e68a7a87e (diff)
downloadgnowsys-ebd6ef6ff10522b487b53424527b1637ec16bcee.tar.gz
Showing blockui while loading the graph
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf')
-rw-r--r--gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html5
-rw-r--r--gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme_drag_zoom_d3tree.html4
2 files changed, 6 insertions, 3 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html
index 8afc7e0..d1aaf1d 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme.html
@@ -342,7 +342,7 @@
}
.download-graph:hover {
color: black;
- background-color: lightgray;
+ background-color: #e5e5e5;
font-size: large;
cursor: pointer;
padding: 0.5em;
@@ -604,12 +604,14 @@
{% if tree == "hierarchical" %}
if({{unfold}})
{
+ $("article").block({message: '<h4>Building a graph... <br/>Please hold on...</h4>'});
$("#theme-drag-zoom-tree-container").addClass("hide")
$(".themes").removeClass("hide");
plotHierarchyTree(true);
}
else
{
+ $("article").block({message: '<h4>Building a graph... <br/>Please hold on...</h4>'});
$("#theme-drag-zoom-tree-container").addClass("hide")
$(".themes").removeClass("hide");
plotHierarchyTree(false);
@@ -621,6 +623,7 @@
{% if node %}
+ $("article").block({message: '<h4>Building a graph... <br/>Please hold on...</h4>'});
$.getJSON("{% url 'get_tree_hierarchy' group_id node.pk %}?collapsible=true", function(data){ treeData = data;})
.done(function(){plotDragZoomTree(treeData);
});
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme_drag_zoom_d3tree.html b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme_drag_zoom_d3tree.html
index 0e7186f..a130c48 100644
--- a/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme_drag_zoom_d3tree.html
+++ b/gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/theme_drag_zoom_d3tree.html
@@ -649,8 +649,8 @@
function downloadCollapsibleGraph(filename)
{
var blob = new Blob([$("#theme-drag-zoom-tree").html()], {type: "image/svg+xml"});
- filename = filename.replace(/\ /g, '_');
- filename += "_collapsible_Graph.svg";
+ filename = filename.replace(/\ /g, '-');
+ filename += "-Collapsible-Graph.svg";
saveAs(blob, filename);
}