From ed5efbed798aaa20df32c071ec096c63c154583e Mon Sep 17 00:00:00 2001 From: Felipe Bormann Date: Mon, 22 May 2017 15:00:06 -0300 Subject: [PATCH] modified css order and added arrow for most used sections --- analytics/static/analytics/general.css | 129 --------------------------------------------------------------------------------------------------------------------------------- analytics/static/analytics/general.css.map | 7 ------- analytics/static/analytics/general.sass | 149 ----------------------------------------------------------------------------------------------------------------------------------------------------- dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc | Bin 5122 -> 0 bytes dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/general.sassc | Bin 0 -> 35579 bytes dashboards/static/dashboards/css/dashboards_category.sass | 4 +++- dashboards/static/dashboards/css/general.css | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ dashboards/static/dashboards/css/general.css.map | 7 +++++++ dashboards/static/dashboards/css/general.sass | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ dashboards/static/dashboards/js/behavior.js | 22 ++++++++++++++++++---- 10 files changed, 315 insertions(+), 290 deletions(-) delete mode 100644 analytics/static/analytics/general.css delete mode 100644 analytics/static/analytics/general.css.map delete mode 100644 analytics/static/analytics/general.sass create mode 100644 dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/general.sassc create mode 100644 dashboards/static/dashboards/css/general.css create mode 100644 dashboards/static/dashboards/css/general.css.map create mode 100644 dashboards/static/dashboards/css/general.sass diff --git a/analytics/static/analytics/general.css b/analytics/static/analytics/general.css deleted file mode 100644 index 90fc2b3..0000000 --- a/analytics/static/analytics/general.css +++ /dev/null @@ -1,129 +0,0 @@ -.report-body { - border: 1px solid #3ebeb4; - border-radius: 20px; - padding: 10px; - overflow: auto; - width: 100%; - background-color: #ffffff; } - -#general-report-header { - height: 10%; - display: block; } - #general-report-header h3 { - color: #009688; } - #general-report-header ul { - float: right; - display: inline-flex; - width: 50%; - margin-bottom: 0px; } - #general-report-header ul li { - margin-right: 2%; - width: 50%; - color: white; - font-size: 20px; - background-color: #0f8a9a; - width: 100%; - text-align: center; - border-radius: 20px; - height: 30px; } - #general-report-header ul li.selected { - background-color: #4dcfbd; - width: 100%; - text-align: center; - border-radius: 20px; } - -#most-used-tags-header { - background: linear-gradient(to right, #0e8999, #6bf0ce); - height: 40px; - border-radius: 10px; - color: #ffffff; - padding-top: 1px; - margin-top: 10px; } - #most-used-tags-header h4 { - margin-left: 1%; } - -.tag-cloud { - border-radius: 25px; - color: #ffffff; } - -.tag-name { - color: #ffffff; } - -#left-data-selector { - background: linear-gradient(#0e8999, #6bf0ce); - margin-top: 5%; - padding-top: 3%; - padding-bottom: 2%; } - -.chart { - width: 30%; - float: left; } - .chart h4 { - color: #009688; - text-align: center; } - -.selector { - width: 90%; - height: 40px; - color: white; - padding-left: 5px; - background-color: #009688; - margin-top: 5px; - border-radius: 0px 20px 20px 0px; } - .selector p { - padding-top: 10px; - font-size: 16px; } - -.middle-chart article { - text-align: center; } - -.user-tooltip { - background: linear-gradient(#0e8999, #6bf0ce); - color: white; - border-radius: 10px; - padding: 7px; } - -.most-accessed-list { - background-color: #52b7bd; - width: 80%; - margin-left: 2%; - margin-top: 4%; - position: relative; - padding-left: 0; - color: white; - border: 2px solid #52b7bd; - transition: width 2s, height 2s, background-color 2s, transform 2s; } - .most-accessed-list li { - padding-left: 1%; } - -.most-accessed-list:after, .most-accessed-list:before { - bottom: 100%; - left: 50%; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; } - -.most-accessed-list:before { - border-width: 12px; - margin-left: -50%; - border-color: rgba(136, 183, 213, 0); - border-bottom-color: #52b7bd; } - -.most-accessed-item:hover { - background-color: #3aa7ad; } - -#month_selector_div { - text-align: center; - color: #009688; } - -.date-tooltip { - width: 40px; - height: 20px; - background: #52b7bd; - color: white; - text-align: center; } - -/*# sourceMappingURL=general.css.map */ diff --git a/analytics/static/analytics/general.css.map b/analytics/static/analytics/general.css.map deleted file mode 100644 index e19270a..0000000 --- a/analytics/static/analytics/general.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "AAEA,YAAY;EACR,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,IAAI;EACd,KAAK,EAAE,IAAI;EACX,gBAAgB,EAAE,OAAO;;AAE7B,sBAAsB;EAClB,MAAM,EAAE,GAAG;EACX,OAAO,EAAE,KAAK;EACd,yBAAE;IACE,KAAK,EAdC,OAAO;EAgBjB,yBAAE;IACE,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,WAAW;IACpB,KAAK,EAAE,GAAG;IACV,aAAa,EAAE,GAAG;IAElB,4BAAE;MACE,YAAY,EAAE,EAAE;MAChB,KAAK,EAAE,GAAG;MACV,KAAK,EAAE,KAAK;MACZ,SAAS,EAAE,IAAI;MACf,gBAAgB,EAAE,OAAO;MACzB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,MAAM;MAClB,aAAa,EAAE,IAAI;MACnB,MAAM,EAAE,IAAI;IAGhB,qCAAW;MACP,gBAAgB,EAAE,OAAO;MACzB,KAAK,EAAE,IAAI;MACX,UAAU,EAAE,MAAM;MAClB,aAAa,EAAE,IAAI;;AAM/B,sBAAsB;EAClB,UAAU,EAAE,2CAA2C;EACvD,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,WAAW,EAAE,GAAG;EAChB,UAAU,EAAE,IAAI;EAEhB,yBAAE;IACE,WAAW,EAAE,EAAE;;AAGvB,UAAU;EACN,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;;AAKlB,SAAS;EACL,KAAK,EAAE,OAAO;;AAGlB,mBAAmB;EACf,UAAU,EAAE,iCAAmC;EAC/C,UAAU,EAAE,EAAE;EACd,WAAW,EAAE,EAAE;EACf,cAAc,EAAE,EAAE;;AAEtB,MAAM;EACF,KAAK,EAAE,GAAG;EACV,KAAK,EAAE,IAAI;EAEX,SAAE;IACE,KAAK,EA9EC,OAAO;IA+Eb,UAAU,EAAE,MAAM;;AAE1B,SAAS;EACL,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;EACZ,YAAY,EAAE,GAAG;EACjB,gBAAgB,EAAE,OAAO;EACzB,UAAU,EAAE,GAAG;EACf,aAAa,EAAE,iBAAiB;EAChC,WAAC;IACG,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,IAAI;;AAInB,qBAAO;EACH,UAAU,EAAE,MAAM;;AAE1B,aAAa;EACT,UAAU,EAAE,iCAAkC;EAC9C,KAAK,EAAE,KAAK;EACZ,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,GAAG;;AAEhB,mBAAmB;EACf,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,GAAG;EACV,WAAW,EAAE,EAAE;EACf,UAAU,EAAE,EAAE;EACd,QAAQ,EAAE,QAAQ;EAClB,YAAY,EAAE,CAAC;EACf,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,iBAAiB;EACzB,UAAU,EAAE,sDAAsD;EAElE,sBAAE;IACE,YAAY,EAAE,EAAE;;AAExB,qDAAqD;EACjD,MAAM,EAAE,IAAI;EACZ,IAAI,EAAE,GAAG;EACT,MAAM,EAAE,iBAAiB;EACzB,OAAO,EAAE,GAAG;EACZ,MAAM,EAAE,CAAC;EACT,KAAK,EAAE,CAAC;EACR,QAAQ,EAAE,QAAQ;EAClB,cAAc,EAAE,IAAI;;AAGxB,0BAA0B;EACtB,YAAY,EAAE,IAAI;EAClB,WAAW,EAAE,IAAI;EACjB,YAAY,EAAE,sBAAsB;EACpC,mBAAmB,EAAE,OAAO;;AAEhC,yBAAyB;EACrB,gBAAgB,EAAE,OAAO;;AAG7B,mBAAmB;EACf,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,OAAO;;AAElB,aAAa;EACT,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,MAAM", -"sources": ["general.sass"], -"names": [], -"file": "general.css" -} \ No newline at end of file diff --git a/analytics/static/analytics/general.sass b/analytics/static/analytics/general.sass deleted file mode 100644 index dd12621..0000000 --- a/analytics/static/analytics/general.sass +++ /dev/null @@ -1,149 +0,0 @@ -$title-color: #009688 - -.report-body - border: 1px solid #3ebeb4 - border-radius: 20px - padding: 10px - overflow: auto - width: 100% - background-color: #ffffff - -#general-report-header - height: 10% - display: block - h3 - color: $title-color - - ul - float: right - display: inline-flex - width: 50% - margin-bottom: 0px - - li - margin-right: 2% - width: 50% - color: white - font-size: 20px - background-color: #0f8a9a - width: 100% - text-align: center - border-radius: 20px - height: 30px - - - li.selected - background-color: #4dcfbd - width: 100% - text-align: center - border-radius: 20px - - - - - -#most-used-tags-header - background: linear-gradient(to right, #0e8999, #6bf0ce) - height: 40px - border-radius: 10px - color: #ffffff - padding-top: 1px - margin-top: 10px - - h4 - margin-left: 1% - - -.tag-cloud - border-radius: 25px - color: #ffffff - - - - -.tag-name - color: #ffffff - - -#left-data-selector - background: linear-gradient( #0e8999, #6bf0ce ) - margin-top: 5% - padding-top: 3% - padding-bottom: 2% - -.chart - width: 30% - float: left - - h4 - color: $title-color - text-align: center - -.selector - width: 90% - height: 40px - color: white - padding-left: 5px - background-color: #009688 - margin-top: 5px - border-radius: 0px 20px 20px 0px - p - padding-top: 10px - font-size: 16px - - -.middle-chart - article - text-align: center - -.user-tooltip - background: linear-gradient( #0e8999, #6bf0ce) - color: white - border-radius: 10px - padding: 7px - -.most-accessed-list - background-color: #52b7bd - width: 80% - margin-left: 2% - margin-top: 4% - position: relative - padding-left: 0 - color: white - border: 2px solid #52b7bd - transition: width 2s, height 2s, background-color 2s, transform 2s - - li - padding-left: 1% - -.most-accessed-list:after, .most-accessed-list:before - bottom: 100% - left: 50% - border: solid transparent - content: " " - height: 0 - width: 0 - position: absolute - pointer-events: none - - -.most-accessed-list:before - border-width: 12px - margin-left: -50% - border-color: rgba(136, 183, 213, 0) - border-bottom-color: #52b7bd - -.most-accessed-item:hover - background-color: #3aa7ad - - -#month_selector_div - text-align: center - color: #009688 - -.date-tooltip - width: 40px - height: 20px - background: #52b7bd - color: white - text-align: center \ No newline at end of file diff --git a/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc b/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc index a4e0da3..0ae59aa 100644 Binary files a/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc and b/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc differ diff --git a/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/general.sassc b/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/general.sassc new file mode 100644 index 0000000..32e7521 Binary files /dev/null and b/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/general.sassc differ diff --git a/dashboards/static/dashboards/css/dashboards_category.sass b/dashboards/static/dashboards/css/dashboards_category.sass index a02c9ee..037a2d3 100644 --- a/dashboards/static/dashboards/css/dashboards_category.sass +++ b/dashboards/static/dashboards/css/dashboards_category.sass @@ -12,4 +12,6 @@ color: #5b8583 #category-selector option:hover - background: red \ No newline at end of file + background: red + + diff --git a/dashboards/static/dashboards/css/general.css b/dashboards/static/dashboards/css/general.css new file mode 100644 index 0000000..1d16a9f --- /dev/null +++ b/dashboards/static/dashboards/css/general.css @@ -0,0 +1,134 @@ +.report-body { + border: 1px solid #3ebeb4; + border-radius: 20px; + padding: 10px; + overflow: auto; + width: 100%; + background-color: #ffffff; } + +#general-report-header { + height: 10%; + display: block; } + #general-report-header h3 { + color: #009688; } + #general-report-header ul { + float: right; + display: inline-flex; + width: 50%; + margin-bottom: 0px; } + #general-report-header ul li { + margin-right: 2%; + width: 50%; + color: white; + font-size: 20px; + background-color: #0f8a9a; + width: 100%; + text-align: center; + border-radius: 20px; + height: 30px; } + #general-report-header ul li.selected { + background-color: #4dcfbd; + width: 100%; + text-align: center; + border-radius: 20px; } + +#most-used-tags-header { + background: linear-gradient(to right, #0e8999, #6bf0ce); + height: 40px; + border-radius: 10px; + color: #ffffff; + padding-top: 1px; + margin-top: 10px; } + #most-used-tags-header h4 { + margin-left: 1%; } + +.tag-cloud { + border-radius: 25px; + color: #ffffff; } + +.tag-name { + color: #ffffff; } + +#left-data-selector { + background: linear-gradient(#0e8999, #6bf0ce); + margin-top: 5%; + padding-top: 3%; + padding-bottom: 2%; } + +.chart { + width: 30%; + float: left; } + .chart h4 { + color: #009688; + text-align: center; } + +.selector { + width: 90%; + height: 40px; + color: white; + padding-left: 5px; + background-color: #009688; + margin-top: 5px; + border-radius: 0px 20px 20px 0px; } + .selector p { + padding-top: 10px; + font-size: 16px; + float: left; } + +.selector i { + margin-right: 20px; + margin-top: 6px; } + +.middle-chart article { + text-align: center; } + +.user-tooltip { + background: linear-gradient(#0e8999, #6bf0ce); + color: white; + border-radius: 10px; + padding: 7px; } + +.most-accessed-list { + background-color: #52b7bd; + width: 80%; + margin-left: 2%; + margin-top: 4%; + position: relative; + padding-left: 0; + color: white; + border: 2px solid #52b7bd; + transition: width 2s, height 2s, background-color 2s, transform 2s; } + .most-accessed-list li { + padding-left: 1%; } + +.most-accessed-list:after, .most-accessed-list:before { + bottom: 100%; + left: 50%; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; } + +.most-accessed-list:before { + border-width: 12px; + margin-left: -50%; + border-color: rgba(136, 183, 213, 0); + border-bottom-color: #52b7bd; } + +.most-accessed-item:hover { + background-color: #3aa7ad; } + +#month_selector_div { + text-align: center; + color: #009688; } + +.date-tooltip { + width: 40px; + height: 20px; + background: #52b7bd; + color: white; + text-align: center; } + +/*# sourceMappingURL=general.css.map */ diff --git a/dashboards/static/dashboards/css/general.css.map b/dashboards/static/dashboards/css/general.css.map new file mode 100644 index 0000000..c82fbd3 --- /dev/null +++ b/dashboards/static/dashboards/css/general.css.map @@ -0,0 +1,7 @@ +{ +"version": 3, +"mappings": "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", +"sources": ["general.sass"], +"names": [], +"file": "general.css" +} \ No newline at end of file diff --git a/dashboards/static/dashboards/css/general.sass b/dashboards/static/dashboards/css/general.sass new file mode 100644 index 0000000..507cffa --- /dev/null +++ b/dashboards/static/dashboards/css/general.sass @@ -0,0 +1,153 @@ +$title-color: #009688 + +.report-body + border: 1px solid #3ebeb4 + border-radius: 20px + padding: 10px + overflow: auto + width: 100% + background-color: #ffffff + +#general-report-header + height: 10% + display: block + h3 + color: $title-color + + ul + float: right + display: inline-flex + width: 50% + margin-bottom: 0px + + li + margin-right: 2% + width: 50% + color: white + font-size: 20px + background-color: #0f8a9a + width: 100% + text-align: center + border-radius: 20px + height: 30px + + + li.selected + background-color: #4dcfbd + width: 100% + text-align: center + border-radius: 20px + + + + + +#most-used-tags-header + background: linear-gradient(to right, #0e8999, #6bf0ce) + height: 40px + border-radius: 10px + color: #ffffff + padding-top: 1px + margin-top: 10px + + h4 + margin-left: 1% + + +.tag-cloud + border-radius: 25px + color: #ffffff + + + + +.tag-name + color: #ffffff + + +#left-data-selector + background: linear-gradient( #0e8999, #6bf0ce ) + margin-top: 5% + padding-top: 3% + padding-bottom: 2% + +.chart + width: 30% + float: left + + h4 + color: $title-color + text-align: center + +.selector + width: 90% + height: 40px + color: white + padding-left: 5px + background-color: #009688 + margin-top: 5px + border-radius: 0px 20px 20px 0px + p + padding-top: 10px + font-size: 16px + float: left +.selector + i + margin-right: 20px + margin-top: 6px + +.middle-chart + article + text-align: center + +.user-tooltip + background: linear-gradient( #0e8999, #6bf0ce) + color: white + border-radius: 10px + padding: 7px + +.most-accessed-list + background-color: #52b7bd + width: 80% + margin-left: 2% + margin-top: 4% + position: relative + padding-left: 0 + color: white + border: 2px solid #52b7bd + transition: width 2s, height 2s, background-color 2s, transform 2s + + li + padding-left: 1% + +.most-accessed-list:after, .most-accessed-list:before + bottom: 100% + left: 50% + border: solid transparent + content: " " + height: 0 + width: 0 + position: absolute + pointer-events: none + + +.most-accessed-list:before + border-width: 12px + margin-left: -50% + border-color: rgba(136, 183, 213, 0) + border-bottom-color: #52b7bd + +.most-accessed-item:hover + background-color: #3aa7ad + + +#month_selector_div + text-align: center + color: #009688 + +.date-tooltip + width: 40px + height: 20px + background: #52b7bd + color: white + text-align: center \ No newline at end of file diff --git a/dashboards/static/dashboards/js/behavior.js b/dashboards/static/dashboards/js/behavior.js index 293a45f..1846d98 100644 --- a/dashboards/static/dashboards/js/behavior.js +++ b/dashboards/static/dashboards/js/behavior.js @@ -9,7 +9,9 @@ $(document).ready(function(){ $('#month_selector').change(function(){ - $.get('/analytics/amount_active_users_per_day', {month: $(this).val() }).done(function(data){ + + var date = $(this).val().split("/"); + $.get('/analytics/amount_active_users_per_day', {month: date[0], year: date[1] }).done(function(data){ charts.month_heatmap(data, '#right-chart-body', 'month-chart'); }); @@ -28,9 +30,21 @@ $(document).ready(function(){ }); - //first call to month selector - $.get('/analytics/amount_active_users_per_day', {month: $('#month_selector option')[(new Date()).getMonth()].text }).done(function(data){ - $('#month_selector').val($('#month_selector option')[(new Date()).getMonth()].text); //update value to actual month + //first call to month selector + var month = new Array(); + month[0] = "January"; + month[1] = "February"; + month[2] = "March"; + month[3] = "April"; + month[4] = "May"; + month[5] = "June"; + month[6] = "July"; + month[7] = "August"; + month[8] = "September"; + month[9] = "October"; + month[10] = "November"; + month[11] = "December"; + $.get('/analytics/amount_active_users_per_day', { month: month[(new Date()).getMonth()] }).done(function(data){ charts.month_heatmap(data, '#right-chart-body', 'month-chart'); }); -- libgit2 0.21.2