summaryrefslogtreecommitdiff
path: root/ishtar_common/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2014-10-21 00:35:40 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2014-10-21 00:35:40 +0200
commit8a2d977a8a2dabb1513bb4f809fbf3ee5c641c72 (patch)
treea7fe5e03a2ca360c2e1e4af6e690d2d6e4bd4fcb /ishtar_common/templates
parent57cdf8896f854de7ba573cfe8d5040155df1e656 (diff)
downloadIshtar-8a2d977a8a2dabb1513bb4f809fbf3ee5c641c72.tar.bz2
Ishtar-8a2d977a8a2dabb1513bb4f809fbf3ee5c641c72.zip
Dashboard: work on graphs for operations (refs #2076)
* add a new creation date field for operations * refactoring of management of dashboard forms * dashboard form for operations
Diffstat (limited to 'ishtar_common/templates')
-rw-r--r--ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
index 820c50136..87ce5c528 100644
--- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
+++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html
@@ -141,7 +141,7 @@ var plot_{{unique_id}} = $.jqplot('chart_{{unique_id}}',
sizeAdjust: 7.5
},
series:[{% for label in dashboard.serie_labels %}
- {%if forloop.counter0%}, {% endif %}{label:"{{label}}"}{% endfor %}
+ {%if forloop.counter0%}, {% endif %}{label:"{{label}}", showmarker:showmarker}{% endfor %}
],
cursor:{
show: true,
@@ -172,9 +172,9 @@ $('#search_{{unique_id}}').click(function (){
return false;
});
-{% ifequal item_name 'files' %}
-load_jquerydate_after();
-load_jquerydate_before();
-{% endifequal %}
+{% if item_name == 'files' or item_name == "operations"%}
+load_jquerydate_{{item_name}}_after();
+load_jquerydate_{{item_name}}_before();
+{% endif %}
});
</script>