3 files changed, 18 insertions, 3 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 8d1dfd2a2..5acc702d6 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -200,6 +200,18 @@ function load_shortcut_menu(){
     });
 }
 
+function dynamic_load(url, target){
+    $.ajax({
+        url: url,
+        success: function(data, textStatus, jqXHR) {
+            $(target).html(jqXHR.responseText);
+            var response = $(jqXHR.responseText);
+            var responseScript = response.filter("script");
+            $.each(responseScript, function(idx, val) { eval(val.text); } );
+   }
+    });
+}
+
 $(document).ready(function(){
     $("#main_menu > ul > li > ul").hide();
     $("#main_menu ul ul .selected").parents().show();
diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html
index f2eefd6d3..692e435a3 100644
--- a/ishtar_common/templates/ishtar/dashboards/dashboard_main.html
+++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main.html
@@ -17,7 +17,7 @@
 $(function() {
     $('#dashboard .nav-link').click(function () {
         var url = $(this).attr('data-url');
-        $("#dashboard .card-body").load(url);
+        dynamic_load(url, "#dashboard .card-body");
         $('#dashboard li').removeClass('active');
         $('#dashboard li').removeClass('show');
         $(this).parent().tab('show');
diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
index ac779abe0..0f33f2069 100644
--- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
+++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
@@ -177,8 +177,11 @@ $(document).ready(function(){
 if (typeof values_1_{{unique_id}} === 'undefined'
     || values_1_{{unique_id}}.length == 0){
 
-$('#chart_img_{{unique_id}}').hide();
-$('#chart_{{unique_id}}').html("<p class='alert'><i class='fa fa-exclamation-triangle' aria-hidden='true'></i> {% trans 'No data for these criteria.' %}</p>");
+    $('#chart_img_{{unique_id}}').hide();
+    $('#chart_{{unique_id}}').html(
+        "<p class='alert alert-warning'>{% trans 'No data for these criteria.' %}</p>"
+    );
+    $('#chart_{{unique_id}}').css('height', 'auto');
 
 } else {
 var showmarker = false;