From eb8bdabe91b33bbaef940452d1bda86dff33ebff Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 3 Apr 2012 14:15:15 -0400
Subject: [PATCH] CC-3482: Live Stream: UI Design for Source Stream panel on
 dashboard

- fixing user info display
---
 airtime_mvc/application/layouts/scripts/layout.phtml     | 9 +++++++--
 .../application/layouts/scripts/playouthistory.phtml     | 7 ++++++-
 .../application/views/scripts/partialviews/header.phtml  | 5 -----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 92d38eef9..70ba1ff90 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -15,11 +15,16 @@
             $sss = $this->SourceSwitchStatus();
             $scs = $this->SourceConnectionStatus();
     ?>
-    <?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(), 
+    <?php echo $this->partial('partialviews/header.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(), 
                 "live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'],
                 "scheduled_play_switch"=>$sss['scheduled_play'])) ?>
 <?php 	$partial = array('menu.phtml', 'default');
-		$this->navigation()->menu()->setPartial($partial); ?>
+    $this->navigation()->menu()->setPartial($partial); ?>
+    <div class="personal-block solo">
+        <ul>
+          <li><span class="name"><?php echo $this->loggedInAs()?></span> | <a href="/Login/logout">Logout</a></li>
+        </ul>
+    </div>
 
 <?php echo $this->navigation()->menu() ?>
 </div>
diff --git a/airtime_mvc/application/layouts/scripts/playouthistory.phtml b/airtime_mvc/application/layouts/scripts/playouthistory.phtml
index 1e8028866..f536d1646 100644
--- a/airtime_mvc/application/layouts/scripts/playouthistory.phtml
+++ b/airtime_mvc/application/layouts/scripts/playouthistory.phtml
@@ -15,12 +15,17 @@
             $sss = $this->SourceSwitchStatus();
             $scs = $this->SourceConnectionStatus();
     ?>
-    <?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(), 
+    <?php echo $this->partial('partialviews/header.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(), 
                 "live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'],
                 "scheduled_play_switch"=>$sss['scheduled_play'])) ?>
 
 <?php 	$partial = array('menu.phtml', 'default');
 		$this->navigation()->menu()->setPartial($partial); ?>
+    <div class="personal-block solo">
+        <ul>
+          <li><span class="name"><?php echo $this->loggedInAs()?></span> | <a href="/Login/logout">Logout</a></li>
+        </ul>
+    </div>
 
 <?php echo $this->navigation()->menu() ?>
 </div>
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index 6f57b5572..5e427d670 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -61,11 +61,6 @@
       <li class="time-zone"><span id="time-zone"></span></li>
     </ul>
   </div>
-  <div class="personal-block solo">
-    <ul>
-      <li><span class="name"><?php echo $this->user ?></span> | <a href="/Login/logout">Logout</a></li>
-    </ul>
-  </div>
   <?php if($this->trial_remain != '' && $this->trial_remain != "Trial expired."){?>
   <div class="trial-box">
       <p>Your trial expires in</p>