From 564cc07daeb302e0267de928cc8651c6e489c4d2 Mon Sep 17 00:00:00 2001 From: Gourav Tiwari Date: Thu, 19 Mar 2015 03:06:37 -0400 Subject: [PATCH] Fixed misc UI issues on analytics page --- app/assets/javascripts/audit_rails/audit.js | 24 ++++++------- .../audit_rails/audit_rails.css.erb | 36 +++++++++++-------- .../audit_rails/audits/_hourly_views.html.erb | 12 +++---- .../audit_rails/audits/_page_views.html.erb | 12 +++---- .../audit_rails/audits/_sub_menu.html.erb | 30 ++++++++-------- .../audit_rails/audits/_user_clicks.html.erb | 12 +++---- .../audit_rails/audits/_user_pages.html.erb | 22 ++++++------ .../audit_rails/audits/analytics.html.erb | 6 ++-- 8 files changed, 79 insertions(+), 75 deletions(-) diff --git a/app/assets/javascripts/audit_rails/audit.js b/app/assets/javascripts/audit_rails/audit.js index d7037fa..05f156b 100644 --- a/app/assets/javascripts/audit_rails/audit.js +++ b/app/assets/javascripts/audit_rails/audit.js @@ -39,33 +39,33 @@ $(document).ready(function(){ }); $('#user-clicks-zoomin').on('click', function(){ - $('#user-clicks').fadeIn( "slow", function() {}); + $('#user-clicks').show("fast", function(){}); }); $('#page-views-zoomin').on('click', function(){ - $('#page-views').fadeIn( "slow", function() {}); + $('#page-views').show("fast", function(){}); }); $('#hourly-views-zoomin').on('click', function(){ - $('#hourly-views').fadeIn( "slow", function() {}); + $('#hourly-views').show("fast", function(){}); }); $('#user-pages-zoomin').on('click', function(){ - $('#user-pages').fadeIn( "slow", function() {}); - $('per-user-by-pages-bar').fadeIn( "slow", function() {}); - $('per-user-by-pages-pie').fadeIn( "slow", function() {}); + $('#user-pages').show("fast", function(){}); + $('per-user-by-pages-bar').show("fast", function(){}); + $('per-user-by-pages-pie').show("fast", function(){}); }); $('#user-clicks-zoomout').on('click', function(){ - $('#user-clicks').fadeOut( "slow", function() {}); + $('#user-clicks').effect("puff", 'slow'); }); $('#page-views-zoomout').on('click', function(){ - $('#page-views').fadeOut( "slow", function() {}); + $('#page-views').effect("puff", 'slow'); }); $('#hourly-views-zoomout').on('click', function(){ - $('#hourly-views').fadeOut( "slow", function() {}); + $('#hourly-views').effect("puff", 'slow'); }); $('#user-pages-zoomout').on('click', function(){ - $('#user-pages').fadeOut( "slow", function() {}); - $('per-user-by-pages-bar').fadeOut( "slow", function() {}); - $('per-user-by-pages-pie').fadeOut( "slow", function() {}); + $('#user-pages').effect("puff", 'slow'); + $('per-user-by-pages-bar').effect("puff", 'slow'); + $('per-user-by-pages-pie').effect("puff", 'slow'); }); }); diff --git a/app/assets/stylesheets/audit_rails/audit_rails.css.erb b/app/assets/stylesheets/audit_rails/audit_rails.css.erb index 1937ee1..ad1877e 100644 --- a/app/assets/stylesheets/audit_rails/audit_rails.css.erb +++ b/app/assets/stylesheets/audit_rails/audit_rails.css.erb @@ -31,13 +31,13 @@ .homepage-heading{ font-family: HelveticaNeueLTStdLtCn; font-weight: bold; - font-size: 24px; + font-size: 24px; } ul.homepage-content li, ol.homepage-content li, .homepage-content{ font-family: HelveticaNeueLTStdLtCn; - font-size: 18px; + font-size: 18px; } ul.error-explanation{ margin:0; @@ -80,7 +80,7 @@ ul.error-explanation li{ } .left-navigation{ - min-height: 650px; + min-height: 400px; } a.active-item, a.active-item:hover{ @@ -115,11 +115,11 @@ a.active-item span.badge{ .section-header{ height: 45px; + background-color: #33aeb8; } .section-text{ color: white; - background-color: #33aeb8; padding: 15px; height: 100%; float: left; @@ -130,7 +130,6 @@ a.active-item span.badge{ } .section-count{ - float: left; background-color: #006978; color: white; height: 45px; @@ -138,12 +137,17 @@ a.active-item span.badge{ font-size: 20px; width: 20%; text-align: center; + width: 70px; + float: right; } .section-count.disabled{ background-color: #C7C7C7; + width: 70px; + float: right; } .section-zoom{ - width: 20%; + width: 70px; + float: right; } .section-body{ @@ -188,17 +192,15 @@ input.download-report:hover{ border-color: #e98e4e; border-radius: 0; } - .overlay{ - width: 92%; - height: 470px; - top: 410px; - position: absolute; - background-color: white; - margin: 0; - padding: 0; + min-width: 960px; + min-height: 470px; + position: relative; + display: none; + clear: both; + margin-left: 15px; + margin-bottom: 10px; } - .overlay-section{ margin: 0; padding: 0; @@ -223,3 +225,7 @@ input.download-report:hover{ .bar:hover { fill: #e98e4e ; } +.chart-modal{ + background-color: white; + min-height: 400px; +} \ No newline at end of file diff --git a/app/views/audit_rails/audits/_hourly_views.html.erb b/app/views/audit_rails/audits/_hourly_views.html.erb index fa0e9a4..bc88448 100644 --- a/app/views/audit_rails/audits/_hourly_views.html.erb +++ b/app/views/audit_rails/audits/_hourly_views.html.erb @@ -1,17 +1,17 @@ -
-
+
+
Hourly Views (UTC)
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
-
+
diff --git a/app/views/audit_rails/audits/_page_views.html.erb b/app/views/audit_rails/audits/_page_views.html.erb index 1cf7fa3..4dd0af3 100644 --- a/app/views/audit_rails/audits/_page_views.html.erb +++ b/app/views/audit_rails/audits/_page_views.html.erb @@ -1,16 +1,16 @@ -
-
+
+
View by Pages
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
-
+
diff --git a/app/views/audit_rails/audits/_sub_menu.html.erb b/app/views/audit_rails/audits/_sub_menu.html.erb index 0353aba..555a31a 100644 --- a/app/views/audit_rails/audits/_sub_menu.html.erb +++ b/app/views/audit_rails/audits/_sub_menu.html.erb @@ -4,12 +4,12 @@
View by Users
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
@@ -19,12 +19,12 @@
View by Pages
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
@@ -34,12 +34,12 @@
Hourly Views (UTC)
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
@@ -53,12 +53,12 @@
Users' Views by Pages
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
@@ -68,12 +68,12 @@
Global Hits
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
diff --git a/app/views/audit_rails/audits/_user_clicks.html.erb b/app/views/audit_rails/audits/_user_clicks.html.erb index 4e54729..5826f36 100644 --- a/app/views/audit_rails/audits/_user_clicks.html.erb +++ b/app/views/audit_rails/audits/_user_clicks.html.erb @@ -1,16 +1,16 @@ -
-
+
+
View by Users
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
-
+
diff --git a/app/views/audit_rails/audits/_user_pages.html.erb b/app/views/audit_rails/audits/_user_pages.html.erb index 3877263..146d87c 100644 --- a/app/views/audit_rails/audits/_user_pages.html.erb +++ b/app/views/audit_rails/audits/_user_pages.html.erb @@ -1,35 +1,35 @@ -
-
+
+
Users' Views by Pages
-
- <%= @analysis[:total] %> -
+
+ <%= @analysis[:total] %> +
- -
-
+ diff --git a/app/views/audit_rails/audits/analytics.html.erb b/app/views/audit_rails/audits/analytics.html.erb index da86d40..0a9f8c8 100644 --- a/app/views/audit_rails/audits/analytics.html.erb +++ b/app/views/audit_rails/audits/analytics.html.erb @@ -14,18 +14,16 @@

-
<% if @analysis[:by_user_name] == {} %> <%= render partial: 'no_audits_available', locals: {no_audits: @no_audits} %> <% else %> - <%= render partial: 'sub_menu' %> -
<%= render partial: 'user_clicks' %> <%= render partial: 'page_views' %> <%= render partial: 'hourly_views' %> <%= render partial: 'user_pages' %> + <%= render partial: 'sub_menu' %> <%#= render partial: 'page_views_by_user_bar' %> <%#= render partial: 'page_views_by_user_pie' %> <% end %> -
\ No newline at end of file +