From 5cc81ba12aaa17c9580645f2413ec2116985ca61 Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Mon, 11 Jul 2016 10:26:34 -0700
Subject: [PATCH 1/2] [Time Conductor] Added mode class to time conductor

---
 .../features/conductor-v2/res/templates/time-conductor.html     | 2 +-
 platform/features/conductor-v2/src/TimeConductorController.js   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/features/conductor-v2/res/templates/time-conductor.html b/platform/features/conductor-v2/res/templates/time-conductor.html
index b8d63e545f0..a27c3695b2e 100644
--- a/platform/features/conductor-v2/res/templates/time-conductor.html
+++ b/platform/features/conductor-v2/res/templates/time-conductor.html
@@ -28,7 +28,7 @@
 </style>
 <!-- Parent holder for time conductor. follow-mode | fixed-mode -->
 <div ng-controller="TimeConductorController as tcController"
-     class="l-flex-col" ng-class="{'follow-mode': followMode}">
+     class="l-flex-col {{modeModel.selected}}-mode">
     <!-- Holds date selectors and ticks -->
     <div class="l-conductor-dates">
         <form class="l-time-range-inputs-holder l-flex-row flex-elem"
diff --git a/platform/features/conductor-v2/src/TimeConductorController.js b/platform/features/conductor-v2/src/TimeConductorController.js
index 3211e0733ad..6e6dadeeb9e 100644
--- a/platform/features/conductor-v2/src/TimeConductorController.js
+++ b/platform/features/conductor-v2/src/TimeConductorController.js
@@ -89,6 +89,8 @@ define(
             var now = Math.ceil(Date.now() / 1000) * 1000;
             //Set the time conductor to some default
             this.conductor.bounds({start: now - SIX_HOURS, end: now});
+            this.$scope.modeModel.selected = 'fixed';
+            this.conductor.follow(false);
         };
 
         TimeConductorController.prototype.validateStart = function (start) {

From 11caa8396adee4728b5cbdb39a571fc12c513d13 Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Mon, 11 Jul 2016 11:18:23 -0700
Subject: [PATCH 2/2] Updated modes

---
 .../res/templates/mode-selector/mode-menu.html   |  4 ++--
 .../templates/mode-selector/mode-selector.html   |  2 +-
 .../conductor-v2/src/TimeConductorController.js  | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html b/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html
index 45257e469f1..4406e9e88b3 100644
--- a/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html
+++ b/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html
@@ -22,8 +22,8 @@
 <div class="contents">
     <div class="pane left menu-items">
         <ul>
-            <li ng-repeat="option in ngModel.options"
-                ng-click="ngModel.selected=option.key">
+            <li ng-repeat="(selected, option) in ngModel.options"
+                ng-click="ngModel.selected=selected">
                 <a
                    ng-mouseover="representation.activeMetadata = option"
                    ng-mouseleave="representation.activeMetadata = undefined">
diff --git a/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html b/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
index ea9e422d64d..cae3f457537 100644
--- a/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
+++ b/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
@@ -39,7 +39,7 @@
 <span ng-controller="ClickAwayController as modeController">
     <div class="s-menu-btn"
          ng-click="modeController.toggle()">
-		<span class="title-label">{{ngModel.selected}}</span>
+		<span class="title-label">{{ngModel.options[ngModel.selected].label}}</span>
     </div>
     <div class="menu super-menu mini mode-selector-menu"
          ng-show="modeController.isActive()">
diff --git a/platform/features/conductor-v2/src/TimeConductorController.js b/platform/features/conductor-v2/src/TimeConductorController.js
index c5ccbc8d9a9..006ae11dbde 100644
--- a/platform/features/conductor-v2/src/TimeConductorController.js
+++ b/platform/features/conductor-v2/src/TimeConductorController.js
@@ -62,26 +62,26 @@ define(
 
             $scope.modeModel = {
                 selected: 'fixed',
-                options: [
-                    {
-                        key: 'fixed',
+                options: {
+                    'fixed': {
                         glyph: '\ue604',
+                        label: 'Fixed',
                         name: 'Fixed Timespan Mode',
                         description: 'Query and explore data that falls between two fixed datetimes.'
                     },
-                    {
-                        key: 'realtime',
+                    'realtime': {
                         glyph: '\u0043',
+                        label: 'Real-time',
                         name: 'Real-time Mode',
                         description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
                     },
-                    {
-                        key: 'latest',
+                    'latest': {
                         glyph: '\u0044',
+                        label: 'Latest',
                         name: 'Latest Available Data Mode',
                         description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.'
                     }
-                ]
+                }
             }
         }