From e6c2f78f83f9bc192866e095f28bd89fbee27b48 Mon Sep 17 00:00:00 2001 From: Jonathon Wilson Date: Wed, 9 Oct 2013 19:56:04 -0600 Subject: [PATCH] Start of connection indicators. Cleanup CSS. --- web/app/assets/javascripts/session.js | 3 +- .../stylesheets/client/session.css.scss | 42 ++++--------------- web/app/views/clients/_session.html.erb | 2 +- 3 files changed, 10 insertions(+), 37 deletions(-) diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 00924ef5a..3a2a17409 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -649,7 +649,7 @@ } else { // Examples of other events // Add media file track: "add", "The_Abyss_4T", 0 - logger.debug('non-vu event: ' + eventName + ',' + mixerId + ',' + value); + logger.dbg('non-vu event: ' + eventName + ',' + mixerId + ',' + value); } } } @@ -809,6 +809,7 @@ this.initialize = function() { context.jamClient.SetVURefreshRate(150); + context.jamClient.SessionSetConnectionStatusRefreshRate(1000); // refresh network connectivity once per second events(); var screenBindings = { 'beforeShow': beforeShow, diff --git a/web/app/assets/stylesheets/client/session.css.scss b/web/app/assets/stylesheets/client/session.css.scss index fcd27f93b..ff81bdf5b 100644 --- a/web/app/assets/stylesheets/client/session.css.scss +++ b/web/app/assets/stylesheets/client/session.css.scss @@ -440,7 +440,7 @@ table.vu td { left:28px; } -.track-connection-green { +.track-connection { position:absolute; bottom:0px; left:0px; @@ -450,50 +450,22 @@ table.vu td { font-weight:bold; font-size:8px; text-align:center; + overflow:hidden; +} +.track-connection.green { background-color:#72a43b; - overflow:hidden; } -.track-connection-yellow { - position:absolute; - bottom:0px; - left:0px; - width: 70px; - height: 8px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:8px; - text-align:center; +.track-connection.yellow { background-color:#cc9900; - overflow:hidden; } -.track-connection-red { - position:absolute; - bottom:0px; - left:0px; - width: 70px; - height: 8px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:8px; - text-align:center; +.track-connection.red { background-color:#980006; - overflow:hidden; } -.track-connection-grey { - position:absolute; - bottom:0px; - left:0px; - width: 70px; - height: 8px; - font-family:Arial, Helvetica, sans-serif; - font-weight:bold; - font-size:8px; - text-align:center; +.track-connection.grey { background-color:#666; - overflow:hidden; } diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb index af1489925..eac4aaac2 100644 --- a/web/app/views/clients/_session.html.erb +++ b/web/app/views/clients/_session.html.erb @@ -166,7 +166,7 @@ <%= image_tag "content/icon_settings_lg.png", {:width => 18, :height => 18} %> -
CONNECTION
+
CONNECTION