From 57068da68c1287585e86fb0f8b549a1e4c687294 Mon Sep 17 00:00:00 2001 From: Felipe Bormann Date: Wed, 3 May 2017 19:00:57 -0300 Subject: [PATCH] finished tag cloud, started styling most accessed left bottom lists --- analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc | Bin 11707 -> 0 bytes analytics/static/analytics/general.css | 27 ++++++++++++++++++++++++--- analytics/static/analytics/general.css.map | 2 +- analytics/static/analytics/general.sass | 32 +++++++++++++++++++++++++++++--- analytics/static/analytics/js/charts.js | 26 ++++++++++++++++---------- analytics/templates/analytics/general.html | 29 +++++++++++++++++++++++++++-- 6 files changed, 97 insertions(+), 19 deletions(-) diff --git a/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc b/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc index 51f9774..a120e66 100644 Binary files a/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc and b/analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc differ diff --git a/analytics/static/analytics/general.css b/analytics/static/analytics/general.css index e190dc9..f7d533f 100644 --- a/analytics/static/analytics/general.css +++ b/analytics/static/analytics/general.css @@ -34,12 +34,33 @@ border-radius: 10px; color: #ffffff; } +.data-container { + width: 80px; + height: 40px; } + .tag-cloud { - width: 10%; border-radius: 25px; - color: #ffffff; } + color: #ffffff; + width: 80px; } .tag-name { - color: #ffffff; } + color: #ffffff; + font-size: 10px; } + +#left-data-selector { + background: linear-gradient(#0e8999, #6bf0ce); + width: 30%; } + +.middle-chart { + width: 30%; + float: left; } + .middle-chart h4 { + color: #009688; } + +.right-chart { + width: 30%; + float: left; } + .right-chart h4 { + color: #009688; } /*# sourceMappingURL=general.css.map */ diff --git a/analytics/static/analytics/general.css.map b/analytics/static/analytics/general.css.map index 5a4cf80..106adbc 100644 --- a/analytics/static/analytics/general.css.map +++ b/analytics/static/analytics/general.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA,YAAY;EACX,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;;AAGd,sBAAsB;EACrB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACD,KAAK,EAAE,OAAO;EAEf,yBAAE;IACD,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IAEX,4BAAE;MACD,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MAEZ,yCAAY;QACX,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;MAEpB,gCAAG;QACF,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;;AAIvB,sBAAsB;EACrB,UAAU,EAAE,2CAA2C;EACvD,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;;AAEf,UAAU;EACT,KAAK,EAAE,GAAG;EACV,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;;AAGf,SAAS;EACR,KAAK,EAAE,OAAO", +"mappings": "AAEA,YAAY;EACX,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;;AAGd,sBAAsB;EACrB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACD,KAAK,EAZO,OAAO;EAcpB,yBAAE;IACD,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IAEX,4BAAE;MACD,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MAEZ,yCAAY;QACX,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;MAEpB,gCAAG;QACF,gBAAgB,EAAE,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,aAAa,EAAE,IAAI;;AAIvB,sBAAsB;EACrB,UAAU,EAAE,2CAA2C;EACvD,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;;AAEf,eAAe;EACd,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;;AAEb,UAAU;EACT,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,KAAK,EAAE,IAAI;;AAIZ,SAAS;EACR,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,IAAI;;AAGhB,mBAAmB;EAClB,UAAU,EAAE,iCAAmC;EAC/C,KAAK,EAAE,GAAG;;AAGX,aAAa;EACZ,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,gBAAE;IACD,KAAK,EAtEO,OAAO;;AAwErB,YAAY;EACX,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EACX,eAAE;IACD,KAAK,EA5EO,OAAO", "sources": ["general.sass"], "names": [], "file": "general.css" diff --git a/analytics/static/analytics/general.sass b/analytics/static/analytics/general.sass index 8a25dae..21f89dc 100644 --- a/analytics/static/analytics/general.sass +++ b/analytics/static/analytics/general.sass @@ -1,3 +1,5 @@ +$title-color: #009688 + .report-body border: 1px solid #3ebeb4 border-radius: 20px @@ -8,7 +10,7 @@ height: 10% display: block h3 - color: #009688 + color: $title-color ul float: right @@ -41,11 +43,35 @@ border-radius: 10px color: #ffffff +.data-container + width: 80px + height: 40px + .tag-cloud - width: 10% border-radius: 25px color: #ffffff + width: 80px + .tag-name - color: #ffffff \ No newline at end of file + color: #ffffff + font-size: 10px + + +#left-data-selector + background: linear-gradient( #0e8999, #6bf0ce ) + width: 30% + + +.middle-chart + width: 30% + float: left + h4 + color: $title-color + +.right-chart + width: 30% + float: left + h4 + color: $title-color \ No newline at end of file diff --git a/analytics/static/analytics/js/charts.js b/analytics/static/analytics/js/charts.js index 1a1f866..b9fb9b6 100644 --- a/analytics/static/analytics/js/charts.js +++ b/analytics/static/analytics/js/charts.js @@ -353,28 +353,34 @@ var charts = { var color = d3.scaleLinear() - .domain([min(), max()]) + .domain([0,1,2]) .range(['#bdbdbd','#52b7bd', '#149e91']); + //this function is to support the mapping for possible colors + function getRandomInt(min, max) { + min = Math.ceil(min); + max = Math.floor(max); + return Math.floor(Math.random() * (max - min)) + min; + } var xScale = d3.scaleSqrt().domain([min(), max()]).range([10,50]); var tag_cloud = svg.selectAll('.tag-cloud-div') .data(dataset) .enter() .append('g') - .attr("class", "data-container") - .attr("width", 100) - .attr("height", 50); + .attr("class", "data-container"); var tag_rects = tag_cloud .append('rect') .attr('class', 'tag-cloud') .attr("width", function(d){ - return xScale(d['count']); + return xScale(d['count'])*1.2; + }) + .attr("height", function(d){ + return xScale(d["count"])*0.8; }) - .attr("height", 25) .attr("fill", function(d, i) { - return color(xScale[d["count"]]); + return color(getRandomInt(0,3)); }) .attr("rx", 20) .attr("ry", 20); @@ -384,8 +390,8 @@ var charts = { .text(function(d){ return d['name']; }) - .attr("x", 15) - .attr("y", 20) + .attr("x", 20) + .attr("y", 25) .attr("class", "tag-name") .attr("fill", "#ffffff"); @@ -394,7 +400,7 @@ var charts = { .force("x", d3.forceX(width/2).strength(0.05)) .force("y", d3.forceY(height/2).strength(0.05)) .force("collide", d3.forceCollide(function(d){ - return 25; + return 30; })); //simulation diff --git a/analytics/templates/analytics/general.html b/analytics/templates/analytics/general.html index 9dcebd6..cae075e 100644 --- a/analytics/templates/analytics/general.html +++ b/analytics/templates/analytics/general.html @@ -61,8 +61,33 @@
-
-
+
+
+

{% trans "Between" %}

+

20-20-17

+

{% trans "and" %}

+

20-20-17

+
+ +
+
    +
  • + {% trans "most accessed categories" %} +
    • +
  • + {% trans "most accessed subjects" %} +
    • +
  • + {% trans "most accessed resource" %} +
    • +
+ +
+ +
+
+

{% trans "most active users" %}

+
-- libgit2 0.21.2