From 026ce33eec390dd9082902e751cbb94dd380e93c Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Fri, 21 Feb 2014 23:18:29 +0100 Subject: [PATCH] http db group --- .../aardvark/frontend/js/templates/dashboardHttpGroup.ejs | 5 +++++ js/apps/system/aardvark/frontend/js/views/dashboardView.js | 7 +++++-- .../system/aardvark/frontend/scss/_dashboardHttpGroup.scss | 5 +++++ js/apps/system/aardvark/frontend/scss/generated.css | 5 +++++ js/apps/system/aardvark/frontend/scss/style.scss | 2 ++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 js/apps/system/aardvark/frontend/js/templates/dashboardHttpGroup.ejs create mode 100644 js/apps/system/aardvark/frontend/scss/_dashboardHttpGroup.scss diff --git a/js/apps/system/aardvark/frontend/js/templates/dashboardHttpGroup.ejs b/js/apps/system/aardvark/frontend/js/templates/dashboardHttpGroup.ejs new file mode 100644 index 0000000000..7b5617b5ca --- /dev/null +++ b/js/apps/system/aardvark/frontend/js/templates/dashboardHttpGroup.ejs @@ -0,0 +1,5 @@ + diff --git a/js/apps/system/aardvark/frontend/js/views/dashboardView.js b/js/apps/system/aardvark/frontend/js/views/dashboardView.js index d24f7453a2..54f34871fe 100644 --- a/js/apps/system/aardvark/frontend/js/views/dashboardView.js +++ b/js/apps/system/aardvark/frontend/js/views/dashboardView.js @@ -283,9 +283,11 @@ template: templateEngine.createTemplate("dashboardView.ejs"), - httpTemplate: templateEngine.createTemplate("dashboardChart.ejs"), + httpTemplate: templateEngine.createTemplate("dashboardHttpGroup.ejs"), - groupTemplate: templateEngine.createTemplate("dashboardGroup.ejs"), + renderHttpGroup: function() { + $('.contentDiv').append(this.httpTemplate.render()); + }, render: function() { var self = this; @@ -296,6 +298,7 @@ this.renderPieCharts(); //this.renderLineCharts(); + this.renderHttpGroup(); console.log(this.series); } diff --git a/js/apps/system/aardvark/frontend/scss/_dashboardHttpGroup.scss b/js/apps/system/aardvark/frontend/scss/_dashboardHttpGroup.scss new file mode 100644 index 0000000000..169a23dc46 --- /dev/null +++ b/js/apps/system/aardvark/frontend/scss/_dashboardHttpGroup.scss @@ -0,0 +1,5 @@ +#dashboardHttpGroup { + width: 100%; + height: 300px; + border: 1px solid black; +} diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css index 5b499208c4..eeff6827bb 100644 --- a/js/apps/system/aardvark/frontend/scss/generated.css +++ b/js/apps/system/aardvark/frontend/scss/generated.css @@ -750,3 +750,8 @@ select.filterSelect { max-width: 160px; float: left; margin-right: 3px; } + +#dashboardHttpGroup { + width: 100%; + height: 300px; + border: 1px solid black; } diff --git a/js/apps/system/aardvark/frontend/scss/style.scss b/js/apps/system/aardvark/frontend/scss/style.scss index 118252d0e7..f942d02069 100644 --- a/js/apps/system/aardvark/frontend/scss/style.scss +++ b/js/apps/system/aardvark/frontend/scss/style.scss @@ -20,3 +20,5 @@ @import "tooltips"; // dbSelection @import "dbSelection"; +// dashboard http group +@import "dashboardHttpGroup";